Commit ff7b0374 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 b58419fb
......@@ -9,6 +9,7 @@ Name[de]=Uhr
Name[el]=Ρολόι
Name[en_GB]=Clock
Name[es]=Reloj
Name[fr]=Horloge
Name[gl]=Reloxo
Name[it]=Orologio
Name[nl]=Klok
......
......@@ -8,6 +8,7 @@ Name[cs]=Rychlé nastavení
Name[de]=Schnelleinstellungen
Name[en_GB]=Quick Settings
Name[es]=Ajustes rápidos
Name[fr]=Paramètres rapides
Name[gl]=Configuración rápida
Name[it]=Impostazioni rapide
Name[nl]=Snelle instellingen
......
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