Replace "_" with "_doc" for documentation translatable strings

This prevents lilypond.pot from being polluted with translatable
strings for documentation.

diff --git a/Documentation/po/GNUmakefile b/Documentation/po/GNUmakefile
index ef93f6aababd1534c1ddf9864c18299aef944c51..75d26a6334f5d366ae171564a84a412a725b386b 100644 (file)
--- a/Documentation/po/GNUmakefile
+++ b/Documentation/po/GNUmakefile
@@ -6,7 +6,7 @@ include $(depth)/make/stepmake.make
 
 doc-localedir=$(outdir)
 DOMAIN=lilypond-doc
-DOC_PO_SOURCES = add_html_footer.py langdefs.py
+DOC_PO_SOURCES = add_html_footer.py texi-gettext.py
 
 messages: $(MO_FILES)
        for i in $(CATALOGS); do \
@@ -16,7 +16,9 @@ messages: $(MO_FILES)
 
 po-update:
        $(PYTHON) $(buildscript-dir)/texi-langutils.py -d $(outdir) -o texi.pot --gettext ../$(depth)/Documentation/user/lilypond.tely
-       xgettext -cjn -L Python -o $(outdir)/buildscripts.pot $(foreach i, $(DOC_PO_SOURCES), $(buildscript-dir)/$(i) )
+       $(foreach i, $(DOC_PO_SOURCES), cp $(buildscript-dir)/$(i) $(outdir) &&) true
+       cd $(outdir) && sed -i -e s/_doc/_/g $(DOC_PO_SOURCES)
+       cd $(outdir) && xgettext -cjn -L Python -o buildscripts.pot $(DOC_PO_SOURCES)
        msgcat -o $(outdir)/doc.pot $(outdir)/buildscripts.pot $(outdir)/texi.pot
        msgmerge -U lilypond-doc.pot $(outdir)/doc.pot
        for i in $(CATALOGS); do \

diff --git a/Documentation/po/de.po b/Documentation/po/de.po
index c2712a89471e3dc6ecf8f518b06f45b8764a3222..e33639b1864bb8989e8b6137b04ebb4bea5f7f88 100644 (file)
--- a/Documentation/po/de.po
+++ b/Documentation/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-27 23:21+0200\n"
+"POT-Creation-Date: 2007-06-17 23:05+0200\n"
 "PO-Revision-Date: 2007-05-12 18:41+0200\n"
 "Last-Translator: Till Rettig <till.rettig@gmx.de>\n"
 "Language-Team: de <LL@li.org>\n"
@@ -16,49 +16,41 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../buildscripts/add_html_footer.py:46
+#: add_html_footer.py:46
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
-msgstr "Diese Seite ist für %(package_name)s-%(package_version)s (%(branch_str)s)."
+msgstr ""
+"Diese Seite ist für %(package_name)s-%(package_version)s (%(branch_str)s)."
 
-#: ../../buildscripts/add_html_footer.py:47
+#: add_html_footer.py:47
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
-msgstr "Fehler bitte an <a href=\"%(mail_address_url)s\">%(mail_address)s</a> melden."
+msgstr ""
+"Fehler bitte an <a href=\"%(mail_address_url)s\">%(mail_address)s</a> melden."
 
-#: ../../buildscripts/add_html_footer.py:54
+#: add_html_footer.py:54
 #, python-format
 msgid "Other languages: %s."
 msgstr "Andere Sprachen: %s."
 
-#: ../../buildscripts/add_html_footer.py:55
+#: add_html_footer.py:55
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr "Über die <A HREF=\"%s\">automatische Sprachauswahl</A>."
 
-#: ../../buildscripts/add_html_footer.py:238
+#: add_html_footer.py:238
 msgid "stable-branch"
 msgstr "stabiler Zweig"
 
-#: ../../buildscripts/add_html_footer.py:240
+#: add_html_footer.py:240
 msgid "development-branch"
 msgstr "Entwicklungszweig"
 
-#: ../../buildscripts/langdefs.py:34
-msgid "English"
-msgstr "Englisch"
-
-#: ../../buildscripts/langdefs.py:35
-msgid "French"
-msgstr "Französisch"
-
-#: ../../buildscripts/langdefs.py:36
-msgid "Spanish"
-msgstr "Spanisch"
-
-#: ../../buildscripts/langdefs.py:37
-msgid "German"
-msgstr "Deutsch"
+#: texi-gettext.py:45
+msgid ""
+"This section has not been translated yet; please refer to the manual in "
+"English."
+msgstr ""
 
 #. @node in ../../../Documentation/user/lilypond.tely
 msgid "Top"
