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>
Sam Hocevar committed
Mar 24, 2009 at 00:42 UTC
966d0778db2e3b11f5fffa2312770ef534263058
13 files changed
+12
-111
lib/branch_delete.tcl
+2
-2
@@ -51,7 +51,7 @@ constructor dialog {} {
51
$w.check \
52
[mc "Delete Only If Merged Into"] \
53
]
54
- $w_check none [mc "Always (Do not perform merge test.)"]
54
+ $w_check none [mc "Always (Do not perform merge checks)"]
55
pack $w.check -anchor nw -fill x -pady 5 -padx 5
56
57
foreach h [load_all_heads] {
@@ -112,7 +112,7 @@ method _delete {} {
112
}
113
if {$to_delete eq {}} return
114
if {$check_cmt eq {}} {
115
- set msg [mc "Recovering deleted branches is difficult. \n\n Delete the selected branches?"]
115
+ set msg [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]
116
if {[tk_messageBox \
117
-icon warning \
118
-type yesno \
lib/remote_branch_delete.tcl
+1
-3
@@ -213,9 +213,7 @@ method _delete {} {
213
-type yesno \
214
-title [wm title $w] \
215
-parent $w \
216
- -message [mc "Recovering deleted branches is difficult.
217
-
218
-Delete the selected branches?"]] ne yes} {
216
+ -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {
217
return
218
}
219
lib/tools.tcl
+1
-1
@@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {
146
}
147
148
if {$ok} {
149
- set msg [mc "Tool completed succesfully: %s" $fullname]
149
+ set msg [mc "Tool completed successfully: %s" $fullname]
150
} else {
151
set msg [mc "Tool failed: %s" $fullname]
152
}
po/de.po
+1
-11
@@ -773,16 +773,6 @@ msgstr "Immer (ohne Zusammenführungstest)"
773
msgid "The following branches are not completely merged into %s:"
774
msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
775
776
-#: lib/branch_delete.tcl:115
777
-msgid ""
778
-"Recovering deleted branches is difficult. \n"
779
-"\n"
780
-" Delete the selected branches?"
781
-msgstr ""
782
-"Gelöschte Zweige können nur mit größerem Aufwand wiederhergestellt werden.\n"
783
-"\n"
784
-"Gewählte Zweige jetzt löschen?"
785
-
776
#: lib/branch_delete.tcl:141
777
#, tcl-format
778
msgid ""
@@ -2506,7 +2496,7 @@ msgstr "Starten: %s"
2496
2497
#: lib/tools.tcl:149
2498
#, tcl-format
2509
-msgid "Tool completed succesfully: %s"
2499
+msgid "Tool completed successfully: %s"
2500
msgstr "Werkzeug erfolgreich abgeschlossen: %s"
2501
2502
#: lib/tools.tcl:151
po/fr.po
+1
-11
@@ -780,16 +780,6 @@ msgstr "Toujours (Ne pas faire de test de fusion.)"
780
msgid "The following branches are not completely merged into %s:"
781
msgstr "Les branches suivantes ne sont pas complètement fusionnées dans %s :"
782
783
-#: lib/branch_delete.tcl:115
784
-msgid ""
785
-"Recovering deleted branches is difficult. \n"
786
-"\n"
787
-" Delete the selected branches?"
788
-msgstr ""
789
-"Il est difficile de récupérer des branches supprimées.\n"
790
-"\n"
791
-"Supprimer les branches sélectionnées ?"
792
-
783
#: lib/branch_delete.tcl:141
784
#, tcl-format
785
msgid ""
@@ -2412,7 +2402,7 @@ msgstr "Lancement de : %s"
2402
2403
#: lib/tools.tcl:149
2404
#, tcl-format
2415
-msgid "Tool completed succesfully: %s"
2405
+msgid "Tool completed successfully: %s"
2406
msgstr "L'outil a terminé avec succès : %s"
2407
2408
#: lib/tools.tcl:151
po/git-gui.pot
+1
-8
@@ -753,13 +753,6 @@ msgstr ""
753
msgid "The following branches are not completely merged into %s:"
754
msgstr ""
755
756
-#: lib/branch_delete.tcl:115
757
-msgid ""
758
-"Recovering deleted branches is difficult. \n"
759
-"\n"
760
-" Delete the selected branches?"
761
-msgstr ""
762
-
756
#: lib/branch_delete.tcl:141
757
#, tcl-format
758
msgid ""
@@ -2220,7 +2213,7 @@ msgstr ""
2213
2214
#: lib/tools.tcl:149
2215
#, tcl-format
2223
-msgid "Tool completed succesfully: %s"
2216
+msgid "Tool completed successfully: %s"
2217
msgstr ""
2218
2219
#: lib/tools.tcl:151
po/hu.po
+1
-11
@@ -776,16 +776,6 @@ msgstr "Mindig (Ne legyen merge teszt.)"
776
msgid "The following branches are not completely merged into %s:"
777
msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
778
779
-#: lib/branch_delete.tcl:115
780
-msgid ""
781
-"Recovering deleted branches is difficult. \n"
782
-"\n"
783
-" Delete the selected branches?"
784
-msgstr ""
785
-"A törölt branchek visszaállítása bonyolult. \n"
786
-"\n"
787
-" Biztosan törli a kiválasztott brancheket?"
788
-
779
#: lib/branch_delete.tcl:141
780
#, tcl-format
781
msgid ""
@@ -2399,7 +2389,7 @@ msgstr "Futtatás: %s..."
2389
2390
#: lib/tools.tcl:149
2391
#, tcl-format
2402
-msgid "Tool completed succesfully: %s"
2392
+msgid "Tool completed successfully: %s"
2393
msgstr "Az eszköz sikeresen befejeződött: %s"
2394
2395
#: lib/tools.tcl:151
po/it.po
+1
-11
@@ -778,16 +778,6 @@ msgstr "Sempre (Non effettuare verifiche di fusione)."
778
msgid "The following branches are not completely merged into %s:"
779
msgstr "I rami seguenti non sono stati fusi completamente in %s:"
780
781
-#: lib/branch_delete.tcl:115
782
-msgid ""
783
-"Recovering deleted branches is difficult. \n"
784
-"\n"
785
-" Delete the selected branches?"
786
-msgstr ""
787
-"Ricomporre rami cancellati può essere complicato. \n"
788
-"\n"
789
-" Eliminare i rami selezionati?"
790
-
781
#: lib/branch_delete.tcl:141
782
#, tcl-format
783
msgid ""
@@ -2418,7 +2408,7 @@ msgstr "Eseguo: %s"
2408
2409
#: lib/tools.tcl:149
2410
#, tcl-format
2421
-msgid "Tool completed succesfully: %s"
2411
+msgid "Tool completed successfully: %s"
2412
msgstr "Il programma esterno è terminato con successo: %s"
2413
2414
#: lib/tools.tcl:151
po/ja.po
+1
-11
@@ -773,16 +773,6 @@ msgstr "無条件(マージテストしない)"
773
msgid "The following branches are not completely merged into %s:"
774
msgstr "以下のブランチは %s に完全にマージされていません:"
775
776
-#: lib/branch_delete.tcl:115
777
-msgid ""
778
-"Recovering deleted branches is difficult. \n"
779
-"\n"
780
-" Delete the selected branches?"
781
-msgstr ""
782
-"ブランチを削除すると元に戻すのは困難です。 \n"
783
-"\n"
784
-" 選択したブランチを削除しますか？"
785
-
776
#: lib/branch_delete.tcl:141
777
#, tcl-format
778
msgid ""
@@ -2382,7 +2372,7 @@ msgstr "実行中: %s"
2372
2373
#: lib/tools.tcl:149
2374
#, tcl-format
2385
-msgid "Tool completed succesfully: %s"
2375
+msgid "Tool completed successfully: %s"
2376
msgstr "ツールが完了しました: %s"
2377
2378
#: lib/tools.tcl:151
po/nb.po
+1
-11
@@ -761,16 +761,6 @@ msgstr "Alltid (Ikke utfør sammenslåingstest.)"
761
msgid "The following branches are not completely merged into %s:"
762
msgstr "Følgende grener er ikke fullstendig slått sammen med %s:"
763
764
-#: lib/branch_delete.tcl:115
765
-msgid ""
766
-"Recovering deleted branches is difficult. \n"
767
-"\n"
768
-" Delete the selected branches?"
769
-msgstr ""
770
-"Gjenoppretting av fjernede grener er vanskelig. \n"
771
-"\n"
772
-" Fjern valgte grener?"
773
-
764
#: lib/branch_delete.tcl:141
765
#, tcl-format
766
msgid ""
@@ -2331,7 +2321,7 @@ msgstr "Kjører: %s"
2321
2322
#: lib/tools.tcl:149
2323
#, tcl-format
2334
-msgid "Tool completed succesfully: %s"
2324
+msgid "Tool completed successfully: %s"
2325
msgstr "Verktøyet ble fullført med suksess: %s"
2326
2327
#: lib/tools.tcl:151
po/ru.po
-10
@@ -661,16 +661,6 @@ msgstr "Всегда (не выполнять проверку на объеди
661
msgid "The following branches are not completely merged into %s:"
662
msgstr "Следующие ветви объединены с %s не полностью:"
663
664
-#: lib/branch_delete.tcl:115
665
-msgid ""
666
-"Recovering deleted branches is difficult. \n"
667
-"\n"
668
-" Delete the selected branches?"
669
-msgstr ""
670
-"Восстанавливать удаленные ветви сложно. \n"
671
-"\n"
672
-" Удалить выбранные ветви?"
673
-
664
#: lib/branch_delete.tcl:141
665
#, tcl-format
666
msgid ""
po/sv.po
+1
-11
@@ -780,16 +780,6 @@ msgstr "Alltid (utför inte sammanslagningstest)."
780
msgid "The following branches are not completely merged into %s:"
781
msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
782
783
-#: lib/branch_delete.tcl:115
784
-msgid ""
785
-"Recovering deleted branches is difficult. \n"
786
-"\n"
787
-" Delete the selected branches?"
788
-msgstr ""
789
-"Det är svårt att återställa borttagna grenar.\n"
790
-"\n"
791
-" Ta bort valda grenar?"
792
-
783
#: lib/branch_delete.tcl:141
784
#, tcl-format
785
msgid ""
@@ -2398,7 +2388,7 @@ msgstr "Exekverar: %s"
2388
2389
#: lib/tools.tcl:149
2390
#, tcl-format
2401
-msgid "Tool completed succesfully: %s"
2391
+msgid "Tool completed successfully: %s"
2392
msgstr "Verktyget avslutades framgångsrikt: %s"
2393
2394
#: lib/tools.tcl:151
po/zh_cn.po
-10
@@ -676,16 +676,6 @@ msgstr "总是合并 (不作合并测试.)"
676
msgid "The following branches are not completely merged into %s:"
677
msgstr "下列分支没有完全被合并到 %s:"
678
679
-#: lib/branch_delete.tcl:115
680
-msgid ""
681
-"Recovering deleted branches is difficult. \n"
682
-"\n"
683
-" Delete the selected branches?"
684
-msgstr ""
685
-"恢复被删除的分支非常困难.\n"
686
-"\n"
687
-"是否要删除所选分支?"
688
-
679
#: lib/branch_delete.tcl:141
680
#, tcl-format
681
msgid ""