l10: de.po: fixes around rebase
cover l10: de.po: fixes around rebase
Fixes to a few issues that I found while running rebase in German locale.
Michael J Gruber (3):
l10: de.po: grammar fix
l10: de.po: punctuation fixes
l10: de.po: translation fix for fall-back to 3way merge
po/de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.4.0.rc3.332.g886447c
PATCH 1/3 l10: de.po: grammar fix
--- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
po/de.po +1 -1
@@ -10478,7 +10478,7 @@ msgstr "" #: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen" #: git-am.sh:157
Signature · 1 line
2.4.0.rc3.332.g886447c
Re: [PATCH 1/3] l10: de.po: grammar fix
Quoted 10 lines · Michael J Gruber
Signed-off-by Michael J Gruber <[email protected]>--- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)po/de.po +0
-0
po/de.po msgstr "" · line 10482
Quoted 6 lines
po/de.po +1
-1@@ -10478,7 +10478,7 @@ msgstr "" #: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen"
Waere es sinnvoll Staging-Area in Staging-Bereich umzubenennen? "Staging" ist wohl ein eher fester Term mit dem man den index/staging area assoziert, aber "Area" 'doesn't ring a bell for me'.
Quoted 9 lines
po/de.po +0
-1#: git-am.sh:157 --2.4.0.rc3.332.g886447c
--
To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/3] l10: de.po: grammar fix
Stefan Beller venit, vidit, dixit 19.05.2015 23:46:
Quoted 7 lines
Quoted 5 lines · Michael J Gruber
Signed-off-by Michael J Gruber <[email protected]>--- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
po/de.po msgstr "" · line 10482
Quoted 11 lines
po/de.po +1
-1@@ -10478,7 +10478,7 @@ msgstr "" #: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen"Waere es sinnvoll Staging-Area in Staging-Bereich umzubenennen? "Staging" ist wohl ein eher fester Term mit dem man den index/staging area assoziert, aber "Area" 'doesn't ring a bell for me'.
Staging-Bereich would be Denglish - half German and halb Englisch.
In any case, the term staging area is highly confusing in this context:
It really is the index, and in this case the user has not "staged anything for commit" in the index. The index is used for storing information during the 3way merge. This is why we refused to replace "index/cache" by "staging area" in the original git documentation.
The de l10n team decided to use "Staging-Area" as the translation for "index" (as far as I can see), and therefore I kept this term: It is important to translate the same concept in the same way consistently in all places. Changing the translation of "index" would be a major decision and a major patch. (I'd vote for "Index".)
Michael
Re: [PATCH 1/3] l10: de.po: grammar fix
2015-05-20 10:55 GMT+02:00 Michael J Gruber <[email protected]>:
Quoted 32 lines
Stefan Beller venit, vidit, dixit 19.05.2015 23:46:
Quoted 7 lines
Quoted 5 lines · Michael J Gruber
Signed-off-by Michael J Gruber <[email protected]>--- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 15 lines
po/de.po msgstr "" · line 10482
Quoted 11 lines
po/de.po +1
-1@@ -10478,7 +10478,7 @@ msgstr "" #: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen"Waere es sinnvoll Staging-Area in Staging-Bereich umzubenennen? "Staging" ist wohl ein eher fester Term mit dem man den index/staging area assoziert, aber "Area" 'doesn't ring a bell for me'.
Staging-Bereich would be Denglish - half German and halb Englisch.
In any case, the term staging area is highly confusing in this context:
It really is the index, and in this case the user has not "staged anything for commit" in the index. The index is used for storing information during the 3way merge. This is why we refused to replace "index/cache" by "staging area" in the original git documentation.
Quoted 6 lines
The de l10n team decided to use "Staging-Area" as the translation for "index" (as far as I can see), and therefore I kept this term: It is important to translate the same concept in the same way consistently in all places. Changing the translation of "index" would be a major decision and a major patch. (I'd vote for "Index".)
The initial version of the glossary of git.git's de.po has been developed in thread [1], where "Index" was part of, initially. We ended up only using "Staging-Area" for "index", because people might understand "Index" as a book's index or database's index [2].
Git itself uses the term "staging area" *very* rarely. "index" would be a Git term we don't translate, but there's also the German word "Index" and hence we might confuse users. However, I still think it may only be confusing for absolute newbies, but give a benefit for users who knows about git's index. I'll send a patch for this change.
Thanks
[1]
http://thread.gmane.org/gmane.comp.version-control.git/224132/
[2]
http://article.gmane.org/gmane.comp.version-control.git/224974
Quoted 1 line
Michael
PATCH 2/3 l10: de.po: punctuation fixes
In reply to Michael J GruberThis respects the ellipsis style used in de.po.
--- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
po/de.po +2 -2
@@ -10479,7 +10479,7 @@ msgstr "" msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " -"nachzustellen" +"nachzustellen ..." #: git-am.sh:157 msgid ""
@@ -10495,7 +10495,7 @@ msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." #: git-am.sh:182 msgid "Failed to merge in the changes." -msgstr "Merge der Änderungen fehlgeschlagen" +msgstr "Merge der Änderungen fehlgeschlagen." #: git-am.sh:277 msgid "Only one StGIT patch series can be applied at once"
Signature · 1 line
2.4.0.rc3.332.g886447c
2015-05-19 10:51 GMT+02:00 Michael J Gruber <[email protected]>:
Quoted 8 lines
Fixes to a few issues that I found while running rebase in German locale.
Michael J Gruber (3):
l10: de.po: grammar fix
l10: de.po: punctuation fixes
l10: de.po: translation fix for fall-back to 3way merge
Thanks!
Quoted 6 lines
po/de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)--
2.4.0.rc3.332.g886447c
PATCH 3/3 l10: de.po: translation fix for fall-back to 3way merge
In reply to Michael J GruberThe English version is correct, but misleading: It is not the 3way merge that is being patched also, but that is being fallen back to also.
The German version translates the former meaning. Make it translate the latter.
---
Notes:
Really, it would be clearer to say "mittels 3-Wege-Merge", and also "using 3way merge" in the original (rather than "and"). But I tried to stay as close as possible to both the English version and the existing translation.
po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
po/de.po +1 -1
@@ -10491,7 +10491,7 @@ msgstr "" #: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." -msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." +msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." #: git-am.sh:182 msgid "Failed to merge in the changes."
Signature · 1 line
2.4.0.rc3.332.g886447c