@@ -1234,11 +1226,23 @@ msgstr "Textbeschriftung"
 msgid "Nested scores"
 msgstr "Geschachtelte Systeme"
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+#, fuzzy
+msgid "Page wrapping text"
+msgstr "Seitenumbrüche"
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Overview of text markup commands"
 msgstr "Überblick über Textbeschriftungsbefehle"
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+#, fuzzy
+msgid "Overview of text markup list commands"
+msgstr "Überblick über Textbeschriftungsbefehle"
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Font selection"
@@ -1484,6 +1488,12 @@ msgstr "Neue Umgebungen definieren"
 msgid "Aligning contexts"
 msgstr "Umgebungen aneinander ausrichten"
 
+#. @node in ../../../Documentation/user/changing-defaults.itely
+#. @subsection in ../../../Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Vertical grouping of grobs"
+msgstr "Vertikale Abstände"
+
 #. @node in ../../../Documentation/user/changing-defaults.itely
 #, fuzzy
 msgid "The \\override command"
@@ -1602,6 +1612,17 @@ msgstr "Titel erstellen"
 msgid "Custom titles"
 msgstr "Eigene Titel"
 
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+msgid "Reference to page numbers"
+msgstr ""
+
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+#, fuzzy
+msgid "Table of contents"
+msgstr "Inhaltsverzeichnis"
+
 #. @node in ../../../Documentation/user/non-music.itely
 #. @section in ../../../Documentation/user/non-music.itely
 msgid "MIDI output"
@@ -1875,6 +1896,12 @@ msgstr "Wie Beschriftungen intern funktionieren"
 msgid "New markup command definition"
 msgstr "Neue Definitionen von Beschriftungsbefehlen"
 
+#. @node in ../../../Documentation/user/programming-interface.itely
+#. @subsection in ../../../Documentation/user/programming-interface.itely
+#, fuzzy
+msgid "New markup list command definition"
+msgstr "Neue Definitionen von Beschriftungsbefehlen"
+
 #. @node in ../../../Documentation/user/programming-interface.itely
 #. @section in ../../../Documentation/user/programming-interface.itely
 msgid "Contexts for programmers"
@@ -2270,3 +2297,15 @@ msgstr "Fußnoten"
 
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
+
+#~ msgid "English"
+#~ msgstr "Englisch"
+
+#~ msgid "French"
+#~ msgstr "Französisch"
+
+#~ msgid "Spanish"
+#~ msgstr "Spanisch"
+
+#~ msgid "German"
+#~ msgstr "Deutsch"

diff --git a/Documentation/po/es.po b/Documentation/po/es.po
index a4d4efcf454fd935e30f5d823e975d2c6e82d394..1202c0298e11e41d73847ed236b02bb97bba1e2e 100644 (file)
--- a/Documentation/po/es.po
+++ b/Documentation/po/es.po
@@ -7,6 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-06-17 23:05+0200\n"
 "PO-Revision-Date: 2007-03-28 10:29+0200\n"
 "Last-Translator: Francisco Vila <francisco.vila@hispalinux.es>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -14,55 +16,43 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-
-
-#: ../../buildscripts/add_html_footer.py:46
+#: add_html_footer.py:46
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
 msgstr ""
 "Esta página corresponde a %(package_name)s-%(package_version)s (%(branch_str)"
 "s)."
 
-#: ../../buildscripts/add_html_footer.py:47
+#: add_html_footer.py:47
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 msgstr ""
 "Informe de los fallos a <a href=\"%(mail_address_url)s\">%(mail_address)s</"
 "a>."
 
-#: ../../buildscripts/add_html_footer.py:54
+#: add_html_footer.py:54
 #, python-format
 msgid "Other languages: %s."
 msgstr "Otros idiomas: %s."
 
-#: ../../buildscripts/add_html_footer.py:55
+#: add_html_footer.py:55
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr "Acerca de la <A HREF=\"%s\">selección automática del idioma</A>."
 
-#: ../../buildscripts/add_html_footer.py:238
+#: add_html_footer.py:238
 msgid "stable-branch"
 msgstr "rama estable"
 
-#: ../../buildscripts/add_html_footer.py:240
+#: add_html_footer.py:240
 msgid "development-branch"
 msgstr "rama de desarrollo"
 
-#: ../../buildscripts/langdefs.py:34
-msgid "English"
-msgstr "Inglés"
-
-#: ../../buildscripts/langdefs.py:35
-msgid "French"
-msgstr "Francés"
-
-#: ../../buildscripts/langdefs.py:36
-msgid "Spanish"
-msgstr "Español"
-
-#: ../../buildscripts/langdefs.py:37
-msgid "German"
-msgstr "Alemán"
+#: texi-gettext.py:45
+msgid ""
+"This section has not been translated yet; please refer to the manual in "
+"English."
+msgstr ""
 
 #. @node in ../../../Documentation/user/lilypond.tely
 msgid "Top"
