From 65364da341a1e5ef0e7c495a3735a47e15d5ee316af35f603f4d329489fcfc9f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Oct 2015 16:16:32 +0000 Subject: [PATCH] Accepting request 340690 from devel:tools:scm 1 OBS-URL: https://build.opensuse.org/request/show/340690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=168 --- ...rash-with-all-in-non-English-locales.patch | 45 + ...id-s-for-menu-items-with-accelerator.patch | 1151 +++++++++++++++++ ...-Add-accelerators-to-Japanese-locale.patch | 108 ++ ...itk-Add-accelerator-to-German-locale.patch | 118 ++ git.changes | 10 + git.spec | 9 + 6 files changed, 1441 insertions(+) create mode 100644 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch create mode 100644 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch create mode 100644 0003-gitk-Add-accelerators-to-Japanese-locale.patch create mode 100644 0004-gitk-Add-accelerator-to-German-locale.patch diff --git a/0001-gitk-Fix-crash-with-all-in-non-English-locales.patch b/0001-gitk-Fix-crash-with-all-in-non-English-locales.patch new file mode 100644 index 0000000..6416968 --- /dev/null +++ b/0001-gitk-Fix-crash-with-all-in-non-English-locales.patch @@ -0,0 +1,45 @@ +From dc5621adb09150be368d2a3d29f4312f79dfcbd3 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 20 Oct 2015 13:40:13 +0200 +Subject: [PATCH 1/4] gitk: Fix crash with --all in non-English locales + +When gitk is invoked with --all option in a non-English locale, it +crashes like: +$ LC_ALL="de_DE.UTF-8" gitk --all +Error in startup script: bad menu entry index "Ansicht bearbeiten ..." + while executing +".bar.view entryconf [mca "Edit view..."] -state normal" + invoked from within +"if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { + # create a view for the files/dirs specified on the command line + se..." + (file "/usr/bin/gitk" line 12442) + +The reason is the leftover strings that don't match any longer with +the new string containing accelerator mark (&). This patch corrects +these strings. + +Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=951153 +Signed-off-by: Takashi Iwai +--- + gitk-git/gitk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gitk-git/gitk b/gitk-git/gitk +index 2028b554f487..fcc606eab735 100755 +--- a/gitk-git/gitk ++++ b/gitk-git/gitk +@@ -12452,8 +12452,8 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} { + set viewchanged(1) 0 + set vdatemode(1) 0 + addviewmenu 1 +- .bar.view entryconf [mca "Edit view..."] -state normal +- .bar.view entryconf [mca "Delete view"] -state normal ++ .bar.view entryconf [mca "&Edit view..."] -state normal ++ .bar.view entryconf [mca "&Delete view"] -state normal + } + + if {[info exists permviews]} { +-- +2.6.1 + diff --git a/0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch b/0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch new file mode 100644 index 0000000..d99bd3e --- /dev/null +++ b/0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch @@ -0,0 +1,1151 @@ +From 05ff62a28a0576b6e10b68b580e8af955e1e0519 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 20 Oct 2015 14:05:11 +0200 +Subject: [PATCH 2/4] gitk: Update msgid's for menu items with accelerator + +The commit d99b4b0de27a ("gitk: Accelerators for the main menu") +modified the menu item strings with the accelerator, but the +translations didn't follow, thus the menus are shown without +translations. + +This patch systematically update the msgid keys just to follow this +change. The contents aren't changed, so the accelerator won't work in +these locales for now. Each locale translator needs to add proper +acceleration keys appropriately. + +Signed-off-by: Takashi Iwai +--- + gitk-git/po/bg.po | 34 +++++++++++++++++----------------- + gitk-git/po/ca.po | 34 +++++++++++++++++----------------- + gitk-git/po/de.po | 34 +++++++++++++++++----------------- + gitk-git/po/es.po | 34 +++++++++++++++++----------------- + gitk-git/po/fr.po | 34 +++++++++++++++++----------------- + gitk-git/po/hu.po | 34 +++++++++++++++++----------------- + gitk-git/po/it.po | 36 ++++++++++++++++++------------------ + gitk-git/po/ja.po | 34 +++++++++++++++++----------------- + gitk-git/po/pt_br.po | 34 +++++++++++++++++----------------- + gitk-git/po/ru.po | 34 +++++++++++++++++----------------- + gitk-git/po/sv.po | 34 +++++++++++++++++----------------- + gitk-git/po/vi.po | 34 +++++++++++++++++----------------- + 12 files changed, 205 insertions(+), 205 deletions(-) + +diff --git a/gitk-git/po/bg.po b/gitk-git/po/bg.po +index 61073ebf6b56..909a56463fe6 100644 +--- a/gitk-git/po/bg.po ++++ b/gitk-git/po/bg.po +@@ -89,71 +89,71 @@ msgid "Cancel" + msgstr "Отказ" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Обновяване" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Презареждане" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Наново прочитане на настройките" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Изброяване на указателите" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Стартиране на „git gui“" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Спиране на програмата" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Файл" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Настройки" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Редактиране" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Нов изглед…" + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Редактиране на изгледа…" + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Изтриване на изгледа" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Всички файлове" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Изглед" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Относно gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Клавишни комбинации" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Помощ" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po +index 976037a64504..d17691ef8d22 100644 +--- a/gitk-git/po/ca.po ++++ b/gitk-git/po/ca.po +@@ -91,71 +91,71 @@ msgid "Cancel" + msgstr "Cancel·la" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Actualitza" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Recarrega" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Rellegeix les referències" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Llista les referències" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Inicia el git gui" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Surt" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Fitxer" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Preferències" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Edita" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Vista nova..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Edita la vista..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Suprimeix vista" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Tots els fitxers" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Vista" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Quant al gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Associacions de tecles" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Ajuda" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po +index 1a3264b2b002..56c053b98428 100644 +--- a/gitk-git/po/de.po ++++ b/gitk-git/po/de.po +@@ -89,71 +89,71 @@ msgid "Cancel" + msgstr "Abbrechen" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Aktualisieren" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Neu laden" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Zweige neu laden" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Zweige/Markierungen auflisten" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "»git gui« starten" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Beenden" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Datei" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Einstellungen" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Bearbeiten" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Neue Ansicht ..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Ansicht bearbeiten ..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Ansicht entfernen" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Alle Dateien" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Ansicht" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Über gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Tastenkürzel" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Hilfe" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/es.po b/gitk-git/po/es.po +index 6402a411a6e8..ddcb0a5f68dc 100644 +--- a/gitk-git/po/es.po ++++ b/gitk-git/po/es.po +@@ -91,71 +91,71 @@ msgid "Cancel" + msgstr "Cancelar" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Actualizar" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Releer referencias" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Lista de referencias" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Salir" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Archivo" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Preferencias" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Editar" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Nueva vista..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Modificar vista..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Eliminar vista" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Todos los archivos" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Vista" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Acerca de gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Combinaciones de teclas" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Ayuda" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po +index 6b1f05c6b906..80f72fb4535a 100644 +--- a/gitk-git/po/fr.po ++++ b/gitk-git/po/fr.po +@@ -93,71 +93,71 @@ msgid "Cancel" + msgstr "Annuler" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Mise à jour" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Recharger" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Relire les références" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Lister les références" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Démarrer git gui" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Quitter" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Fichier" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Préférences" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Éditer" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Nouvelle vue..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Éditer la vue..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Supprimer la vue" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Tous les fichiers" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Vue" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "À propos de gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Raccourcis clavier" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Aide" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/hu.po b/gitk-git/po/hu.po +index 00023f1cab41..66fd75ba5b16 100644 +--- a/gitk-git/po/hu.po ++++ b/gitk-git/po/hu.po +@@ -88,71 +88,71 @@ msgid "Cancel" + msgstr "Visszavonás" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Frissités" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Újratöltés" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Referenciák újraolvasása" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Referenciák listázása" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Git gui indítása" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Kilépés" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Fájl" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Beállítások" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Szerkesztés" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Új nézet ..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Nézet szerkesztése ..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Nézet törlése" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Minden fájl" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Nézet" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Gitk névjegy" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Billentyűkombináció" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Segítség" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/it.po b/gitk-git/po/it.po +index b8212b17009b..b5f002db7d52 100644 +--- a/gitk-git/po/it.po ++++ b/gitk-git/po/it.po +@@ -89,71 +89,71 @@ msgid "Cancel" + msgstr "Annulla" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Aggiorna" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Ricarica" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Rileggi riferimenti" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Elenca riferimenti" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Avvia git gui" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Esci" + + #: gitk:2068 +-msgid "File" +-msgstr "File" ++msgid "&File" ++msgstr "&File" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Preferenze" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Modifica" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Nuova vista..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Modifica vista..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Elimina vista" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Tutti i file" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Vista" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Informazioni su gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Scorciatoie da tastiera" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Aiuto" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po +index 8bbc67f6b58a..9bbbadd3b427 100644 +--- a/gitk-git/po/ja.po ++++ b/gitk-git/po/ja.po +@@ -90,71 +90,71 @@ msgid "Cancel" + msgstr "キャンセル" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "更新" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "リロード" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "リファレンスを再読み込み" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "リファレンスリストを表示" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "git gui の開始" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "終了" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "ファイル" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "設定" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "編集" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "新規ビュー..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "ビュー編集..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "ビュー削除" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "全てのファイル" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "ビュー" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "gitk について" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "キーバインディング" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "ヘルプ" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/pt_br.po b/gitk-git/po/pt_br.po +index 07e5d63b65cc..3f78f1b74826 100644 +--- a/gitk-git/po/pt_br.po ++++ b/gitk-git/po/pt_br.po +@@ -90,71 +90,71 @@ msgid "Cancel" + msgstr "Cancelar" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Atualizar" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Recarregar" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Ler as referências novamente" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Listar referências" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Iniciar Git GUI" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Sair" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Arquivo" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Preferências" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Editar" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Nova vista..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Editar vista..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Apagar vista" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Todos os arquivos" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Exibir" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Sobre o gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Atalhos de teclado" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Ajuda" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/ru.po b/gitk-git/po/ru.po +index f1bac879e3a6..acd65785be32 100644 +--- a/gitk-git/po/ru.po ++++ b/gitk-git/po/ru.po +@@ -86,71 +86,71 @@ msgid "Cancel" + msgstr "Отмена" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Обновить" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Перечитать" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Обновить список ссылок" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Список ссылок" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Запустить git gui" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Завершить" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Файл" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Настройки" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Редактировать" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Новое представление..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Редактировать представление..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Удалить представление" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Все файлы" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Представление" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "О gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Назначения клавиатуры" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Подсказка" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po +index 0bd46d788101..75317f43965b 100644 +--- a/gitk-git/po/sv.po ++++ b/gitk-git/po/sv.po +@@ -92,71 +92,71 @@ msgid "Cancel" + msgstr "Avbryt" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Uppdatera" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Ladda om" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Läs om referenser" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Visa referenser" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Starta git gui" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Avsluta" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Arkiv" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Inställningar" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Redigera" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Ny vy..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Ändra vy..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Ta bort vy" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Alla filer" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Visa" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Om gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Tangentbordsbindningar" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Hjälp" + + #: gitk:2185 gitk:8652 +diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po +index 7133c422b736..0d0f6f0bcffe 100644 +--- a/gitk-git/po/vi.po ++++ b/gitk-git/po/vi.po +@@ -88,71 +88,71 @@ msgid "Cancel" + msgstr "Thôi" + + #: gitk:2069 +-msgid "Update" ++msgid "&Update" + msgstr "Cập nhật" + + #: gitk:2070 +-msgid "Reload" ++msgid "&Reload" + msgstr "Tải lại" + + #: gitk:2071 +-msgid "Reread references" ++msgid "Reread re&ferences" + msgstr "Đọc lại tham chiếu" + + #: gitk:2072 +-msgid "List references" ++msgid "&List references" + msgstr "Liệt kê các tham chiếu" + + #: gitk:2074 +-msgid "Start git gui" ++msgid "Start git &gui" + msgstr "Khởi chạy git gui" + + #: gitk:2076 +-msgid "Quit" ++msgid "&Quit" + msgstr "Thoát" + + #: gitk:2068 +-msgid "File" ++msgid "&File" + msgstr "Chính" + + #: gitk:2080 +-msgid "Preferences" ++msgid "&Preferences" + msgstr "Cá nhân hóa" + + #: gitk:2079 +-msgid "Edit" ++msgid "&Edit" + msgstr "Chỉnh sửa" + + #: gitk:2084 +-msgid "New view..." ++msgid "&New view..." + msgstr "Thêm trình bày mới..." + + #: gitk:2085 +-msgid "Edit view..." ++msgid "&Edit view..." + msgstr "Sửa cách trình bày..." + + #: gitk:2086 +-msgid "Delete view" ++msgid "&Delete view" + msgstr "Xóa cách trình bày" + + #: gitk:2088 gitk:4043 +-msgid "All files" ++msgid "&All files" + msgstr "Mọi tập tin" + + #: gitk:2083 gitk:4067 +-msgid "View" ++msgid "&View" + msgstr "Trình bày" + + #: gitk:2093 gitk:2103 gitk:3012 +-msgid "About gitk" ++msgid "&About gitk" + msgstr "Giới thiệu về gitk" + + #: gitk:2094 gitk:2108 +-msgid "Key bindings" ++msgid "&Key bindings" + msgstr "Tổ hợp phím" + + #: gitk:2092 gitk:2107 +-msgid "Help" ++msgid "&Help" + msgstr "Trợ giúp" + + #: gitk:2185 gitk:8652 +-- +2.6.1 + diff --git a/0003-gitk-Add-accelerators-to-Japanese-locale.patch b/0003-gitk-Add-accelerators-to-Japanese-locale.patch new file mode 100644 index 0000000..6f33991 --- /dev/null +++ b/0003-gitk-Add-accelerators-to-Japanese-locale.patch @@ -0,0 +1,108 @@ +From def48190211772ca6b5a6b4f2603201be1768bb2 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 20 Oct 2015 14:09:36 +0200 +Subject: [PATCH 3/4] gitk: Add accelerators to Japanese locale + +Just follow the English accelerator keys. + +Signed-off-by: Takashi Iwai +--- + gitk-git/po/ja.po | 34 +++++++++++++++++----------------- + 1 file changed, 17 insertions(+), 17 deletions(-) + +diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po +index 9bbbadd3b427..59e42a89fd7e 100644 +--- a/gitk-git/po/ja.po ++++ b/gitk-git/po/ja.po +@@ -91,71 +91,71 @@ msgstr "キャンセル" + + #: gitk:2069 + msgid "&Update" +-msgstr "更新" ++msgstr "更新(&U)" + + #: gitk:2070 + msgid "&Reload" +-msgstr "リロード" ++msgstr "リロード(&R)" + + #: gitk:2071 + msgid "Reread re&ferences" +-msgstr "リファレンスを再読み込み" ++msgstr "リファレンスを再読み込み(&F)" + + #: gitk:2072 + msgid "&List references" +-msgstr "リファレンスリストを表示" ++msgstr "リファレンスリストを表示(&L)" + + #: gitk:2074 + msgid "Start git &gui" +-msgstr "git gui の開始" ++msgstr "git gui の開始(&G)" + + #: gitk:2076 + msgid "&Quit" +-msgstr "終了" ++msgstr "終了(&Q)" + + #: gitk:2068 + msgid "&File" +-msgstr "ファイル" ++msgstr "ファイル(&F)" + + #: gitk:2080 + msgid "&Preferences" +-msgstr "設定" ++msgstr "設定(&P)" + + #: gitk:2079 + msgid "&Edit" +-msgstr "編集" ++msgstr "編集(&E)" + + #: gitk:2084 + msgid "&New view..." +-msgstr "新規ビュー..." ++msgstr "新規ビュー...(&N)" + + #: gitk:2085 + msgid "&Edit view..." +-msgstr "ビュー編集..." ++msgstr "ビュー編集...(&E)" + + #: gitk:2086 + msgid "&Delete view" +-msgstr "ビュー削除" ++msgstr "ビュー削除(&D)" + + #: gitk:2088 gitk:4043 + msgid "&All files" +-msgstr "全てのファイル" ++msgstr "全てのファイル(&A)" + + #: gitk:2083 gitk:4067 + msgid "&View" +-msgstr "ビュー" ++msgstr "ビュー(&V)" + + #: gitk:2093 gitk:2103 gitk:3012 + msgid "&About gitk" +-msgstr "gitk について" ++msgstr "gitk について(&A)" + + #: gitk:2094 gitk:2108 + msgid "&Key bindings" +-msgstr "キーバインディング" ++msgstr "キーバインディング(&K)" + + #: gitk:2092 gitk:2107 + msgid "&Help" +-msgstr "ヘルプ" ++msgstr "ヘルプ(&H)" + + #: gitk:2185 gitk:8652 + msgid "SHA1 ID:" +-- +2.6.1 + diff --git a/0004-gitk-Add-accelerator-to-German-locale.patch b/0004-gitk-Add-accelerator-to-German-locale.patch new file mode 100644 index 0000000..7a07147 --- /dev/null +++ b/0004-gitk-Add-accelerator-to-German-locale.patch @@ -0,0 +1,118 @@ +From 1c4d07e5f86ae9507e973b50ed28fbaf8eebea67 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 20 Oct 2015 14:21:49 +0200 +Subject: [PATCH 4/4] gitk: Add accelerator to German locale + +Assigned either to the first letter or some unique letter. At least +there are no conflicts, as far as I see... + +Signed-off-by: Takashi Iwai +--- + gitk-git/po/de.po | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po +index 56c053b98428..d9ba4052e20b 100644 +--- a/gitk-git/po/de.po ++++ b/gitk-git/po/de.po +@@ -9,7 +9,7 @@ msgstr "" + "Project-Id-Version: git-gui\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2015-05-17 14:32+1000\n" +-"PO-Revision-Date: 2010-01-27 20:27+0100\n" ++"PO-Revision-Date: 2015-10-20 14:20+0200\n" + "Last-Translator: Christian Stimming \n" + "Language-Team: German\n" + "Language: \n" +@@ -90,71 +90,71 @@ msgstr "Abbrechen" + + #: gitk:2069 + msgid "&Update" +-msgstr "Aktualisieren" ++msgstr "&Aktualisieren" + + #: gitk:2070 + msgid "&Reload" +-msgstr "Neu laden" ++msgstr "&Neu laden" + + #: gitk:2071 + msgid "Reread re&ferences" +-msgstr "Zweige neu laden" ++msgstr "&Zweige neu laden" + + #: gitk:2072 + msgid "&List references" +-msgstr "Zweige/Markierungen auflisten" ++msgstr "Zweige/Markierungen auf&listen" + + #: gitk:2074 + msgid "Start git &gui" +-msgstr "»git gui« starten" ++msgstr "»git &gui« starten" + + #: gitk:2076 + msgid "&Quit" +-msgstr "Beenden" ++msgstr "&Beenden" + + #: gitk:2068 + msgid "&File" +-msgstr "Datei" ++msgstr "&Datei" + + #: gitk:2080 + msgid "&Preferences" +-msgstr "Einstellungen" ++msgstr "&Einstellungen" + + #: gitk:2079 + msgid "&Edit" +-msgstr "Bearbeiten" ++msgstr "&Bearbeiten" + + #: gitk:2084 + msgid "&New view..." +-msgstr "Neue Ansicht ..." ++msgstr "&Neue Ansicht ..." + + #: gitk:2085 + msgid "&Edit view..." +-msgstr "Ansicht bearbeiten ..." ++msgstr "Ansicht &bearbeiten ..." + + #: gitk:2086 + msgid "&Delete view" +-msgstr "Ansicht entfernen" ++msgstr "Ansicht &entfernen" + + #: gitk:2088 gitk:4043 + msgid "&All files" +-msgstr "Alle Dateien" ++msgstr "&Alle Dateien" + + #: gitk:2083 gitk:4067 + msgid "&View" +-msgstr "Ansicht" ++msgstr "&Ansicht" + + #: gitk:2093 gitk:2103 gitk:3012 + msgid "&About gitk" +-msgstr "Über gitk" ++msgstr "Über &gitk" + + #: gitk:2094 gitk:2108 + msgid "&Key bindings" +-msgstr "Tastenkürzel" ++msgstr "&Tastenkürzel" + + #: gitk:2092 gitk:2107 + msgid "&Help" +-msgstr "Hilfe" ++msgstr "&Hilfe" + + #: gitk:2185 gitk:8652 + msgid "SHA1 ID:" +-- +2.6.1 + diff --git a/git.changes b/git.changes index 01f6939..d650c29 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Oct 22 20:27:11 CEST 2015 - tiwai@suse.de + +- Fix crash of gitk with --all option in non-English locales + (bsc#951153): + 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch + 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch + 0003-gitk-Add-accelerators-to-Japanese-locale.patch + 0004-gitk-Add-accelerator-to-German-locale.patch + ------------------------------------------------------------------- Mon Oct 19 08:16:32 UTC 2015 - astieger@suse.com diff --git a/git.spec b/git.spec index feeb504..680a61a 100644 --- a/git.spec +++ b/git.spec @@ -51,6 +51,11 @@ Patch5: git-bash-completion-egrep-color-fix.diff Patch6: git-tcsh-completion-fixes.diff # adapt paths in zsh completion (bnc#853183) Patch7: git-zsh-completion-fixes.diff +# PATCH-FIX-OPENSUSE fixes for gitk crash (bsc#951153) +Patch101: 0001-gitk-Fix-crash-with-all-in-non-English-locales.patch +Patch102: 0002-gitk-Update-msgid-s-for-menu-items-with-accelerator.patch +Patch103: 0003-gitk-Add-accelerators-to-Japanese-locale.patch +Patch104: 0004-gitk-Add-accelerator-to-German-locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2 BuildRequires: asciidoc @@ -236,6 +241,10 @@ directory /git/ that calls the cgi script. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 %build cat > .make <<'EOF'