Commit dd134e98 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 f63db12b
......@@ -7,6 +7,7 @@ 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[es]=Importador de complementos de Python
Name[gl]=Importador de complementos de Python
Name[nl]=Importeur van Plugin voor Python
Name[pl]=Import wtyczek Pythona
......@@ -18,6 +19,7 @@ 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[es]=Importa complementos de Python desde archivos 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.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment