git gui: improve German translation #525
Conversation
Welcome to GitGitGadgetHi @cstim, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that your Pull Request has a good description, as it will be used as cover letter. Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment If you want to see what email(s) would be sent for a After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail). If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the curl -g --user "<EMailAddress>:<Password>" \
--url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txtTo iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description): To send a new iteration, just add another PR comment with the contents: Need help?New contributors who want advice are encouraged to join [email protected], where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join. You may also be able to find help in real time in the developer IRC channel, |
|
/allow |
|
User cstim is now allowed to use GitGitGadget. |
|
Hi @cstim, Thanks for the contribution. Since I don't speak German, I can't really review the second patch. So unless someone else volunteers to go through it, I'll just trust you and merge it in. I glanced at the first patch, and I might have a couple comments. I will give it a thorough read once you submit it to the list. Once you feel the two patches are ready, please comment with |
|
Hi @prati0100 , thanks for the heads-up. I got some first feedback from the other German translators. I would like to collect some more feedback from the other German translators, and then submit a consolidated patch. This might take a few more days. Thanks! |
|
Dear @prati0100, I have questions to your remark about my first patch:
The first of my patches was "only" an update of my language's de.po files from the current source code base. As both .pot files were heavily out of date, I regenerated those ( For my German language patch I made sure to keep this rather technical first step separated from the actual translation update (currently the second patch, more might come within the next days), because the actual translation should get some review from other German speaking translators. One of them already agreed to give a review once I submit this to the git mailing list, but I'd like to do further work before doing so. Thanks! |
|
My comment was mainly about the commit message not following the project's convention. The commit subject should start with 'git-gui: ' and follow with short title that shouldn't need more than one line. I didn't look very closely at the patch contents, but nothing looks out of place to me at first glance.
Sure, take your time :-). Thanks for contributing. |
|
There is an issue in commit 8cd0e60036e09240709b60a61c0eddb4d22d6103: |
|
There is an issue in commit 6006c1b7e65f28987a9978da8d106a3d46311236: |
|
@cstim would you mind changing the upper-case "U" to a lower-case "u" in "git-gui: update German translation."? And while at it, drop the "." at the end? Thank you! |
|
There is an issue in commit 8cd0e60036e09240709b60a61c0eddb4d22d6103: |
|
There is an issue in commit 6006c1b7e65f28987a9978da8d106a3d46311236: |
|
There is an issue in commit b05739febeee93b1348305c7003c63ba17281be0: |
cstim
force-pushed
the
cstim-gitgui
branch
2 times, most recently
from
6b90d41 to
c91a84b
Compare
|
Preview email sent as [email protected] |
|
Oops, did I crash the other build pipeline by removing one of my earlier comments here? I thought my comment containing the |
|
/submit |
|
Submitted as [email protected] |
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
| @@ -7,41 +7,42 @@ msgid "" | |||
| msgstr "" | |||
There was a problem hiding this comment.
On the Git mailing list, Pratyush Yadav wrote (reply to this):
Hi Christian,
Thanks for the patches. I don't have much to say about this patch other
than the commit message since I don't speak German.
> Subject: Re: [PATCH 2/3] git-gui: update german translation
Nitpick: capitalise "german". So, s/german/German/
On 24/01/20 10:33PM, Christian Stimming via GitGitGadget wrote:
> From: Christian Stimming <[email protected]>
>
> Switch several terms from uncommon translations back to english
> vocabulary, most prominently commit (noun, verb) and repository. Adapt
> glossary and translation accordingly.
Can you also explain _why_ these uncommon translations are changed to
English vocabulary? My guess is that the translated versions are too
awkward and don't express the meaning very well, and terms like "commit"
and "repository" are more suitable even when German is being used. An
explanation like this would help explain the need for this patch much
better.
Everything else looks fine.
PS: It would be nice if we can get an ACK from a German speaker.
> Signed-off-by: Christian Stimming <[email protected]>
--
Regards,
Pratyush Yadav
There was a problem hiding this comment.
On the Git mailing list, Christian Stimming wrote (reply to this):
Dear Pratyush,
thanks for the first evaluation.
Am Samstag, 25. Januar 2020, 17:56:29 CET schrieb Pratyush Yadav:
> > Subject: Re: [PATCH 2/3] git-gui: update german translation
>
> Nitpick: capitalise "german". So, s/german/German/
Of course I can do that... however, the capitalization of the headline is
somewhat different every time in the repository. The first word is lower case,
yes, but e.g. the language adjective is sometimes upper case, sometimes lower
case.
> On 24/01/20 10:33PM, Christian Stimming via GitGitGadget wrote:
> > From: Christian Stimming <[email protected]>
> >
> > Switch several terms from uncommon translations back to english
> > vocabulary, most prominently commit (noun, verb) and repository. Adapt
> > glossary and translation accordingly.
>
> Can you also explain _why_ these uncommon translations are changed to
> English vocabulary?
I've written an explanation in the cover letter email. Do you want to have it
copied into the commit message?
Regards,
Christian
There was a problem hiding this comment.
On the Git mailing list, Junio C Hamano wrote (reply to this):
Christian Stimming <[email protected]> writes:
> Dear Pratyush,
>
> thanks for the first evaluation.
>
> Am Samstag, 25. Januar 2020, 17:56:29 CET schrieb Pratyush Yadav:
>> > Subject: Re: [PATCH 2/3] git-gui: update german translation
>>
>> Nitpick: capitalise "german". So, s/german/German/
>
> Of course I can do that... however, the capitalization of the headline is
> somewhat different every time in the repository. The first word is lower case,
> yes, but e.g. the language adjective is sometimes upper case, sometimes lower
> case.
>
>> On 24/01/20 10:33PM, Christian Stimming via GitGitGadget wrote:
>> > From: Christian Stimming <[email protected]>
>> >
>> > Switch several terms from uncommon translations back to english
>> > vocabulary, most prominently commit (noun, verb) and repository. Adapt
>> > glossary and translation accordingly.
>>
>> Can you also explain _why_ these uncommon translations are changed to
>> English vocabulary?
>
> I've written an explanation in the cover letter email. Do you want to have it
> copied into the commit message?
It is unclear to me how these translation patches were split into
three. I am sort-of guessing that 1/3 is only to cover the new
entries in .pot that have no corresponding entries in translation,
and the rest is to update/fix existing translations, but I do not
know how these changes are split between 2/3 and 3/3. In any case,
"we must update original translation that does not match accepted
computer lingo" you wrote in the cover letter sounds like a very
good justification to record in the commit that updates/fixes the
existing entries.
There was a problem hiding this comment.
On the Git mailing list, Pratyush Yadav wrote (reply to this):
On 26/01/20 04:52PM, Christian Stimming wrote:
> Dear Pratyush,
>
> thanks for the first evaluation.
>
> Am Samstag, 25. Januar 2020, 17:56:29 CET schrieb Pratyush Yadav:
> > > Subject: Re: [PATCH 2/3] git-gui: update german translation
> >
> > Nitpick: capitalise "german". So, s/german/German/
>
> Of course I can do that... however, the capitalization of the headline is
> somewhat different every time in the repository. The first word is lower case,
> yes, but e.g. the language adjective is sometimes upper case, sometimes lower
> case.
Well, that's why I marked the comment as a nitpick. I'm fine with
either, so go with whatever you feel is fine. But FWIW I do have a
slight preference for capitalizing it.
> > On 24/01/20 10:33PM, Christian Stimming via GitGitGadget wrote:
> > > From: Christian Stimming <[email protected]>
> > >
> > > Switch several terms from uncommon translations back to english
> > > vocabulary, most prominently commit (noun, verb) and repository. Adapt
> > > glossary and translation accordingly.
> >
> > Can you also explain _why_ these uncommon translations are changed to
> > English vocabulary?
>
> I've written an explanation in the cover letter email. Do you want to have it
> copied into the commit message?
Ah, I was in a hurry and didn't read the cover letter. Yes, that
explanation would be great in the commit message.
--
Regards,
Pratyush Yadav
| @@ -7,41 +7,42 @@ msgid "" | |||
| msgstr "" | |||
There was a problem hiding this comment.
On the Git mailing list, Pratyush Yadav wrote (reply to this):
Hi,
> Subject: Re: [PATCH 3/3] git-gui: completed german translation
Well, since I don't have much to say about the patch contents, I'll just
comment on the commit message.
"completed german translation" seems to suggest it was in some way
incomplete before. My impression from reading the patch is that it is
more glossary/word changes. Maybe change the subject to reflect that?
On 24/01/20 10:33PM, Christian Stimming via GitGitGadget wrote:
> From: Christian Stimming <[email protected]>
>
> More glossary changed, mostly adapted to git-core German glossary at
> https://github.com/ruester/git-po-de/wiki/Translation-Guidelines
> and translation changed accordingly. One notable change in translation
> is branch -> Branch. Overall increased consistency.
Same comment as the last patch: along with explaining _what_ the commit
does, also explain _why_ the commit does it.
Thanks for the patches. Will merge them once you send in a re-roll with
the updated commit subjects and messages.
PS: It would be nice if we can get an ACK from a German speaker.
> Signed-off-by: Christian Stimming <[email protected]>
--
Regards,
Pratyush Yadav
… code No content changes so far, only the preparation for subsequent edits. Signed-off-by: Christian Stimming <[email protected]>
The English glossary template was missing some terms, some of them not only for git-gui, but also gitk and/or git core. Many such terms have been added. Also, the list has been sorted alphabetically so that comparison to other glossary lists are easier. Signed-off-by: Christian Stimming <[email protected]>
Update German translation (glossary and final translation) with recent additions, but also switch several terms from uncommon translations back to English vocabulary. This most prominently concerns "commit" (noun, verb), "repository", "branch", and some more. These uncommon translations have been introduced long ago and never been changed since. In fact, the whole German translation here hasn't been touched for a long time. However, in German literature and magazines, git-gui is regularly noted for its uncommon choice of translated vocabulary. This somewhat distracts from the actual benefits of this tool. So it is probably better to abandon the uncommon translations and rather stick to the common English vocabulary in git version control. Signed-off-by: Christian Stimming <[email protected]>
|
/submit |
|
Submitted as [email protected] |
|
On the Git mailing list, Pratyush Yadav wrote (reply to this): |
git-gui: update/improve German translation
Update translation template and translation glossary as prerequisite. Then, update German translation (glossary and final translation) to recent source code changes, but also switch several terms from uncommon translations back to English vocabulary, similar to the rest of git-core.
This most prominently concerns "commit" (noun, verb), "repository", "branch", and some more. These uncommon translations have been introduced long ago and never been changed since. In fact, the whole German translation here hasn't been touched for a long time. However, in German literature and magazines, git-gui is regularly noted for its uncommon choice of translated vocabulary. This somewhat distracts from the actual benefits of this tool. So it is probably better to abandon the uncommon translations and rather stick to the common English vocabulary in git version control.
The glossary is adapted to the git-core glossary at
https://github.com/ruester/git-po-de/wiki/Translation-Guidelines
and the changed and updated terms are used in the actual translation accordingly.
Changes since v1: