Ralf Thielow venit, vidit, dixit 03.12.2012 05:49: > Translate 22 new messages came from git.pot > updates in 9306b5b (l10n: Update git.pot (3 new, > 6 removed messages)), fe52cd6 (l10n: Update git.pot > (14 new, 3 removed messages)) and f9472e3 > (l10n: Update git.pot (5 new, 1 removed messages)). > > Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> > --- > po/de.po | 68 > ++++++++++++++++++++++++++++++++++------------------------------ > 1 file changed, 36 insertions(+), 32 deletions(-) > > diff --git a/po/de.po b/po/de.po > index a0bf3da..7350818 100644 > --- a/po/de.po > +++ b/po/de.po ... > #: remote.c:1659 > -#, fuzzy > msgid " (use \"git pull\" to merge the remote branch into yours)\n" > msgstr "" > -" (benutze \"git am --abort\" um den ursprünglichen Zweig > wiederherzustellen)" > +" (benutze \"git pull\" um den externen Zweig mit Deinem > zusammenzuführen)\n"
That sounds as if git-pull did something to the remote branch, whereas it would do something with your local branch. Reverting the roles may help: +" (benutze \"git pull\" um Deinen Zweig mit dem externen zusammenzuführen)\n" BTW: Is there a standard about capitalising or not "Deine/Du" in de.pot? I think I've seen both here. (New spelling after the reform(s) recommends du/deine but Sie/Ihr, me thinks.) > #: builtin/grep.c:740 > msgid "pager" > @@ -8029,6 +8024,9 @@ msgid "" > "submodule '%s' (or one of its nested submodules) uses a .git directory\n" > "(use 'rm -rf' if you really want to remove it including all of its history)" > msgstr "" > +"Unterprojekt '%s' (oder ein geschachteltes Unterprojekt dessen) verwendet > \n" s/dessen/hiervon/ ? > +"ein .git-Verzeichnis (benutze 'rm -rf' wenn du dieses wirklich mit seiner\n" > +"Historie löschen möchtest)" s/mit/mitsamt/ ? (to emphasize "including" like in the original and avoid "mit=by" misinterpretation) Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
