* [PATCH] l10n: de.po: fix translation of autostash
@ 2016-06-24 18:07 Ralf Thielow
2016-06-25 7:07 ` Matthias Rüster
0 siblings, 1 reply; 2+ messages in thread
From: Ralf Thielow @ 2016-06-24 18:07 UTC (permalink / raw)
To: git
Cc: tr, jk, stimming, phillip.szelat, matthias.ruester,
magnus.goerlitz, Ralf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
po/de.po | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/po/de.po b/po/de.po
index d50cb1b..fdf4d92 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12408,7 +12408,7 @@ msgstr ""
#: git-rebase.sh:168
msgid "Applied autostash."
-msgstr "\"autostash\" angewendet."
+msgstr "Automatischen Stash angewendet."
#: git-rebase.sh:171
#, sh-format
@@ -12421,7 +12421,7 @@ msgid ""
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"Anwendung von \"autostash\" resultierte in Konflikten.\n"
+"Anwendung des automatischen Stash resultierte in Konflikten.\n"
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
@@ -12508,12 +12508,12 @@ msgstr "fatal: Branch $branch_name nicht gefunden"
#: git-rebase.sh:558
msgid "Cannot autostash"
-msgstr "Kann \"autostash\" nicht ausführen."
+msgstr "Kann automatischen Stash nicht anwenden."
#: git-rebase.sh:563
#, sh-format
msgid "Created autostash: $stash_abbrev"
-msgstr "\"autostash\" erzeugt: $stash_abbrev"
+msgstr "Automatischen Stash erzeugt: $stash_abbrev"
#: git-rebase.sh:567
msgid "Please commit or stash them."
--
2.9.0.129.g44ae68f
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] l10n: de.po: fix translation of autostash
2016-06-24 18:07 [PATCH] l10n: de.po: fix translation of autostash Ralf Thielow
@ 2016-06-25 7:07 ` Matthias Rüster
0 siblings, 0 replies; 2+ messages in thread
From: Matthias Rüster @ 2016-06-25 7:07 UTC (permalink / raw)
To: Ralf Thielow, git; +Cc: tr, jk, stimming, phillip.szelat, magnus.goerlitz
Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
Am 24.06.2016 um 20:07 schrieb Ralf Thielow:
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> po/de.po | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/po/de.po b/po/de.po
> index d50cb1b..fdf4d92 100644
> --- a/po/de.po
> +++ b/po/de.po
> @@ -12408,7 +12408,7 @@ msgstr ""
>
> #: git-rebase.sh:168
> msgid "Applied autostash."
> -msgstr "\"autostash\" angewendet."
> +msgstr "Automatischen Stash angewendet."
>
> #: git-rebase.sh:171
> #, sh-format
> @@ -12421,7 +12421,7 @@ msgid ""
> "Your changes are safe in the stash.\n"
> "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
> msgstr ""
> -"Anwendung von \"autostash\" resultierte in Konflikten.\n"
> +"Anwendung des automatischen Stash resultierte in Konflikten.\n"
> "Ihre Änderungen sind im Stash sicher.\n"
> "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
>
> @@ -12508,12 +12508,12 @@ msgstr "fatal: Branch $branch_name nicht gefunden"
>
> #: git-rebase.sh:558
> msgid "Cannot autostash"
> -msgstr "Kann \"autostash\" nicht ausführen."
> +msgstr "Kann automatischen Stash nicht anwenden."
>
> #: git-rebase.sh:563
> #, sh-format
> msgid "Created autostash: $stash_abbrev"
> -msgstr "\"autostash\" erzeugt: $stash_abbrev"
> +msgstr "Automatischen Stash erzeugt: $stash_abbrev"
>
> #: git-rebase.sh:567
> msgid "Please commit or stash them."
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-25 7:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-24 18:07 [PATCH] l10n: de.po: fix translation of autostash Ralf Thielow
2016-06-25 7:07 ` Matthias Rüster
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).