Docs: fix translations status generation script

diff --git a/Documentation/contributor/doc-translation-list.itexi b/Documentation/contributor/doc-translation-list.itexi
index 9ed969bec8d9ec8d8f924a62774ed9b0859b04f9..219b0590ebdccda0add164192f0e0ce0b32273e7 100644 (file)
--- a/Documentation/contributor/doc-translation-list.itexi
+++ b/Documentation/contributor/doc-translation-list.itexi
@@ -19,35 +19,33 @@ Word counts (excluding LilyPond snippets) are given for each file.
 FIXME: take into account the new web site integration in main sources.
 
 @example
--1- Documentation index and Tutorial
-429   learning.tely
-6368  learning/tutorial.itely
+-1- Tutorial
+132   learning.tely
+2678  learning/tutorial.itely
+4138  learning/common-notation.itely
 23    dedication.itely
-432   macros.itexi
-171   index.html.in
+1059  macros.itexi
 161   translations.template.html.in
-6522  po/lilypond-doc.pot (translate to po/@var{MY_LANGUAGE}.po)
+1670  po/lilypond-doc.pot (translate to po/@var{MY_LANGUAGE}.po)
 ---   lilypond-texi2html.init (section TRANSLATIONS)
-14106 total
+9861  total
 
--2- Introduction and beginning of Application Usage
+-2- Fundamental Concepts and beginning of Application Usage
+11135 learning/fundamental.itely -- Fundamental concepts
 411   learning/preface.itely
-3866  learning/introduction.itely
-407   application.tely
-193   application/install.itely
-1149  application/setup.itely
-3023  application/running.itely
-9049  total
+145   usage.tely
+3531  usage/running.itely
+1189  usage/updating.itely
+16411 total
 
--3- Learning manual
-10323 learning/fundamental.itely -- Fundamental concepts
-14834 learning/tweaks.itely -- Tweaking output
-5033  learning/working.itely -- Working on LilyPond files
-498   learning/templates.itely -- Templates
-30688 total
+-3- Rest of Learning manual and Suggestions on writing LilyPond files
+15578 learning/tweaks.itely -- Tweaking output
+201   learning/templates.itely -- Templates
+2694  usage/suggestions.itely -- Suggestions on writing LilyPond files
+18473 total
 
 -4- Notation reference
-724   notation.tely
+467   notation.tely
 91    notation/notation.itely -- Musical notation
 3155  notation/pitches.itely
 4757  notation/rhythms.itely
@@ -57,7 +55,7 @@ FIXME: take into account the new web site integration in main sources.
 1689  notation/staff.itely
 919   notation/editorial.itely
 2412  notation/text.itely
-76    notation/specialist.itely -- Specialist notation
+81    notation/specialist.itely -- Specialist notation
 2725  notation/vocal.itely
 1516  notation/chords.itely
 702   notation/piano.itely
@@ -66,19 +64,19 @@ FIXME: take into account the new web site integration in main sources.
 66    notation/strings.itely
 242   notation/bagpipes.itely
 4487  notation/ancient.itely
-6170  notation/input.itely -- Input syntax
+6264  notation/input.itely -- Input syntax
 2164  notation/non-music.itely -- Non-musical notation
-8663  notation/spacing.itely -- Spacing issues
-11800 notation/changing-defaults.itely -- Changing defaults
+8433  notation/spacing.itely -- Spacing issues
+11933 notation/changing-defaults.itely -- Changing defaults
 5187  notation/programming-interface.itely -- Interfaces for programmers
-611   notation/notation-appendices.itely -- Notation manual tables
+2002  notation/notation-appendices.itely -- Notation manual tables
 252   notation/cheatsheet.itely -- Cheat sheet
-63447 total
+64583 total
 
--5- Application usage
-3248  application/lilypond-book.itely -- LilyPond-book
-1171  application/converters.itely -- Converting from other formats
-4419  total
+-5- Rest of Application Usage
+3511  usage/lilypond-book.itely -- LilyPond-book
+1122  usage/converters.itely -- Converting from other formats
+4633  total
 
 -6- Appendices whose translation is optional
 310   notation/literature.itely

diff --git a/Documentation/de/essay.tely b/Documentation/de/essay.tely
index 1c173ce2085a596a649027bf8e1aa0f05bd45f99..dd71e5242586141235a63c8a2c81de073a0d5d69 100644 (file)
--- a/Documentation/de/essay.tely
+++ b/Documentation/de/essay.tely
@@ -10,7 +10,7 @@
 @documentencoding UTF-8
 @documentlanguage de
 
-@c Translators Till Paala
+@c Translators: Till Paala
 @c this is a stub:
 @c TODO: translate essay.itely
 

diff --git a/Documentation/fr/general.texi b/Documentation/fr/general.texi
index 07a93a76e4f6e105d0edf7e9646d7fe9dbbbd329..4cab8b42d24da196596285fb0a5b63ac1641a7a7 100644 (file)
--- a/Documentation/fr/general.texi
+++ b/Documentation/fr/general.texi
@@ -21,6 +21,7 @@
 
 @translationof Top
 
+@c Translators: Test
 
 @chapheading
 @end ifnottex

diff --git a/Documentation/nl/learning.tely b/Documentation/nl/learning.tely
index c430f2864028b1b3a645373b4e42f66b73115c58..c050dbb1448c87bb30190eb626b0ebd39e53e4c0 100644 (file)
--- a/Documentation/nl/learning.tely
+++ b/Documentation/nl/learning.tely
@@ -13,6 +13,9 @@
 @documentencoding UTF-8
 @documentlanguage nl
 @include macros.itexi
+
+@c Translators: Test
+
 @c This produces the unified index
 @afourpaper
 @c don't remove this comment.

diff --git a/Documentation/nl/notation.tely b/Documentation/nl/notation.tely
index d0f0741715f979032162cc0c124b8f495f23bd3a..17eeff2eda6e2054c1ac68715b8d8409f7474104 100644 (file)
--- a/Documentation/nl/notation.tely
+++ b/Documentation/nl/notation.tely
@@ -13,6 +13,9 @@
 @documentencoding UTF-8
 @documentlanguage nl
 @include macros.itexi
+
+@c Translators: Test
+
 @afourpaper
 @c Keep this here, since it pertains to the direntry below.
 @c * lilypond: (lilypond-application)Running LilyPond.      Invoking the

diff --git a/Documentation/nl/usage.tely b/Documentation/nl/usage.tely
index 7d414774840ecdf70791707c92dd26a1f3e44d98..6384d8d528a36885565129b551fe6b875b9faf03 100644 (file)
--- a/Documentation/nl/usage.tely
+++ b/Documentation/nl/usage.tely
@@ -13,6 +13,9 @@
 @documentencoding UTF-8
 @documentlanguage nl
 @include macros.itexi
+
+@c Translators: Test
+
 @afourpaper
 @c don't remove this comment.
 @ifnottex

diff --git a/scripts/auxiliar/translations-status.py b/scripts/auxiliar/translations-status.py
index 591e3855071e4f59fe535fe11b0a7a606970ad6b..574bb679ef31d682c073f7ada53ab50eae6cd6a5 100755 (executable)
--- a/scripts/auxiliar/translations-status.py
+++ b/scripts/auxiliar/translations-status.py
@@ -88,7 +88,8 @@ texi_level = {
     'chapter': ('n', 1),
     'section': ('n', 2),
     'subsection': ('n', 3),
-    'appendix': ('l', 1)
+    'appendix': ('l', 1),
+    'appendixsec': ('l', 2),
 }
 
 appendix_number_trans = string.maketrans ('@ABCDEFGHIJKLMNOPQRSTUVWXY',
@@ -225,7 +226,10 @@ class TranslatedTelyDocument (TelyDocument):
             try:
                 self.translators = parent_translation.translators
             except:
-                error ('%s: no translator name found, \nplease \
+                if 'macros.itexi' in self.filename:
+                    self.translators = ['']
+                else:
+                    error ('%s: no translator name found, \nplease \
 specify at least one in the master file as a line containing\n\
 @c Translators: FirstName1 LastName1, FirstName2 LastName2' % self.filename)
         m = checkers_re.search (self.contents)
@@ -562,7 +566,7 @@ status_txt_file = 'out/translations-status.txt'
 progress ("Writing %s..." % status_txt_file)
 open (status_txt_file, 'w').write (main_status_txt)
 
-translation_instructions_file = 'devel/doc-translation-list.itexi'
+translation_instructions_file = 'contributor/doc-translation-list.itexi'
 progress ("Updating %s..." % translation_instructions_file)
 translation_instructions = open (translation_instructions_file).read ()