@@ -1249,11 +1239,23 @@ msgstr "Marcado del texto"
 msgid "Nested scores"
 msgstr "Partituras anidadas"
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+#, fuzzy
+msgid "Page wrapping text"
+msgstr "Saltos de página"
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Overview of text markup commands"
 msgstr "Panorámica de los comandos de marcado de texto"
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+#, fuzzy
+msgid "Overview of text markup list commands"
+msgstr "Panorámica de los comandos de marcado de texto"
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Font selection"
@@ -1502,6 +1504,12 @@ msgstr "Definir contextos nuevos"
 msgid "Aligning contexts"
 msgstr "Alinear los contextos"
 
+#. @node in ../../../Documentation/user/changing-defaults.itely
+#. @subsection in ../../../Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Vertical grouping of grobs"
+msgstr "Espaciado vertical"
+
 #. @node in ../../../Documentation/user/changing-defaults.itely
 msgid "The \\override command"
 msgstr "El comando \\override"
@@ -1619,6 +1627,18 @@ msgstr "Crear títulos"
 msgid "Custom titles"
 msgstr "Títulos personalizados"
 
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+msgid "Reference to page numbers"
+msgstr ""
+
+# this is the same translation that babel LaTex package uses . FVD
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+#, fuzzy
+msgid "Table of contents"
+msgstr "Índice general"
+
 #. @node in ../../../Documentation/user/non-music.itely
 #. @section in ../../../Documentation/user/non-music.itely
 msgid "MIDI output"
@@ -1893,6 +1913,12 @@ msgstr "Cómo funciona internamente el marcado"
 msgid "New markup command definition"
 msgstr "Definición de un comando nuevo de marcado"
 
+#. @node in ../../../Documentation/user/programming-interface.itely
+#. @subsection in ../../../Documentation/user/programming-interface.itely
+#, fuzzy
+msgid "New markup list command definition"
+msgstr "Definición de un comando nuevo de marcado"
+
 #. @node in ../../../Documentation/user/programming-interface.itely
 #. @section in ../../../Documentation/user/programming-interface.itely
 msgid "Contexts for programmers"
@@ -2290,6 +2316,18 @@ msgstr "Notas al pie"
 msgid "Table of Contents"
 msgstr "Índice general"
 
+#~ msgid "English"
+#~ msgstr "Inglés"
+
+#~ msgid "French"
+#~ msgstr "Francés"
+
+#~ msgid "Spanish"
+#~ msgstr "Español"
+
+#~ msgid "German"
+#~ msgstr "Alemán"
+
 #~ msgid "Controlling spacing of individual systems"
 #~ msgstr "Controlar el espaciado de los sistemas individuales"
 

diff --git a/Documentation/po/fr.po b/Documentation/po/fr.po
index c189fb8d2280593cc749032970d4f39964c031d5..45d87bed300a058f3e68d5486629b782c31bdcfc 100644 (file)
--- a/Documentation/po/fr.po
+++ b/Documentation/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-27 23:21+0200\n"
+"POT-Creation-Date: 2007-06-17 23:05+0200\n"
 "PO-Revision-Date: 2007-03-27 23:06+0200\n"
 "Last-Translator: John Mandereau <john.mandereau@free.fr>\n"
 "Language-Team: Français <lilypond-user-fr@gnu.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../../buildscripts/add_html_footer.py:46
+#: add_html_footer.py:46
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
 msgstr ""
 "Cette page documente %(package_name)s-%(package_version)s (%(branch_str)s)."
 
-#: ../../buildscripts/add_html_footer.py:47
+#: add_html_footer.py:47
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 msgstr ""
@@ -31,39 +31,29 @@ msgstr ""
 "org\">lilypond-user-fr@gnu.org</a> ou en anglais à <a href=\"%"
 "(mail_address_url)s\">%(mail_address)s</a>"
 
-#: ../../buildscripts/add_html_footer.py:54
+#: add_html_footer.py:54
 #, python-format
 msgid "Other languages: %s."
 msgstr "Autres langues&nbsp;: %s."
 
-#: ../../buildscripts/add_html_footer.py:55
+#: add_html_footer.py:55
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr "À propos de la <A HREF=\"%s\">sélection automatique de la langue</A>."
 
-#: ../../buildscripts/add_html_footer.py:238
+#: add_html_footer.py:238
 msgid "stable-branch"
 msgstr "branche stable"
 
