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>
This commit is contained in:
Sam Hocevar
Shawn O. Pearce
parent
b59f091d80
commit
966d0778db
@ -51,7 +51,7 @@ constructor dialog {} {
|
||||
$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] {
|
||||
|
||||
@ -213,9 +213,7 @@ method _delete {} {
|
||||
-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
|
||||
}
|
||||
|
||||
|
||||
@ -146,7 +146,7 @@ proc tools_complete {fullname w {ok 1}} {
|
||||
}
|
||||
|
||||
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]
|
||||
}
|
||||
|
||||
12
po/de.po
12
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:"
|
||||
|
||||
#: 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 ""
|
||||
@ -2506,7 +2496,7 @@ msgstr "Starten: %s"
|
||||
|
||||
#: 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
|
||||
|
||||
12
po/fr.po
12
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 :"
|
||||
|
||||
#: 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 ""
|
||||
@ -2412,7 +2402,7 @@ msgstr "Lancement de : %s"
|
||||
|
||||
#: 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
|
||||
|
||||
@ -753,13 +753,6 @@ 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 ""
|
||||
@ -2220,7 +2213,7 @@ msgstr ""
|
||||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr ""
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
||||
12
po/hu.po
12
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:"
|
||||
|
||||
#: 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 ""
|
||||
@ -2399,7 +2389,7 @@ msgstr "Futtatás: %s..."
|
||||
|
||||
#: 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
|
||||
|
||||
12
po/it.po
12
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:"
|
||||
|
||||
#: 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 ""
|
||||
@ -2418,7 +2408,7 @@ msgstr "Eseguo: %s"
|
||||
|
||||
#: 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
|
||||
|
||||
12
po/ja.po
12
po/ja.po
@ -773,16 +773,6 @@ msgstr "無条件(マージテストしない)"
|
||||
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 ""
|
||||
@ -2382,7 +2372,7 @@ msgstr "実行中: %s"
|
||||
|
||||
#: lib/tools.tcl:149
|
||||
#, tcl-format
|
||||
msgid "Tool completed succesfully: %s"
|
||||
msgid "Tool completed successfully: %s"
|
||||
msgstr "ツールが完了しました: %s"
|
||||
|
||||
#: lib/tools.tcl:151
|
||||
|
||||
12
po/nb.po
12
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:"
|
||||
|
||||
#: 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 ""
|
||||
@ -2331,7 +2321,7 @@ msgstr "Kjører: %s"
|
||||
|
||||
#: 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
|
||||
|
||||
10
po/ru.po
10
po/ru.po
@ -661,16 +661,6 @@ msgstr "Всегда (не выполнять проверку на объеди
|
||||
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 ""
|
||||
|
||||
12
po/sv.po
12
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:"
|
||||
|
||||
#: 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 ""
|
||||
@ -2398,7 +2388,7 @@ msgstr "Exekverar: %s"
|
||||
|
||||
#: 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
|
||||
|
||||
10
po/zh_cn.po
10
po/zh_cn.po
@ -676,16 +676,6 @@ msgstr "总是合并 (不作合并测试.)"
|
||||
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 ""
|
||||
|
||||
Loading…
Reference in New Issue
Block a user