Uniformise some error messages, translate all dutch undefined.

[lilypond.git] / po / ja.po

diff --git a/po/ja.po b/po/ja.po
index 3ccb98463f795215c94b6519a5329240fc841820..cced011926df5453b373178ad0ccd2cb64f58dc9 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 1.2.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-16 16:50+0200\n"
+"POT-Creation-Date: 2006-12-23 10:49+0100\n"
 "PO-Revision-Date: 2000-03-29 20:50+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -14,756 +14,607 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fontextract.py:25
-#, fuzzy, python-format
-msgid "Scanning %s"
-msgstr "·Ù¹ð: "
-
-#: fontextract.py:70
+#: convertrules.py:12
 #, python-format
-msgid "Extracted %s"
+msgid "Not smart enough to convert %s"
 msgstr ""
 
-#: fontextract.py:86
-#, fuzzy, python-format
-msgid "Writing fonts to %s"
-msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
-
-#: lilylib.py:62
-msgid "lilylib module"
+#: convertrules.py:13
+msgid "Please refer to the manual for details, and update manually."
 msgstr ""
 
-#: lilylib.py:65 lilypond-book.py:89 midi2ly.py:100 mup2ly.py:75 ps2png.py:41
-#: main.cc:145
-msgid "print this help"
-msgstr "¤³¤Î¥Ø¥ë¥×"
-
-#: lilylib.py:112 midi2ly.py:136 mup2ly.py:130
+#: convertrules.py:14
 #, python-format
-msgid "Copyright (c) %s by"
-msgstr "Copyright (c) %s by"
-
-#: lilylib.py:116 midi2ly.py:141 mup2ly.py:135
-msgid "Distributed under terms of the GNU General Public License."
+msgid "%s has been replaced by %s"
 msgstr ""
 
-#: lilylib.py:118 midi2ly.py:142 mup2ly.py:136
-msgid "It comes with NO WARRANTY."
+#: convertrules.py:2398
+msgid "LilyPond source must be UTF-8"
 msgstr ""
 
-#: lilylib.py:125 warn.cc:44 input.cc:79
-#, fuzzy, c-format, python-format
-msgid "warning: %s"
-msgstr "·Ù¹ð: "
-
-#: lilylib.py:128 warn.cc:50 input.cc:85 input.cc:93
-#, fuzzy, c-format, python-format
-msgid "error: %s"
-msgstr "¥¨¥é¡¼: "
-
-#: lilylib.py:132
-#, fuzzy, python-format
-msgid "Exiting (%d)..."
-msgstr "¹Ô ..."
-
-#: lilylib.py:200 midi2ly.py:223 mup2ly.py:219
-#, fuzzy, python-format
-msgid "Usage: %s [OPTIONS]... FILE"
-msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
-
-#: lilylib.py:204 convert-ly.py:57 midi2ly.py:227 mup2ly.py:223 main.cc:211
-#, c-format
-msgid "Options:"
-msgstr "¥ª¥×¥·¥ç¥ó:"
-
-#: lilylib.py:208 convert-ly.py:68 lilypond-pdfpc-helper.py:28 midi2ly.py:231
-#: mup2ly.py:227 main.cc:215
-#, c-format, python-format
-msgid "Report bugs to %s."
-msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø."
+#: convertrules.py:2401
+msgid "Try the texstrings backend"
+msgstr ""
 
-#: lilylib.py:228
+#: convertrules.py:2404
 #, python-format
-msgid "Binary %s has version %s, looking for version %s"
+msgid "Do something like: %s"
 msgstr ""
 
-#: lilylib.py:262
+#: convertrules.py:2407
+msgid "Or save as UTF-8 in your editor"
+msgstr ""
+
+#: fontextract.py:26
 #, fuzzy, python-format
-msgid "Opening pipe `%s'"
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+msgid "Scanning %s"
+msgstr "·Ù¹ð: "
 
-#: lilylib.py:277 lilypond-book.py:1162
+#: fontextract.py:71
 #, python-format
-msgid "`%s' failed (%d)"
+msgid "Extracted %s"
 msgstr ""
 
-#: lilylib.py:282 lilylib.py:341 lilypond-book.py:1163
-msgid "The error log is as follows:"
-msgstr ""
+#: fontextract.py:86
+#, fuzzy, python-format
+msgid "Writing fonts to %s"
+msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: lilylib.py:313 midi2ly.py:259 mup2ly.py:255
+#: lilylib.py:85 lilylib.py:136
 #, fuzzy, python-format
 msgid "Invoking `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilylib.py:315
+#: lilylib.py:87 lilylib.py:138
 #, fuzzy, python-format
 msgid "Running %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilylib.py:334
-#, python-format
-msgid "`%s' failed (%s)"
-msgstr ""
+#: lilylib.py:203
+#, fuzzy, python-format
+msgid "Usage: %s"
+msgstr "·Ù¹ð: "
 
-#: lilylib.py:337 midi2ly.py:265 mup2ly.py:263
-msgid "(ignored)"
+#: abc2ly.py:1351
+msgid ""
+"This program converts ABC music files (see\n"
+"http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) to LilyPond input."
 msgstr ""
 
-#: lilylib.py:355 midi2ly.py:275 mup2ly.py:273
-#, fuzzy, python-format
-msgid "Cleaning %s..."
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+#: abc2ly.py:1354
+#, fuzzy
+msgid "set output filename to FILE"
+msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
-#: lilylib.py:518
-#, python-format
-msgid "%s exited with status: %d"
+#: abc2ly.py:1356
+msgid "be strict about succes"
 msgstr ""
 
-#: convert-ly.py:32
-#, python-format
-msgid "%s has been replaced by %s"
+#: abc2ly.py:1358
+msgid "preserve ABC's notion of beams"
 msgstr ""
 
-#: convert-ly.py:33
-#, python-format
-msgid "Not smart enough to convert %s"
+#: convert-ly.py:41
+msgid ""
+"Update LilyPond input to newer version.  By default, update from the\n"
+"version taken from the \\version command, to the current LilyPond version.\n"
+"\n"
+"Examples:\n"
+"\n"
+"  convert-ly -e old.ly\n"
+"  convert-ly --from=2.3.28 --to 2.5.21 foobar.ly\n"
 msgstr ""
 
-#: convert-ly.py:34
-msgid "Please refer to the manual for details, and update manually."
+#: convert-ly.py:57 lilypond-book.py:98 warn.cc:48 input.cc:90
+#, fuzzy, c-format, python-format
+msgid "warning: %s"
+msgstr "·Ù¹ð: "
+
+#: convert-ly.py:60 lilypond-book.py:101 warn.cc:54 input.cc:96 input.cc:104
+#, fuzzy, c-format, python-format
+msgid "error: %s"
+msgstr "¥¨¥é¡¼: "
+
+#: convert-ly.py:76 etf2ly.py:1190 lilypond-book.py:121 midi2ly.py:98
+msgid "Distributed under terms of the GNU General Public License."
 msgstr ""
 
-#: convert-ly.py:50
-#, fuzzy, python-format
-msgid "Usage: %s [OPTION]... [FILE]..."
-msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
+#: convert-ly.py:77 etf2ly.py:1191 lilypond-book.py:122 midi2ly.py:99
+msgid "It comes with NO WARRANTY."
+msgstr ""
 
-#: convert-ly.py:53
-msgid ""
-"Update LilyPond input to newer version.  By default, update from the\n"
-"version taken from the \\version command, to the current LilyPond version."
+#: convert-ly.py:88 convert-ly.py:108
+msgid "VERSION"
 msgstr ""
 
-#: convert-ly.py:59
-msgid ""
-"  -e, --edit             edit in place\n"
-"  -f, --from=VERSION     start from VERSION [default: \\version found in "
-"file]\n"
-"  -h, --help             print this help\n"
-"  -n, --no-version       do not add \\version command if missing\n"
-"  -s, --show-rules       print rules [default: --from=0, --"
-"to=@TOPLEVEL_VERSION@]\n"
-"  -t, --to=VERSION       convert to VERSION [default: @TOPLEVEL_VERSION@]\n"
-"  -v, --version          print program version"
-msgstr ""
-
-#: convert-ly.py:75 lilypond-pdfpc-helper.py:34 main.cc:98
-#, fuzzy, c-format, python-format
-msgid ""
-"This program is free software.  It is covered by the GNU General Public\n"
-"License and you are welcome to change it and/or distribute copies of it\n"
-"under certain conditions.  Invoke as `%s --warranty' for more\n"
-"information.\n"
+#: convert-ly.py:90
+msgid "start from VERSION [default: \\version found in file]"
 msgstr ""
-"This is free software.  It is covered by the GNU General Public License,\n"
-"and you are welcome to change it and/or distribute copies of it under\n"
-"certain conditions.  Invoke as `%s --warranty' for more information.\n"
-"\n"
-"-- »²¹ÍÌõ\n"
-"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Ë´ð¤Å¤­¡¢Æ±°ì¾ò·ï¤Ç\n"
-"¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
-"`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
 
-#: convert-ly.py:2407
-msgid "LilyPond source must be UTF-8"
+#: convert-ly.py:93
+msgid "edit in place"
 msgstr ""
 
-#: convert-ly.py:2410
-msgid "Try the texstrings backend"
+#: convert-ly.py:96
+msgid "do not add \\version command if missing"
 msgstr ""
 
-#: convert-ly.py:2413
-#, python-format
-msgid "Do something like: %s"
+#: convert-ly.py:102
+msgid "print rules [default: --from=0, --to=@TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:2416
-msgid "Or save as UTF-8 in your editor"
+#: convert-ly.py:107
+msgid "convert to VERSION [default: @TOPLEVEL_VERSION@]"
 msgstr ""
 
-#: convert-ly.py:2494
+#: convert-ly.py:154
 msgid "Applying conversion: "
 msgstr ""
 
-#: convert-ly.py:2506
-#, python-format
-msgid "%s: error while converting"
+#: convert-ly.py:167
+msgid "Error while converting"
 msgstr ""
 
-#: convert-ly.py:2509 score-engraver.cc:111
-msgid "Aborting"
-msgstr "½ªÎ»¤·¤Þ¤¹"
+#: convert-ly.py:169
+msgid "Stopping at last succesful rule"
+msgstr ""
 
-#: convert-ly.py:2530
+#: convert-ly.py:191
 #, fuzzy, python-format
 msgid "Processing `%s'... "
 msgstr "½èÍýÃæ..."
 
-#: convert-ly.py:2632
+#: convert-ly.py:278 source-file.cc:54
+#, fuzzy, c-format, python-format
+msgid "cannot open file: `%s'"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
+
+#: convert-ly.py:285
 #, fuzzy, python-format
-msgid "%s: can't determine version for `%s'"
+msgid "cannot determine version for `%s'. Skipping"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: convert-ly.py:2641
-#, fuzzy, python-format
-msgid "%s: skipping: `%s'"
-msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+#: etf2ly.py:1198
+msgid ""
+"Enigma Transport Format is a format used by Coda Music Technology's\n"
+"Finale product. This program will convert a subset of ETF to a\n"
+"ready-to-use LilyPond file."
+msgstr ""
+
+#: etf2ly.py:1201 midi2ly.py:885
+#, fuzzy
+msgid "write output to FILE"
+msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
+
+#: etf2ly.py:1202 midi2ly.py:886 main.cc:172 main.cc:178
+msgid "FILE"
+msgstr "FILE"
+
+#: etf2ly.py:1204 midi2ly.py:899
+#, fuzzy
+msgid "show warranty"
+msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
 #: lilypond-book.py:71
 msgid ""
-"Process LilyPond snippets in hybrid HTML, LaTeX, or texinfo document.\n"
+"Process LilyPond snippets in hybrid HTML, LaTeX, texinfo or DocBook "
+"document.\n"
+"\n"
 "Example usage:\n"
 "\n"
-"   lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
-"   lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
-"   lilypond-book --process='lilypond -I include' BOOK\n"
+" lilypond-book --filter=\"tr '[a-z]' '[A-Z]'\" BOOK\n"
+" lilypond-book --filter=\"convert-ly --no-version --from=2.0.0 -\" BOOK\n"
+" lilypond-book --process='lilypond -I include' BOOK\n"
 msgstr ""
 
-#: lilypond-book.py:83
-msgid "FMT"
-msgstr ""
+#: lilypond-book.py:87
+#, fuzzy, python-format
+msgid "Exiting (%d)..."
+msgstr "¹Ô ..."
 
-#: lilypond-book.py:84
-#, fuzzy
-msgid ""
-"use output format FMT (texi [default], texi-html,\n"
-"\t\tlatex, html)"
-msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦"
+#: lilypond-book.py:119
+#, python-format
+msgid "Copyright (c) %s by"
+msgstr "Copyright (c) %s by"
 
-#: lilypond-book.py:86
+#: lilypond-book.py:130
 #, fuzzy
 msgid "FILTER"
 msgstr "FILE"
 
-#: lilypond-book.py:87
+#: lilypond-book.py:133
 msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
-#: lilypond-book.py:90 lilypond-book.py:92 main.cc:147
-msgid "DIR"
-msgstr "DIR"
+#: lilypond-book.py:136
+#, fuzzy
+msgid ""
+"use output format FORMAT (texi [default], texi-html, latex, html, docbook)"
+msgstr "½ÐÎÏ¥Õ¥©¡¼¥Þ¥Ã¥È EXT ¤ò»È¤¦"
 
