Re: [PATCH] gitk: Update German translation

[Christian Stimming <stimming@tuhh.de>]

Hi Stephan,

Am Donnerstag, 15. Mai 2008 18:20 schrieb Stephan Beyer:
> > > The original
> > >  "Find next/prev commit _containing:_ [insert]"
> > > should be translated to
> > >  "Suche nächste/vorige Version, die [insert] enthält."
> > > But this is beyond the used techniques for software translation ;-)
>
> I want to repeat my suggestions from the last mail:
>   1. "Suche nächste/vorige Version nach _Beschreibung:_ [insert]"
>   2. "Suche nächste/vorige Version nach _Pfaden:_ [insert]"
>      (or maybe "nach _Dateien:_", if it's commonly accepted that
>       directories are files, too.)
>   3. "Suche nächste/vorige Version nach _Änderungen:_ [insert]"
> which makes it much more clearer than the English original, imho.

Okay, I've inserted your suggestions in my translation update. I'm not too 
sure about any translation of this part, but your proposal is maybe better 
than the existing one.

> > > Btw, 'man git-cherry-pick' says
> > >         "Apply the change introduced by an existing commit".
> > > So why not take this and use
> > >  "Durch diese Version eingeführte Änderungen übernehmen" or
> > >  "Durch diese Version eingeführte Änderungen anwenden"?
> >
> > This is indeed a case where a better translation can still be found.
> > However, all of "kopieren, übernehmen, anwenden" IMHO sound too similar
> > to actions that already appear here or there in the version control GUI.
>
> You are right with "kopieren" and "anwenden", but where is "übernehmen"?
>
> Ok, it is used in the glossary for "pull", but nowhere in code that is
> actually used.  

The glossary is for git-gui, which has GUI items for "git pull" but not "git 
cherry-pick", currently. OTOH gitk has GUI items only for "git cherry-pick" 
but not "git pull", currently.

> And I think a better translation for "pull" is 
> something that stresses the fact that "pull" = "fetch" + "merge",
> something like "Holen und Zusammenführen".

That's indeed an interesting suggestion. (Which bears the question why it is 
being called "pull" in English in the first place, when it should rather be 
described by "fetch and merge". Heh.)

> > Cherry-picking is a specialized action and should thus get a specialized
> > German word.
>
> I'm still unsure about this.  But it's your choice. ;-)

Yeah. I'm also not completely sure, but for now I'd still prefer "pflücken" 
over the other possibilities we've discussed so far.

Regards,

Christian