undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

l10n-2.4-maint-de-updates

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVfYcVAAoJEMek6Rt1RHooiUUP/jCnWBGo05jYu0eUrQ0HQqzE
 HBZymXG0kdZseVOi80mltaf0TK4dJaK/pEs0Cyq3WfnRovCbfq50MjjwcUqsDgVA
 K7tIDUHY1n+LZ8RtrX0kJKuDRvAuyXc3ent7q8ilCMFBpUw13XpuuZ+uRBN1xllp
 RZAj61aZ7vfqlzH2pIRmCaV+5tIHhct1hZu+ZeozYMxcpOEOCpwKbmMzgjwnc+Ia
 JCMviE7GFf0FXn4pVns6VHYZAD7/FteiFLrtucL+MdT3tzuYXpqi7OoIpLwG8JHm
 HcfLljBzujfp+RcX56/uA1cLIjZS96MWD/QooBTV5R2tEoTY2dtXkUuz2ymU7MZr
 bycWkxtunLsyC36aFF+2G7jKtzEeUk4mkTi1wcw3KhRcPhmxfZCmQjPOAV0ZEqxu
 8n+AFe8dEpwRXqbamZVu/3EKDWUTc87Ey1EVBG+S0JaBAClZgeyHrrpZQ9PmuQqD
 LdRMhZiRc3yCLH2FvwTfV3Nldal5WQp7tCQHEANy+YErjUxhp3VZzPt9hMVQkVqW
 FIxgpbHs1/znW5+DELltJ/tNonee8MuKW5eUkIqq6eDf3yb9lTpt8TitWN3IRE6i
 7AyfSldTjn+I4C+Najh0hQuJYaqi19sl650f997dCWmDXbuOMoSwMydstdvLXI7n
 y//xYLvHrm7/r/i/9612
 =YY1A
 -----END PGP SIGNATURE-----

Merge tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po into maint

l10n-2.4-maint-de-updates

* tag 'l10n-2.4-maint-de-updates' of git://github.com/git-l10n/git-po:
  l10n: de.po: translation fix for fall-back to 3way merge
  l10n: de.po: punctuation fixes
  l10n: de.po: grammar fix
  l10n: de.po: change error message from "sagen" to "Meinten Sie"
This commit is contained in:
Junio C Hamano 2015-06-14 14:24:49 -07:00
commit 2c185f0476
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
po/de.po
View File

@ -2183,7 +2183,7 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
#: builtin/add.c:358 #: builtin/add.c:358
#, c-format #, c-format
msgid "Maybe you wanted to say 'git add .'?\n" 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/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 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
@ -10478,8 +10478,8 @@ msgstr ""
#: git-am.sh:142 #: git-am.sh:142
msgid "Using index info to reconstruct a base tree..." msgid "Using index info to reconstruct a base tree..."
msgstr "" msgstr ""
"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen" "nachzustellen ..."
#: git-am.sh:157 #: git-am.sh:157
msgid "" msgid ""
@ -10491,11 +10491,11 @@ msgstr ""
#: git-am.sh:166 #: git-am.sh:166
msgid "Falling back to patching base and 3-way merge..." 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 #: git-am.sh:182
msgid "Failed to merge in the changes." msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen" msgstr "Merge der Änderungen fehlgeschlagen."
#: git-am.sh:277 #: git-am.sh:277
msgid "Only one StGIT patch series can be applied at once" msgid "Only one StGIT patch series can be applied at once"