Doc: rename translation branch.

Also includes the change in lily-git.tcl.

diff --git a/Documentation/contributor/doc-work.itexi b/Documentation/contributor/doc-work.itexi
index 39bd1e1df06087e61b5b0b2a2d1c3baf02b66a4a..dabb13beb4b581609003bce4fd6e6c7f0b60138f 100644 (file)
--- a/Documentation/contributor/doc-work.itexi
+++ b/Documentation/contributor/doc-work.itexi
@@ -1542,7 +1542,7 @@ take some time before your request or contribution is handled.
 @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
@@ -2235,19 +2235,19 @@ translations to Git.
 
 @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{lilypond/translation} too.  Similarly, changes matching
+@code{translation} too.  Similarly, changes matching
 @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
-@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.

diff --git a/Documentation/contributor/introduction.itexi b/Documentation/contributor/introduction.itexi
index b15b4291d0727c36a2e00ea935a5479d9b5c2be1..bb0f9849350575ddeccd4029a0a119aea85d5fac 100644 (file)
--- a/Documentation/contributor/introduction.itexi
+++ b/Documentation/contributor/introduction.itexi
@@ -124,7 +124,7 @@ base your work from this, but do @strong{not push} to it.
 @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}:

diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi
index 73385511023f7eab213904c3513ed622049ffacb..97e1025e47bf9f9809207b6d847ab20a84fbd7a8 100644 (file)
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -619,13 +619,13 @@ development releases), the documentation (and its translations),
 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
-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.
 
@@ -673,11 +673,11 @@ git remote add -ft master -m master \
   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:
 
 @example
-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
@@ -715,7 +715,7 @@ git checkout -b @var{branch} origin/@var{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:
 
@@ -899,7 +899,7 @@ changed committishes in the head of translated files using commits
 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.}
@@ -1021,10 +1021,10 @@ If any conflict happens, see @ref{Resolving conflicts}.
 
 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{lilypond/translation} builds successfully.
+@code{translation} builds successfully.
 
 
 @node Commits and patches
@@ -1436,7 +1436,7 @@ in learning more about git.}
 
 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
@@ -1482,7 +1482,7 @@ git pull git://git.sv.gnu.org/lilypond.git/ @var{branch}:origin/@var{branch}
 
 @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.
 
@@ -1612,7 +1612,7 @@ current branch.  For example, if your current branch is
 @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

diff --git a/Documentation/included/compile.itexi b/Documentation/included/compile.itexi
index 933f5c9829e3789f9df86369d1de9844d66df2a2..e95cf2629cd8122a1f7c0c909f3f8d731d5bef0e 100644 (file)
--- a/Documentation/included/compile.itexi
+++ b/Documentation/included/compile.itexi
@@ -673,7 +673,7 @@ make info
 @end example
 
 @noindent
-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:
 

diff --git a/scripts/auxiliar/lily-git.tcl b/scripts/auxiliar/lily-git.tcl
index 7767686f4a3a99e4b6aa71145c64a98c8a7f6f96..a734269ed8a89ef97abac31e5bb728beab6944e2 100755 (executable)
--- a/scripts/auxiliar/lily-git.tcl
+++ b/scripts/auxiliar/lily-git.tcl
@@ -30,7 +30,7 @@ if {$translator == 1} {
         "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 {