CHECK STATE OF TRANSLATION
UPDATE A TRANSLATION
POLICY DURING GDP PROCESS
-MANAGING TRANSLATIONS ON GIT
+MANAGING TRANSLATIONS WITH GIT
+SOME GIT TIPS
DEALING WITH SEVERAL GIT BRANCHES
+GIT PUSH ACCESS
+TECHNICAL BACKGROUND
SOURCES
Word counts (excluding lilypond snippets) are given for each file.
-1- Documentation index and Tutorial
-396 user/lilypond-learning.tely
-5593 user/tutorial.itely
+415 user/lilypond-learning.tely
+6365 user/tutorial.itely
23 user/dedication.itely
-100 user/macros.itexi
-216 index.html.in
-2022 po/lilypond-doc.pot (translate to po/<MY_LANGUAGE>.po)
-8250 total
+409 user/macros.itexi
+171 index.html.in
+3792 po/lilypond-doc.pot (translate to po/<MY_LANGUAGE>.po)
+11175 total
-2- Introduction and beginning of Application Usage
411 user/preface.itely
-3198 user/introduction.itely
-374 user/lilypond-program.tely
-1477 user/install.itely (partial translation)
-947 user/setup.itely
-2860 user/running.itely
-9267 total
+3855 user/introduction.itely
+393 user/lilypond-program.tely
+1867 user/install.itely (partial translation)
+1149 user/setup.itely
+2896 user/running.itely
+10571 total
-3- Learning manual
-8626 user/fundamental.itely -- Fundamental concepts
-12134 user/tweaks.itely -- Tweaking output
-2985 user/working.itely -- Working on LilyPond files
+10318 user/fundamental.itely -- Fundamental concepts
+12353 user/tweaks.itely -- Tweaking output
+3005 user/working.itely -- Working on LilyPond files
483 user/templates.itely -- Templates
-24228 total
+26159 total
-4- Notation reference
-539 user/lilypond.tely
+680 user/lilypond.tely
91 user/notation.itely -- Musical notation
-2808 user/pitches.itely
-7336 user/rhythms.itely
-1681 user/expressive.itely
-725 user/repeats.itely
-916 user/simultaneous.itely
-1861 user/staff.itely
-879 user/editorial.itely
-2336 user/text.itely
-54 user/specialist.itely -- Specialist notation
-2630 user/vocal.itely
-1275 user/chords.itely
+3147 user/pitches.itely
+6312 user/rhythms.itely
+1110 user/expressive.itely
+556 user/repeats.itely
+1452 user/simultaneous.itely
+1690 user/staff.itely
+902 user/editorial.itely
+2410 user/text.itely
+76 user/specialist.itely -- Specialist notation
+2679 user/vocal.itely
+1326 user/chords.itely
702 user/piano.itely
-481 user/percussion.itely
+810 user/percussion.itely
826 user/guitar.itely
66 user/strings.itely
242 user/bagpipes.itely
-4289 user/ancient.itely
-2458 user/input.itely -- Input syntax
+4240 user/ancient.itely
+5661 user/input.itely -- Input syntax
2164 user/non-music.itely -- Non-musical notation
-8399 user/spacing.itely -- Spacing issues
-5149 user/changing-defaults.itely -- Changing defaults
-4547 user/programming-interface.itely -- Interfaces for programmers
-935 user/notation-appendices.itely -- Notation manual tables
+8297 user/spacing.itely -- Spacing issues
+11197 user/changing-defaults.itely -- Changing defaults
+5202 user/programming-interface.itely -- Interfaces for programmers
+1155 user/notation-appendices.itely -- Notation manual tables
250 user/cheatsheet.itely -- Cheat sheet
-53639 total
+63243 total
-5- Application usage
-2917 user/lilypond-book.itely -- LilyPond-book
-975 user/converters.itely -- Converting from other formats
-3892 total
+3194 user/lilypond-book.itely -- LilyPond-book
+1171 user/converters.itely -- Converting from other formats
+4365 total
-6- Appendices whose translation is optional
-299 user/literature.itely
+310 user/literature.itely
960 user/scheme-tutorial.itely (needs to be revised first)
-1259 total
+1270 total
TRANSLATION DETAILED INSTRUCTIONS
@c KEEP LY
-Otherwise the music snippet would be reset to the same contents as the
+Otherwise the music snippet would be reset to the same content as the
English version at next 'make snippet-update' run (see UPDATING A
TRANSLATION below).
make ISOLANG=<MY_LANGUAGE> check-translation | grep 'diff --git'
+To avoid printing terminal colors control characters, which is often
+desirable when you redirect output to a file, run
+
+ make ISOLANG=<MY_LANGUAGE> NO_COLOR=1 check-translation
+
Global state of the translation is recorded in
Documentation/translations.html.in, which is used to generate
Updating music snippets can quickly become cumbersome, as most
snippets should be identical in all languages. Fortunately, there is
-a script than can do this odd job for you (run from Documentation):
+a script that can do this odd job for you (run from Documentation):
make ISOLANG=<MY_LANGUAGE> snippet-update
game is catching where has gone each section. In Learning manual, and
in Notation Reference sections which have been revised in GDP, there
may be completely new sections: in this case, copy @node and
-@section-command from English docs, and put the usual tricky line
-'UNTRANSLATED NODE: IGNORE ME'. Note that it is not possible to
-exactly match subsections or subsubsections of documentation in
-English, when contents has been deeply revised; in this case, kee
-obsolete (sub)subsections in the translation.
+@section-command from English docs, and add the marker for
+untranslated status '@untranslated' on a single line. Note that it is
+not possible to exactly match subsections or subsubsections of
+documentation in English, when contents has been deeply revised; in
+this case, keep obsolete (sub)subsections in the translation, marking
+them with a line '@c obsolete' just before the node.
-* Hints for Emacs users (without Emacs AucTeX installed)
+4) update sections finished in GDP; check sections status at GDP website.
+
+
+* Hints for Emacs users
Emacs with Texinfo mode makes this step easier:
-- C-c C-s shows structure of current Texinfo file in a new buffer
-*Occur*; to show structure of two files simultaneously, first split
-Emacs window in 4 tiles (with C-x 1 and C-x 2), press C-c C-s to
-show structure of one file (e.g. the translated file), copy *Occur*
-contents into *Scratch*, then press C-c C-s for the other file.
+- without Emacs AucTeX installed, C-c C-s shows structure of current
+Texinfo file in a new buffer *Occur*; to show structure of two files
+simultaneously, first split Emacs window in 4 tiles (with C-x 1 and
+C-x 2), press C-c C-s to show structure of one file (e.g. the translated
+file), copy *Occur* contents into *Scratch*, then press C-c C-s for the
+other file.
+If you happen to have installed AucTeX, you can either call the macro
+by doing M-x texinfo-show-structure or create a key binding in your
+~/.emacs, by adding the four following lines:
+ (add-hook 'Texinfo-mode-hook
+ '(lambda ()
+ (define-key Texinfo-mode-map "\C-cs"
+ 'texinfo-show-structure)))
+and then obtain the structure in the *Occur* buffer with C-c s
+
- Do not bother updating @menus when all menu entries are in the same
file ; make sure there is at least a (possibly empty) @menu block
documentation sectioning has been revised in one go, so all this
maintenance plan has to be repeated whenever a big reorganization is
made. Currently (in May 2008), only chapters 3-7 in Notation Reference
-and Application Usage have not be reorganized yet.
+and Application Usage have not been reorganized yet.
- This just makes translated documentation take advantage of the new
organization, which is far better than the old one.
texi2html and node names are directly translated in source files.
-MANAGING TRANSLATIONS ON GIT
+MANAGING TRANSLATIONS WITH GIT
This policy explains how to manage Git branches and commit
translations to Git.
PROCESS'.
+SOME GIT TIPS
+
+* Saving uncommited changes in the working tree:
+
+ git diff > foo.diff
+
+This does not save untracked or ignored files. If you prefer to
+include changes added to the index with 'git add', replace 'git diff'
+with 'git diff HEAD'.
+Then, you may try to apply foo.diff on a source tree with
+
+ patch -p1 < foo.diff
+
+
DEALING WITH SEVERAL GIT BRANCHES
* It is possible to work with several branches on the same local Git
Note that it is possible to check out another branch while having
uncommitted changes, but it is not recommended unless you know what
you are doing; it is recommended to run 'git status' to check this
-kind of issue before checking ouy another branch.
+kind of issue before checking out another branch.
When pulling using SHORTHAND, do not forget to check first that the
right branch is checked out, i.e. the branch named A in the first part
delete...) on these branches, but this possibility is not detailed
here.
+Note that when you push BRANCH from SUBDIR to the main repository,
+and BRANCH is checked out in the main repository, you must save
+uncommitted changes (see SOME GIT TIPS) and do 'git reset --hard' in
+the main repository in order to apply pushed changes in the working
+tree of the main repository.
+
+
+GIT PUSH ACCESS
+
+If you have permission to push to Git with login USER, please start a
+new Git repository from scratch to avoid polluting history with
+duplicate commits; follow the usual instructions, except that every
+file you write in .git/remotes should contain instead
+
+URL: ssh://USER@git.sv.gnu.org/srv/git/lilypond.git
+Push: BRANCH:refs/heads/BRANCH
+Pull: BRANCH:refs/remotes/origin/BRANCH
+
+Then, you can use .git/remotes/NAME to push BRANCH with
+
+ git push NAME
+
+which works regardless of the branch checked out.
+
TECHNICAL BACKGROUND
projects / lilypond.git / blobdiff