Commit 3eb7dd24 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 1a3fdc84
......@@ -5,6 +5,7 @@ X-KDE-Library=tenscripts
X-Python-2-Compatible=false
Name=Ten Scripts
Name[ca]=Deu scripts
Name[ca@valencia]=Deu scripts
Name[en_GB]=Ten Scripts
Name[nl]=Tien scripts
Name[pt]=Dez Programas
......@@ -13,6 +14,7 @@ Name[uk]=Десять скриптів
Name[x-test]=xxTen Scriptsxx
Comment=A Python-based plugin for creating ten actions and assign them to Python scripts
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[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
......
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