On Thu, Sep 17, 2015 at 8:50 AM, Phillip Sz <phillip.szelat@xxxxxxxxx> wrote: > just 2 strings I think we could translate better. > > Signed-off-by: Phillip Sz <phillip.szelat@xxxxxxxxx> > --- > po/de.po | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/po/de.po b/po/de.po > index 6ed3509..2f54093 100644 > --- a/po/de.po > +++ b/po/de.po > @@ -10785,7 +10785,7 @@ msgid "" > "it will be removed. Please do not use it anymore." > msgstr "" > "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" > -"entfernt. Bitte nicht mehr verwenden." > +"entfernt. Bitte verwenden Sie diese nicht mehr." > > #: git-am.sh:507 > #, sh-format > @@ -10795,7 +10795,7 @@ msgstr "" > > #: git-am.sh:512 > msgid "Please make up your mind. --skip or --abort?" > -msgstr "Bitte werden Sie sich klar. --skip oder --abort?" That was a hilarious translation. > +msgstr "Bitte entscheiden Sie sich. --skip oder --abort?" I wonder if we should use a better wording upstream "Only one of --skip or --abort allowed". I think that is what we do usually, e.g. in builtin/clone we have die(_("--bare and --separate-git-dir are incompatible.")); But this is definitely better than before. :) > > #: git-am.sh:560 > #, sh-format > -- > 2.5.2 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html