Merge pull request #81 from MightyCreak/fix-translations

Add .desktop translations in .po files
This commit is contained in:
Creak 2020-12-08 14:16:51 -05:00 committed by GitHub
commit 39256ddd86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 152 additions and 57 deletions

10
data/diffuse.desktop.in Normal file
View File

@ -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

10
data/meson.build Normal file
View File

@ -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'
)

View File

@ -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')

View File

@ -1,2 +1,5 @@
# List of source files which contain translatable strings.
# Copyright (C) 2020 Romain Failliot <romain.failliot@foolstep.com>
data/diffuse.desktop.in
src/usr/bin/diffuse.py.in

View File

@ -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 <khagaroth@gmail.com>\n"
"Language-Team: NONE <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 ""

View File

@ -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 <henrimenke4@aim.com>\n"
"Language-Team: German <henrimenke4@aim.com>\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 ""

View File

@ -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 <davefx@gmail.com>\n"
"Language-Team: Spanish <henrimenke4@aim.com>\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 ""

View File

@ -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 <cri.penta@gmail.com>\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 ""

View File

@ -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 <derrick_moser@yahoo.com>\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 ""

View File

@ -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 <bundo@bundo.biz>\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 ""

View File

@ -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 <adres.email@ymail.com>, 2012\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\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 ""

View File

@ -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 <pmra@gmx.com>\n"
"Language-Team: Português <pmra@gmx.com>\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 ""

View File

@ -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 <opakhtusov@gmail.com>\n"
"Language-Team: Russian <opakhtusov@gmail.com>\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 ""

View File

@ -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 <eson@svenskasprakfiler.se>\n"
"Language-Team: Svenska Språkfiler <contactform@svenskasprakfiler.se>\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 ""

View File

@ -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 <knight2000@gmail.com>\n"
"Language-Team: Thai <thai-l10n@googlegroups.com>\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 ""

View File

@ -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: <jarryson@gmail.com>\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 "版权所有"

View File

@ -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 <bluebat@member.fsf.org>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\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 "著作權"

View File

@ -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

View File

@ -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

View File

@ -2,8 +2,8 @@
<component type="desktop-application">
<id>io.github.mightycreak.Diffuse</id>
<name>Diffuse</name>
<summary>Graphical merge tool</summary>
<name>Diffuse Merge Tool</name>
<summary>Graphical tool for merging and comparing text files</summary>
<description>
<p>
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.