-#: lilypond-book.py:91
+#: lilypond-book.py:139
 #, fuzzy
 msgid "add DIR to include path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
-#: lilypond-book.py:93
+#: lilypond-book.py:144
 #, fuzzy
 msgid "write output to DIR"
 msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
 
-#: lilypond-book.py:94
+#: lilypond-book.py:148
 msgid "COMMAND"
 msgstr ""
 
-#: lilypond-book.py:95
+#: lilypond-book.py:149
 msgid "process ly_files using COMMAND FILE..."
 msgstr ""
 
-#: lilypond-book.py:96 midi2ly.py:102 main.cc:148 main.cc:149
-msgid "FILE"
-msgstr "FILE"
-
-#: lilypond-book.py:97
-msgid "extract all PS snippet fonts into FILE"
+#: lilypond-book.py:160
+msgid ""
+"extract all PostScript fonts into INPUT.psfonts for LaTeX\n"
+"must use this with dvips -h INPUT.psfonts"
 msgstr ""
 
-#: lilypond-book.py:99 midi2ly.py:105 mup2ly.py:78 ps2png.py:42 main.cc:155
+#: lilypond-book.py:163 midi2ly.py:896 main.cc:182
 #, fuzzy
 msgid "be verbose"
 msgstr "¾ÜºÙ¤Ê¾ðÊó¤òɽ¼¨¤·¤Þ¤¹"
 
-#: lilypond-book.py:101
-#, fuzzy
-msgid "print version information"
-msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
-
-#: lilypond-book.py:103 midi2ly.py:107 mup2ly.py:80 main.cc:156
+#: lilypond-book.py:169 main.cc:183
 msgid "show warranty and copyright"
 msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë"
 
-#: lilypond-book.py:609
+#: lilypond-book.py:779
 #, python-format
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:807
+#: lilypond-book.py:1010
 #, python-format
 msgid "deprecated ly-option used: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:810
+#: lilypond-book.py:1013
 #, python-format
 msgid "compatibility mode translation: %s=%s"
 msgstr ""
 
-#: lilypond-book.py:814
+#: lilypond-book.py:1017
 #, python-format
 msgid "deprecated ly-option used: %s"
 msgstr ""
 
-#: lilypond-book.py:817
+#: lilypond-book.py:1020
 #, python-format
 msgid "compatibility mode translation: %s"
 msgstr ""
 
-#: lilypond-book.py:836
+#: lilypond-book.py:1039
 #, python-format
 msgid "ignoring unknown ly option: %s"
 msgstr ""
 
-#: lilypond-book.py:1145
+#: lilypond-book.py:1394
 #, fuzzy, python-format
 msgid "Opening filter `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1308
+#: lilypond-book.py:1411
+#, python-format
+msgid "`%s' failed (%d)"
+msgstr ""
+
+#: lilypond-book.py:1412
+msgid "The error log is as follows:"
+msgstr ""
+
+#: lilypond-book.py:1482
+msgid "Can't find \\begin{document} in LaTeX document"
+msgstr ""
+
+#: lilypond-book.py:1592
 #, fuzzy
 msgid "Writing snippets..."
 msgstr "¹Ô ..."
 
-#: lilypond-book.py:1313
+#: lilypond-book.py:1597
 #, fuzzy
 msgid "Processing..."
 msgstr "½èÍýÃæ..."
 
-#: lilypond-book.py:1317
+#: lilypond-book.py:1601
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1327
+#: lilypond-book.py:1611
 #, fuzzy, python-format
-msgid "can't determine format for: %s"
+msgid "cannot determine format for: %s"
 msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lilypond-book.py:1338
-msgid "Output file is up to date."
+#: lilypond-book.py:1622
+#, python-format
+msgid "%s is up to date."
 msgstr ""
 
-#: lilypond-book.py:1343
-msgid "Writing output file."
-msgstr ""
+#: lilypond-book.py:1628
+#, fuzzy, python-format
+msgid "Writing `%s'..."
+msgstr "¹Ô ..."
 
-#: lilypond-book.py:1383
+#: lilypond-book.py:1683
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:1387
+#: lilypond-book.py:1687
 #, fuzzy, python-format
 msgid "Reading %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1403
+#: lilypond-book.py:1706
 #, fuzzy
 msgid "Dissecting..."
 msgstr "¹Ô ..."
 
-#: lilypond-book.py:1433
+#: lilypond-book.py:1722
 #, fuzzy, python-format
 msgid "Compiling %s..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1444
+#: lilypond-book.py:1731
 #, fuzzy, python-format
 msgid "Processing include: %s"
 msgstr "½èÍýÃæ..."
 
-#: lilypond-book.py:1458
+#: lilypond-book.py:1745
 #, fuzzy, python-format
 msgid "Removing `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: lilypond-book.py:1471 midi2ly.py:1016 ps2png.py:52
-#, python-format
-msgid "getopt says: `%s'"
+#: lilypond-book.py:1821
+#, fuzzy, python-format
+msgid "Writing fonts to %s..."
+msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
+
+#: lilypond-book.py:1836
+msgid "option --psfonts not used"
 msgstr ""
 
-#: lilypond-pdfpc-helper.py:72
-msgid "Not in FILE:LINE:COL format: "
+#: lilypond-book.py:1837
+msgid "processing with dvips will have no fonts"
 msgstr ""
 
-#: lilypond-pdfpc-helper.py:100
-#, python-format
-msgid "Command failed: `%s' (status %d)"
+#: lilypond-book.py:1840
+msgid "DVIPS usage:"
 msgstr ""
 
-#. temp_dir = os.path.join (original_dir,  '%s.dir' % program_name)
-#. original_dir = os.getcwd ()
-#. keep_temp_dir_p = 0
-#: midi2ly.py:94
+#: midi2ly.py:106 lily-library.scm:613 lily-library.scm:621
+msgid "warning: "
+msgstr "·Ù¹ð: "
+
+#: midi2ly.py:109 midi2ly.py:925
+msgid "error: "
+msgstr "¥¨¥é¡¼: "
+
+#: midi2ly.py:110
+#, fuzzy
+msgid "Exiting ... "
+msgstr "¹Ô ..."
+
+#: midi2ly.py:857
+#, fuzzy, python-format
+msgid "%s output to `%s'..."
+msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
+
+#: midi2ly.py:871
 msgid "Convert MIDI to LilyPond source."
 msgstr ""
 
-#: midi2ly.py:97
+#: midi2ly.py:875
 msgid "print absolute pitches"
 msgstr ""
 
-#: midi2ly.py:98 midi2ly.py:103
+#: midi2ly.py:877 midi2ly.py:889
 msgid "DUR"
 msgstr "DUR"
 
-#: midi2ly.py:98
+#: midi2ly.py:878
 msgid "quantise note durations on DUR"
 msgstr ""
 
-#: midi2ly.py:99
+#: midi2ly.py:881
 msgid "print explicit durations"
 msgstr ""
 
-#: midi2ly.py:101
-#, fuzzy
-msgid "ALT[:MINOR]"
-msgstr "ACC[:MINOR]"
-
-#: midi2ly.py:101
+#: midi2ly.py:882
 #, fuzzy
 msgid "set key: ALT=+sharps|-flats; MINOR=1"
 msgstr "Ä´¤òÀßÄê: ACC +¥·¥ã¡¼¥×/-¥Õ¥é¥Ã¥È :1 ûĴ"
 
-#: midi2ly.py:102 mup2ly.py:76
+#: midi2ly.py:883
 #, fuzzy
-msgid "write output to FILE"
-msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
+msgid "ALT[:MINOR]"
+msgstr "ACC[:MINOR]"
 
-#: midi2ly.py:103
+#: midi2ly.py:888
 msgid "quantise note starts on DUR"
 msgstr ""
 
-#: midi2ly.py:104
+#: midi2ly.py:891
 msgid "DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:104
+#: midi2ly.py:894
 msgid "allow tuplet durations DUR*NUM/DEN"
 msgstr ""
 
-#: midi2ly.py:106 mup2ly.py:79 main.cc:154
-msgid "print version number"
-msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
-
-#: midi2ly.py:108
+#: midi2ly.py:902
 msgid "treat every text as a lyric"
 msgstr ""
 
-#: midi2ly.py:149 mup2ly.py:143 lily-library.scm:345 lily-library.scm:353
-msgid "warning: "
-msgstr "·Ù¹ð: "
-
-#: midi2ly.py:164 midi2ly.py:1016 midi2ly.py:1081 mup2ly.py:146 mup2ly.py:160
-msgid "error: "
-msgstr "¥¨¥é¡¼: "
-
-#: midi2ly.py:165 mup2ly.py:161
-#, fuzzy
-msgid "Exiting ... "
-msgstr "¹Ô ..."
-
-#: midi2ly.py:263 mup2ly.py:260
-#, python-format
-msgid "command exited with value %d"
-msgstr ""
-
-#: midi2ly.py:1000
-#, fuzzy, python-format
-msgid "%s output to `%s'..."
-msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
-
-#: midi2ly.py:1031
-msgid "Example:"
+#: midi2ly.py:905
+msgid "example"
 msgstr ""
 
-#: midi2ly.py:1081
+#: midi2ly.py:926
 msgid "no files specified on command line."
 msgstr ""
 
-#: mup2ly.py:70
-msgid "Convert mup to LilyPond source."
-msgstr ""
-
-#: mup2ly.py:73
-msgid "debug"
-msgstr ""
-
-#: mup2ly.py:74
-msgid "define macro NAME [optional expansion EXP]"
-msgstr ""
-
-#: mup2ly.py:77
-msgid "only pre-process"
-msgstr ""
-
-#: mup2ly.py:1075
-#, fuzzy, python-format
-msgid "no such context: %s"
-msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
-
-#: mup2ly.py:1300
-#, fuzzy, python-format
-msgid "Processing `%s'..."
-msgstr "½èÍýÃæ..."
-
-#: mup2ly.py:1319
-#, fuzzy, python-format
-msgid "Writing `%s'..."
-msgstr "¹Ô ..."
-
-#. ugr.
-#: ps2png.py:36
-msgid "Convert PostScript to PNG image."
-msgstr ""
-
-#: ps2png.py:43
-msgid "PAPER"
-msgstr ""
-
-#: ps2png.py:43
-msgid "use papersize PAPER"
-msgstr ""
-
-#: ps2png.py:44
-msgid "RES"
-msgstr ""
-
-#: ps2png.py:44
-msgid "set the resolution of the preview to RES"
-msgstr ""
-
-#: ps2png.py:76
-#, fuzzy, python-format
-msgid "Wrote `%s'"
-msgstr "¹Ô ..."
-
-#: getopt-long.cc:143
+#: getopt-long.cc:140
 #, fuzzy, c-format
 msgid "option `%s' requires an argument"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹"
 
-#: getopt-long.cc:147
+#: getopt-long.cc:144
 #, fuzzy, c-format
 msgid "option `%s' doesn't allow an argument"
 msgstr "¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òµö²Ä¤·¤Þ¤»¤ó"
 
-#: getopt-long.cc:151
+#: getopt-long.cc:148
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó: `%s'"
 
-#: getopt-long.cc:158
+#: getopt-long.cc:154
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "¥ª¥×¥·¥ç¥ó `%2$s' ¤ËÂФ¹¤ë̵¸ú¤Ê°ú¿ô `%1$s'"
 
-#: warn.cc:64 grob.cc:632
+#: warn.cc:68 grob.cc:559 input.cc:82
 #, fuzzy, c-format
 msgid "programming error: %s"
 msgstr "¥×¥í¥°¥é¥à¾å¤Î¥¨¥é¡¼: "
 
-#: warn.cc:65
+#: warn.cc:69 input.cc:83
 msgid "continuing, cross fingers"
 msgstr ""
 
-#.
-#. todo i18n.
-#.
-#: kpath.c:142
-#, fuzzy, c-format
-msgid "can't dlopen: %s: %s"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
-
-#: kpath.c:143
-#, fuzzy, c-format
-msgid "install package: %s or %s"
-msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
-
-#: kpath.c:156
-#, fuzzy, c-format
-msgid "no such symbol: %s: %s"
-msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
-
-#: kpath.c:179
-#, c-format
-msgid "error opening kpathsea library"
-msgstr ""
-
-#: kpath.c:180
-#, fuzzy, c-format
-msgid "aborting"
-msgstr "½ªÎ»¤·¤Þ¤¹"
-
-#: accidental-engraver.cc:235
+#: accidental-engraver.cc:240
 #, c-format
 msgid "accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:263
+#: accidental-engraver.cc:268
 #, fuzzy, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr "¥·¥ã¡¼¥×¤¬Â¿¤¹¤®¤Þ¤¹ (%s)"
 
-#: accidental-engraver.cc:279
+#: accidental-engraver.cc:284
 #, c-format
 msgid "pair or context-name expected for accidental rule, found %s"
 msgstr ""
 
