Commit ecabdc7f 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 61010a5e
......@@ -29,7 +29,7 @@ Name[gl]=Configuración avanzada
Name[he]=הגדרות מתקדמות
Name[hu]=Speciális beállítások
Name[ia]=Preferentias Avantiate
Name[id]=Setelan Lanjutan
Name[id]=Setelan Tingkatlanjut
Name[it]=Impostazioni avanzate
Name[ko]=고급 설정
Name[lt]=Išsamesni nustatymai
......@@ -72,7 +72,7 @@ Comment[gl]=Configuración avanzada de Bluetooth
Comment[he]=הגדרות בלוטוס מתקדמות
Comment[hu]=Speciális Bluetooth beállítások
Comment[ia]=Preferentias Avantiate de Bluetooth
Comment[id]=Setelan Lanjutan Bluetooth
Comment[id]=Setelan Tingkatlanjut Bluetooth
Comment[it]=Impostazioni avanzate del Bluetooth
Comment[ko]=고급 블루투스 설정
Comment[lt]=Išsamesni Bluetooth nustatymai
......
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