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

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

[Ralf Thielow]

Translate 5 new messages came from git.pot update in b8ecf23
(l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)).

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

diff --git a/po/de.po b/po/de.po
index 7599f9c..11dde11 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1210,11 +1210,10 @@ msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 #: sequencer.c:1130
 msgid "Can't cherry-pick into empty head"
 msgstr "Kann nicht als allerersten Commit einen Cherry-Pick ausführen."
 
 #: sha1_name.c:440
-#, fuzzy
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
 "may be created by mistake. For example,\n"
 "\n"
@@ -1232,11 +1231,11 @@ msgstr ""
 "  git checkout -b $br $(git rev-parse ...)\n"
 "\n"
 "wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
 "wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
 "Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
-"indem Sie \"git config advice.object_name_warning false\"\n"
+"indem Sie \"git config advice.objectNameWarning false\"\n"
 "ausführen."
 
 #: sha1_name.c:1097
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
@@ -4000,11 +3999,10 @@ msgstr ""
 "Sie fragten den jüngsten Commit nachzubessern, aber das würde diesen leer\n"
 "machen. Sie können Ihr Kommando mit --allow-empty wiederholen, oder diesen\n"
 "Commit mit \"git reset HEAD^\" vollständig entfernen.\n"
 
 #: builtin/commit.c:62
-#, fuzzy
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
 "\n"
 "    git commit --allow-empty\n"
@@ -4014,25 +4012,30 @@ msgstr ""
 "Konfliktauflösung.\n"
 "Wenn Sie dies trotzdem committen wollen, benutzen Sie:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
-"Andernfalls benutzen Sie bitte 'git reset'\n"
 
 #: builtin/commit.c:69
 msgid "Otherwise, please use 'git reset'\n"
-msgstr ""
+msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"
 
 #: builtin/commit.c:72
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
 "    git reset\n"
 "\n"
 "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
 "the remaining commits.\n"
 msgstr ""
+"Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
+"\n"
+"    git reset\n"
+"\n"
+"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
+"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
 
 #: builtin/commit.c:279
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
 
@@ -10040,11 +10043,10 @@ msgstr "\"autostash\" angewendet."
 #, sh-format
 msgid "Cannot store $stash_sha1"
 msgstr "Kann $stash_sha1 nicht speichern."
 
 #: git-rebase.sh:160
-#, fuzzy
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
-- 
1.8.2.1873.gfc589a4

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

[Thomas Rast]

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

The changes look good to me.  The following is purely about the original
English messages.

>  #: builtin/commit.c:62
> -#, fuzzy
>  msgid ""
>  "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
>  "If you wish to commit it anyway, use:\n"
>  "\n"
>  "    git commit --allow-empty\n"
> @@ -4014,25 +4012,30 @@ msgstr ""
>  "Konfliktauflösung.\n"
>  "Wenn Sie dies trotzdem committen wollen, benutzen Sie:\n"
>  "\n"
>  "    git commit --allow-empty\n"
>  "\n"
> -"Andernfalls benutzen Sie bitte 'git reset'\n"
>  
>  #: builtin/commit.c:69
>  msgid "Otherwise, please use 'git reset'\n"
> -msgstr ""
> +msgstr "Andernfalls benutzen Sie bitte 'git reset'\n"

This results from Peff's c17592a (commit: tweak empty cherry pick advice
for sequencer, 2013-07-26):

  diff --git a/builtin/commit.c b/builtin/commit.c
  index a17a5df..39717d5 100644
  --- a/builtin/commit.c
  +++ b/builtin/commit.c
  @@ -62,8 +62,18 @@
   "If you wish to commit it anyway, use:\n"
   "\n"
   "    git commit --allow-empty\n"
  +"\n");
  +
  +static const char empty_cherry_pick_advice_single[] =
  +N_("Otherwise, please use 'git reset'\n");
  +
  +static const char empty_cherry_pick_advice_multi[] =
  +N_("If you wish to skip this commit, use:\n"
   "\n"
  -"Otherwise, please use 'git reset'\n");
  +"    git reset\n"
  +"\n"
  +"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
  +"the remaining commits.\n");
   
   static const char *use_message_buffer;
   static const char commit_editmsg[] = "COMMIT_EDITMSG";


I was wondering for a while if this was a smart move, based on the usual
observation that it is better to translate things in one chunk because
many languages have more interdependencies than English does.  The
gettext manual says:

     puts ("Apollo 13 scenario: Stack overflow handling failed.");
     puts ("On the next stack overflow we will crash!!!");

  Should these two statements merged into a single one? I would recommend
  to merge them if the two sentences are related to each other, because
  then it makes it easier for the translator to understand and translate
  both.  On the other hand, if one of the two messages is a stereotypic
  one, occurring in other places as well, you will do a favour to the
  translator by not merging the two.
[...]
     Translatable strings should be limited to one paragraph; don't let a
  single message be longer than ten lines.

So it seems that concatenating sentences indeed falls into a gray area
between "avoid sentence lego" and "split at paragraphs".  And Peff's
style of splitting it saves the translators work because the first part
of the message is shared among two code paths.

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

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

[Jeff King]

On Wed, Aug 07, 2013 at 11:17:08AM +0200, Thomas Rast wrote:

> This results from Peff's c17592a (commit: tweak empty cherry pick advice
> for sequencer, 2013-07-26):
> 
>   diff --git a/builtin/commit.c b/builtin/commit.c
>   index a17a5df..39717d5 100644
>   --- a/builtin/commit.c
>   +++ b/builtin/commit.c
>   @@ -62,8 +62,18 @@
>    "If you wish to commit it anyway, use:\n"
>    "\n"
>    "    git commit --allow-empty\n"
>   +"\n");
>   +
>   +static const char empty_cherry_pick_advice_single[] =
>   +N_("Otherwise, please use 'git reset'\n");
>   +
>   +static const char empty_cherry_pick_advice_multi[] =
>   +N_("If you wish to skip this commit, use:\n"
>    "\n"
>   -"Otherwise, please use 'git reset'\n");
>   +"    git reset\n"
>   +"\n"
>   +"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
>   +"the remaining commits.\n");
>    
>    static const char *use_message_buffer;
>    static const char commit_editmsg[] = "COMMIT_EDITMSG";
>
> [...]
>
> So it seems that concatenating sentences indeed falls into a gray area
> between "avoid sentence lego" and "split at paragraphs".  And Peff's
> style of splitting it saves the translators work because the first part
> of the message is shared among two code paths.

Yeah, I was mainly trying to avoid repeating myself, since the first
part of the message would be the same (and I did not want them to fall
out of sync).

However, I do not mind changing it if translators would prefer to see
the whole message as a single string. I agree it's a gray area.

-Peff