-#: accidental.cc:233 key-signature-interface.cc:127
+#: accidental.cc:243 key-signature-interface.cc:133
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: afm.cc:142
-#, fuzzy, c-format
-msgid "parsing AFM file: `%s'"
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
-
-#. FIXME: broken sentence
-#: all-font-metrics.cc:176
-#, c-format
-msgid "checksum mismatch for font file: `%s'"
-msgstr ""
-
-#: all-font-metrics.cc:178
-#, c-format
-msgid "does not match: `%s'"
-msgstr ""
-
-#: all-font-metrics.cc:184
-msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
-msgstr ""
-
-#: all-font-metrics.cc:186
-msgid "Rerun with -V to show font paths."
+#: align-interface.cc:222
+msgid ""
+"vertical alignment called before line-breaking.\n"
+"Only do cross-staff spanners with PianoStaff."
 msgstr ""
 
-#: all-font-metrics.cc:188
-msgid "A script for removing font-files is delivered with the source-code:"
+#: align-interface.cc:329
+msgid "tried to get a translation for something that isn't my child"
 msgstr ""
 
-#: all-font-metrics.cc:297
+#: all-font-metrics.cc:173
 #, fuzzy, c-format
-msgid "can't find font: `%s'"
+msgid "cannot find font: `%s'"
 msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: all-font-metrics.cc:298
-#, fuzzy
-msgid "loading default font"
-msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹"
-
-#: all-font-metrics.cc:313
-#, fuzzy, c-format
-msgid "can't find default font: `%s'"
-msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
-
-#: all-font-metrics.cc:314 includable-lexer.cc:59 lily-parser-scheme.cc:70
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
-
-#: all-font-metrics.cc:315 volta-engraver.cc:142
-#, fuzzy
-msgid "giving up"
-msgstr "Äü¤á¤Þ¤·¤¿"
-
-#: apply-context-iterator.cc:33
+#: apply-context-iterator.cc:31
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:60
+#: auto-change-iterator.cc:63 change-iterator.cc:61
 #, fuzzy, c-format
-msgid "can't change, already in translator: %s"
+msgid "cannot change, already in translator: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: axis-group-engraver.cc:112
+#: axis-group-engraver.cc:78
 msgid "Axis_group_engraver: vertical group already has a parent"
 msgstr ""
 
-#: axis-group-engraver.cc:113
+#: axis-group-engraver.cc:79
 msgid "are there two Axis_group_engravers?"
 msgstr ""
 
-#: axis-group-engraver.cc:114
+#: axis-group-engraver.cc:80
 msgid "removing this vertical group"
 msgstr ""
 
-#: bar-check-iterator.cc:70
+#: axis-group-interface.cc:96
+msgid "tried to calculate pure-height at a non-breakpoint"
+msgstr ""
+
+#: axis-group-interface.cc:370
+msgid "an outside-staff object should have a direction, defaulting to up"
+msgstr ""
+
+#: axis-group-interface.cc:383
+#, c-format
+msgid "outside-staff object %s has an empty extent"
+msgstr ""
+
+#: bar-check-iterator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr "¾®Àá¥Á¥§¥Ã¥¯¤¬¼ºÇÔ: %s"
 
-#: beam-engraver.cc:136
+#: beam-engraver.cc:128
 #, fuzzy
 msgid "already have a beam"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: beam-engraver.cc:205
+#: beam-engraver.cc:196
 #, fuzzy
 msgid "unterminated beam"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: beam-engraver.cc:238 chord-tremolo-engraver.cc:165
+#: beam-engraver.cc:238 chord-tremolo-engraver.cc:134
 #, fuzzy
 msgid "stem must have Rhythmic structure"
 msgstr "ÉäÈø¤Ï¥ê¥º¥à¹½Â¤¤ò»ý¤¿¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:251
+#: beam-engraver.cc:246
 #, fuzzy
 msgid "stem doesn't fit in beam"
 msgstr "ÉäÈø¤¬³Ã¤ÎÃæ¤Ë¤ª¤µ¤Þ¤ê¤Þ¤»¤ó"
 
-#: beam-engraver.cc:252
+#: beam-engraver.cc:247
 #, fuzzy
 msgid "beam was started here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: beam.cc:142
-#, fuzzy
-msgid "beam has less than two visible stems"
-msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
+#: beam-quanting.cc:307
+msgid "no feasible beam position"
+msgstr ""
 
-#: beam.cc:147
+#: beam.cc:144
 #, fuzzy
-msgid "removing beam with less than two stems"
+msgid "removing beam with no stems"
 msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
 
-#: beam.cc:988
+#: beam.cc:1007
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:205
+#: break-alignment-interface.cc:208
 #, fuzzy, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: change-iterator.cc:22
+#: change-iterator.cc:23
 #, fuzzy, c-format
-msgid "can't change `%s' to `%s'"
+msgid "cannot change `%s' to `%s'"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
 #. FIXME: constant error message.
-#: change-iterator.cc:81
+#: change-iterator.cc:82
 #, fuzzy
-msgid "can't find context to switch to"
+msgid "cannot find context to switch to"
 msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #. We could change the current translator's id, but that would make
@@ -771,201 +622,180 @@ msgstr "`%s' 
 #.
 #. last->translator_id_string () = get_change
 #. ()->change_to_id_string ();
-#: change-iterator.cc:90
+#: change-iterator.cc:91
 #, fuzzy, c-format
 msgid "not changing to same context type: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
 #. FIXME: uncomprehensable message
-#: change-iterator.cc:94
+#: change-iterator.cc:95
 msgid "none of these in my family"
 msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó"
 
-#: chord-tremolo-engraver.cc:94
-#, c-format
-msgid "expect 2 elements for chord tremolo, found %d"
-msgstr ""
+#: chord-tremolo-engraver.cc:88
+#, fuzzy
+msgid "No tremolo to end"
+msgstr "ËöÈø¤Ø¤Î¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: chord-tremolo-engraver.cc:131
+#: chord-tremolo-engraver.cc:110
 #, fuzzy
 msgid "unterminated chord tremolo"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: chord-tremolo-iterator.cc:64
-#, fuzzy
-msgid "no one to print a tremolos"
-msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+#: chord-tremolo-iterator.cc:33
+#, c-format
+msgid "expect 2 elements for chord tremolo, found %d"
+msgstr ""
 
-#: clef.cc:57
+#: clef.cc:54
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
-#: cluster.cc:118
+#: cluster.cc:110
 #, fuzzy, c-format
 msgid "unknown cluster style `%s'"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
-#: cluster.cc:144
+#: cluster.cc:135
 msgid "junking empty cluster"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:84
-#, c-format
-msgid "gotcha: ptr=%ul"
-msgstr ""
-
-#: coherent-ligature-engraver.cc:93
-msgid "distance undefined, assuming 0.1"
-msgstr ""
-
-#: coherent-ligature-engraver.cc:96
-#, c-format
-msgid "distance=%f"
-msgstr ""
-
-#: coherent-ligature-engraver.cc:139
+#: coherent-ligature-engraver.cc:100
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment=0.01': ptr=%ul"
 msgstr ""
 
-#: context-def.cc:111
+#. if we get to here, just put everything on one line
+#: constrained-breaking.cc:176 constrained-breaking.cc:193
+#, fuzzy
+msgid "cannot find line breaking that satisfies constraints"
+msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
+
+#: context-def.cc:130
 #, fuzzy, c-format
 msgid "program has no such type: `%s'"
 msgstr "¥×¥í¥°¥é¥à¤Ë¤Ï¤½¤ÎÍͤʥ¿¥¤¥×¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: context-def.cc:285
-#, fuzzy, c-format
-msgid "can't find: `%s'"
-msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
-
-#: context-property.cc:111
+#: context-property.cc:76
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: context.cc:146
+#: context.cc:151
 #, fuzzy, c-format
-msgid "can't find or create new `%s'"
+msgid "cannot find or create new `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: context.cc:210
+#: context.cc:213
 #, fuzzy, c-format
-msgid "can't find or create `%s' called `%s'"
+msgid "cannot find or create `%s' called `%s'"
 msgstr "`%2$s' ¤Ë¸Æ¤Ð¤ì¤¿ `%1$s' ¤¬¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó"
 
-#: context.cc:301
+#: context.cc:276
+#, c-format
+msgid "Invalid CreateContext event: Cannot create %s context"
+msgstr ""
+
+#: context.cc:388
 #, fuzzy, c-format
-msgid "can't find or create: `%s'"
+msgid "cannot find or create: `%s'"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: custos.cc:83
+#: custos.cc:77
 #, c-format
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dynamic-engraver.cc:171 span-dynamic-performer.cc:83
+#: dispatcher.cc:71
+msgid "Event class should be a symbol"
+msgstr ""
+
+#: dispatcher.cc:78
+#, fuzzy, c-format
+msgid "Unknown event class %s"
+msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
+
+#: dots.cc:38
+#, c-format
+msgid "dot `%s' not found"
+msgstr ""
+
+#: dynamic-engraver.cc:186 span-dynamic-performer.cc:87
 #, fuzzy
-msgid "can't find start of (de)crescendo"
+msgid "cannot find start of (de)crescendo"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: dynamic-engraver.cc:180
+#: dynamic-engraver.cc:195
 #, fuzzy
 msgid "already have a decrescendo"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: dynamic-engraver.cc:182
+#: dynamic-engraver.cc:197
 #, fuzzy
 msgid "already have a crescendo"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: dynamic-engraver.cc:185
+#: dynamic-engraver.cc:200
 #, fuzzy
 msgid "cresc starts here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: dynamic-engraver.cc:304
+#: dynamic-engraver.cc:323
 #, fuzzy
 msgid "unterminated (de)crescendo"
 msgstr "½ªÎ»¤·¤Æ¤¤¤Ê¤¤¥¯¥ì¥Ã¥·¥§¥ó¥É"
 
-#: event-chord-iterator.cc:55 output-property-music-iterator.cc:29
-#, fuzzy, c-format
-msgid "junking event: `%s'"
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
-
-#: extender-engraver.cc:139 extender-engraver.cc:148
+#: extender-engraver.cc:131 extender-engraver.cc:140
 msgid "unterminated extender"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
 
-#: folded-repeat-iterator.cc:64
-msgid "no one to print a repeat brace"
-msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: font-config.cc:23
+#: font-config.cc:28
 msgid "Initializing FontConfig..."
 msgstr ""
 
-#: font-config.cc:26
-msgid "initializing FontConfig"
+#: font-config.cc:44
+#, c-format
+msgid "Rebuilding FontConfig cache %s, this may take a while..."
 msgstr ""
 
-#: font-config.cc:47
+#: font-config.cc:55
 #, fuzzy, c-format
-msgid "adding lilypond directory: %s"
+msgid "failed adding font directory: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: font-config.cc:49
+#: font-config.cc:57
 #, fuzzy, c-format
 msgid "adding font directory: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: general-scheme.cc:172
+#: general-scheme.cc:160
 msgid "infinity or NaN encountered while converting Real number"
 msgstr ""
 
-#: general-scheme.cc:173
+#: general-scheme.cc:161
 msgid "setting to zero"
 msgstr ""
 
-#: glissando-engraver.cc:97
+#: glissando-engraver.cc:92
 #, fuzzy
 msgid "unterminated glissando"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: global-context-scheme.cc:50 global-context-scheme.cc:77
+#: global-context-scheme.cc:91 global-context-scheme.cc:107
 #, fuzzy
 msgid "no music found in score"
 msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹"
 
-#: global-context-scheme.cc:67
+#: global-context-scheme.cc:97
 #, fuzzy
 msgid "Interpreting music... "
 msgstr "³Ú¶Ê¤Î²ò¼áÃæ..."
 
-#: global-context-scheme.cc:88
+#: global-context-scheme.cc:120
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "·Ð²á»þ´Ö: %.2f ÉÃ"
 
-#: global-context.cc:160
-#, fuzzy, c-format
-msgid "can't find `%s' context"
-msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: gourlay-breaking.cc:199
-#, c-format
-msgid "Optimal demerits: %f"
-msgstr ""
-
-#: gourlay-breaking.cc:204
-msgid "no feasible line breaking found"
-msgstr ""
-
-#: gourlay-breaking.cc:212
-#, fuzzy
-msgid "can't find line breaking that satisfies constraints"
-msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
-
 #: gregorian-ligature-engraver.cc:59
 #, c-format
 msgid "\\%s ignored"
@@ -976,156 +806,190 @@ msgstr ""
 msgid "implied \\%s added"
 msgstr ""
 
-#: gregorian-ligature-engraver.cc:213
-msgid "Cannot apply `\\~' on first head of ligature; ignoring `\\~'"
-msgstr ""
+#. ligature may not start with 2nd head of pes or flexa
+#: gregorian-ligature-engraver.cc:212
+#, fuzzy
+msgid "cannot apply `\\~' on first head of ligature"
+msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: gregorian-ligature-engraver.cc:227
-msgid "can't apply `\\~' on heads with identical pitch; ignoring `\\~'"
+#. (pitch == prev_pitch)
+#: gregorian-ligature-engraver.cc:224
+msgid "cannot apply `\\~' on heads with identical pitch"
 msgstr ""
 
-#: grob-interface.cc:45
+#: grob-interface.cc:57
 #, fuzzy, c-format
 msgid "Unknown interface `%s'"
 msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
 
-#: grob-interface.cc:56
+#: grob-interface.cc:68
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: hairpin.cc:131
-msgid "decrescendo too small"
+#: grob.cc:253
+msgid "Infinity or NaN encountered"
 msgstr ""
 
