Menu
▾
▴
#2721 CG 3.2.1: Improve and update instructions on how to track the translation branch
Accepted
nobody
None
Documentation
2017-04-16
2012-08-07
Anonymous
No
Originally created by: *anonymous
Originally created by: colingh...@gmail.com
Originally owned by: pkx1...@gmail.com
Federico Bruni reported here:
http://lists.gnu.org/archive/html/bug-lilypond/2012-08/msg00006.html
http://article.gmane.org/gmane.comp.gnu.lilypond.bugs/35904
Quoting the original post:
--------------------------
Hi
in CG 3.2.1, Initializing a repository
the recommended way to download the source code is using clone:
git clone git://git.sv.gnu.org/lilypond.git ~/lilypond-git
git clone sets only the master branch.
Previously the doc contained complex git commands but there were full instructions for both developers and translators. Now (new) translators are missing some information.
I think that all translators should know is these two commands:
git branch --track translation origin/translation
git checkout translation
On a side note, 'git clone' sees _all_ the remote branches.
I think that it would be nice to say also how to clean all the remote branches that one will never use. You may say it's a nitpick, yes it is :-) but 'git branch -a' is a bit messy.
I know how to remove them one by one, for example:
git branch -d -r origin/stable/0.0
but obviously this is not the way to go.
Wildcards unfortunately don't work:
git branch -d -r origin/stable/*
error: remote branch 'origin/stable/*' not found.
And this doesn't work neither:
git branch -a | grep dev | xargs git branch -d
-------------------------
End of quote
In a subsequent post Federico suggested the following documentation change:
This paragraph is marked as obsolete:
http://lilypond.org/doc/v2.15/Documentation/contributor/downloading-remote-branches
So if you want to open an issue, here's a quick and dirty description:
We currently recommend in 3.2.1 to use 'git clone' to download the repository. This command downloads all the remote branches and makes the checkout of the master branch.
3.2.4, Downloading individual branch, is obsolete and should be removed.
What we should keep are the instructions on how to start working on a new branch, different from master, that is:
git checkout -b branch origin/branch
This means that translators should use:
git checkout translation origin/translation
Originally posted by: john.man...@gmail.com
Last line of the comment should read
git checkout -b translation origin/translation
instead. Don't use a shorthand "git checkout origin/translation", as it does not have the same effect in old Git versions (1.5.x).
Originally posted by: pkx1...@gmail.com
On 08/07/14 22:38, Federico Bruni wrote:
> 2014-07-08 18:49 GMT+02:00 Simon Albrecht <simon.albrecht@mail.de>:
>
> Am 08.07.2014 16:16, schrieb Federico Bruni:
>
> Hi Michael
>
> Problems in translated manuals should be reported on the translation list.
> The german translation is not updated as far as I know, since I've seen
> some reports from german users in the last year. Last commit of Till Paala
> was in october 2012. Unfortunately these reports can't be useful if nobody
> works on them.
>
> Would you like to help with upgrading the german translation? I can help
> you to understand the workflow.
>
> During the summer I might have time and a good mind to help.
> I’ll ask for assistance then.
> Yours, Simon
>
>
> Great!
> I'll probably be away from keyboard during summer, but you'll find some translator ready to help you.
> I attach my "easy guide for lilypond translators". Hope that it will help
---
Attached is a text file containing this 'easy guide' to help update the information in the CG
Owner: pkx1...@gmail.com
Originally posted by: pkx1...@gmail.com
On 09/07/14 19:41, Federico Bruni wrote:
> Yes, please go ahead.
> You may update the title of this issue (which reports only a small problem):
> https://code.google.com/p/lilypond/issues/detail?id=2721
> It may be worth adding that translators should not build in build/, otherwise the maintenance scripts won't work.
> I discussed about this some time ago (when build/ was recommended) and Francisco and Jean-Charles told me that they always compile in the root of the project.
Originally posted by: pkx1...@gmail.com
(No comment was entered for this change.)
Summary: CG 3.2.1: Improve and update instructions on how to track the translation branch
The following sentence I wrote in the lilypond-translation-guide.en.rst file is wrong:
Not translated @ref work fine only on html output, while links are broken in PDF.
So they should be translated, just like the crossreferences. In fact spanish and french manuals have them translated.