[PATCH] l10n: de.po: translate 5 new messages

[PATCH] l10n: de.po: translate 5 new messages

[Ralf Thielow]

Translate 5 new messages came from git.pot update in 235537a
(l10n: git.pot: v1.8.2 round 3 (5 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
 po/de.po | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/po/de.po b/po/de.po
index ed813ef..c0e5398 100644
--- a/po/de.po
+++ b/po/de.po
@@ -731,7 +731,7 @@ msgstr "    %s"
 
 #: parse-options.c:548
 msgid "-NUM"
-msgstr ""
+msgstr "-NUM"
 
 #: pathspec.c:83
 #, c-format
@@ -1271,9 +1271,9 @@ msgstr ""
 "wiederherzustellen)"
 
 #: wt-status.c:879 wt-status.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Sie sind gerade beim Neuaufbau."
+msgstr "Sie sind gerade beim Neuaufbau von Zweig '%s' auf '%s'."
 
 #: wt-status.c:884 wt-status.c:901
 msgid "You are currently rebasing."
@@ -1300,10 +1300,11 @@ msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
 
 #: wt-status.c:908
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
-msgstr "Sie teilen gerade eine Version während eines Neuaufbaus auf."
+msgstr "Sie teilen gerade eine Version auf, während ein Neuaufbau von Zweig "
+"'%s' auf '%s' im Gange ist."
 
 #: wt-status.c:913
 msgid "You are currently splitting a commit during a rebase."
@@ -1316,9 +1317,10 @@ msgstr ""
 "continue\" aus)"
 
 #: wt-status.c:920
-#, fuzzy, c-format
+#, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
-msgstr "Sie editieren gerade eine Version während eines Neuaufbaus."
+msgstr "Sie editieren gerade eine Version während eines Neuaufbaus von Zweig "
+"'%s' auf '%s'."
 
 #: wt-status.c:925
 msgid "You are currently editing a commit during a rebase."
@@ -1345,9 +1347,9 @@ msgid "  (all conflicts fixed: run \"git commit\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git commit\" aus)"
 
 #: wt-status.c:958
-#, fuzzy, c-format
+#, c-format
 msgid "You are currently bisecting branch '%s'."
-msgstr "Sie sind gerade beim Halbieren."
+msgstr "Sie sind gerade beim Halbieren in Zweig '%s'."
 
 #: wt-status.c:962
 msgid "You are currently bisecting."
-- 
1.8.2.rc0.16.g20a599e

Re: [PATCH] l10n: de.po: translate 5 new messages

[Thomas Rast]

Ralf Thielow <ralf.thielow@gmail.com> writes:

>  msgid "You are currently bisecting branch '%s'."
> -msgstr "Sie sind gerade beim Halbieren."
> +msgstr "Sie sind gerade beim Halbieren in Zweig '%s'."

I know this one is already in other messages (and also in the Glossary),
but I still find it iffy and I might finally have a better idea:

  Sie sind gerade an einer binären Suche in Zweig '%s'.

[note to English speakers: I'm just using "binary search" instead of
"bisect"]

That makes it quite a bit harder to use it in a verbed[1] form, but I
think it gets the concept across much better.  (And in all the usage I
know in CS, the two things refer to the same.)

ACK on the rest.


Footnotes: 
[1]  Verbing weirds language. -- Calvin

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

Re: [PATCH] l10n: de.po: translate 5 new messages

[Ralf Thielow]

Hi,

2013/2/19 Thomas Rast <trast@inf.ethz.ch>:
> Ralf Thielow <ralf.thielow@gmail.com> writes:
>
>>  msgid "You are currently bisecting branch '%s'."
>> -msgstr "Sie sind gerade beim Halbieren."
>> +msgstr "Sie sind gerade beim Halbieren in Zweig '%s'."
>
> I know this one is already in other messages (and also in the Glossary),
> but I still find it iffy and I might finally have a better idea:
>
>   Sie sind gerade an einer binären Suche in Zweig '%s'.
>
> [note to English speakers: I'm just using "binary search" instead of
> "bisect"]
>
> That makes it quite a bit harder to use it in a verbed[1] form, but I
> think it gets the concept across much better.  (And in all the usage I
> know in CS, the two things refer to the same.)
>

Very good idea! Thank you. I'll create a patch on top and update the
glossary.

> ACK on the rest.
>

Thanks for review.

>
> Footnotes:
> [1]  Verbing weirds language. -- Calvin
>
> --
> Thomas Rast
> trast@{inf,student}.ethz.ch