From 39f9819931519f6126298149e20a8fa52c45146b Mon Sep 17 00:00:00 2001 From: Phillip Sz Date: Sat, 9 May 2015 13:28:55 +0200 Subject: [PATCH 1/4] l10n: de.po: change error message from "sagen" to "Meinten Sie" We should not use "sagen" if someone has written something wrong. Although it's "say" in English, we should not use it in German and instead use our normal error message. Signed-off-by: Phillip Sz Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 2feaec1888..a435da065e 100644 --- a/po/de.po +++ b/po/de.po @@ -2183,7 +2183,7 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" #: builtin/add.c:358 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" +msgstr "Meinten Sie vielleicht 'git add .'?\n" #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 From 872b1f26b8b0b682a3101d1e3cf9e1c5e640a6f5 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:32 +0200 Subject: [PATCH 2/4] l10n: de.po: grammar fix Signed-off-by: Michael J Gruber Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index a435da065e..c8b70ad9bf 100644 --- a/po/de.po +++ b/po/de.po @@ -10478,7 +10478,7 @@ msgstr "" #: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen" #: git-am.sh:157 From 47a1657ab902a4cd98f34d01277246c533216beb Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:33 +0200 Subject: [PATCH 3/4] l10n: de.po: punctuation fixes This respects the ellipsis style used in de.po. Signed-off-by: Michael J Gruber Signed-off-by: Ralf Thielow --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index c8b70ad9bf..a1274cf0ce 100644 --- a/po/de.po +++ b/po/de.po @@ -10479,7 +10479,7 @@ msgstr "" msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " -"nachzustellen" +"nachzustellen ..." #: git-am.sh:157 msgid "" @@ -10495,7 +10495,7 @@ msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." #: git-am.sh:182 msgid "Failed to merge in the changes." -msgstr "Merge der Änderungen fehlgeschlagen" +msgstr "Merge der Änderungen fehlgeschlagen." #: git-am.sh:277 msgid "Only one StGIT patch series can be applied at once" From a9845c5f504498644abcb5f6fd6adc2ffd076f2b Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:34 +0200 Subject: [PATCH 4/4] l10n: de.po: translation fix for fall-back to 3way merge The English version is correct, but misleading: It is not the 3way merge that is being patched also, but that is being fallen back to also. The German version translates the former meaning. Make it translate the latter. Signed-off-by: Michael J Gruber Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index a1274cf0ce..7d603c2602 100644 --- a/po/de.po +++ b/po/de.po @@ -10491,7 +10491,7 @@ msgstr "" #: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." -msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." +msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." #: git-am.sh:182 msgid "Failed to merge in the changes."