-#: ../../buildscripts/add_html_footer.py:240
+#: add_html_footer.py:240
 msgid "development-branch"
 msgstr "branche de développement"
 
-#: ../../buildscripts/langdefs.py:34
-msgid "English"
-msgstr "Anglais"
-
-#: ../../buildscripts/langdefs.py:35
-msgid "French"
-msgstr "Français"
-
-#: ../../buildscripts/langdefs.py:36
-msgid "Spanish"
-msgstr "Espagnol"
-
-#: ../../buildscripts/langdefs.py:37
-msgid "German"
-msgstr "Allemand"
+#: texi-gettext.py:45
+msgid ""
+"This section has not been translated yet; please refer to the manual in "
+"English."
+msgstr ""
 
 #. @node in ../../../Documentation/user/lilypond.tely
 msgid "Top"
@@ -1239,11 +1229,23 @@ msgstr "Texte mis en forme"
 msgid "Nested scores"
 msgstr "Partitions emboîtées"
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+#, fuzzy
+msgid "Page wrapping text"
+msgstr "Saut de page"
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Overview of text markup commands"
 msgstr "Vue d'ensemble des commandes d'indication textuelle"
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+#, fuzzy
+msgid "Overview of text markup list commands"
+msgstr "Vue d'ensemble des commandes d'indication textuelle"
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Font selection"
@@ -1489,6 +1491,12 @@ msgstr "Définir de nouveaux contextes"
 msgid "Aligning contexts"
 msgstr "Aligner des contextes"
 
+#. @node in ../../../Documentation/user/changing-defaults.itely
+#. @subsection in ../../../Documentation/user/changing-defaults.itely
+#, fuzzy
+msgid "Vertical grouping of grobs"
+msgstr "Espacement vertical"
+
 #. @node in ../../../Documentation/user/changing-defaults.itely
 msgid "The \\override command"
 msgstr "La commande \\override"
@@ -1603,6 +1611,17 @@ msgstr "Créer des titres"
 msgid "Custom titles"
 msgstr "Titres personnalisés"
 
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+msgid "Reference to page numbers"
+msgstr ""
+
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+#, fuzzy
+msgid "Table of contents"
+msgstr "Table des matières"
+
 #. @node in ../../../Documentation/user/non-music.itely
 #. @section in ../../../Documentation/user/non-music.itely
 msgid "MIDI output"
@@ -1877,6 +1896,12 @@ msgstr "Fonctionnement interne des marqueurs"
 msgid "New markup command definition"
 msgstr "Définition d'une nouvelle commande de marqueur"
 
+#. @node in ../../../Documentation/user/programming-interface.itely
+#. @subsection in ../../../Documentation/user/programming-interface.itely
+#, fuzzy
+msgid "New markup list command definition"
+msgstr "Définition d'une nouvelle commande de marqueur"
+
 #. @node in ../../../Documentation/user/programming-interface.itely
 #. @section in ../../../Documentation/user/programming-interface.itely
 msgid "Contexts for programmers"
@@ -2271,3 +2296,15 @@ msgstr "Notes de bas de page"
 
 msgid "Table of Contents"
 msgstr "Table des matières"
+
+#~ msgid "English"
+#~ msgstr "Anglais"
+
+#~ msgid "French"
+#~ msgstr "Français"
+
+#~ msgid "Spanish"
+#~ msgstr "Espagnol"
+
+#~ msgid "German"
+#~ msgstr "Allemand"

diff --git a/Documentation/po/lilypond-doc.pot b/Documentation/po/lilypond-doc.pot
index 931449a8280d074fda44711e5af9e6c4a464227e..29bed425d2494a1bc6c25ed82ac9da726831ae60 100644 (file)
--- a/Documentation/po/lilypond-doc.pot
+++ b/Documentation/po/lilypond-doc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-27 23:21+0200\n"
+"POT-Creation-Date: 2007-06-17 23:05+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,48 +16,38 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../buildscripts/add_html_footer.py:46
+#: add_html_footer.py:46
 #, python-format
 msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
 msgstr ""
 
-#: ../../buildscripts/add_html_footer.py:47
+#: add_html_footer.py:47
 #, python-format
 msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
 msgstr ""
 
-#: ../../buildscripts/add_html_footer.py:54
+#: add_html_footer.py:54
 #, python-format
 msgid "Other languages: %s."
 msgstr ""
 
-#: ../../buildscripts/add_html_footer.py:55
+#: add_html_footer.py:55
 #, python-format
 msgid "About <A HREF=\"%s\">automatic language selection</A>."
 msgstr ""
 
-#: ../../buildscripts/add_html_footer.py:238
+#: add_html_footer.py:238
 msgid "stable-branch"
 msgstr ""
 
