* [PATCH 1/2] l10n: de.po: translate "leave behind" correctly
@ 2015-01-26 15:34 Michael J Gruber
2015-01-26 15:34 ` [PATCH 2/2] l10n: de.po: correct singular form Michael J Gruber
2015-01-26 18:22 ` [PATCH 1/2] l10n: de.po: translate "leave behind" correctly Ralf Thielow
0 siblings, 2 replies; 3+ messages in thread
From: Michael J Gruber @ 2015-01-26 15:34 UTC (permalink / raw)
To: git; +Cc: Ralf Thielow
This message is about leaving orphaned commits behind, not about
behing behind an upstream branch. Try to make this clear.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/de.po b/po/de.po
index 5a93ea8..65a8ac0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3559,26 +3559,26 @@ msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
-"Warnung: Sie sind um %d Commit hinterher. Folgende Commits sind in\n"
+"Warnung: Sie lassen %d Commit zurück. Folgende Commits sind in\n"
"keinem Ihrer Branches enthalten:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Warnung: Sie sind um %d Commits hinterher. Folgende Commits sind in\n"
+"Warnung: Sie lassen %d Commits zurück. Folgende Commits sind in\n"
"keinem Ihrer Branches enthalten:\n"
"\n"
"%s\n"
#: builtin/checkout.c:729
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
"to do so with:\n"
"\n"
--
2.3.0.rc1.222.gae238f2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] l10n: de.po: correct singular form
2015-01-26 15:34 [PATCH 1/2] l10n: de.po: translate "leave behind" correctly Michael J Gruber
@ 2015-01-26 15:34 ` Michael J Gruber
2015-01-26 18:22 ` [PATCH 1/2] l10n: de.po: translate "leave behind" correctly Ralf Thielow
1 sibling, 0 replies; 3+ messages in thread
From: Michael J Gruber @ 2015-01-26 15:34 UTC (permalink / raw)
To: git; +Cc: Ralf Thielow
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
po/de.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/de.po b/po/de.po
index 65a8ac0..6af1599 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3559,21 +3559,21 @@ msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgid_plural ""
"Warning: you are leaving %d commits behind, not connected to\n"
"any of your branches:\n"
"\n"
"%s\n"
msgstr[0] ""
-"Warnung: Sie lassen %d Commit zurück. Folgende Commits sind in\n"
+"Warnung: Sie lassen %d Commit zurück. Folgender Commit ist in\n"
"keinem Ihrer Branches enthalten:\n"
"\n"
"%s\n"
msgstr[1] ""
"Warnung: Sie lassen %d Commits zurück. Folgende Commits sind in\n"
"keinem Ihrer Branches enthalten:\n"
"\n"
"%s\n"
#: builtin/checkout.c:729
--
2.3.0.rc1.222.gae238f2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] l10n: de.po: translate "leave behind" correctly
2015-01-26 15:34 [PATCH 1/2] l10n: de.po: translate "leave behind" correctly Michael J Gruber
2015-01-26 15:34 ` [PATCH 2/2] l10n: de.po: correct singular form Michael J Gruber
@ 2015-01-26 18:22 ` Ralf Thielow
1 sibling, 0 replies; 3+ messages in thread
From: Ralf Thielow @ 2015-01-26 18:22 UTC (permalink / raw)
To: Michael J Gruber; +Cc: git, Ralf Thielow
2015-01-26 16:34 GMT+01:00 Michael J Gruber <git@drmicha.warpmail.net>:
> This message is about leaving orphaned commits behind, not about
> behing behind an upstream branch. Try to make this clear.
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Thanks for both patches!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-26 18:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-26 15:34 [PATCH 1/2] l10n: de.po: translate "leave behind" correctly Michael J Gruber
2015-01-26 15:34 ` [PATCH 2/2] l10n: de.po: correct singular form Michael J Gruber
2015-01-26 18:22 ` [PATCH 1/2] l10n: de.po: translate "leave behind" correctly Ralf Thielow
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 NNTP newsgroup(s).