Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because this is a warning message, and would add a prefix: warning: . #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n For this reason, translations as follows are not well-formed. So I rewind git-po, and your commits may need a bit amend. Swedish update from Peter: +push.default har inte ställts in; dess underförstådda värde ändras i\n +Git 2.0 från \matching\ till \simple\. För att undertrycka det här\n +meddelandet och behålla nuvarande beteende efter att förvalet ändras,\n +skriver du:\n +\n + git config --global push.default matching\n Vietnamese update form Trần Ngọc Quân: +msgstr +push.default chưa được đặt, giá trị ngầm định của nó đã được thay đổi trong\n +Git 2.0 từ 'matching' thành 'simple'. Để chấm dứt lời nhắc nhở này\n +và duy trì cách xử lý sau những thay đổi mặc định này, hãy chạy lệnh:\n +\n + git config --global push.default matching\n 2012/9/6 Ralf Thielow ralf.thie...@gmail.com: Translate 2 new messages came from git.pot update in ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Hi German l10n team, please review this small update on German translation. This patch here is based on a preparation commit which just contains the msgmerge change. For an easier review, I'll copy the first message in english in this email. The second change shows that there are some newlines, came from 'msgmerge', on places where we don't want to have them. I'll fix that soon. A hint on this translation: I've translated See 'git help config' and search for as Führe 'git help config' aus und suche nach..., not as Siehe 'git help config' und suche nach... because the second doesn't sound good to me. Perhaps someone else has a better idea. Thanks, Ralf #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n \n To squelch this message and adopt the new behavior now, use:\n \n git config --global push.default simple\n \n See 'git help config' and search for 'push.default' for further information.\n (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n 'current' instead of 'simple' if you sometimes use older versions of Git) po/de.po | 20 ++-- 1 Datei geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/po/de.po b/po/de.po index f3d232e..df5187e 100644 --- a/po/de.po +++ b/po/de.po @@ -4431,6 +4431,23 @@ msgid (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n 'current' instead of 'simple' if you sometimes use older versions of Git) msgstr +'push.default' ist nicht gesetzt; der implizit gesetzte Wert wird in\n +Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu unter-\n +drücken und das aktuelle Verhalten nach Änderung des Standardwertes\n +beizubehalten, benutze: +\n + git config --global push.default matching\n +\n +Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n +benutze:\n +\n + git config --global push.default simple\n +\n +Führe 'git help config' aus und suche nach 'push.default' für weitere +Informationen.\n +(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den gleichartigen + Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von + Git benutzt) #: builtin/push.c:199 msgid @@ -4453,7 +4470,6 @@ msgstr für weitere Details. #: builtin/push.c:212 -#, fuzzy msgid Updates were rejected because a pushed branch tip is behind its remote\n counterpart. If you did not intend to push that branch, you may want to\n @@ -4465,7 +4481,7 @@ msgstr beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu versendenden\n Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu -'current'\n +'simple', 'current'\n oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden. #: builtin/push.c:218 -- 1.7.12 -- 蒋鑫 北京群英汇信息技术有限公司 邮件: worldhello@gmail.com 网址: http://www.ossxp.com/ 博客: http://www.worldhello.net/ 微博: http://weibo.com/gotgit/ 电话: 010-51262007, 18601196889 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because this is a warning message, and would add a prefix: warning: . #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n For this reason, translations as follows are not well-formed. So I rewind git-po, and your commits may need a bit amend. I admit that I don't really understand what you mean. I can't see a big difference in line lengths. It's not more than others have. Do you mean that the first line just lacks of a warning: part? In this case, the message needs to get fixed. Imagine that this line starts with warning: , the updated German translation would looks like this: msgstr Warnung: 'push.default' ist nicht gesetzt; der implizit gesetzte Wert wird\n in Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu\n unterdrücken und das aktuelle Verhalten nach Änderung des Standardwertes\n beizubehalten, benutze: [...] I'll send you another pull request contains this update. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because this is a warning message, and would add a prefix: warning: . #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n For this reason, translations as follows are not well-formed. So I rewind git-po, and your commits may need a bit amend. I admit that I don't really understand what you mean. I can't see a big difference in line lengths. It's not more than others I got it. This warning: is added automatically. Sorry -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
On Fri, Sep 7, 2012 at 7:05 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because this is a warning message, and would add a prefix: warning: . #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n For this reason, translations as follows are not well-formed. So I rewind git-po, and your commits may need a bit amend. I admit that I don't really understand what you mean. I can't see a big difference in line lengths. It's not more than others I got it. This warning: is added automatically. Sorry The update would looks like this: msgstr 'push.default' ist nicht gesetzt; der implizit gesetzte Wert\n wird in Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu\n unterdrücken und das aktuelle Verhalten nach Änderung des Standardwertes\n ... -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
Ralf Thielow ralf.thie...@gmail.com writes: On Fri, Sep 7, 2012 at 6:36 PM, Ralf Thielow ralf.thie...@gmail.com wrote: On Fri, Sep 7, 2012 at 12:31 PM, Jiang Xin worldhello@gmail.com wrote: I just notice that the 1st line of the orignal message below has only 56 characters, much shorter than other lines. It is because this is a warning message, and would add a prefix: warning: . #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n For this reason, translations as follows are not well-formed. So I rewind git-po, and your commits may need a bit amend. I admit that I don't really understand what you mean. I can't see a big difference in line lengths. It's not more than others I got it. This warning: is added automatically. Sorry We may want to revisit this behaviour, by the way. If you have a long string that barely happens to fit on a line with warning: prefix in the original, your translation might want to spell it in two lines, i.e. warning(_(A quick brown fox jumps over the lazy dog.)); which gives warning: A quick brown fox jumps over the lazy dog.LF might want to turn into warning(AA qquuiicckk bbrroowwnn ffooxx\n jjuummppss oovveerr tthhee llaazzyy ddoogg.); and currently gives: wwaarrnniinngg: AA qquuiicckk bbrroowwnn ffooxxLF jjuummppss oovveerr tthhee llaazzyy ddoogg.LF But we may want to give wwaarrnniinngg: AA qquuiicckk bbrroowwnn ffooxxLF wwaarrnniinngg: jjuummppss oovveerr tthhee llaazzyy ddoogg.LF instead. Check out the way advice.c::advise() does its hints: prefix for hints, but we probably would want to avoid anything that allocates more memory in the die() codepath. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
Ralf Thielow ralf.thie...@gmail.com writes:
(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n
'current' instead of 'simple' if you sometimes use older versions of Git)
[...]
+(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den
gleichartigen
+ Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen
von
+ Git benutzt)
You translate similar as gleichartig, which sounds too much like
the same to me. Perhaps ähnlich? Or is there no danger of
confusing this in de_DE usage?
Ack on the rest.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH/RFC] l10n: de.po: translate 2 new messages
On Thu, Sep 6, 2012 at 6:44 PM, Thomas Rast tr...@inf.ethz.ch wrote: Ralf Thielow ralf.thie...@gmail.com writes: (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n 'current' instead of 'simple' if you sometimes use older versions of Git) [...] +(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den gleichartigen + Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von + Git benutzt) You translate similar as gleichartig, which sounds too much like the same to me. Perhaps ähnlich? Or is there no danger of confusing this in de_DE usage? Ack on the rest. Yeah, ähnlich is probably the better translation in this case. I'll change it. Thanks -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH/RFC] l10n: de.po: translate 2 new messages
Translate 2 new messages came from git.pot update in ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- Hi German l10n team, please review this small update on German translation. This patch here is based on a preparation commit which just contains the msgmerge change. For an easier review, I'll copy the first message in english in this email. The second change shows that there are some newlines, came from 'msgmerge', on places where we don't want to have them. I'll fix that soon. A hint on this translation: I've translated See 'git help config' and search for as Führe 'git help config' aus und suche nach..., not as Siehe 'git help config' und suche nach... because the second doesn't sound good to me. Perhaps someone else has a better idea. Thanks, Ralf #: builtin/push.c:151 msgid push.default is unset; its implicit value is changing in\n Git 2.0 from 'matching' to 'simple'. To squelch this message\n and maintain the current behavior after the default changes, use:\n \n git config --global push.default matching\n \n To squelch this message and adopt the new behavior now, use:\n \n git config --global push.default simple\n \n See 'git help config' and search for 'push.default' for further information.\n (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n 'current' instead of 'simple' if you sometimes use older versions of Git) po/de.po | 20 ++-- 1 Datei geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/po/de.po b/po/de.po index f3d232e..df5187e 100644 --- a/po/de.po +++ b/po/de.po @@ -4431,6 +4431,23 @@ msgid (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n 'current' instead of 'simple' if you sometimes use older versions of Git) msgstr +'push.default' ist nicht gesetzt; der implizit gesetzte Wert wird in\n +Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu unter-\n +drücken und das aktuelle Verhalten nach Änderung des Standardwertes\n +beizubehalten, benutze: +\n + git config --global push.default matching\n +\n +Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n +benutze:\n +\n + git config --global push.default simple\n +\n +Führe 'git help config' aus und suche nach 'push.default' für weitere +Informationen.\n +(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den gleichartigen + Modus 'current' anstatt 'simple', falls du gelegentlich ältere Versionen von + Git benutzt) #: builtin/push.c:199 msgid @@ -4453,7 +4470,6 @@ msgstr für weitere Details. #: builtin/push.c:212 -#, fuzzy msgid Updates were rejected because a pushed branch tip is behind its remote\n counterpart. If you did not intend to push that branch, you may want to\n @@ -4465,7 +4481,7 @@ msgstr beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu versendenden\n Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu -'current'\n +'simple', 'current'\n oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden. #: builtin/push.c:218 -- 1.7.12 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
