Commit 5870efcf authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 1712da28
......@@ -7,18 +7,22 @@ X-Krita-Manual=manual.html
Name=Python Plugin Importer
Name[ca]=Importador de connectors del Python
Name[ca@valencia]=Importador de connectors del Python
Name[gl]=Importador de complementos de Python
Name[nl]=Importeur van Plugin voor Python
Name[pl]=Import wtyczek Pythona
Name[pt]=Importador de 'Plugins' do Python
Name[sv]=Python-insticksimport
Name[uk]=Засіб імпортування додатків Python
Name[x-test]=xxPython Plugin Importerxx
Name[zh_CN]=Python 插件导入器
Comment=Imports Python plugins from zip files.
Comment[ca]=Importa connectors del Python a partir de fitxers «zip».
Comment[ca@valencia]=Importa connectors del Python a partir de fitxers «zip».
Comment[gl]=Importa complementos de Python de ficheiros zip.
Comment[nl]=Importeert Python-plug-ins uit zip-bestanden.
Comment[pl]=Importuj wtyczki Pythona z plików zip.
Comment[pt]=Importa os 'plugins' em Python a partir de ficheiros Zip.
Comment[sv]=Importerar Python-insticksprogram från zip-filer.
Comment[uk]=Імпортує додатки Python з файлів zip.
Comment[x-test]=xxImports Python plugins from zip files.xx
Comment[zh_CN]=从 zip 文件导入 Python 插件。
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment