Commit d9468910 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 b1227ba0
......@@ -12,6 +12,7 @@ Name=Remote
Name[ca]=Remot
Name[ca@valencia]=Remot
Name[cs]=Vzdálené
Name[da]=Ekstern
Name[el]=Απομακρυσμένο
Name[en_GB]=Remote
Name[es]=Remoto
......
......@@ -104,6 +104,7 @@ Comment=System settings options.
Comment[ca]=Opcions de l'arranjament del sistema.
Comment[ca@valencia]=Opcions de l'arranjament del sistema.
Comment[cs]=Možnosti nastavení systému.
Comment[da]=Muligheder for Systemindstillinger.
Comment[el]=Επιλογές ρυθμίσεων συστήματος
Comment[en_GB]=System settings options.
Comment[es]=Opciones de las preferencias del sistema.
......
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