{"thread":{"id":"18388","subject":"[PATCH] git-gui: minor spelling fix and string factorisation.","startedAt":"2009-03-18T21:22:30Z","lastAt":"2009-03-18T23:22:02Z","messageCount":5,"participants":["Sam Hocevar","Junio C Hamano","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"108439","messageId":"20090318212230.GA2511@zoy.org","threadId":"18388","inReplyTo":null,"subject":"[PATCH] git-gui: minor spelling fix and string factorisation.","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-18T21:22:30Z","receivedAt":"2009-03-18T21:22:30Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"Properly spell \"successful\" and slightly rewrite a couple of strings\nthat actually say the same thing in order to reduce translation work.\n\nSigned-off-by: Sam Hocevar <sam@zoy.org>\n---\n lib/branch_delete.tcl        |    4 ++--\n lib/remote_branch_delete.tcl |    4 +---\n lib/tools.tcl                |    2 +-\n 3 files changed, 4 insertions(+), 6 deletions(-)\n\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex ef1930b..20d5e42 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -51,7 +51,7 @@ constructor dialog {} {\n \t\t$w.check \\\n \t\t[mc \"Delete Only If Merged Into\"] \\\n \t\t]\n-\t$w_check none [mc \"Always (Do not perform merge test.)\"]\n+\t$w_check none [mc \"Always (Do not perform merge checks)\"]\n \tpack $w.check -anchor nw -fill x -pady 5 -padx 5\n \n \tforeach h [load_all_heads] {\n@@ -112,7 +112,7 @@ method _delete {} {\n \t}\n \tif {$to_delete eq {}} return\n \tif {$check_cmt eq {}} {\n-\t\tset msg [mc \"Recovering deleted branches is difficult. \\n\\n Delete the selected branches?\"]\n+\t\tset msg [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]\n \t\tif {[tk_messageBox \\\n \t\t\t-icon warning \\\n \t\t\t-type yesno \\\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex 89eb0f7..4e02fc0 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -213,9 +213,7 @@ method _delete {} {\n \t\t-type yesno \\\n \t\t-title [wm title $w] \\\n \t\t-parent $w \\\n-\t\t-message [mc \"Recovering deleted branches is difficult.\n-\n-Delete the selected branches?\"]] ne yes} {\n+\t\t-message [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]] ne yes} {\n \t\treturn\n \t}\n \ndiff --git a/lib/tools.tcl b/lib/tools.tcl\nindex 6ae63b6..95e6e55 100644\n--- a/lib/tools.tcl\n+++ b/lib/tools.tcl\n@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {\n \t}\n \n \tif {$ok} {\n-\t\tset msg [mc \"Tool completed succesfully: %s\" $fullname]\n+\t\tset msg [mc \"Tool completed successfully: %s\" $fullname]\n \t} else {\n \t\tset msg [mc \"Tool failed: %s\" $fullname]\n \t}\n-- \n1.6.2\n"},{"id":"108449","messageId":"7vvdq6bgzv.fsf@gitster.siamese.dyndns.org","threadId":"18388","inReplyTo":"20090318212230.GA2511@zoy.org","subject":"Re: [PATCH] git-gui: minor spelling fix and string factorisation.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-18T22:31:16Z","receivedAt":"2009-03-18T22:31:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sam Hocevar <sam@zoy.org> writes:\n\n> Properly spell \"successful\" and slightly rewrite a couple of strings\n> that actually say the same thing in order to reduce translation work.\n>\n> Signed-off-by: Sam Hocevar <sam@zoy.org>\n> ---\n>  lib/branch_delete.tcl        |    4 ++--\n>  lib/remote_branch_delete.tcl |    4 +---\n>  lib/tools.tcl                |    2 +-\n>  3 files changed, 4 insertions(+), 6 deletions(-)\n>\n> diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\n> index ef1930b..20d5e42 100644\n> --- a/lib/branch_delete.tcl\n> +++ b/lib/branch_delete.tcl\n> @@ -51,7 +51,7 @@ constructor dialog {} {\n>  \t\t$w.check \\\n>  \t\t[mc \"Delete Only If Merged Into\"] \\\n>  \t\t]\n> -\t$w_check none [mc \"Always (Do not perform merge test.)\"]\n> +\t$w_check none [mc \"Always (Do not perform merge checks)\"]\n\nDon't you also need to adjust the existing translations if you are\nchanging the key strings used by mc?\n"},{"id":"108452","messageId":"20090318224301.GH27280@zoy.org","threadId":"18388","inReplyTo":"7vvdq6bgzv.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] git-gui: minor spelling fix and string factorisation.","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-18T22:43:02Z","receivedAt":"2009-03-18T22:43:02Z","isPatch":true,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"On Wed, Mar 18, 2009, Junio C Hamano wrote:\n\n> Don't you also need to adjust the existing translations if you are\n> changing the key strings used by mc?\n\n   I assumed a typical workflow where the translation coordinator\ndecides when to update .pot (typically at string freeze before a\nrelease). I can provide the appropriate patch nonetheless.\n\n-- \nSam.\n"},{"id":"108456","messageId":"20090318225423.GI23521@spearce.org","threadId":"18388","inReplyTo":"20090318224301.GH27280@zoy.org","subject":"Re: [PATCH] git-gui: minor spelling fix and string factorisation.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-18T22:54:23Z","receivedAt":"2009-03-18T22:54:23Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Sam Hocevar <sam@zoy.org> wrote:\n> On Wed, Mar 18, 2009, Junio C Hamano wrote:\n> \n> > Don't you also need to adjust the existing translations if you are\n> > changing the key strings used by mc?\n> \n>    I assumed a typical workflow where the translation coordinator\n> decides when to update .pot (typically at string freeze before a\n> release). I can provide the appropriate patch nonetheless.\n\nWell, we are only adjusting the English translation.  The .pot\nand .po files use the English translation as the message keys.\nI don't see a reason why we can't fix them for the translators\nwhen the message keys are being modified in ways that shouldn't\nimpact the translated text.\n\nUnless the translators translated the typos.  I doubt they did.\n\n-- \nShawn.\n"},{"id":"108459","messageId":"20090318232202.GA4624@zoy.org","threadId":"18388","inReplyTo":"20090318225423.GI23521@spearce.org","subject":"[PATCHv2] git-gui: minor spelling fix and string factorisation.","fromName":"Sam Hocevar","fromEmail":"sam@zoy.org","sentAt":"2009-03-18T23:22:02Z","receivedAt":"2009-03-18T23:22:02Z","isPatch":false,"sender":{"key":"sam@zoy.org","avatar":"https://gravatar.com/avatar/1fc1e5d8c3a8d737f14572135671adfbc0e61ffba5c3bc1d1b8a6f4aac764470?d=mp&s=160"},"body":"Properly spell \"successful\" and slightly rewrite a couple of strings\nthat actually say the same thing in order to reduce translation work.\n\nUpdate .pot and .po files accordingly since no new translation is\nrequired.\n\nSigned-off-by: Sam Hocevar <sam@zoy.org>\n---\n\n This new version of the patch updates .po and .pot files, following\n Junio's and Shawn's wishes.\n\n lib/branch_delete.tcl        |    4 ++--\n lib/remote_branch_delete.tcl |    4 +---\n lib/tools.tcl                |    2 +-\n po/de.po                     |   12 +-----------\n po/fr.po                     |   12 +-----------\n po/git-gui.pot               |    9 +--------\n po/hu.po                     |   12 +-----------\n po/it.po                     |   12 +-----------\n po/ja.po                     |   12 +-----------\n po/nb.po                     |   12 +-----------\n po/ru.po                     |   10 ----------\n po/sv.po                     |   12 +-----------\n po/zh_cn.po                  |   10 ----------\n 13 files changed, 12 insertions(+), 111 deletions(-)\n\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex ef1930b..20d5e42 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -51,7 +51,7 @@ constructor dialog {} {\n \t\t$w.check \\\n \t\t[mc \"Delete Only If Merged Into\"] \\\n \t\t]\n-\t$w_check none [mc \"Always (Do not perform merge test.)\"]\n+\t$w_check none [mc \"Always (Do not perform merge checks)\"]\n \tpack $w.check -anchor nw -fill x -pady 5 -padx 5\n \n \tforeach h [load_all_heads] {\n@@ -112,7 +112,7 @@ method _delete {} {\n \t}\n \tif {$to_delete eq {}} return\n \tif {$check_cmt eq {}} {\n-\t\tset msg [mc \"Recovering deleted branches is difficult. \\n\\n Delete the selected branches?\"]\n+\t\tset msg [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]\n \t\tif {[tk_messageBox \\\n \t\t\t-icon warning \\\n \t\t\t-type yesno \\\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex 89eb0f7..4e02fc0 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -213,9 +213,7 @@ method _delete {} {\n \t\t-type yesno \\\n \t\t-title [wm title $w] \\\n \t\t-parent $w \\\n-\t\t-message [mc \"Recovering deleted branches is difficult.\n-\n-Delete the selected branches?\"]] ne yes} {\n+\t\t-message [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]] ne yes} {\n \t\treturn\n \t}\n \ndiff --git a/lib/tools.tcl b/lib/tools.tcl\nindex 6ae63b6..95e6e55 100644\n--- a/lib/tools.tcl\n+++ b/lib/tools.tcl\n@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {\n \t}\n \n \tif {$ok} {\n-\t\tset msg [mc \"Tool completed succesfully: %s\" $fullname]\n+\t\tset msg [mc \"Tool completed successfully: %s\" $fullname]\n \t} else {\n \t\tset msg [mc \"Tool failed: %s\" $fullname]\n \t}\ndiff --git a/po/de.po b/po/de.po\nindex a6f730b..51abb50 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -773,16 +773,6 @@ msgstr \"Immer (ohne Zusammenführungstest)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\\n\"\n-\"\\n\"\n-\"Gewählte Zweige jetzt löschen?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2506,7 +2496,7 @@ msgstr \"Starten: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Werkzeug erfolgreich abgeschlossen: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/fr.po b/po/fr.po\nindex eb5f68e..2abf524 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -780,16 +780,6 @@ msgstr \"Toujours (Ne pas faire de test de fusion.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Les branches suivantes ne sont pas complètement fusionnées dans %s :\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Il est difficile de récupérer des branches supprimées.\\n\"\n-\"\\n\"\n-\"Supprimer les branches sélectionnées ?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2412,7 +2402,7 @@ msgstr \"Lancement de : %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"L'outil a terminé avec succès : %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/git-gui.pot b/po/git-gui.pot\nindex 15aea0d..53b7d36 100644\n--- a/po/git-gui.pot\n+++ b/po/git-gui.pot\n@@ -753,13 +753,6 @@ msgstr \"\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2220,7 +2213,7 @@ msgstr \"\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/hu.po b/po/hu.po\nindex f761b64..0f87bc1 100644\n--- a/po/hu.po\n+++ b/po/hu.po\n@@ -776,16 +776,6 @@ msgstr \"Mindig (Ne legyen merge teszt.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"A következő branchek nem teljesen lettek merge-ölve ebbe: %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"A törölt branchek visszaállítása bonyolult. \\n\"\n-\"\\n\"\n-\" Biztosan törli a kiválasztott brancheket?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2399,7 +2389,7 @@ msgstr \"Futtatás: %s...\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Az eszköz sikeresen befejeződött: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/it.po b/po/it.po\nindex 294e595..762632c 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -778,16 +778,6 @@ msgstr \"Sempre (Non effettuare verifiche di fusione).\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"I rami seguenti non sono stati fusi completamente in %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Ricomporre rami cancellati può essere complicato. \\n\"\n-\"\\n\"\n-\" Eliminare i rami selezionati?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2418,7 +2408,7 @@ msgstr \"Eseguo: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Il programma esterno è terminato con successo: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/ja.po b/po/ja.po\nindex 09d60be..63c4695 100644\n--- a/po/ja.po\n+++ b/po/ja.po\n@@ -773,16 +773,6 @@ msgstr \"無条件(マージテストしない)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"以下のブランチは %s に完全にマージされていません:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"ブランチを削除すると元に戻すのは困難です。 \\n\"\n-\"\\n\"\n-\" 選択したブランチを削除しますか？\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2382,7 +2372,7 @@ msgstr \"実行中: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"ツールが完了しました: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/nb.po b/po/nb.po\nindex 1c5137d..6de93c2 100644\n--- a/po/nb.po\n+++ b/po/nb.po\n@@ -761,16 +761,6 @@ msgstr \"Alltid (Ikke utfør sammenslåingstest.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Følgende grener er ikke fullstendig slått sammen med %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Gjenoppretting av fjernede grener er vanskelig. \\n\"\n-\"\\n\"\n-\" Fjern valgte grener?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2331,7 +2321,7 @@ msgstr \"Kjører: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Verktøyet ble fullført med suksess: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/ru.po b/po/ru.po\nindex db55b3e..04df2aa 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -661,16 +661,6 @@ msgstr \"Всегда (не выполнять проверку на объеди\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Следующие ветви объединены с %s не полностью:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Восстанавливать удаленные ветви сложно. \\n\"\n-\"\\n\"\n-\" Удалить выбранные ветви?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\ndiff --git a/po/sv.po b/po/sv.po\nindex 167654c..c1535f9 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -780,16 +780,6 @@ msgstr \"Alltid (utför inte sammanslagningstest).\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"Följande grenar är inte till fullo sammanslagna med %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"Det är svårt att återställa borttagna grenar.\\n\"\n-\"\\n\"\n-\" Ta bort valda grenar?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n@@ -2398,7 +2388,7 @@ msgstr \"Exekverar: %s\"\n \n #: lib/tools.tcl:149\n #, tcl-format\n-msgid \"Tool completed succesfully: %s\"\n+msgid \"Tool completed successfully: %s\"\n msgstr \"Verktyget avslutades framgångsrikt: %s\"\n \n #: lib/tools.tcl:151\ndiff --git a/po/zh_cn.po b/po/zh_cn.po\nindex d2c6866..91c1be2 100644\n--- a/po/zh_cn.po\n+++ b/po/zh_cn.po\n@@ -676,16 +676,6 @@ msgstr \"总是合并 (不作合并测试.)\"\n msgid \"The following branches are not completely merged into %s:\"\n msgstr \"下列分支没有完全被合并到 %s:\"\n \n-#: lib/branch_delete.tcl:115\n-msgid \"\"\n-\"Recovering deleted branches is difficult. \\n\"\n-\"\\n\"\n-\" Delete the selected branches?\"\n-msgstr \"\"\n-\"恢复被删除的分支非常困难.\\n\"\n-\"\\n\"\n-\"是否要删除所选分支?\"\n-\n #: lib/branch_delete.tcl:141\n #, tcl-format\n msgid \"\"\n-- \n1.6.2.1\n"}]}