-#: hairpin.cc:132
-#, fuzzy
-msgid "crescendo too small"
-msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É"
+#: hairpin.cc:183
+msgid "decrescendo too small"
+msgstr ""
 
-#: horizontal-bracket-engraver.cc:55
+#: horizontal-bracket-engraver.cc:59
 #, fuzzy
 msgid "don't have that many brackets"
 msgstr "¤½¤ó¤Ê¤ËÂô»³¤Î¥ª¥¯¥¿¡¼¥Ö (%s) ¤ò»È¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤"
 
-#: horizontal-bracket-engraver.cc:64
+#: horizontal-bracket-engraver.cc:68
 #, fuzzy
 msgid "conflicting note group events"
 msgstr "Çï»Ò¤ÎÍ׵᤬¶¥¹ç¤·¤Þ¤¹"
 
-#: hyphen-engraver.cc:89
+#: hyphen-engraver.cc:93
 #, fuzzy
 msgid "removing unterminated hyphen"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: hyphen-engraver.cc:102
+#: hyphen-engraver.cc:107
 #, fuzzy
 msgid "unterminated hyphen; removing"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: includable-lexer.cc:50
+#: includable-lexer.cc:53
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: includable-lexer.cc:57 lily-guile.cc:90 lily-parser-scheme.cc:77
+#: includable-lexer.cc:60 lily-guile.cc:94 lily-parser-scheme.cc:116
 #, fuzzy, c-format
-msgid "can't find file: `%s'"
+msgid "cannot find file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: input.cc:101 source-file.cc:144 source-file.cc:266
+#: includable-lexer.cc:62 lily-parser-scheme.cc:107
+#, c-format
+msgid "(search path: `%s')"
+msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
+
+#: input.cc:112 source-file.cc:168 source-file.cc:183
 msgid "position unknown"
 msgstr "°ÌÃÖ¤¬È½¤ê¤Þ¤»¤ó"
 
-#: ligature-engraver.cc:152
+#: ligature-engraver.cc:93
 #, fuzzy
-msgid "can't find start of ligature"
+msgid "cannot find start of ligature"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: ligature-engraver.cc:158
+#: ligature-engraver.cc:98
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:184
+#: ligature-engraver.cc:120
 #, fuzzy
 msgid "already have a ligature"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: ligature-engraver.cc:200
+#: ligature-engraver.cc:129
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:256
+#: ligature-engraver.cc:173
 #, fuzzy
 msgid "unterminated ligature"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: ligature-engraver.cc:280
+#: ligature-engraver.cc:202
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:281
+#: ligature-engraver.cc:203
 #, fuzzy
 msgid "ligature was started here"
 msgstr "³Ã¤Ï¤³¤³¤«¤é³«»Ï¤µ¤ì¤Þ¤·¤¿"
 
