{"thread":{"id":"39365","subject":"[PATCH 0/3] l10: de.po: fixes around rebase","startedAt":"2015-05-19T08:51:31Z","lastAt":"2015-05-21T20:27:53Z","messageCount":8,"participants":["Michael J Gruber","Ralf Thielow","Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"261539","messageId":"cover.1432025365.git.git@drmicha.warpmail.net","threadId":"39365","inReplyTo":null,"subject":"[PATCH 0/3] l10: de.po: fixes around rebase","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-19T08:51:31Z","receivedAt":"2015-05-19T08:51:31Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Fixes to a few issues that I found while running rebase\nin German locale.\n\nMichael J Gruber (3):\n l10: de.po: grammar fix\n l10: de.po: punctuation fixes\n l10: de.po: translation fix for fall-back to 3way merge\n\n po/de.po | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"261540","messageId":"2b4460dbf6abb15c4cd94d4c5c335cc9e8059ee7.1432025365.git.git@drmicha.warpmail.net","threadId":"39365","inReplyTo":"cover.1432025365.git.git@drmicha.warpmail.net","subject":"[PATCH 1/3] l10: de.po: grammar fix","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-19T08:51:32Z","receivedAt":"2015-05-19T08:51:32Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n po/de.po | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 2feaec1..25258e3 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -10478,7 +10478,7 @@ msgstr \"\"\n #: git-am.sh:142\n msgid \"Using index info to reconstruct a base tree...\"\n msgstr \"\"\n-\"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis \"\n+\"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis \"\n \"nachzustellen\"\n \n #: git-am.sh:157\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"261541","messageId":"1b4e0ba64c033fccb47528a0c5e03b66d3f5773b.1432025365.git.git@drmicha.warpmail.net","threadId":"39365","inReplyTo":"cover.1432025365.git.git@drmicha.warpmail.net","subject":"[PATCH 2/3] l10: de.po: punctuation fixes","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-19T08:51:33Z","receivedAt":"2015-05-19T08:51:33Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"This respects the ellipsis style used in de.po.\n\nSigned-off-by: Michael J Gruber \n---\n po/de.po | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 25258e3..6405f3e 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -10479,7 +10479,7 @@ msgstr \"\"\n msgid \"Using index info to reconstruct a base tree...\"\n msgstr \"\"\n \"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis \"\n-\"nachzustellen\"\n+\"nachzustellen ...\"\n \n #: git-am.sh:157\n msgid \"\"\n@@ -10495,7 +10495,7 @@ msgstr \"Falle zurück zum Patchen der Basis und des 3-Wege-Merges ...\"\n \n #: git-am.sh:182\n msgid \"Failed to merge in the changes.\"\n-msgstr \"Merge der Änderungen fehlgeschlagen\"\n+msgstr \"Merge der Änderungen fehlgeschlagen.\"\n \n #: git-am.sh:277\n msgid \"Only one StGIT patch series can be applied at once\"\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"261542","messageId":"d7f87b49a0d229a62f2f6c51a327c9fb98690b49.1432025365.git.git@drmicha.warpmail.net","threadId":"39365","inReplyTo":"cover.1432025365.git.git@drmicha.warpmail.net","subject":"[PATCH 3/3] l10: de.po: translation fix for fall-back to 3way merge","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-19T08:51:34Z","receivedAt":"2015-05-19T08:51:34Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"The English version is correct, but misleading: It is not the 3way merge\nthat is being patched also, but that is being fallen back to also.\n\nThe German version translates the former meaning. Make it translate the\nlatter.\n\nSigned-off-by: Michael J Gruber \n---\n\nNotes:\n Really, it would be clearer to say \"mittels 3-Wege-Merge\", and\n also \"using 3way merge\" in the original (rather than \"and\").\n But I tried to stay as close as possible to both the English version\n and the existing translation.\n\n po/de.po | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 6405f3e..b9eaa82 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -10491,7 +10491,7 @@ msgstr \"\"\n \n #: git-am.sh:166\n msgid \"Falling back to patching base and 3-way merge...\"\n-msgstr \"Falle zurück zum Patchen der Basis und des 3-Wege-Merges ...\"\n+msgstr \"Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ...\"\n \n #: git-am.sh:182\n msgid \"Failed to merge in the changes.\"\n-- \n2.4.0.rc3.332.g886447c\n"},{"id":"261563","messageId":"CAN0XMOKq853gzzMp15GGOd9kONs2aGfU3pz_VA7Xm7zBVFzXBA@mail.gmail.com","threadId":"39365","inReplyTo":"cover.1432025365.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 0/3] l10: de.po: fixes around rebase","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-05-19T16:26:43Z","receivedAt":"2015-05-19T16:26:43Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"2015-05-19 10:51 GMT+02:00 Michael J Gruber :\n> Fixes to a few issues that I found while running rebase\n> in German locale.\n>\n> Michael J Gruber (3):\n> l10: de.po: grammar fix\n> l10: de.po: punctuation fixes\n> l10: de.po: translation fix for fall-back to 3way merge\n>\n\nThanks!\n\n> po/de.po | 8 ++++----\n> 1 file changed, 4 insertions(+), 4 deletions(-)\n>\n> --\n> 2.4.0.rc3.332.g886447c\n>\n"},{"id":"261604","messageId":"CAGZ79kYPhTK=tymEcB_YsYdNZvt0=sA4-Hon1SLwujV39W7fmA@mail.gmail.com","threadId":"39365","inReplyTo":"2b4460dbf6abb15c4cd94d4c5c335cc9e8059ee7.1432025365.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 1/3] l10: de.po: grammar fix","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2015-05-19T21:46:07Z","receivedAt":"2015-05-19T21:46:07Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Tue, May 19, 2015 at 1:51 AM, Michael J Gruber\n wrote:\n> Signed-off-by: Michael J Gruber \n> ---\n> po/de.po | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/po/de.po b/po/de.po\n> index 2feaec1..25258e3 100644\n> --- a/po/de.po\n> +++ b/po/de.po\n> @@ -10478,7 +10478,7 @@ msgstr \"\"\n> #: git-am.sh:142\n> msgid \"Using index info to reconstruct a base tree...\"\n> msgstr \"\"\n> -\"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis \"\n> +\"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis \"\n> \"nachzustellen\"\n\nWaere es sinnvoll Staging-Area in Staging-Bereich umzubenennen?\n\"Staging\" ist wohl ein eher fester Term mit dem man den index/staging area\nassoziert, aber \"Area\" 'doesn't ring a bell for me'.\n\n\n\n>\n> #: git-am.sh:157\n> --\n> 2.4.0.rc3.332.g886447c\n>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"},{"id":"261648","messageId":"555C4C14.4040305@drmicha.warpmail.net","threadId":"39365","inReplyTo":"CAGZ79kYPhTK=tymEcB_YsYdNZvt0=sA4-Hon1SLwujV39W7fmA@mail.gmail.com","subject":"Re: [PATCH 1/3] l10: de.po: grammar fix","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-05-20T08:55:48Z","receivedAt":"2015-05-20T08:55:48Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Stefan Beller venit, vidit, dixit 19.05.2015 23:46:\n> On Tue, May 19, 2015 at 1:51 AM, Michael J Gruber\n> wrote:\n>> Signed-off-by: Michael J Gruber \n>> ---\n>> po/de.po | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/po/de.po b/po/de.po\n>> index 2feaec1..25258e3 100644\n>> --- a/po/de.po\n>> +++ b/po/de.po\n>> @@ -10478,7 +10478,7 @@ msgstr \"\"\n>> #: git-am.sh:142\n>> msgid \"Using index info to reconstruct a base tree...\"\n>> msgstr \"\"\n>> -\"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis \"\n>> +\"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis \"\n>> \"nachzustellen\"\n> \n> Waere es sinnvoll Staging-Area in Staging-Bereich umzubenennen?\n> \"Staging\" ist wohl ein eher fester Term mit dem man den index/staging area\n> assoziert, aber \"Area\" 'doesn't ring a bell for me'.\n\nStaging-Bereich would be Denglish - half German and halb Englisch.\n\nIn any case, the term staging area is highly confusing in this context:\nIt really is the index, and in this case the user has not \"staged\nanything for commit\" in the index. The index is used for storing\ninformation during the 3way merge. This is why we refused to replace\n\"index/cache\" by \"staging area\" in the original git documentation.\n\nThe de l10n team decided to use \"Staging-Area\" as the translation for\n\"index\" (as far as I can see), and therefore I kept this term: It is\nimportant to translate the same concept in the same way consistently in\nall places. Changing the translation of \"index\" would be a major\ndecision and a major patch. (I'd vote for \"Index\".)\n\nMichael\n"},{"id":"261848","messageId":"CAN0XMOL8vPBpJi=LuQBDsDjm68mjvMJXOGr8aTqemcCaB4FY1Q@mail.gmail.com","threadId":"39365","inReplyTo":"555C4C14.4040305@drmicha.warpmail.net","subject":"Re: [PATCH 1/3] l10: de.po: grammar fix","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-05-21T20:27:53Z","receivedAt":"2015-05-21T20:27:53Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"2015-05-20 10:55 GMT+02:00 Michael J Gruber :\n> Stefan Beller venit, vidit, dixit 19.05.2015 23:46:\n>> On Tue, May 19, 2015 at 1:51 AM, Michael J Gruber\n>> wrote:\n>>> Signed-off-by: Michael J Gruber \n>>> ---\n>>> po/de.po | 2 +-\n>>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>>>\n>>> diff --git a/po/de.po b/po/de.po\n>>> index 2feaec1..25258e3 100644\n>>> --- a/po/de.po\n>>> +++ b/po/de.po\n>>> @@ -10478,7 +10478,7 @@ msgstr \"\"\n>>> #: git-am.sh:142\n>>> msgid \"Using index info to reconstruct a base tree...\"\n>>> msgstr \"\"\n>>> -\"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis \"\n>>> +\"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis \"\n>>> \"nachzustellen\"\n>>\n>> Waere es sinnvoll Staging-Area in Staging-Bereich umzubenennen?\n>> \"Staging\" ist wohl ein eher fester Term mit dem man den index/staging area\n>> assoziert, aber \"Area\" 'doesn't ring a bell for me'.\n>\n> Staging-Bereich would be Denglish - half German and halb Englisch.\n>\n> In any case, the term staging area is highly confusing in this context:\n> It really is the index, and in this case the user has not \"staged\n> anything for commit\" in the index. The index is used for storing\n> information during the 3way merge. This is why we refused to replace\n> \"index/cache\" by \"staging area\" in the original git documentation.\n>\n> The de l10n team decided to use \"Staging-Area\" as the translation for\n> \"index\" (as far as I can see), and therefore I kept this term: It is\n> important to translate the same concept in the same way consistently in\n> all places. Changing the translation of \"index\" would be a major\n> decision and a major patch. (I'd vote for \"Index\".)\n>\n\nThe initial version of the glossary of git.git's de.po has been developed in\nthread [1], where \"Index\" was part of, initially. We ended up only using\n\"Staging-Area\" for \"index\", because people might understand \"Index\"\nas a book's index or database's index [2].\n\nGit itself uses the term \"staging area\" *very* rarely. \"index\" would be a\nGit term we don't translate, but there's also the German word \"Index\"\nand hence we might confuse users. However, I still think it may only be\nconfusing for absolute newbies, but give a benefit for users who knows\nabout git's index. I'll send a patch for this change.\n\nThanks\n\n[1]\nhttp://thread.gmane.org/gmane.comp.version-control.git/224132/\n[2]\nhttp://article.gmane.org/gmane.comp.version-control.git/224974\n\n> Michael\n"}]}