-#: ../../buildscripts/add_html_footer.py:240
+#: add_html_footer.py:240
 msgid "development-branch"
 msgstr ""
 
-#: ../../buildscripts/langdefs.py:34
-msgid "English"
-msgstr ""
-
-#: ../../buildscripts/langdefs.py:35
-msgid "French"
-msgstr ""
-
-#: ../../buildscripts/langdefs.py:36
-msgid "Spanish"
-msgstr ""
-
-#: ../../buildscripts/langdefs.py:37
-msgid "German"
+#: texi-gettext.py:45
+msgid ""
+"This section has not been translated yet; please refer to the manual in "
+"English."
 msgstr ""
 
 #. @node in ../../../Documentation/user/lilypond.tely
@@ -1234,11 +1224,21 @@ msgstr ""
 msgid "Nested scores"
 msgstr ""
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+msgid "Page wrapping text"
+msgstr ""
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Overview of text markup commands"
 msgstr ""
 
+#. @node in ../../../Documentation/user/advanced-notation.itely
+#. @subsection in ../../../Documentation/user/advanced-notation.itely
+msgid "Overview of text markup list commands"
+msgstr ""
+
 #. @node in ../../../Documentation/user/advanced-notation.itely
 #. @subsection in ../../../Documentation/user/advanced-notation.itely
 msgid "Font selection"
@@ -1484,6 +1484,11 @@ msgstr ""
 msgid "Aligning contexts"
 msgstr ""
 
+#. @node in ../../../Documentation/user/changing-defaults.itely
+#. @subsection in ../../../Documentation/user/changing-defaults.itely
+msgid "Vertical grouping of grobs"
+msgstr ""
+
 #. @node in ../../../Documentation/user/changing-defaults.itely
 msgid "The \\override command"
 msgstr ""
@@ -1598,6 +1603,16 @@ msgstr ""
 msgid "Custom titles"
 msgstr ""
 
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+msgid "Reference to page numbers"
+msgstr ""
+
+#. @node in ../../../Documentation/user/non-music.itely
+#. @subsection in ../../../Documentation/user/non-music.itely
+msgid "Table of contents"
+msgstr ""
+
 #. @node in ../../../Documentation/user/non-music.itely
 #. @section in ../../../Documentation/user/non-music.itely
 msgid "MIDI output"
@@ -1871,6 +1886,11 @@ msgstr ""
 msgid "New markup command definition"
 msgstr ""
 
+#. @node in ../../../Documentation/user/programming-interface.itely
+#. @subsection in ../../../Documentation/user/programming-interface.itely
+msgid "New markup list command definition"
+msgstr ""
+
 #. @node in ../../../Documentation/user/programming-interface.itely
 #. @section in ../../../Documentation/user/programming-interface.itely
 msgid "Contexts for programmers"

diff --git a/buildscripts/add_html_footer.py b/buildscripts/add_html_footer.py
index d70ddcee6ea87d34ba46d2078feb50d9d198fc3a..7e331ba710aec86a369c5809f567eb0a97c473ce 100644 (file)
--- a/buildscripts/add_html_footer.py
+++ b/buildscripts/add_html_footer.py
@@ -25,7 +25,7 @@ non_copied_pages = ['Documentation/user/out-www/lilypond-big-page',
                     'Documentation/out-www/DEDICATION',
                     'Documentation/topdocs/out-www/AUTHORS']
 
