Commit 9d2c006a authored by Script Kiddy's avatar Script Kiddy
Browse files

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 28bf5354
......@@ -545,6 +545,7 @@ Name=Device Setup Finished
Name[ca]=Ha finalitzat la configuració del dispositiu
Name[cs]=Nastavení zařízení dokončeno
Name[da]=Opsætning af enhed gennemført
Name[en_GB]=Device Setup Finished
Name[es]=Configuración del dispositivo terminada
Name[et]=Seadme seadistamine on lõpetatud
Name[eu]=Gailua ezartzea burutu da
......@@ -568,6 +569,7 @@ Comment=Setting up a Bluetooth device finished successfully
Comment[ca]=La configuració del dispositiu Bluetooth ha finalitzat correctament
Comment[cs]=Nastavení zařízení bylo úspěšně dokončeno
Comment[da]=Opsætningen af en Bluetooth-enhed blev gennemført
Comment[en_GB]=Setting up a Bluetooth device finished successfully
Comment[es]=La configuración de un dispositivo Bluetooth ha terminado con éxito
Comment[et]=Bluetoothi seadme seadistamine lõpetati edukalt
Comment[eu]=Bluetooth gailu bat ezartzea ondo burutu da
......
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