Commit 6cc2a407 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 21579ff8
......@@ -7,6 +7,7 @@ Name=Ten Scripts
Name[ca]=Deu scripts
Name[ca@valencia]=Deu scripts
Name[en_GB]=Ten Scripts
Name[es]=Diez guiones
Name[nl]=Tien scripts
Name[pt]=Dez Programas
Name[sv]=Tio skript
......@@ -16,6 +17,7 @@ Comment=A Python-based plugin for creating ten actions and assign them to Python
Comment[ca]=Un connector basant en el Python per crear deu accions i assignar-les a scripts del Python
Comment[ca@valencia]=Un connector basant en el Python per crear deu accions i assignar-les a scripts del Python
Comment[en_GB]=A Python-based plugin for creating ten actions and assign them to Python scripts
Comment[es]=Un complemento basado en Python para crear diez acciones y asignarlas a guiones de Python
Comment[nl]=Een op Python gebaseerde plug-in voor aanmaken van tien acties en ze dan toewijzen aan Python-scripts
Comment[pt]=Um 'plugin' feito em Python para criar dez acções e atribuí-las a programas em Python
Comment[sv]=Ett Python-baserat insticksprogram för att skapa tio åtgärder och tilldela dem till Python-skript
......
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