-def _ (s):
+def _doc (s):
     return s
 
 header = r"""
@@ -43,16 +43,16 @@ footer = '''
 </p>
 </div>
 '''
-footer_name_version = _ ('This page is for %(package_name)s-%(package_version)s (%(branch_str)s).')
-footer_report_errors = _ ('Report errors to <a href="%(mail_address_url)s">%(mail_address)s</a>.')
+footer_name_version = _doc ('This page is for %(package_name)s-%(package_version)s (%(branch_str)s).')
+footer_report_errors = _doc ('Report errors to <a href="%(mail_address_url)s">%(mail_address)s</a>.')
 
 mail_address = 'http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
 
 header_tag = '<!-- header_tag -->'
 footer_tag = '<!-- footer_tag -->'
 
-lang_available = _ ("Other languages: %s.")
-browser_lang = _ ('About <A HREF="%s">automatic language selection</A>.')
+lang_available = _doc ("Other languages: %s.")
+browser_lang = _doc ('About <A HREF="%s">automatic language selection</A>.')
 browser_language_url = "/web/about/browser-language"
 
 LANGUAGES_TEMPLATE = '''
@@ -187,7 +187,7 @@ def add_menu (page_flavors, prefix, available, target, translation):
         if page_flavors[k][0] != '':
             t = translation[page_flavors[k][0]]
         else:
-            t = _
+            t = _doc
         for lang in available:
             lang_file = lang.file_name (os.path.basename (prefix), '.html')
             if language_menu != '':
@@ -235,9 +235,9 @@ def add_html_footer (translation,
         mail_address_url= 'mailto:' + mail_address
 
     versiontup = package_version.split ('.')
-    branch_str = _('stable-branch')
-    if int ( versiontup[1]) %  2:
-        branch_str = _('development-branch')
+    branch_str = _doc ('stable-branch')
+    if int (versiontup[1]) %  2:
+        branch_str = _doc ('development-branch')
 
     for prefix, ext_list in pages_dict.items ():
         for lang_ext in ext_list:

diff --git a/buildscripts/html-gettext.py b/buildscripts/html-gettext.py
index 1aebf6ca34eba02f92f837a2df039afb96bfa594..702b1872c33138c5617e4e5c5b8186e2107674c3 100644 (file)
--- a/buildscripts/html-gettext.py
+++ b/buildscripts/html-gettext.py
@@ -25,8 +25,6 @@ sys.path.append (buildscript_dir)
 import langdefs
 
 double_punct_char_separator = langdefs.LANGDICT[lang].double_punct_char_sep
-print localedir
-print lang
 t = gettext.translation('lilypond-doc', localedir, [lang])
 my_gettext = t.gettext
 

diff --git a/buildscripts/langdefs.py b/buildscripts/langdefs.py
index 6886a60347d1ce88b9004ed9eead390336d112e0..4c9a0a7d8b61dffc980275254756b34ce03713e4 100644 (file)
--- a/buildscripts/langdefs.py
+++ b/buildscripts/langdefs.py
@@ -1,4 +1,5 @@
 #!@PYTHON@
+#-*- coding: utf-8 -*-
 
 """
 Documentation i18n module
@@ -6,9 +7,6 @@ Documentation i18n module
 
 import re
 
-def _ (s):
-    return s
-
 def lang_file_name (p, langext, ext):
     if langext != '':
         return p + '.' + langext + ext
@@ -32,9 +30,9 @@ class LanguageDef:
 
 # All language information needed for documentation i18n is defined
 # here. For each 'Documentation/ab' directory containing docs
-# translated in 'ab', there should be an entry in LANGUAGES.
+# translated in 'ab', there should be one entry in LANGUAGES.
 
-site = LanguageDef ('en', _('English'), webext='')
+site = LanguageDef ('en', 'English', webext='')
 
 html_page_body = re.compile ('</?body>', re.M | re.I)
 french_html_typo_rules = ((' :', '&nbsp;:'),
@@ -48,10 +46,9 @@ def french_html_filter (page):
         parts[1] = parts[1].replace (r[0], r[1])
     return parts[0] + '<body>' + parts[1] + '</body>' + parts[2]
 
-fr = LanguageDef ('fr', _('French'), double_punct_char_sep='&nbsp;', html_filter = french_html_filter)
-es = LanguageDef ('es', _('Spanish') )
-de = LanguageDef ('de', _('German') )
-#nl = LanguageDef ('nl', 'Nederlands')
+fr = LanguageDef ('fr', 'français', double_punct_char_sep='&nbsp;', html_filter = french_html_filter)
+es = LanguageDef ('es', 'español')
+de = LanguageDef ('de', 'deutsch')
 
 # Outdated or broken translations may be disabled
 # (please run 'make web-clean' before doing that):

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 3b2bedecc4d69f64861a8a8baad300f37b3b9e75..7d30315618ee59c13a3b4fd4270e64ba0b91f5a9 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-29 14:39+0200\n"
+"POT-Creation-Date: 2007-06-17 22:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,53 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: add_html_footer.py:46
-#, python-format
-msgid "This page is for %(package_name)s-%(package_version)s (%(branch_str)s)."
-msgstr ""
-
-#: add_html_footer.py:47
-#, python-format
-msgid "Report errors to <a href=\"%(mail_address_url)s\">%(mail_address)s</a>."
-msgstr ""
-
-#: add_html_footer.py:54
-#, python-format
-msgid "Other languages: %s."
-msgstr ""
-
-#: add_html_footer.py:55
-#, python-format
-msgid "About <A HREF=\"%s\">automatic language selection</A>."
-msgstr ""
-
-#: add_html_footer.py:238
-msgid "stable-branch"
-msgstr ""
-
-#: add_html_footer.py:240
-msgid "development-branch"
-msgstr ""
-
-#. All language information needed for documentation i18n is defined
-#. here. For each 'Documentation/ab' directory containing docs
-#. translated in 'ab', there should be an entry in LANGUAGES.
-#: langdefs.py:37
-msgid "English"
-msgstr ""
-
-#: langdefs.py:51
-msgid "French"
-msgstr ""
-
-#: langdefs.py:52
-msgid "Spanish"
-msgstr ""
-
-#: langdefs.py:53
-msgid "German"
-msgstr ""
-
 #: convertrules.py:12
 #, python-format
 msgid "Not smart enough to convert %s"
@@ -222,7 +175,7 @@ msgstr ""
 msgid "Processing `%s'... "
 msgstr ""
 
-#: convert-ly.py:268 relocate.cc:363 source-file.cc:54
+#: convert-ly.py:268 relocate.cc:362 source-file.cc:54
 #, c-format, python-format
 msgid "cannot open file: `%s'"
 msgstr ""
@@ -645,7 +598,7 @@ msgstr ""
 msgid "beam was started here"
 msgstr ""
 
-#: beam-quanting.cc:314
+#: beam-quanting.cc:309
 msgid "no feasible beam position"
 msgstr ""
 
@@ -653,7 +606,7 @@ msgstr ""
 msgid "removing beam with no stems"
 msgstr ""
 
-#: beam.cc:1035
+#: beam.cc:1039
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
@@ -982,16 +935,16 @@ msgstr ""
 msgid "type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:250
+#: lily-lexer.cc:251
 msgid "include files are not allowed in safe mode"
 msgstr ""
 
-#: lily-lexer.cc:269
+#: lily-lexer.cc:270
 #, c-format
 msgid "identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:284
+#: lily-lexer.cc:285
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
@@ -1535,7 +1488,7 @@ msgstr ""
 msgid "cannot find start of piano pedal bracket: `%s'"
 msgstr ""
 
-#: program-option-scheme.cc:207
+#: program-option-scheme.cc:215
 #, c-format
 msgid "no such internal option: %s"
 msgstr ""
@@ -1605,12 +1558,12 @@ msgstr ""
 msgid "LILYPONDPREFIX is obsolete, use LILYPOND_DATADIR"
 msgstr ""
 
-#: relocate.cc:357
+#: relocate.cc:356
 #, c-format
 msgid "Relocation file: %s"
 msgstr ""
 
-#: relocate.cc:393
+#: relocate.cc:392
 #, c-format
 msgid "Unknown relocation command %s"
 msgstr ""
@@ -1848,119 +1801,119 @@ msgstr ""
 msgid "giving up"
 msgstr ""
 
-#: parser.yy:712
+#: parser.yy:727
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:736
+#: parser.yy:751
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1195
+#: parser.yy:1210
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1493
+#: parser.yy:1508
 msgid "second argument must be pitch list"
 msgstr ""
 
-#: parser.yy:1520 parser.yy:1525 parser.yy:1990
+#: parser.yy:1535 parser.yy:1540 parser.yy:2005
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1622
+#: parser.yy:1637
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:1777 parser.yy:1827
+#: parser.yy:1792 parser.yy:1842
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:1944
+#: parser.yy:1959
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2005
+#: parser.yy:2020
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: lexer.ll:176
+#: lexer.ll:177
 msgid "stray UTF-8 BOM encountered"
 msgstr ""
 
-#: lexer.ll:180
+#: lexer.ll:181
 msgid "Skipping UTF-8 BOM"
 msgstr ""
 
-#: lexer.ll:235
+#: lexer.ll:236
 #, c-format
 msgid "Renaming input to: `%s'"
 msgstr ""
 
-#: lexer.ll:252
+#: lexer.ll:253
 msgid "quoted string expected after \\version"
 msgstr ""
 
-#: lexer.ll:256
+#: lexer.ll:257
 msgid "quoted string expected after \\sourcefilename"
 msgstr ""
 
-#: lexer.ll:260
+#: lexer.ll:261
 msgid "integer expected after \\sourcefileline"
 msgstr ""
 
-#: lexer.ll:273
+#: lexer.ll:274
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:288
+#: lexer.ll:289
 msgid "\\maininput not allowed outside init files"
 msgstr ""
 
-#: lexer.ll:312
+#: lexer.ll:313
 #, c-format
 msgid "wrong or undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:321
+#: lexer.ll:322
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:466
+#: lexer.ll:467
 msgid "Brace found at end of lyric.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:561
+#: lexer.ll:578
 msgid "Brace found at end of markup.  Did you forget a space?"
 msgstr ""
 
-#: lexer.ll:665
+#: lexer.ll:682
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:780
+#: lexer.ll:797 lexer.ll:798
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:886
+#: lexer.ll:903 lexer.ll:904
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:887
+#: lexer.ll:904 lexer.ll:905
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: lexer.ll:893
+#: lexer.ll:910 lexer.ll:911
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
 
-#: backend-library.scm:19 lily.scm:752 ps-to-png.scm:58
+#: backend-library.scm:19 lily.scm:762 ps-to-png.scm:58
 #, scheme-format
 msgid "Invoking `~a'..."
 msgstr ""
@@ -1970,7 +1923,7 @@ msgstr ""
 msgid "`~a' failed (~a)"
 msgstr ""
 
-#: backend-library.scm:115 framework-tex.scm:343 framework-tex.scm:368
+#: backend-library.scm:115 framework-tex.scm:344 framework-tex.scm:369
 #, scheme-format
 msgid "Converting to `~a'..."
 msgstr ""
@@ -2002,11 +1955,11 @@ msgstr ""
 msgid "translator listens to nonexisting event class ~A"
 msgstr ""
 
-#: define-markup-commands.scm:273
+#: define-markup-commands.scm:274
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:1315
+#: define-markup-commands.scm:1312
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
@@ -2060,42 +2013,42 @@ msgstr ""
 msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
-#: framework-eps.scm:89
+#: framework-eps.scm:90
 #, scheme-format
 msgid "Writing ~a..."
 msgstr ""
 
-#: framework-ps.scm:281
+#: framework-ps.scm:280
 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:334
+#: framework-ps.scm:333
 #, scheme-format
 msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:351
+#: framework-ps.scm:350
 #, scheme-format
 msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:382
+#: framework-ps.scm:381
 #, scheme-format
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:731
+#: framework-ps.scm:735
 #, scheme-format
 msgid "cannot convert <stdout> to ~S"
 msgstr ""
 
-#: framework-ps.scm:750 framework-ps.scm:753
+#: framework-ps.scm:754 framework-ps.scm:757
 #, scheme-format
 msgid "cannot generate ~S using the postscript back-end"
 msgstr ""
 
-#: framework-ps.scm:760
+#: framework-ps.scm:764
 msgid ""
 "\n"
 "The PostScript backend does not support the system-by-system \n"
@@ -2111,7 +2064,7 @@ msgid ""
 "  %% ****************************************************************\n"
 msgstr ""
 
-#: framework-tex.scm:360
+#: framework-tex.scm:361
 #, scheme-format
 msgid "TeX file name must not contain whitespace: `~a'"
 msgstr ""
@@ -2135,7 +2088,7 @@ msgstr ""
 msgid "Can't fit systems on page -- ignoring between-system-padding"
 msgstr ""
 
-#: layout-page-layout.scm:449
+#: layout-page-layout.scm:447
 msgid "Calculating page breaks..."
 msgstr ""
 
@@ -2153,34 +2106,34 @@ msgstr ""
 msgid "old relative compatibility not used"
 msgstr ""
 
-#: lily.scm:173
+#: lily.scm:182
 #, scheme-format
 msgid "cannot find: ~A"
 msgstr ""
 
-#: lily.scm:238
+#: lily.scm:247
 #, scheme-format
 msgid "wrong type for argument ~a.  Expecting ~a, found ~s"
 msgstr ""
 
-#: lily.scm:619
+#: lily.scm:629
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
-#: lily.scm:622
+#: lily.scm:632
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
-#: lily.scm:649 lily.scm:742
+#: lily.scm:659 lily.scm:752
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:732
+#: lily.scm:742
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
@@ -2194,12 +2147,12 @@ msgstr ""
 msgid "Invalid property operation ~a"
 msgstr ""
 
-#: markup.scm:94
+#: markup.scm:124
 #, scheme-format
 msgid "Wrong number of arguments.  Expect: ~A, found ~A: ~S"
 msgstr ""
 
-#: markup.scm:100
+#: markup.scm:130
 #, scheme-format
 msgid "Invalid argument in position ~A.  Expect: ~A, found: ~S."
 msgstr ""
@@ -2238,17 +2191,17 @@ msgstr ""
 msgid "utf-8-string encountered in PS backend"
 msgstr ""
 
-#: output-svg.scm:42
+#: output-svg.scm:45
 #, scheme-format
 msgid "undefined: ~S"
 msgstr ""
 
-#: output-svg.scm:132
+#: output-svg.scm:135
 #, scheme-format
 msgid "cannot decypher Pango description: ~a"
 msgstr ""
 
-#: output-tex.scm:97
+#: output-tex.scm:96
 #, scheme-format
 msgid "cannot find ~a in ~a"
 msgstr ""