-#: lily-guile.cc:92
+#: lily-guile.cc:96
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(Æɹþ¥Ñ¥¹: `%s')"
 
-#: lily-guile.cc:484
+#: lily-guile.cc:459
 #, c-format
-msgid "can't find property type-check for `%s' (%s)."
+msgid "cannot find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:487
+#: lily-guile.cc:462
 msgid "perhaps a typing error?"
 msgstr ""
 
-#: lily-guile.cc:493
+#: lily-guile.cc:468
 msgid "doing assignment anyway"
 msgstr ""
 
-#: lily-guile.cc:505
+#: lily-guile.cc:480
 #, c-format
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:210
+#: lily-lexer.cc:254
 #, fuzzy, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr "¼±ÊÌ»Ò̾¤Ï¥­¡¼¥ï¡¼¥É¤Ç¤¹: `%s'"
 
-#: lily-lexer.cc:225
+#: lily-lexer.cc:269
 #, c-format
 msgid "error at EOF: %s"
 msgstr "EOF ¤Î¤È¤³¤í¤Ç¥¨¥é¡¼: %s"
 
-#: lily-parser-scheme.cc:30
+#: lily-parser-scheme.cc:29
 #, fuzzy, c-format
 msgid "deprecated function called: %s"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lily-parser-scheme.cc:69
+#: lily-parser-scheme.cc:88
+#, fuzzy, c-format
+msgid "Changing working directory to `%s'"
+msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
+
+#: lily-parser-scheme.cc:106
 #, fuzzy, c-format
-msgid "can't find init file: `%s'"
+msgid "cannot find init file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: lily-parser-scheme.cc:87
+#: lily-parser-scheme.cc:125
 #, fuzzy, c-format
 msgid "Processing `%s'"
 msgstr "½èÍýÃæ..."
 
-#: lily-parser.cc:101
+#: lily-parser.cc:99
 msgid "Parsing..."
 msgstr "¹½Ê¸²òÀÏÃæ..."
 
-#: lily-parser.cc:119
+#: lily-parser.cc:127
 #, fuzzy
-msgid "braces don't match"
+msgid "braces do not match"
 msgstr "¥Ö¥ì¡¼¥¹¤¬°ìÃפ·¤Þ¤»¤ó"
 
-#: main.cc:104
+#: lyric-combine-music-iterator.cc:291
+#, fuzzy, c-format
+msgid "cannot find Voice `%s'"
+msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#: main.cc:116
+#, fuzzy, c-format
+msgid ""
+"This program is free software.  It is covered by the GNU General Public\n"
+"License and you are welcome to change it and/or distribute copies of it\n"
+"under certain conditions.  Invoke as `%s --warranty' for more\n"
+"information.\n"
+msgstr ""
+"This is free software.  It is covered by the GNU General Public License,\n"
+"and you are welcome to change it and/or distribute copies of it under\n"
+"certain conditions.  Invoke as `%s --warranty' for more information.\n"
+"\n"
+"-- »²¹ÍÌõ\n"
+"¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£GNU °ìÈ̸øÍ­»ÈÍѵöÂú½ñ¤Ë´ð¤Å¤­¡¢Æ±°ì¾ò·ï¤Ç\n"
+"¤³¤ì¤ò²þÊѤ·¤¿¤ê¡¢Ê£À½¤òÇÛÉÛ¤·¤¿¤ê¤¹¤ë»ö¤Ï´¿·Þ¤µ¤ì¤Þ¤¹¡£\n"
+"`--warranty' ¥ª¥×¥·¥ç¥óÉÕ¤­¤Çµ¯Æ°¤¹¤ë¤È¡¢¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£\n"
+
+#: main.cc:122
 #, fuzzy
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
@@ -1137,7 +1001,7 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
 "General Public License for more details.\n"
 "\n"
-"    You should have received a copy (refer to the file COPYING) of the\n"
+"    You should have received a copy of the\n"
 "GNU General Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
 "Boston, MA 02111-1307, USA.\n"
@@ -1173,106 +1037,133 @@ msgstr ""
 "¤Ç¤¹(COPYING ¥Õ¥¡¥¤¥ë¤ò»²¾È)¡£¤½¤¦¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Free Software Foundation,\n"
 "Inc., 675 Mass Ave, Cambridge, MA 02139, USA ¤Ë¼ê»æ¤ò½ñ¤¤¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: main.cc:135
+#: main.cc:153
 msgid "BACK"
 msgstr ""
 
-#: main.cc:135
+#: main.cc:153
 msgid ""
-"use backend BACK (gnome, ps [default],\n"
-"                                       scm, svg, tex, texstr)"
+"use backend BACK (gnome, ps,eps,\n"
+"scm, svg, tex, texstr)\n"
+"default: PS"
 msgstr ""
 
-#: main.cc:136
-msgid "EXPR"
+#: main.cc:155
+msgid "SYM[=VAL]"
 msgstr ""
 
-#: main.cc:136
+#: main.cc:156
 msgid ""
-"set scheme option, for help use\n"
-"                                       -e '(ly:option-usage)'"
+"set Scheme program option SYM to VAL (default: #t)\n"
+"Use -dhelp for help."
 msgstr ""
 
+#: main.cc:159
+msgid "EXPR"
+msgstr ""
+
+#: main.cc:159
+#, fuzzy
+msgid "evaluate scheme code"
+msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó"
+
 #. Bug in option parser: --output =foe is taken as an abbreviation
 #. for --output-format.
-#: main.cc:139
+#: main.cc:162
 msgid "FORMATs"
 msgstr ""
 
-#: main.cc:139
+#: main.cc:162
 msgid "dump FORMAT,...  Also as separate options:"
 msgstr ""
 
-#: main.cc:140
+#: main.cc:163
 #, fuzzy
 msgid "generate DVI (tex backend only)"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:141
+#: main.cc:164
+msgid "relocate using directory of lilypond program"
+msgstr ""
+
+#: main.cc:165
 #, fuzzy
 msgid "generate PDF (default)"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:142
+#: main.cc:166
 #, fuzzy
 msgid "generate PNG"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:143
+#: main.cc:167
 #, fuzzy
 msgid "generate PostScript"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:144
+#: main.cc:168
 msgid "generate TeX (tex backend only)"
 msgstr ""
 
-#: main.cc:146
+#: main.cc:169
+msgid "show this help and exit"
+msgstr ""
+
+#: main.cc:170
 #, fuzzy
 msgid "FIELD"
 msgstr "FILE"
 
-#: main.cc:146
-msgid "write header field to BASENAME.FIELD"
+#: main.cc:170
+msgid "dump a header field to file BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:147
+#: main.cc:171
+msgid "DIR"
+msgstr "DIR"
+
+#: main.cc:171
 msgid "add DIR to search path"
 msgstr "DIR ¤ò¸¡º÷¥Ñ¥¹¤ËÄɲÃ"
 
-#: main.cc:148
+#: main.cc:172
 msgid "use FILE as init file"
 msgstr "FILE ¤ò½é´ü²½¥Õ¥¡¥¤¥ë¤È¤·¤Æ»ÈÍÑ"
 
-#: main.cc:149
-#, fuzzy
-msgid "write output to FILE (suffix will be added)"
-msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
-
-#: main.cc:150
+#: main.cc:174
 msgid "USER,GROUP,JAIL,DIR"
 msgstr ""
 
-#: main.cc:150
+#: main.cc:174
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
-"                                       and cd into DIR"
+"and cd into DIR"
 msgstr ""
 
-#: main.cc:151
+#: main.cc:177
 #, fuzzy
 msgid "do not generate printed output"
 msgstr "À©¸Â¤ò´ËÏÂ"
 
-#: main.cc:152
+#: main.cc:178
+#, fuzzy
+msgid "write output to FILE (suffix will be added)"
+msgstr "BASENAME[-x].³ÈÄ¥»Ò ¤Ø½ÐÎϤò½ñ¤­¹þ¤à"
+
+#: main.cc:179
 msgid "generate a preview of the first system"
 msgstr ""
 
-#: main.cc:153
-msgid "run in safe mode"
+#: main.cc:180
+msgid "disallow unsafe Scheme and PostScript operations"
 msgstr ""
 
-#: main.cc:177
+#: main.cc:181
+#, fuzzy
+msgid "show version number and exit"
+msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
+
+#: main.cc:222
 #, fuzzy, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1280,111 +1171,131 @@ msgid ""
 msgstr "Copyright (c) %s by"
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:203
+#: main.cc:249
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
 
-#: main.cc:205
+#: main.cc:251
 #, fuzzy, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr "¥Õ¥¡¥¤¥ë¤Î³Ú¶Ê¤òÁÈÈǤ·¤¿¤ê¡¢MIDI ±éÁÕ¤·¤¿¤ê¤¹¤ë."
 
-#: main.cc:207
+#: main.cc:253
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:209
+#: main.cc:255
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:299
+#: main.cc:257
+#, c-format
+msgid "Options:"
+msgstr "¥ª¥×¥·¥ç¥ó:"
+
+#: main.cc:261
+#, fuzzy, c-format
+msgid "Report bugs via %s"
+msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï %s ¤Ø."
+
+#: main.cc:307
 #, c-format
-msgid "expected %d arguments with jail, found: %d"
+msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:313
+#: main.cc:321
 #, fuzzy, c-format
 msgid "no such user: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: main.cc:315
+#: main.cc:323
 #, c-format
-msgid "can't get user id from user name: %s: %s"
+msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:330
+#: main.cc:338
 #, fuzzy, c-format
 msgid "no such group: %s"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: main.cc:332
+#: main.cc:340
 #, fuzzy, c-format
-msgid "can't get group id from group name: %s: %s"
+msgid "cannot get group id from group name: %s: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: main.cc:340
+#: main.cc:348
 #, fuzzy, c-format
-msgid "can't chroot to: %s: %s"
+msgid "cannot chroot to: %s: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: main.cc:347
+#: main.cc:355
 #, fuzzy, c-format
-msgid "can't change group id to: %d: %s"
+msgid "cannot change group id to: %d: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: main.cc:353
+#: main.cc:361
 #, fuzzy, c-format
-msgid "can't change user id to: %d: %s"
+msgid "cannot change user id to: %d: %s"
 msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
 
-#: main.cc:359
+#: main.cc:367
 #, fuzzy, c-format
-msgid "can't change working directory to: %s: %s"
+msgid "cannot change working directory to: %s: %s"
 msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
+#: main.cc:413
+#, c-format
+msgid "Evaluating %s"
+msgstr ""
+
+#: main.cc:643
+#, c-format
+msgid "exception caught: %s"
+msgstr ""
+
 #. FIXME: constant error message.
-#: mark-engraver.cc:123
+#: mark-engraver.cc:154
 msgid "rehearsalMark must have integer value"
 msgstr ""
 
-#: mark-engraver.cc:129
+#: mark-engraver.cc:160
 msgid "mark label must be a markup object"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:74
+#: mensural-ligature-engraver.cc:85
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:101
+#: mensural-ligature-engraver.cc:112
 msgid "cannot determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:115
+#: mensural-ligature-engraver.cc:126
 msgid "single note ligature - skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:127
+#: mensural-ligature-engraver.cc:138
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:139
+#: mensural-ligature-engraver.cc:150
 msgid "mensural ligature: duration none of Mx, L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:187
+#: mensural-ligature-engraver.cc:198
 msgid "semibrevis must be followed by another one -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:198
+#: mensural-ligature-engraver.cc:209
 msgid ""
 "semibreves can only appear at the beginning of a ligature,\n"
 "and there may be only zero or two of them"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:225
+#: mensural-ligature-engraver.cc:236
 msgid ""
 "invalid ligatura ending:\n"
 "when the last note is a descending brevis,\n"
@@ -1392,434 +1303,435 @@ msgid ""
 "or the ligatura must be LB or SSB"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:345
+#: mensural-ligature-engraver.cc:356
 msgid "unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:131
+#: mensural-ligature.cc:141
 msgid "Mensural_ligature: unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:183
+#: mensural-ligature.cc:192
 msgid "Mensural_ligature: (join_right == 0)"
 msgstr ""
 
-#: midi-item.cc:150
+#: midi-item.cc:152
 #, fuzzy, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: midi-item.cc:254
+#: midi-item.cc:273
 msgid "silly pitch"
 msgstr "Çϼ¯¤²¤¿¥Ô¥Ã¥Á"
 
-#: midi-item.cc:270
+#: midi-item.cc:289
 #, c-format
 msgid "experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
-#: midi-stream.cc:27
+#: midi-stream.cc:28
 #, fuzzy, c-format
-msgid "can't open for write: %s: %s"
+msgid "cannot open for write: %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
 #: midi-stream.cc:44
 #, fuzzy, c-format
-msgid "can't write to file: `%s'"
+msgid "cannot write to file: `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: music.cc:176
+#: music-iterator.cc:171
+msgid "Sending non-event to context"
+msgstr ""
+
+#: music.cc:141
 #, c-format
-msgid "octave check failed; expected %s, found: %s"
+msgid "octave check failed; expected \"%s\", found: %s"
 msgstr ""
 
-#: music.cc:239
+#: music.cc:207
 #, fuzzy, c-format
 msgid "transposition by %s makes alteration larger than double"
 msgstr "%s ¤ÎÊÑÄ´¤Ë¤è¤Ã¤Æ¡¢Æó¤Ä¤òĶ¤¨¤ëÇÉÀ¸²»¤¬ºî¤é¤ì¤Þ¤·¤¿"
 
-#: new-fingering-engraver.cc:84
-msgid "can't add text scripts to individual note heads"
-msgstr ""
-
-#.
-#. music for the softenon children?
-#.
-#: new-fingering-engraver.cc:158
-msgid "music for the martians."
+#: new-fingering-engraver.cc:96
+msgid "cannot add text scripts to individual note heads"
 msgstr ""
 
-#: new-fingering-engraver.cc:266
+#: new-fingering-engraver.cc:239
 msgid "no placement found for fingerings"
 msgstr ""
 
-#: new-fingering-engraver.cc:267
+#: new-fingering-engraver.cc:240
 msgid "placing below"
 msgstr ""
 
-#: new-lyric-combine-music-iterator.cc:240
-#, fuzzy, c-format
-msgid "cannot find Voice `%s'"
-msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
-
-#: note-collision.cc:404
+#: note-collision.cc:457
 #, fuzzy
 msgid "ignoring too many clashing note columns"
 msgstr "Äà¤ê¹ç¤ï¤Ê¤¤²»É䤬¿¤¹¤®¤Þ¤¹¡£¤½¤ì¤é¤ò̵»ë¤·¤Þ¤¹¡£"
 
-#: note-column.cc:115
-msgid "can't have note heads and rests together on a stem"
+#: note-column.cc:124
+msgid "cannot have note heads and rests together on a stem"
 msgstr ""
 
-#: note-head.cc:66
+#: note-head.cc:63
 #, c-format
-msgid "note head `%s' not found"
+msgid "none of note heads `%s' or `%s' found"
+msgstr ""
+
+#: note-heads-engraver.cc:61
+msgid "NoteEvent without pitch"
 msgstr ""
 
-#: open-type-font.cc:29
+#: open-type-font.cc:33
 #, fuzzy, c-format
-msgid "can't allocate %d bytes"
+msgid "cannot allocate %lu bytes"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: open-type-font.cc:33
+#: open-type-font.cc:37
 #, fuzzy, c-format
-msgid "can't load font table: %s"
+msgid "cannot load font table: %s"
 msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: open-type-font.cc:84
+#: open-type-font.cc:98
 #, c-format
 msgid "unsupported font format: %s"
 msgstr ""
 
-#: open-type-font.cc:86
+#: open-type-font.cc:100
 #, c-format
 msgid "unknown error: %d reading font file: %s"
 msgstr ""
 
-#: open-type-font.cc:140
+#: open-type-font.cc:173 open-type-font.cc:297
+#, c-format
+msgid "FT_Get_Glyph_Name() returned error: %u"
+msgstr ""
+
+#: page-turn-page-breaking.cc:205
+msgid ""
+"cannot fit the first page turn onto a single page.  Consider setting first-"
+"page-number to an even number."
+msgstr ""
+
+#: page-turn-page-breaking.cc:218
+#, c-format
+msgid "Calculating page and line breaks (%d possible page breaks)..."
+msgstr ""
+
+#: page-turn-page-breaking.cc:236 paper-score.cc:154
+#, fuzzy
+msgid "Drawing systems..."
+msgstr "²»À¼¤òºîÀ®Ãæ..."
+
+#: pango-font.cc:181
 #, c-format
-msgid "FT_Get_Glyph_Name() returned error: %d"
+msgid ""
+"Glyph has no name, but font supports glyph naming.\n"
+"Skipping glyph U+%0X, file %s"
 msgstr ""
 
-#: pango-font.cc:130
+#: pango-font.cc:224
 #, fuzzy, c-format
 msgid "no PostScript font name for font `%s'"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
 
-#: pango-font.cc:177
+#: pango-font.cc:272
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
-#: paper-outputter-scheme.cc:26
+#: paper-outputter-scheme.cc:33
 #, fuzzy, c-format
 msgid "Layout output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: paper-score.cc:66
+#: paper-score.cc:105
+#, fuzzy
+msgid "Calculating line breaks..."
+msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
+
+#: paper-score.cc:118
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr ""
 
-#: paper-score.cc:70
+#: paper-score.cc:122
 #, fuzzy
 msgid "Preprocessing graphical objects..."
 msgstr "Í×ÁǤòÁ°½èÍýÃæ..."
 
-#: parse-scm.cc:81
+#: parse-scm.cc:83
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
-#: percent-repeat-engraver.cc:100
-#, fuzzy, c-format
-msgid "can't handle a percent repeat of length: %s"
-msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó"
-
-#: percent-repeat-engraver.cc:158
+#: percent-repeat-engraver.cc:200
 #, fuzzy
 msgid "unterminated percent repeat"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó"
 
-#: percent-repeat-iterator.cc:51
-#, fuzzy
-msgid "no one to print a percent"
-msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
-
-#: performance.cc:47
+#: performance.cc:45
 #, fuzzy
 msgid "Track..."
 msgstr "¥È¥é¥Ã¥¯ ..."
 
-#: performance.cc:71
+#: performance.cc:74
 msgid "MIDI channel wrapped around"
 msgstr ""
 
-#: performance.cc:72
+#: performance.cc:75
 msgid "remapping modulo 16"
 msgstr ""
 
-#: performance.cc:91
-msgid "Creator: "
-msgstr "ºî¶Ê¼Ô: "
-
-#: performance.cc:111
-#, fuzzy
-msgid "at "
-msgstr ", at "
-
-#: performance.cc:164
+#: performance.cc:103
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
-#: phrasing-slur-engraver.cc:115
+#: phrasing-slur-engraver.cc:146
 #, fuzzy
 msgid "unterminated phrasing slur"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: piano-pedal-engraver.cc:224
+#: piano-pedal-engraver.cc:286
 #, c-format
-msgid "expect 3 strings for piano pedals, found: %d"
+msgid "expect 3 strings for piano pedals, found: %ld"
 msgstr ""
 
-#: piano-pedal-engraver.cc:240 piano-pedal-engraver.cc:255
-#: piano-pedal-performer.cc:80
+#: piano-pedal-engraver.cc:301 piano-pedal-engraver.cc:312
+#: piano-pedal-performer.cc:93
 #, fuzzy, c-format
-msgid "can't find start of piano pedal: `%s'"
+msgid "cannot find start of piano pedal: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: piano-pedal-engraver.cc:305
+#: piano-pedal-engraver.cc:347
 #, fuzzy, c-format
-msgid "can't find start of piano pedal bracket: `%s'"
+msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr "¸Æ¤Ó½Ð¤µ¤ì¤¿Ê¸»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: property-iterator.cc:90
+#: program-option.cc:205
+#, fuzzy, c-format
+msgid "no such internal option: %s"
+msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+
+#: property-iterator.cc:74
 #, c-format
 msgid "not a grob name, `%s'"
 msgstr ""
 
-#: quote-iterator.cc:254
-#, fuzzy, c-format
-msgid "in quotation: junking event %s"
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
-
 #: relative-octave-check.cc:38
 msgid "Failed octave check, got: "
 msgstr ""
 
-#: rest-collision.cc:147
-msgid "rest direction not set.  Cannot resolve collision."
-msgstr ""
+#: relocate.cc:44
+#, fuzzy, c-format
+msgid "Setting %s to %s\n"
+msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
 
-#: rest-collision.cc:162 rest-collision.cc:208
-msgid "too many colliding rests"
-msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹"
+#: relocate.cc:58
+#, fuzzy, c-format
+msgid "no such file: %s for %s"
+msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+
+#: relocate.cc:68 relocate.cc:86
+#, fuzzy, c-format
+msgid "no such directory: %s for %s"
+msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
 
-#: rest.cc:140
+#: relocate.cc:78
 #, c-format
-msgid "rest `%s' not found"
+msgid "%s=%s (prepend)\n"
 msgstr ""
 
-#: scm-option.cc:54
+#: relocate.cc:98
 #, c-format
-msgid "lilypond -e EXPR means:"
+msgid "Relocation: compile prefix=%s, new prefix=%s"
 msgstr ""
 
-#: scm-option.cc:56
+#: relocate.cc:128
 #, c-format
-msgid "  Evalute the Scheme EXPR before parsing any .ly files."
+msgid "Relocation: framework_prefix=%s"
 msgstr ""
 
-#: scm-option.cc:58
+#: relocate.cc:168
 #, c-format
-msgid ""
-"  Multiple -e options may be given, they will be evaluated sequentially."
+msgid "Relocation: is absolute: argv0=%s"
 msgstr ""
 
-#: scm-option.cc:60
+#: relocate.cc:175
 #, c-format
-msgid ""
-"  The function ly:set-option allows for access to some internal variables."
+msgid "Relocation: from cwd: argv0=%s"
 msgstr ""
 
-#: scm-option.cc:62
+#: relocate.cc:184
 #, c-format
-msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
+msgid ""
+"Relocation: from PATH=%s\n"
+"argv0=%s"
 msgstr ""
 
-#: scm-option.cc:64
+#: relocate.cc:353
+#, fuzzy, c-format
+msgid "Relocation file %s\n"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
+
+#: relocate.cc:358
+#, fuzzy, c-format
+msgid "cannot open file %s"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
+
+#: relocate.cc:388
 #, c-format
-msgid "Use help as SYMBOL to get online help."
+msgid "Unknown relocation command %s"
 msgstr ""
 
-#: scm-option.cc:135 scm-option.cc:175
-#, fuzzy, c-format
-msgid "no such internal option: %s"
-msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+#: rest-collision.cc:151
+msgid "cannot resolve rest collision: rest direction not set"
+msgstr ""
+
+#: rest-collision.cc:165 rest-collision.cc:210
+msgid "too many colliding rests"
+msgstr "µÙÉä¤Î¾×Æͤ¬Â¿¤¹¤®¤Þ¤¹"
+
+#: rest.cc:144
+#, c-format
+msgid "rest `%s' not found"
+msgstr ""
 
-#: score-engraver.cc:105
+#: score-engraver.cc:67
 #, fuzzy, c-format
 msgid "cannot find `%s'"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: score-engraver.cc:107
+#: score-engraver.cc:69
 msgid "Music font has not been installed properly."
 msgstr ""
 
-#: score-engraver.cc:109
+#: score-engraver.cc:71
 #, fuzzy, c-format
 msgid "Search path `%s'"
 msgstr "(¸¡º÷¥Ñ¥¹: `%s')"
 
-#: score.cc:213
+#: score-engraver.cc:73
+msgid "Aborting"
+msgstr "½ªÎ»¤·¤Þ¤¹"
+
+#: score.cc:225
 #, fuzzy
 msgid "already have music in score"
 msgstr "³ÚÉè¤Ë¤Ï³Ú¶Ê¤¬É¬ÍפǤ¹"
 
-#: score.cc:214
+#: score.cc:226
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:219
+#: score.cc:231
 #, fuzzy
 msgid "errors found, ignoring music expression"
 msgstr "¥¨¥é¡¼¤òȯ¸«/*, ³ÚÉè¤ò½èÍý¤·¤Þ¤»¤ó*/"
 
 #. FIXME:
-#: script-engraver.cc:100
+#: script-engraver.cc:102
 #, fuzzy
 msgid "don't know how to interpret articulation: "
 msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
 
-#: script-engraver.cc:101
+#: script-engraver.cc:103
 #, fuzzy
 msgid "scheme encoding: "
 msgstr "¥ª¥×¥·¥ç¥ó:"
 
-#. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:52 separation-item.cc:96
-#, fuzzy
-msgid "Separation_item:  I've been drinking too much"
-msgstr "Single_malt_grouping_item:  °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿"
-
-#: simple-spacer.cc:410
+#: simple-spacer.cc:375
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:113
+#: slur-engraver.cc:83 tuplet-engraver.cc:75
+#, c-format
+msgid "direction of %s invalid: %d"
+msgstr ""
+
+#: slur-engraver.cc:157
 msgid "unterminated slur"
 msgstr "½ªÃ¼¤µ¤ì¤Æ¤¤¤Ê¤¤¥¹¥é¡¼"
 
-#: slur-engraver.cc:122
+#: slur-engraver.cc:166
 #, fuzzy
-msgid "can't end slur"
+msgid "cannot end slur"
 msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#: source-file.cc:55
-#, fuzzy, c-format
-msgid "can't open file: `%s'"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
-
-#: source-file.cc:68
+#: source-file.cc:74
 #, c-format
 msgid "expected to read %d characters, got %d"
 msgstr ""
 
-#: spacing-spanner.cc:377
-#, c-format
-msgid "Global shortest duration is %s"
+#: staff-symbol-engraver.cc:62
+msgid "staff-span event has no direction"
 msgstr ""
 
-#: stem-engraver.cc:88
+#: stem-engraver.cc:92
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:125
+#: stem-engraver.cc:129
 #, fuzzy, c-format
 msgid "adding note head to incompatible stem (type = %d)"
 msgstr "Ì·½â¤·¤¿ÉäÈø¤ØÉäƬ¤òÄɲä·¤Þ¤¹ (¥¿¥¤¥× = %d)"
 
-#: stem-engraver.cc:126
+#: stem-engraver.cc:131
 msgid "maybe input should specify polyphonic voices"
 msgstr ""
 
-#: stem.cc:124
+#: stem.cc:105
 #, fuzzy
 msgid "weird stem size, check for narrow beams"
 msgstr "ÊѤÊÉäÈø¤Î¥µ¥¤¥º -- ºÙ¤¤³Ã¤Î¥Á¥§¥Ã¥¯¤ò¤·¤Æ²¼¤µ¤¤"
 
-#: stem.cc:577
+#: stem.cc:641
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:588
+#: stem.cc:652
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:145
+#: system.cc:180
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:224
+#: system.cc:276
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: system.cc:240
-#, fuzzy
-msgid "Calculating line breaks..."
-msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
-
 #: text-spanner-engraver.cc:61
 #, fuzzy
-msgid "can't find start of text spanner"
+msgid "cannot find start of text spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: text-spanner-engraver.cc:75
+#: text-spanner-engraver.cc:73
 #, fuzzy
 msgid "already have a text spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: text-spanner-engraver.cc:136
+#: text-spanner-engraver.cc:133
 #, fuzzy
 msgid "unterminated text spanner"
 msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
 
-#. Not using ngettext's plural feature here, as this message is
-#. more of a programming error.
-#: tfm-reader.cc:106
-#, fuzzy, c-format
-msgid "TFM header of `%s' has only %u word (s)"
-msgstr "`%s' ¤Î TFM ¥Ø¥Ã¥À¤Ë %u ¸ì¤·¤«¤¢¤ê¤Þ¤»¤ó"
-
-#: tfm-reader.cc:139
-#, c-format
-msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
-msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó"
-
-#: tfm.cc:70
-#, fuzzy, c-format
-msgid "can't find ascii character: %d"
-msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'"
-
-#: tie-engraver.cc:194
+#: tie-engraver.cc:264
 msgid "lonely tie"
 msgstr "°ì¤Ä¤À¤±¤Î¥¿¥¤"
 
-#: time-scaled-music-iterator.cc:22
-msgid "no one to print a tuplet start bracket"
-msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
-
 #.
 #. Todo: should make typecheck?
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:54
+#: time-signature-engraver.cc:64
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
@@ -1836,550 +1748,656 @@ msgstr ""
 msgid "unknown translator: `%s'"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
+#: translator-group.cc:151
+#, fuzzy, c-format
+msgid "cannot find: `%s'"
+msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#: translator.cc:332
+#, c-format
+msgid "Two simultaneous %s events, junking this one"
+msgstr ""
+
+#: translator.cc:333
+#, c-format
+msgid "Previous %s event here"
+msgstr ""
+
 #: trill-spanner-engraver.cc:68
 #, fuzzy
-msgid "can't find start of trill spanner"
+msgid "cannot find start of trill spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: trill-spanner-engraver.cc:82
+#: trill-spanner-engraver.cc:80
 #, fuzzy
 msgid "already have a trill spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: trill-spanner-engraver.cc:142
-#, fuzzy
-msgid "unterminated trill spanner"
-msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
-
-#: tuplet-bracket.cc:438
-msgid "removing tuplet bracket across linebreak"
-msgstr ""
-
-#: vaticana-ligature-engraver.cc:341
+#: vaticana-ligature-engraver.cc:388
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:568
+#: vaticana-ligature-engraver.cc:714
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr =%ul"
 msgstr ""
 
-#: vaticana-ligature.cc:87
+#: vaticana-ligature.cc:84
 msgid "flexa-height undefined; assuming 0"
 msgstr ""
 
-#: vaticana-ligature.cc:93
+#: vaticana-ligature.cc:89
 msgid "ascending vaticana style flexa"
 msgstr ""
 
-#: vaticana-ligature.cc:182
+#: vaticana-ligature.cc:177
 msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
 #. fixme: be more verbose.
-#: volta-engraver.cc:127
+#: volta-engraver.cc:144
 #, fuzzy
-msgid "can't end volta spanner"
+msgid "cannot end volta spanner"
 msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: volta-engraver.cc:137
+#: volta-engraver.cc:154
 msgid "already have a volta spanner, ending that one prematurely"
 msgstr ""
 
-#: volta-engraver.cc:141
+#: volta-engraver.cc:158
 #, fuzzy
 msgid "also already have an ended spanner"
 msgstr "´û¤Ë³Ã¤¬¤¢¤ê¤Þ¤¹"
 
-#: parser.yy:90
-msgid "tag must be symbol or list of symbols"
-msgstr ""
-
-#: parser.yy:656
-msgid "identifier should have alphabetic characters only"
-msgstr ""
+#: volta-engraver.cc:159
+#, fuzzy
+msgid "giving up"
+msgstr "Äü¤á¤Þ¤·¤¿"
 
-#: parser.yy:814
+#: parser.yy:702
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:838
+#: parser.yy:726
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:983
-#, fuzzy
-msgid "more alternatives than repeats"
-msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£"
-
-#: parser.yy:1020
-#, c-format
-msgid "expect 2 elements for Chord tremolo, found %d"
-msgstr ""
-
-#: parser.yy:1175
-msgid "music head function must return Music object"
-msgstr ""
-
-#: parser.yy:1447
+#: parser.yy:1172
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1807
+#: parser.yy:1475
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1846 parser.yy:1851 parser.yy:2332
+#: parser.yy:1502 parser.yy:1507 parser.yy:1972
 #, fuzzy
 msgid "have to be in Lyric mode for lyrics"
 msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: parser.yy:1944
+#: parser.yy:1604
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:2107 parser.yy:2157
+#: parser.yy:1759 parser.yy:1809
 #, c-format
 msgid "not a duration: %d"
 msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
 
-#: parser.yy:2251
-#, fuzzy
-msgid "have to be in Note mode for notes"
-msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
-
-#: parser.yy:2345
-#, fuzzy
-msgid "have to be in Chord mode for chords"
-msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
-
-#: parser.yy:2496
-msgid "need integer number arg"
-msgstr ""
-
-#: parser.yy:2694
-#, fuzzy, c-format
-msgid "suspect duration in beam: %s"
-msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
-
-#: lexer.ll:193
-#, fuzzy, c-format
-msgid "Renaming input to: `%s'"
-msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
-
-#: lexer.ll:201
-msgid "quoted string expected after \\version"
-msgstr ""
-
-#: lexer.ll:205
-msgid "quoted string expected after \\renameinput"
-msgstr ""
-
-#: lexer.ll:218
-msgid "EOF found inside a comment"
-msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
-
-#: lexer.ll:233
-#, fuzzy
-msgid "\\maininput not allowed outside init files"
-msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó"
-
-#: lexer.ll:257
-#, fuzzy, c-format
-msgid "wrong or undefined identifier: `%s'"
-msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'"
-
-#. backup rule
-#: lexer.ll:266
-msgid "end quote missing"
-msgstr ""
-
-#: lexer.ll:428
-msgid "Brace found at end of lyric.  Did you forget a space?"
-msgstr ""
-
-#: lexer.ll:527
-msgid "Brace found at end of markup.  Did you forget a space?"
-msgstr ""
-
-#: lexer.ll:616
-#, c-format
-msgid "invalid character: `%c'"
-msgstr "̵¸ú¤Êʸ»ú: `%c'"
-
-#: lexer.ll:703 lexer.ll:704
-#, c-format
-msgid "unknown escaped string: `\\%s'"
-msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
-
-#: lexer.ll:801 lexer.ll:802
-#, fuzzy, c-format
-msgid "Incorrect lilypond version: %s (%s, %s)"
-msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
-
-#: lexer.ll:802 lexer.ll:803
-msgid "Consider updating the input with the convert-ly script"
-msgstr ""
-
-#. TODO: print location
-#: lexer.ll:939 lexer.ll:940
+#: parser.yy:1926
 #, fuzzy
-msgid "can't find signature for music function"
-msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: out/parser.cc:1893
-#, fuzzy
-msgid "syntax error: cannot back up"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
-
-#: out/parser.cc:1993
-#, fuzzy
-msgid "Stack now"
-msgstr "¥È¥é¥Ã¥¯ "
-
-#: out/parser.cc:2021
-#, c-format
-msgid "Reducing stack by rule %d (line %u), "
-msgstr ""
+msgid "have to be in Note mode for notes"
+msgstr "²»Éä¤Ï Note ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#. Each stack pointer address is followed by the size of the
-#. data in use in that stack, in bytes.  This used to be a
-#. conditional around just the two extra args, but that might
-#. be undefined if yyoverflow is a macro.
-#: out/parser.cc:2351 out/parser.cc:5824
-msgid "parser stack overflow"
-msgstr ""
+#: parser.yy:1987
+#, fuzzy
+msgid "have to be in Chord mode for chords"
+msgstr "¥³¡¼¥É¤Ï Chord ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
-#: out/parser.cc:2391
-#, c-format
-msgid "Stack size increased to %lu\n"
+#: lexer.ll:176
+msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: out/parser.cc:2398
-#, c-format
-msgid "Entering state %d\n"
+#: lexer.ll:180
+msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: out/parser.cc:2422
-#, fuzzy
-msgid "Reading a token: "
+#: lexer.ll:235
+#, fuzzy, c-format
+msgid "Renaming input to: `%s'"
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: out/parser.cc:2429
-msgid "Now at end of input.\n"
+#: lexer.ll:252
+msgid "quoted string expected after \\version"
 msgstr ""
 
-#: out/parser.cc:2434
-msgid "Next token is"
+#: lexer.ll:256
+msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#. Shift the look-ahead token.
-#. Shift the error token.
-#: out/parser.cc:2455 out/parser.cc:5796
-msgid "Shifting"
+#: lexer.ll:260
+msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#. This is so xgettext sees the translatable formats that are
-#. constructed on the fly.
-#: out/parser.cc:5615
-#, fuzzy, c-format
-msgid "syntax error, unexpected %s"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+#: lexer.ll:273
+msgid "EOF found inside a comment"
+msgstr "¥³¥á¥ó¥ÈÆâ¤Ë EOF ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: out/parser.cc:5616
-#, fuzzy, c-format
-msgid "syntax error, unexpected %s, expecting %s"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+#: lexer.ll:288
+#, fuzzy
+msgid "\\maininput not allowed outside init files"
+msgstr "½é´ü²½¥Õ¥¡¥¤¥ë¤Î³°¤Ç¤Ï \\maininput ¤òµ­½Ò¤Ç¤­¤Þ¤»¤ó"
 
-#: out/parser.cc:5617
+#: lexer.ll:312
 #, fuzzy, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+msgid "wrong or undefined identifier: `%s'"
+msgstr "̤ÄêµÁ¤Î¼±ÊÌ»Ò: `%s'"
 
-#: out/parser.cc:5618
-#, fuzzy, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s or %s"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+#. backup rule
+#: lexer.ll:321
+msgid "end quote missing"
+msgstr ""
 
-#: out/parser.cc:5619
-#, c-format
-msgid "syntax error, unexpected %s, expecting %s or %s or %s or %s"
+#: lexer.ll:466
+msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: out/parser.cc:5693
-#, fuzzy
-msgid "syntax error; also memory exhausted"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+#: lexer.ll:559
+msgid "Brace found at end of markup.  Did you forget a space?"
+msgstr ""
 
-#: out/parser.cc:5697
-#, fuzzy
-msgid "syntax error"
-msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+#: lexer.ll:659
+#, c-format
+msgid "invalid character: `%c'"
+msgstr "̵¸ú¤Êʸ»ú: `%c'"
+
+#: lexer.ll:774 lexer.ll:775
+#, c-format
+msgid "unknown escaped string: `\\%s'"
+msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
 
-#: out/parser.cc:5718 out/parser.cc:5778
-msgid "Error: popping"
+#: lexer.ll:880 lexer.ll:881
+#, c-format
+msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: out/parser.cc:5724
-msgid "Error: discarding"
+#: lexer.ll:881 lexer.ll:882
+msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: out/parser.cc:5813
-msgid "Error: discarding lookahead"
+#: lexer.ll:887 lexer.ll:888
+#, c-format
+msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:18
-#, fuzzy, lisp-format
+#: backend-library.scm:19 lily.scm:599 ps-to-png.scm:82
+#, fuzzy, scheme-format
 msgid "Invoking `~a'..."
 msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
 
-#: backend-library.scm:23
-#, lisp-format
+#: backend-library.scm:24
+#, scheme-format
 msgid "`~a' failed (~a)"
 msgstr ""
 
-#: backend-library.scm:42 framework-tex.scm:332 framework-tex.scm:357
-#, fuzzy, lisp-format
+#: backend-library.scm:95 framework-tex.scm:343 framework-tex.scm:368
+#, fuzzy, scheme-format
 msgid "Converting to `~a'..."
 msgstr "¹Ô ..."
 
-#. Do not try to guess the name of the png file,
-#. GS produces PNG files like BASE-page%d.png.
-#. (ly:message (_ "Converting to `~a'...")
-#. (string-append (basename name ".ps") "-page1.png" )))
-#: backend-library.scm:65
-#, fuzzy, lisp-format
+#: backend-library.scm:108
+#, fuzzy, scheme-format
 msgid "Converting to ~a..."
 msgstr "¹Ô ..."
 
-#: backend-library.scm:95
-#, fuzzy, lisp-format
+#: backend-library.scm:145
+#, fuzzy, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr "°Í¸´Ø·¸¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß: `%s'..."
 
-#: beam.scm:79
-#, lisp-format
-msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
-msgstr ""
-
-#: beam.scm:93
-#, lisp-format
-msgid "Error in beam quanting.  Expected ~S 0, found ~S."
-msgstr ""
-
-#: clef.scm:124
-#, fuzzy, lisp-format
-msgid "unknown clef type `~a'"
-msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
-
-#: clef.scm:125
-msgid "see scm/clef.scm for supported clefs"
-msgstr ""
-
-#: define-context-properties.scm:13 define-grob-properties.scm:10
+#: define-context-properties.scm:20 define-grob-properties.scm:10
 #: define-music-properties.scm:10
-#, lisp-format
+#, scheme-format
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-markup-commands.scm:79
-#, lisp-format
-msgid "Could not find bounding box of `~a'"
+#: define-event-classes.scm:119
+#, scheme-format
+msgid "event class ~A seems to be unused"
 msgstr ""
 
-#: define-markup-commands.scm:110
+#. should be programming-error
+#: define-event-classes.scm:125
+#, scheme-format
+msgid "translator listens to nonexisting event class ~A"
+msgstr ""
+
+#: define-markup-commands.scm:255
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:651
-#, fuzzy, lisp-format
+#: define-markup-commands.scm:1297
+#, fuzzy, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
 
-#: define-music-types.scm:802
-#, lisp-format
+#: define-music-types.scm:751
+#, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:805
-#, fuzzy, lisp-format
-msgid "can't find music object: ~S"
-msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: define-music-types.scm:825
-#, fuzzy, lisp-format
-msgid "unknown repeat type `~S'"
-msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
-
-#: define-music-types.scm:826
-msgid "See music-types.scm for supported repeats"
-msgstr ""
-
 #: document-backend.scm:91
-#, lisp-format
+#, scheme-format
 msgid "pair expected in doc ~s"
 msgstr ""
 
-#: document-backend.scm:135
-#, fuzzy, lisp-format
-msgid "can't find interface for property: ~S"
-msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
-
-#: document-backend.scm:144
-#, fuzzy, lisp-format
-msgid "unknown interface: ~S"
-msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
-
 #: documentation-lib.scm:45
-#, fuzzy, lisp-format
+#, fuzzy, scheme-format
 msgid "Processing ~S..."
 msgstr "½èÍýÃæ..."
 
-#: documentation-lib.scm:160
-#, fuzzy, lisp-format
+#: documentation-lib.scm:150
+#, fuzzy, scheme-format
 msgid "Writing ~S..."
 msgstr "¹Ô ..."
 
-#: documentation-lib.scm:182
-#, lisp-format
-msgid "can't find description for property ~S"
-msgstr ""
-
-#: framework-eps.scm:45 framework-eps.scm:46
-#, fuzzy, lisp-format
+#: framework-eps.scm:91 framework-eps.scm:92
+#, fuzzy, scheme-format
 msgid "Writing ~a..."
 msgstr "¹Ô ..."
 
-#: framework-ps.scm:236
-#, fuzzy, lisp-format
-msgid "can't find CFF/PFA/PFB font ~S=~S"
-msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
-
-#: framework-ps.scm:368
-#, lisp-format
-msgid "can't convert <stdout> to ~S"
+#: framework-ps.scm:349
+#, scheme-format
+msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:383 framework-ps.scm:386
-#, lisp-format
-msgid "can't generate ~S using the postscript back-end"
-msgstr ""
+#: framework-ps.scm:380
+#, fuzzy, scheme-format
+msgid "do not know how to embed font ~s ~s ~s"
+msgstr "²»Àá `%s' ¤Î²ò¼áÊýË¡¤¬È½¤ê¤Þ¤»¤ó"
 
-#: framework-tex.scm:349
-#, fuzzy, lisp-format
+#: framework-tex.scm:360
+#, fuzzy, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr "´û¤Ë´Þ¤ó¤Ç¤¤¤Þ¤¹: `%s'"
 
-#: lily-library.scm:314
-#, fuzzy, lisp-format
+#: layout-beam.scm:29
+#, scheme-format
+msgid "Error in beam quanting.  Expected (~S,~S) found ~S."
+msgstr ""
+
+#: layout-beam.scm:46
+#, scheme-format
+msgid "Error in beam quanting.  Expected ~S 0, found ~S."
+msgstr ""
+
+#: layout-page-layout.scm:357
+#, fuzzy
+msgid "Calculating page breaks..."
+msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
+
+#: lily-library.scm:582
+#, fuzzy, scheme-format
 msgid "unknown unit: ~S"
 msgstr "Ƚ¤é¤Ê¤¤¥È¥é¥ó¥¹¥ì¡¼¥¿: `%s'"
 
-#: lily-library.scm:347
-#, lisp-format
-msgid "no \\version statement found,  add~afor future compatibility"
+#: lily-library.scm:615
+#, scheme-format
+msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
 
-#: lily-library.scm:354
+#: lily-library.scm:622
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:97
-#, lisp-format
+#: lily.scm:144
+#, fuzzy, scheme-format
+msgid "Can't find ~A"
+msgstr "¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#: lily.scm:209
+#, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:319
-#, lisp-format
+#: lily.scm:525 lily.scm:589
+#, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: markup.scm:88
-#, lisp-format
+#: lily.scm:579
+#, fuzzy, scheme-format
+msgid "Redirecting output to ~a..."
+msgstr "%s ¤Ø paper ½ÐÎÏ..."
+
+#: ly-syntax-constructors.scm:40
+msgid "Music head function must return Music object"
+msgstr ""
+
+#: ly-syntax-constructors.scm:136
+#, scheme-format
+msgid "Invalid property operation ~a"
+msgstr ""
+
+#: markup.scm:123
+#, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:94
-#, lisp-format
+#: markup.scm:129
+#, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
 
-#: music-functions.scm:507
-#, fuzzy, lisp-format
+#: music-functions.scm:213
+#, fuzzy
+msgid "More alternatives than repeats. Junking excess alternatives"
+msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£"
+
+#: music-functions.scm:232
+#, scheme-format
+msgid "expecting 2 elements for chord tremolo, found ~a"
+msgstr ""
+
+#: music-functions.scm:538
+#, fuzzy, scheme-format
 msgid "music expected: ~S"
 msgstr "¶õÇò¤¬É¬ÍפǤ¹"
 
 #. FIXME: uncomprehensable message
-#: music-functions.scm:558
-#, lisp-format
+#: music-functions.scm:589
+#, scheme-format
 msgid "Bar check failed.  Expect to be at ~a, instead at ~a"
 msgstr ""
 
-#: music-functions.scm:702
-#, fuzzy, lisp-format
-msgid "can't find quoted music `~S'"
-msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
-
-#: music-functions.scm:875
-#, fuzzy, lisp-format
-msgid "unknown accidental style: ~S"
-msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
-
-#: output-lib.scm:246
-#, fuzzy, lisp-format
-msgid "unknown bar glyph: `~S'"
-msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
-
-#: output-ps.scm:311
-msgid "utf8-string encountered in PS backend"
+#: output-ps.scm:315
+msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
-#: output-svg.scm:41
-#, lisp-format
+#: output-svg.scm:42
+#, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
-#: output-svg.scm:119
-#, lisp-format
-msgid "can't decypher Pango description: ~a"
-msgstr ""
-
-#: output-tex.scm:114
-#, fuzzy, lisp-format
-msgid "can't find ~a in ~a"
-msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: page-layout.scm:425
-#, fuzzy
-msgid "Calculating page breaks..."
-msgstr "¥«¥é¥à°ÌÃÖ¤ò·×»»Ãæ..."
-
-#: paper.scm:68
+#: paper.scm:69
 #, fuzzy
 msgid "Not in toplevel scope"
 msgstr "ºÇ¾å°Ì¤Î¥È¥é¥ó¥¹¥ì¡¼¥¿¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: paper.scm:113
-#, lisp-format
+#: paper.scm:117
+#, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
+#: paper.scm:129
+#, fuzzy, scheme-format
+msgid "Unknown papersize: ~a"
+msgstr "paper ÊÑ¿ô¤ÎÃͤ¬È½¤ê¤Þ¤»¤ó: `%s'"
+
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:141
+#: paper.scm:144
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
+#: parser-clef.scm:126
+#, fuzzy, scheme-format
+msgid "unknown clef type `~a'"
+msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
+
+#: parser-clef.scm:127
+msgid "see scm/clef.scm for supported clefs"
+msgstr ""
+
+#: ps-to-png.scm:88
+#, scheme-format
+msgid "~a exited with status: ~S"
+msgstr ""
+
 #: to-xml.scm:190
-msgid "assertion failed"
+#, scheme-format
+msgid "assertion failed: ~S"
 msgstr ""
 
-#~ msgid "More alternatives than repeats.  Junking excess alternatives."
+#, fuzzy
+#~ msgid "loading default font"
+#~ msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤ò¥í¡¼¥É¤·¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "cannot find default font: `%s'"
+#~ msgstr "¥Ç¥Õ¥©¥ë¥È¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "couldn't find line breaking that satisfies constraints"
+#~ msgstr "¤½¤Î²ò·è¤ÏÀ©¸Â¤òËþ¤¿¤·¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "crescendo too small"
+#~ msgstr "¥¯¥ì¥Ã¥·¥§¥ó¥É"
+
+#~ msgid "print this help"
+#~ msgstr "¤³¤Î¥Ø¥ë¥×"
+
+#, fuzzy
+#~ msgid "Incorrect lilypond version: %s (%s, %s)"
+#~ msgstr "´Ö°ã¤Ã¤¿ mudela ¥Ð¡¼¥¸¥ç¥ó: %s (%s, %s)"
+
+#, fuzzy
+#~ msgid "cannot find music object: ~S"
+#~ msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "unknown repeat type `~S'"
+#~ msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
+
+#, fuzzy
+#~ msgid "cannot find interface for property: ~S"
+#~ msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
+
+#, fuzzy
+#~ msgid "unknown Grob interface: ~S"
+#~ msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
+
+#, fuzzy
+#~ msgid "cannot find description for property ~S (~S)"
+#~ msgstr "ʸ»úÈֹ椬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %d"
+
+#, fuzzy
+#~ msgid "cannot find quoted music `~S'"
+#~ msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "unknown accidental style: ~S"
+#~ msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×ʸ»úÎó: `\\%s'"
+
+#, fuzzy
+#~ msgid "cannot find ~a in ~a"
+#~ msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "no one to print a tremolos"
+#~ msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "junking event: `%s'"
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#~ msgid "no one to print a repeat brace"
+#~ msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "cannot find `%s' context"
+#~ msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "no one to print a percent"
+#~ msgstr "È¿Éüµ­¹æ¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid "Creator: "
+#~ msgstr "ºî¶Ê¼Ô: "
+
+#, fuzzy
+#~ msgid "at "
+#~ msgstr ", at "
+
+#, fuzzy
+#~ msgid "in quotation: junking event %s"
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#, fuzzy
+#~ msgid "TFM header of `%s' has only %u word (s)"
+#~ msgstr "`%s' ¤Î TFM ¥Ø¥Ã¥À¤Ë %u ¸ì¤·¤«¤¢¤ê¤Þ¤»¤ó"
+
+#~ msgid ""
+#~ "%s: TFM file has %u parameters, which is more than the %u I can handle"
+#~ msgstr "%s: TFM ¥Õ¥¡¥¤¥ë¤Ï %u ¸Ä¤Î¥Ñ¥é¥á¥¿¤¬¤¢¤ê¤Þ¤¹¤¬¡¢%u °Ê¾å¤Ï°·¤¨¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "cannot find ascii character: %d"
+#~ msgstr "ascii ʸ»ú¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%d'"
+
+#~ msgid "no one to print a tuplet start bracket"
+#~ msgstr "¥¿¥×¥ì¥Ã¥È³«»Ï¥Ö¥é¥±¥Ã¥È¤òɽ¼¨¤¹¤ë¤â¤Î¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "unterminated trill spanner"
+#~ msgstr "½ªÃ¼¤Î¤Ê¤¤¥¨¥¯¥¹¥Æ¥ó¥À"
+
+#, fuzzy
+#~ msgid "more alternatives than repeats"
 #~ msgstr "·«¤êÊÖ¤·¤è¤ê¤âÁªÂò»è¤¬Â¿¤¤¡£Ä¶²áʬ¤ò¼Î¤Æ¤Þ¤¹¡£"
 
+#, fuzzy
+#~ msgid "cannot find signature for music function"
+#~ msgstr "`%s' ¥³¥ó¥Æ¥­¥¹¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTIONS]... FILE"
+#~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]"
+
+#, fuzzy
+#~ msgid "Opening pipe `%s'"
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#, fuzzy
+#~ msgid "Cleaning %s..."
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#, fuzzy
+#~ msgid "Usage: %s [OPTION]... [FILE]..."
+#~ msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..."
+
+#, fuzzy
+#~ msgid "%s: skipping: `%s'"
+#~ msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "print version information"
+#~ msgstr "¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤òɽ¼¨"
+
+#, fuzzy
+#~ msgid "no such context: %s"
+#~ msgstr "¤½¤ÎÍͤʳڴï¤Ï¤¢¤ê¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "Processing `%s'..."
+#~ msgstr "½èÍýÃæ..."
+
+#, fuzzy
+#~ msgid "Wrote `%s'"
+#~ msgstr "¹Ô ..."
+
+#, fuzzy
+#~ msgid "cannot dlopen: %s: %s"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "install package: %s or %s"
+#~ msgstr "`%s' ¤«¤é `%s' ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "aborting"
+#~ msgstr "½ªÎ»¤·¤Þ¤¹"
+
+#, fuzzy
+#~ msgid "parsing AFM file: `%s'"
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#, fuzzy
+#~ msgid "beam has less than two visible stems"
+#~ msgstr "³Ã¤¬Æó¤Ä̤Ëþ¤ÎÉäÈø¤È¤È¤â¤Ë»È¤ï¤ì¤Þ¤·¤¿"
+
+#, fuzzy
+#~ msgid "adding lilypond directory: %s"
+#~ msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "cannot handle a percent repeat of length: %s"
+#~ msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "Separation_item:  I've been drinking too much"
+#~ msgstr "Single_malt_grouping_item:  °û¤ß¤¹¤®¤Á¤ã¤Ã¤¿"
+
+#, fuzzy
+#~ msgid "suspect duration in beam: %s"
+#~ msgstr "²»Ä¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %d"
+
+#, fuzzy
+#~ msgid "syntax error: cannot back up"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "Stack now"
+#~ msgstr "¥È¥é¥Ã¥¯ "
+
+#, fuzzy
+#~ msgid "Reading a token: "
+#~ msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'"
+
+#, fuzzy
+#~ msgid "syntax error, unexpected %s"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "syntax error, unexpected %s, expecting %s"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "syntax error, unexpected %s, expecting %s or %s"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "syntax error, unexpected %s, expecting %s or %s or %s"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "syntax error; also memory exhausted"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "syntax error"
+#~ msgstr "³¹Ô²Äǽ¤Ê¥¨¥é¡¼: "
+
+#, fuzzy
+#~ msgid "cannot find CFF/PFA/PFB font ~S=~S"
+#~ msgstr "¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "unknown bar glyph: `~S'"
+#~ msgstr "ÉÔÌÀ¤Ê²»Éôµ­¹æ(Clef)"
+
+#, fuzzy
+#~ msgid "Extracting fonts to %s..."
+#~ msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
+
+#, fuzzy
+#~ msgid "Writing %s..."
+#~ msgstr "¹Ô ..."
+
 #~ msgid "Have to be in Lyric mode for lyrics"
 #~ msgstr "²Î»ì¤Ï Lyric ¥â¡¼¥ÉÆâ¤Ë½ñ¤¤¤Æ¤¯¤À¤µ¤¤"
 
@@ -2424,11 +2442,11 @@ msgstr ""
 #~ msgstr "FIXME: ¥­¡¼Êѹ¹¤Î¥Þ¡¼¥¸"
 
 #, fuzzy
-#~ msgid "kpathsea can't find %s file: `%s'"
+#~ msgid "kpathsea cannot find %s file: `%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
-#~ msgid "kpathsea can't find file: `%s'"
+#~ msgid "kpathsea cannot find file: `%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
@@ -2455,10 +2473,6 @@ msgstr ""
 #~ msgid "kpathsea can not find TFM file: `%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
-#, fuzzy
-#~ msgid "Can't open file %s"
-#~ msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó: `%s'"
-
 #, fuzzy
 #~ msgid "Cannot switch translators, I'm there already"
 #~ msgstr "¥È¥é¥ó¥¹¥ì¡¼¥¿¤òÀÚ¤êÂؤ¨¤é¤ì¤Þ¤»¤ó¡£´û¤Ë¤½¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
@@ -2503,7 +2517,7 @@ msgstr ""
 #~ msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ"
 
 #, fuzzy
-#~ msgid "can't find file: `%s.%s'"
+#~ msgid "cannot find file: `%s.%s'"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'"
 
 #, fuzzy
@@ -2525,10 +2539,6 @@ msgstr ""
 #~ msgid "Writing HTML menu `%s'"
 #~ msgstr "¹Ô ..."
 
-#, fuzzy
-#~ msgid "dependencies output to `%s'..."
-#~ msgstr "%s ¤Ø paper ½ÐÎÏ..."
-
 #, fuzzy
 #~ msgid "programming error: %s (Continuing; cross thumbs)\n"
 #~ msgstr " (³¤±¤Þ¤¹ -- cross thumbs)"
@@ -2594,7 +2604,7 @@ msgstr ""
 #~ msgstr "²»³ÚŪÄêµÁ¤è¤ê: %s"
 
 #, fuzzy
-#~ msgid "can't find start of phrasing slur"
+#~ msgid "cannot find start of phrasing slur"
 #~ msgstr "ËöÈø¤Ø¤Î(¥Ç)¥¯¥ì¥Ã¥·¥§¥ó¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #, fuzzy
@@ -2621,9 +2631,6 @@ msgstr ""
 #~ msgid "Must have duration object"
 #~ msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹"
 
-#~ msgid "Can't evaluate Scheme in safe mode"
-#~ msgstr "°ÂÁ´¥â¡¼¥É¤Ç¤Ï Scheme ¤Îɾ²Á¤ò¤Ç¤­¤Þ¤»¤ó"
-
 #, fuzzy
 #~ msgid "%r: release directory"
 #~ msgstr "¸«¤Ä¤«¤é¤Ê¤¤¤«ºî¤ì¤Þ¤»¤ó: `%s'"
@@ -2656,7 +2663,7 @@ msgstr ""
 #~ msgstr "¤³¤ÎÍ×µá¤ËÂФ¹¤ëÊý¸þ¤ò»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó"
 
 #, fuzzy
-#~ msgid "can't map file"
+#~ msgid "cannot map file"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤Ç¤­¤Þ¤»¤ó"
 
 #~ msgid "This binary was compiled with the following options:"
@@ -2691,9 +2698,6 @@ msgstr ""
 #~ msgid "track %d:"
 #~ msgstr "¥È¥é¥Ã¥¯ %d:"
 
-#~ msgid "Creating voices..."
-#~ msgstr "²»À¼¤òºîÀ®Ãæ..."
-
 #~ msgid "NOT Filtering tempo..."
 #~ msgstr "¥Æ¥ó¥Ý¤Î¥Õ¥£¥ë¥¿¤ò¤·¤Þ¤»¤ó..."
 
@@ -2731,7 +2735,7 @@ msgstr ""
 #~ msgstr "¥Ç¥Ð¥Ã¥°½ÐÎϤòÍ­¸ú"
 
 #, fuzzy
-#~ msgid "don't output tuplets, double dots or rests, smallest is 32"
+#~ msgid "do not output tuplets, double dots or rests, smallest is 32"
 #~ msgstr "ÉäÅÀ¤äÊ£ÉäÅÀ¤ò¤Ê¤¯¤¹¤è¤¦»î¤ß¤Þ¤¹¡¢ºÇ¾®¤Ï 32"
 
 #~ msgid "set FILE as default output"
@@ -2743,7 +2747,7 @@ msgstr ""
 #~ msgid "set smallest duration"
 #~ msgstr "²»Ä¹¤òºÇ¾®¤ËÀßÄꤷ¤Þ¤¹"
 
-#~ msgid "don't timestamp the output"
+#~ msgid "do not timestamp the output"
 #~ msgstr "½ÐÎϤ˥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¤Ä¤±¤Ê¤¤"
 
 #~ msgid "assume no double dotted notes"
@@ -2772,7 +2776,7 @@ msgstr ""
 #~ msgstr "̵¸ú¤Ê¥È¥é¥Ã¥¯¿ô"
 
 #, fuzzy
-#~ msgid "can't handle non-metrical time"
+#~ msgid "cannot handle non-metrical time"
 #~ msgstr "±¤Î§¤Ë¤Ê¤é¤Ê¤¤Çï»Ò¤Ï°·¤¨¤Þ¤»¤ó"
 
 #~ msgid "Junking note-end event: channel = %d, pitch = %d"
@@ -2817,7 +2821,7 @@ msgstr ""
 #~ msgstr "ÉâÆ°¾®¿ôÅÀÎã³°"
 
 #, fuzzy
-#~ msgid "can't set mem-checking!"
+#~ msgid "cannot set mem-checking!"
 #~ msgstr "¥á¥â¥ê¥Á¥§¥Ã¥¯¤òÀßÄê¤Ç¤­¤Þ¤»¤ó"
 
 #, fuzzy
@@ -2879,7 +2883,7 @@ msgstr ""
 #~ msgstr "¾®À᤬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£È¿Éü¤ò̵»ë¤·¤Þ¤¹¡£"
 
 #, fuzzy
-#~ msgid "can't find both ends of %s"
+#~ msgid "cannot find both ends of %s"
 #~ msgstr "%s ¤Îξü¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
 #~ msgid "slur"
@@ -2925,9 +2929,6 @@ msgstr ""
 #~ msgid "elapsed time %.2f seconds"
 #~ msgstr "%.2f É÷вá"
 
-#~ msgid "no tremolo beam to end"
-#~ msgstr "ËöÈø¤Ø¤Î¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó"
-
 #~ msgid "Already have a tremolo beam"
 #~ msgstr "¤¹¤Ç¤Ë¥È¥ì¥â¥íµ­¹æ¤¬¤¢¤ê¤Þ¤¹"
 
@@ -2970,9 +2971,6 @@ msgstr ""
 #~ msgid "Must set spring between differing columns"
 #~ msgstr "°Û¤Ê¤ë¥«¥é¥à¤Î´Ö¤Ë spring ¤ò¥»¥Ã¥È¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#~ msgid "unknown paper variable: `%s'"
-#~ msgstr "paper ÊÑ¿ô¤ÎÃͤ¬È½¤ê¤Þ¤»¤ó: `%s'"
-
 #~ msgid "not a real variable"
 #~ msgstr "Ãͤ¬¼Â¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
@@ -3030,7 +3028,7 @@ msgstr ""
 #~ msgid "Generating stupido solution"
 #~ msgstr "Çϼ¯¤²¤¿²ò·è¤òÀ¸À®Ãæ"
 
-#~ msgid "I don't fit; put me on Montignac"
+#~ msgid "I do not fit; put me on Montignac"
 #~ msgstr "¾å¼ê¤¯¤Ï¤Þ¤ê¤Þ¤»¤ó -- Montignac ¤Î¤È¤³¤í¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤"
 
 #~ msgid "More than one music block"