From 4cd8943e10d291e4c72f4eba927f867108200d43 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Tue, 8 Dec 2020 14:07:26 -0500 Subject: [PATCH 1/2] Add .desktop translations in .po files --- data/diffuse.desktop.in | 10 ++++++ data/meson.build | 10 ++++++ meson.build | 1 + po/POTFILES.in | 3 ++ src/meson.build | 15 ++++---- src/usr/share/applications/diffuse.desktop | 36 ------------------- ...io.github.mightycreak.Diffuse.metainfo.xml | 4 +-- 7 files changed, 35 insertions(+), 44 deletions(-) create mode 100644 data/diffuse.desktop.in create mode 100644 data/meson.build delete mode 100644 src/usr/share/applications/diffuse.desktop diff --git a/data/diffuse.desktop.in b/data/diffuse.desktop.in new file mode 100644 index 0000000..81a7132 --- /dev/null +++ b/data/diffuse.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Diffuse Merge Tool +Comment=Graphical tool for merging and comparing text files +Exec=diffuse -s %F +Icon=diffuse +Terminal=false +Type=Application +MimeType=text/plain;text/x-csrc;text/x-chdr; +Categories=Development;GTK; +StartupNotify=true diff --git a/data/meson.build b/data/meson.build new file mode 100644 index 0000000..fa85471 --- /dev/null +++ b/data/meson.build @@ -0,0 +1,10 @@ +desktop_file = 'diffuse.desktop' +i18n.merge_file( + desktop_file, + input: desktop_file + '.in', + output: desktop_file, + po_dir: '../po', + install: true, + install_dir: join_paths(datadir, 'applications'), + type: 'desktop' +) diff --git a/meson.build b/meson.build index a23de6c..3a5589e 100644 --- a/meson.build +++ b/meson.build @@ -23,6 +23,7 @@ pkgdatadir = join_paths(datadir, meson.project_name()) podir = join_paths(meson.source_root(), 'po') subdir('po') +subdir('data') subdir('src') meson.add_install_script('build-scripts/meson-postinstall.py') diff --git a/po/POTFILES.in b/po/POTFILES.in index c57c949..a35e8c6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,2 +1,5 @@ # List of source files which contain translatable strings. +# Copyright (C) 2020 Romain Failliot + +data/diffuse.desktop.in src/usr/bin/diffuse.py.in diff --git a/src/meson.build b/src/meson.build index 72e8f97..4657bc4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -26,12 +26,15 @@ configure_file( metainfo_file = join_paths(meson.source_root(), 'src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml') ascli_exe = find_program('appstreamcli', required: false) if ascli_exe.found() - test('validate metainfo file', - ascli_exe, - args: ['validate', - '--no-net', - '--pedantic', - metainfo_file] + test( + 'validate metainfo file', + ascli_exe, + args: [ + 'validate', + '--no-net', + '--pedantic', + metainfo_file + ] ) endif diff --git a/src/usr/share/applications/diffuse.desktop b/src/usr/share/applications/diffuse.desktop deleted file mode 100644 index d22ac4b..0000000 --- a/src/usr/share/applications/diffuse.desktop +++ /dev/null @@ -1,36 +0,0 @@ -[Desktop Entry] -Name=Diffuse Merge Tool -Name[cs]=Diffuse -Name[de]=Diffuse Mischwerkzeug -Name[es]=Diffuse utillaje de textos -Name[it]=Diffuse - strumento di unione -Name[ja]=Diffuse マージツール -Name[ko]=Diffuse 병합도구 -Name[pl]=Diffuse Narzędzie Scalania -Name[pt]=Diffuse Ferramenta de união -Name[ru]=Diffuse Инструмент Слияния -Name[sv]=Diffuse sammanfogningsverktyg -Name[th]=Diffuse - เครื่องมือผสานแฟ้ม -Name[zh_CN]=Diffuse 比较合并工具 -Name[zh_TW]=Diffuse 比較合併工具 -Comment=Graphical tool for merging and comparing text files -Comment[cs]=Grafický nástroj pro slučování a porovnávání textových souborů -Comment[de]=Werkzeug zum Mischen und Vergleichen von Textdateien -Comment[es]=Un utillaje para juntar y comparar archivos de texto -Comment[it]=Strumento grafico per l'unione e il confronto di file -Comment[ja]=テキストファイルをマージして比較するためのグラフィックツール -Comment[ko]=텍스트 파일을 병합하고 비교하기위한 도구 -Comment[pl]=Graficzne narzędzie do łączenia i porównywania plików tekstowych -Comment[pt]=Ferramenta gráfica para unir e comparar ficheiros de texto -Comment[ru]=Графический инструмент для слияния и сравнения текстовых файлов -Comment[sv]=Grafiskt verktyg för jämförelse och sammanfogning av textfiler -Comment[th]=เครื่องมือแบบกราฟิกสำหรับเปรียบเทียบและผสานแฟ้มข้อความ -Comment[zh_CN]=图形化的比较和合并文本文件的工具 -Comment[zh_TW]=比較與合併文字檔案的圖形化工具 -Exec=diffuse -s %F -Icon=diffuse -Terminal=false -Type=Application -MimeType=text/plain;text/x-csrc;text/x-chdr; -Categories=Development;GTK; -StartupNotify=true diff --git a/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml b/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml index 31d9889..86a598f 100644 --- a/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml +++ b/src/usr/share/metainfo/io.github.mightycreak.Diffuse.metainfo.xml @@ -2,8 +2,8 @@ io.github.mightycreak.Diffuse - Diffuse - Graphical merge tool + Diffuse Merge Tool + Graphical tool for merging and comparing text files

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories. From 10e8fb9be6625ac798e68d2c7d5a1ba1326e575b Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Tue, 8 Dec 2020 14:08:43 -0500 Subject: [PATCH 2/2] Update all the PO files --- po/cs.po | 10 +++++++++- po/de.po | 10 +++++++++- po/es.po | 10 +++++++++- po/it.po | 10 +++++++++- po/ja.po | 10 +++++++++- po/ko.po | 10 +++++++++- po/pl.po | 10 +++++++++- po/pt.po | 10 +++++++++- po/ru.po | 10 +++++++++- po/sv.po | 10 +++++++++- po/th.po | 10 +++++++++- po/zh_CN.po | 10 +++++++++- po/zh_TW.po | 10 +++++++++- 13 files changed, 117 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index e39011c..f5dbf73 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Jindřich Šesták \n" "Language-Team: NONE \n" @@ -22,6 +22,14 @@ msgstr "" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Grafický nástroj pro slučování a porovnávání textových souborů" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/de.po b/po/de.po index 2001020..c129e0a 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Henri Menke \n" "Language-Team: German \n" @@ -21,6 +21,14 @@ msgstr "" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse Mischwerkzeug" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Werkzeug zum Mischen und Vergleichen von Textdateien" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/es.po b/po/es.po index 7f5d3fb..07858df 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: David Marín Carreño \n" "Language-Team: Spanish \n" @@ -18,6 +18,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse utillaje de textos" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Un utillaje para juntar y comparar archivos de texto" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/it.po b/po/it.po index b03c5e2..317cefb 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Diffuse 0.4.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Cristian Marchi \n" "Language-Team: Italian\n" @@ -17,6 +17,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse - strumento di unione" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Strumento grafico per l'unione e il confronto di file" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/ja.po b/po/ja.po index 90eb606..137b13b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn r316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Derrick Moser \n" "Language-Team: Japanese\n" @@ -17,6 +17,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse マージツール" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "テキストファイルをマージして比較するためのグラフィックツール" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/ko.po b/po/ko.po index 293c85c..2b816ad 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn r316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Kang Bundo \n" "Language-Team: Korean\n" @@ -17,6 +17,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse 병합도구" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "텍스트 파일을 병합하고 비교하기위한 도구" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/pl.po b/po/pl.po index db108fa..8d3f838 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-0.4.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Miś Uszatek , 2012\n" "Language-Team: Polish \n" @@ -17,6 +17,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse Narzędzie Scalania" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Graficzne narzędzie do łączenia i porównywania plików tekstowych" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/pt.po b/po/pt.po index a035d11..0dd7e7d 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Pedro Albuquerque \n" "Language-Team: Português \n" @@ -22,6 +22,14 @@ msgstr "" "X-Poedit-KeywordsList: _\n" "X-Poedit-SearchPath-0: .\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse Ferramenta de união" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Ferramenta gráfica para unir e comparar ficheiros de texto" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/ru.po b/po/ru.po index df735e9..c8da07f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse-svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Oleg Pakhtusov \n" "Language-Team: Russian \n" @@ -21,6 +21,14 @@ msgstr "" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse Инструмент Слияния" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Графический инструмент для слияния и сравнения текстовых файлов" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/sv.po b/po/sv.po index 3b6d546..2570141 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Åke Engelbrektson \n" "Language-Team: Svenska Språkfiler \n" @@ -18,6 +18,14 @@ msgstr "" "X-Generator: Poedit 1.8.7.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse sammanfogningsverktyg" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "Grafiskt verktyg för jämförelse och sammanfogning av textfiler" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/th.po b/po/th.po index 87a37c4..d7176e8 100644 --- a/po/th.po +++ b/po/th.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse 0.4.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Akom Chotiphantawanon \n" "Language-Team: Thai \n" @@ -18,6 +18,14 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Gtranslator 2.91.6\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse - เครื่องมือผสานแฟ้ม" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "เครื่องมือแบบกราฟิกสำหรับเปรียบเทียบและผสานแฟ้มข้อความ" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1d264fd..e52ae75 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Diffuse svn 316\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: \n" "Language-Team: Chinese (simplified)\n" @@ -17,6 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse 比较合并工具" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "图形化的比较和合并文本文件的工具" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "版权所有" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d49655..c389c4a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: diffuse 0.4.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-12-08 13:04-0500\n" +"POT-Creation-Date: 2020-12-08 13:51-0500\n" "PO-Revision-Date: 2020-06-29 14:49-0400\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -19,6 +19,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: data/diffuse.desktop.in:3 +msgid "Diffuse Merge Tool" +msgstr "Diffuse 比較合併工具" + +#: data/diffuse.desktop.in:4 +msgid "Graphical tool for merging and comparing text files" +msgstr "比較與合併文字檔案的圖形化工具" + #: src/usr/bin/diffuse.py.in:70 msgid "Copyright" msgstr "著作權"