git-gui: minor spelling fix and string factorisation.

Properly spell "successful" and slightly rewrite a couple of strings
that actually say the same thing in order to reduce translation work.

Update .pot and .po files accordingly since no new translation is
required.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl
index ef1930b4911591566be4561b8c17c24e1cfbfaad..20d5e42307c70a976e56f922f787610cde5bac9f 100644 (file)
--- a/lib/branch_delete.tcl
+++ b/lib/branch_delete.tcl
@@ -51,7 +51,7 @@ constructor dialog {} {
                $w.check \
                [mc "Delete Only If Merged Into"] \
                ]
                $w.check \
                [mc "Delete Only If Merged Into"] \
                ]

-       $w_check none [mc "Always (Do not perform merge test.)"]
+       $w_check none [mc "Always (Do not perform merge checks)"]

        pack $w.check -anchor nw -fill x -pady 5 -padx 5
 
        foreach h [load_all_heads] {
        pack $w.check -anchor nw -fill x -pady 5 -padx 5
 
        foreach h [load_all_heads] {


@@ -112,7 +112,7 @@ method _delete {} {
        }
        if {$to_delete eq {}} return
        if {$check_cmt eq {}} {
        }
        if {$to_delete eq {}} return
        if {$check_cmt eq {}} {

-               set msg [mc "Recovering deleted branches is difficult. \n\n Delete the selected branches?"]
+               set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]

                if {[tk_messageBox \
                        -icon warning \
                        -type yesno \
                if {[tk_messageBox \
                        -icon warning \
                        -type yesno \

diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl
index 89eb0f70f289e48e2b875e2cd49eb026a266ca0e..4e02fc0d393ff9fe8d2983fec99a03db7f36273a 100644 (file)
--- a/lib/remote_branch_delete.tcl
+++ b/lib/remote_branch_delete.tcl
@@ -213,9 +213,7 @@ method _delete {} {
                -type yesno \
                -title [wm title $w] \
                -parent $w \
                -type yesno \
                -title [wm title $w] \
                -parent $w \

-               -message [mc "Recovering deleted branches is difficult.
-
-Delete the selected branches?"]] ne yes} {
+               -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {

                return
        }
 
                return
        }
 

diff --git a/lib/tools.tcl b/lib/tools.tcl
index 6ae63b6c7c61cb8f773ba5b9367c948820a0873a..95e6e5553ea86482d0fe9be77b07e805e01e3393 100644 (file)
--- a/lib/tools.tcl
+++ b/lib/tools.tcl
@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {
        }
 
        if {$ok} {
        }
 
        if {$ok} {

-               set msg [mc "Tool completed succesfully: %s" $fullname]
+               set msg [mc "Tool completed successfully: %s" $fullname]

        } else {
                set msg [mc "Tool failed: %s" $fullname]
        }
        } else {
                set msg [mc "Tool failed: %s" $fullname]
        }

diff --git a/po/de.po b/po/de.po
index a6f730b4eb38365b5156b715e9bb2fd8772c672c..51abb50bb627d05d702de2d794c47b874c9667ca 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -773,16 +773,6 @@ msgstr "Immer (ohne Zusammenführungstest)"
 msgid "The following branches are not completely merged into %s:"
 msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n"
-"\n"
-"Gewählte Zweige jetzt löschen?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2506,7 +2496,7 @@ msgstr "Starten: %s"
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "Werkzeug erfolgreich abgeschlossen: %s"
 
 #: lib/tools.tcl:151
 msgstr "Werkzeug erfolgreich abgeschlossen: %s"
 
 #: lib/tools.tcl:151

diff --git a/po/fr.po b/po/fr.po
index a56aad766871733fcc459e5dbf56eb1bd8a649a5..a944ace6ced4c68b55b7b25023d546521a8ecd68 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -780,16 +780,6 @@ msgstr "Toujours (Ne pas faire de test de fusion.)"
 msgid "The following branches are not completely merged into %s:"
 msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Il est difficile de récupérer des branches supprimées.\n"
-"\n"
-"Supprimer les branches sélectionnées ?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2412,7 +2402,7 @@ msgstr "Lancement de : %s"
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "L'outil a terminé avec succès : %s"
 
 #: lib/tools.tcl:151
 msgstr "L'outil a terminé avec succès : %s"
 
 #: lib/tools.tcl:151

diff --git a/po/git-gui.pot b/po/git-gui.pot
index 15aea0dc64fd9711bf7246d347ceaafc773d874b..53b7d3634d842a43f8043e3f825d4232e17588aa 100644 (file)
--- a/po/git-gui.pot
+++ b/po/git-gui.pot
@@ -753,13 +753,6 @@ msgstr ""
 msgid "The following branches are not completely merged into %s:"
 msgstr ""
 
 msgid "The following branches are not completely merged into %s:"
 msgstr ""
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2220,7 +2213,7 @@ msgstr ""
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr ""
 
 #: lib/tools.tcl:151
 msgstr ""
 
 #: lib/tools.tcl:151

diff --git a/po/hu.po b/po/hu.po
index f761b6415298809897f4f1cccdd0ea325ccbb1dc..0f87bc1cbeedca8d9040777a5484500d1071c2e6 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -776,16 +776,6 @@ msgstr "Mindig (Ne legyen merge teszt.)"
 msgid "The following branches are not completely merged into %s:"
 msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"A törölt branchek visszaállítása bonyolult. \n"
-"\n"
-" Biztosan törli a kiválasztott brancheket?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2399,7 +2389,7 @@ msgstr "Futtatás: %s..."
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "Az eszköz sikeresen befejeződött: %s"
 
 #: lib/tools.tcl:151
 msgstr "Az eszköz sikeresen befejeződött: %s"
 
 #: lib/tools.tcl:151

diff --git a/po/it.po b/po/it.po
index 294e5958874f41c52071313cd107124b38c710a3..762632c22f9e5567bf4603e2958401e6156f1872 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -778,16 +778,6 @@ msgstr "Sempre (Non effettuare verifiche di fusione)."
 msgid "The following branches are not completely merged into %s:"
 msgstr "I rami seguenti non sono stati fusi completamente in %s:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "I rami seguenti non sono stati fusi completamente in %s:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Ricomporre rami cancellati può essere complicato. \n"
-"\n"
-" Eliminare i rami selezionati?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2418,7 +2408,7 @@ msgstr "Eseguo: %s"
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "Il programma esterno è terminato con successo: %s"
 
 #: lib/tools.tcl:151
 msgstr "Il programma esterno è terminato con successo: %s"
 
 #: lib/tools.tcl:151

diff --git a/po/ja.po b/po/ja.po
index 09d60bef74990e43a9515437d9b4de53e5df0b98..63c4695103a764acbf116df1946fd0bc311c47f0 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -773,16 +773,6 @@ msgstr "無条件(マージテストしない)"
 msgid "The following branches are not completely merged into %s:"
 msgstr "以下のブランチは %s に完全にマージされていません:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "以下のブランチは %s に完全にマージされていません:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"ブランチを削除すると元に戻すのは困難です。 \n"
-"\n"
-" 選択したブランチを削除しますか？"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2382,7 +2372,7 @@ msgstr "実行中: %s"
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "ツールが完了しました: %s"
 
 #: lib/tools.tcl:151
 msgstr "ツールが完了しました: %s"
 
 #: lib/tools.tcl:151

diff --git a/po/nb.po b/po/nb.po
index 1c5137d84ca8797238dbcf1cbc6fd80218fbca5f..6de93c28c2e2b7cb0413521c987161c4a4fcb59d 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -761,16 +761,6 @@ msgstr "Alltid (Ikke utfør sammenslåingstest.)"
 msgid "The following branches are not completely merged into %s:"
 msgstr "Følgende grener er ikke fullstendig slått sammen med %s:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "Følgende grener er ikke fullstendig slått sammen med %s:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Gjenoppretting av fjernede grener er vanskelig. \n"
-"\n"
-" Fjern valgte grener?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2331,7 +2321,7 @@ msgstr "Kjører: %s"
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "Verktøyet ble fullført med suksess: %s"
 
 #: lib/tools.tcl:151
 msgstr "Verktøyet ble fullført med suksess: %s"
 
 #: lib/tools.tcl:151

diff --git a/po/ru.po b/po/ru.po
index db55b3e0a69813cba16932212ee1b2ce0f5b2b9a..04df2aac260a21b36cc3d00625a6cad5a8cea0ef 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -661,16 +661,6 @@ msgstr "Всегда (не выполнять проверку на объеди
 msgid "The following branches are not completely merged into %s:"
 msgstr "Следующие ветви объединены с %s не полностью:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "Следующие ветви объединены с %s не полностью:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Восстанавливать удаленные ветви сложно. \n"
-"\n"
-" Удалить выбранные ветви?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""

diff --git a/po/sv.po b/po/sv.po
index 167654c7094c73f85b212ce5f48c401a31fca91b..c1535f94e86f2d619b4609965324a7c8ca0b396c 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -780,16 +780,6 @@ msgstr "Alltid (utför inte sammanslagningstest)."
 msgid "The following branches are not completely merged into %s:"
 msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"Det är svårt att återställa borttagna grenar.\n"
-"\n"
-" Ta bort valda grenar?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""


@@ -2398,7 +2388,7 @@ msgstr "Exekverar: %s"
 
 #: lib/tools.tcl:149
 #, tcl-format
 
 #: lib/tools.tcl:149
 #, tcl-format

-msgid "Tool completed succesfully: %s"
+msgid "Tool completed successfully: %s"

 msgstr "Verktyget avslutades framgångsrikt: %s"
 
 #: lib/tools.tcl:151
 msgstr "Verktyget avslutades framgångsrikt: %s"
 
 #: lib/tools.tcl:151

diff --git a/po/zh_cn.po b/po/zh_cn.po
index d2c686667163ec4cd83045efd429e3413564290e..91c1be23c2bb8e87a6e08188f5a0f0b860af4242 100644 (file)
--- a/po/zh_cn.po
+++ b/po/zh_cn.po
@@ -676,16 +676,6 @@ msgstr "总是合并 (不作合并测试.)"
 msgid "The following branches are not completely merged into %s:"
 msgstr "下列分支没有完全被合并到 %s:"
 
 msgid "The following branches are not completely merged into %s:"
 msgstr "下列分支没有完全被合并到 %s:"
 

-#: lib/branch_delete.tcl:115
-msgid ""
-"Recovering deleted branches is difficult. \n"
-"\n"
-" Delete the selected branches?"
-msgstr ""
-"恢复被删除的分支非常困难.\n"
-"\n"
-"是否要删除所选分支?"
-

 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""
 #: lib/branch_delete.tcl:141
 #, tcl-format
 msgid ""