Commit e3465e91 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 188014b2
......@@ -9,6 +9,7 @@ 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[it]=Importatore estensioni Python
Name[nl]=Importeur van Plugin voor Python
Name[pl]=Import wtyczek Pythona
Name[pt]=Importador de 'Plugins' do Python
......@@ -21,6 +22,7 @@ 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[it]=Importa le estensioni Python dai file compressi.
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.
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