Also includes the change in lily-git.tcl.
@node Getting started with documentation translation
@subsection Getting started with documentation translation
@node Getting started with documentation translation
@subsection Getting started with documentation translation
-First, get the sources of branch @code{lilypond/translation} from the
+First, get the sources of branch @code{translation} from the
Git repository, see @ref{Starting with Git}.
@menu
Git repository, see @ref{Starting with Git}.
@menu
@itemize
@item Translation changes matching master branch are preferably made on
@itemize
@item Translation changes matching master branch are preferably made on
-@code{lilypond/translation} branch; they may be pushed directly to
+@code{translation} branch; they may be pushed directly to
@code{master} only if they do not break compilation of LilyPond and
its documentation, and in this case they should be pushed to
@code{master} only if they do not break compilation of LilyPond and
its documentation, and in this case they should be pushed to
-@code{lilypond/translation} too. Similarly, changes matching
+@code{translation} too. Similarly, changes matching
@code{stable/X.Y} are preferably made on
@code{lilypond/X.Ytranslation}.
@code{stable/X.Y} are preferably made on
@code{lilypond/X.Ytranslation}.
-@item @code{lilypond/translation} Git branch may be merged into
+@item @code{translation} Git branch may be merged into
master only if LilyPond (@command{make all}) and documentation
(@command{make doc}) compile successfully.
@item @code{master} Git branch may be merged into
master only if LilyPond (@command{make all}) and documentation
(@command{make doc}) compile successfully.
@item @code{master} Git branch may be merged into
-@code{lilypond/translation} whenever @command{make} and @command{make
+@code{translation} whenever @command{make} and @command{make
doc} are successful (in order to ease documentation compilation by
translators), or when significant changes had been made in
documentation in English in master branch.
doc} are successful (in order to ease documentation compilation by
translators), or when significant changes had been made in
documentation in English in master branch.
@item @code{staging}:
after a successful review (see below), push here.
@item @code{staging}:
after a successful review (see below), push here.
-@item @code{lilypond/translation}:
+@item @code{translation}:
translators should base their work from this, and also push to it.
@item @code{dev/foo}:
translators should base their work from this, and also push to it.
@item @code{dev/foo}:
and the website. Generally, the @code{master} branch is expected
to compile successfully.
and the website. Generally, the @code{master} branch is expected
to compile successfully.
-The @code{lilypond/translation} branch is a side branch that
+The @code{translation} branch is a side branch that
allows translators to work without needing to worry about
compilation problems. Periodically, the Translation Meister
(after verifying that it doesn't break compilation), will
@emph{merge} this branch back into @code{master} to incorporate
recent translations. Similarly, the @code{master} branch is
allows translators to work without needing to worry about
compilation problems. Periodically, the Translation Meister
(after verifying that it doesn't break compilation), will
@emph{merge} this branch back into @code{master} to incorporate
recent translations. Similarly, the @code{master} branch is
-usually merged into the @code{lilypond/translation} branch after
+usually merged into the @code{translation} branch after
significant changes to the English documentation. See
@ref{Translating the documentation} for details.
significant changes to the English documentation. See
@ref{Translating the documentation} for details.
origin git://git.sv.gnu.org/lilypond.git/
@end example
origin git://git.sv.gnu.org/lilypond.git/
@end example
-To download the @code{lilypond/translation} branch, enter:
+To download the @code{translation} branch, enter:
-git remote add -ft lilypond/translation -m \
- lilypond/translation origin git://git.sv.gnu.org/lilypond.git/
+git remote add -ft translation -m \
+ translation origin git://git.sv.gnu.org/lilypond.git/
@end example
The @command{git@tie{}remote@tie{}add} process could take up to
@end example
The @command{git@tie{}remote@tie{}add} process could take up to
@noindent
where @code{@var{branch}} is the name of your tracking branch,
@noindent
where @code{@var{branch}} is the name of your tracking branch,
-either @code{master} or @code{lilypond/translation}.
+either @code{master} or @code{translation}.
Git will issue some warnings; this is normal:
Git will issue some warnings; this is normal:
you have not yet pushed to @code{git.sv.gnu.org}, please do not
rebase. If you want to avoid wondering whether you should rebase
each time you pull, please always use committishes from master
you have not yet pushed to @code{git.sv.gnu.org}, please do not
rebase. If you want to avoid wondering whether you should rebase
each time you pull, please always use committishes from master
-and/or lilypond/translation branch on @code{git.sv.gnu.org}, which
+and/or translation branch on @code{git.sv.gnu.org}, which
in particular implies that you must push your changes to
documentation except committishes updates (possibly after having
rebased), then update the committishes and push them.}
in particular implies that you must push your changes to
documentation except committishes updates (possibly after having
rebased), then update the committishes and push them.}
There are common usage cases for merging: as a translator, you
will often want to merge @code{master} into
There are common usage cases for merging: as a translator, you
will often want to merge @code{master} into
-@code{lilypond/translation}; on the other hand, the Translations
-meister wants to merge @code{lilypond/translation} into
+@code{translation}; on the other hand, the Translations
+meister wants to merge @code{translation} into
@code{master} whenever he has checked that
@code{master} whenever he has checked that
-@code{lilypond/translation} builds successfully.
+@code{translation} builds successfully.
@node Commits and patches
@node Commits and patches
It is possible to work with several branches on the same local Git
repository; this is especially useful for translators who may have
It is possible to work with several branches on the same local Git
repository; this is especially useful for translators who may have
-to deal with both @code{lilypond/translation} and a stable branch,
+to deal with both @code{translation} and a stable branch,
e.g. @code{stable/2.12}.
Some Git commands are introduced first, then a workflow with
e.g. @code{stable/2.12}.
Some Git commands are introduced first, then a workflow with
@noindent
where @code{@var{branch}} is typically @code{master} or
@noindent
where @code{@var{branch}} is typically @code{master} or
-@code{lilypond/translation}; if you do not know or remember, see
+@code{translation}; if you do not know or remember, see
@ref{Downloading remote branches} to remember which commands you
issued or which source code you wanted to get.
@ref{Downloading remote branches} to remember which commands you
issued or which source code you wanted to get.
@subsubheading Local clones, or having several working trees
If you play with several Git branches, e.g. @code{master},
@subsubheading Local clones, or having several working trees
If you play with several Git branches, e.g. @code{master},
-@code{lilypond/translation}, @code{stable/2.12}), you may want to
+@code{translation}, @code{stable/2.12}), you may want to
have one source and build tree for each branch; this is possible
with subdirectories of your local Git repository, used as local
cloned subrepositories. To create a local clone for the branch
have one source and build tree for each branch; this is possible
with subdirectories of your local Git repository, used as local
cloned subrepositories. To create a local clone for the branch
-An issue when switching branches between master and lilypond/translation
+An issue when switching branches between master and translation
is the appearance/disappearance of translated versions of some manuals.
If you see such a warning from make:
is the appearance/disappearance of translated versions of some manuals.
If you see such a warning from make:
"LilyPond Translator's Git Interface version $version"
set updateButtonText "1. Update translation"
set initializeButtonText "1. Get translation"
"LilyPond Translator's Git Interface version $version"
set updateButtonText "1. Update translation"
set initializeButtonText "1. Get translation"
- set originHead "lilypond/translation"
+ set originHead "translation"
set pushHead $originHead
set rebase 0
} else {
set pushHead $originHead
set rebase 0
} else {