Commit 7ac713d2 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 052e4de5
......@@ -622,6 +622,7 @@ Name[nn]=Einingsoppsett fullført
Name[pa]=ਡਿਵਾਈਸ ਸੈਟਅੱਪ ਪੂਰਾ ਹੋਇਆ
Name[pt]=Configuração do Dispositivo Terminada
Name[pt_BR]=Configuração do dispositivo concluída
Name[ro]=Configurare dispozitiv încheiată
Name[ru]=Настройка устройства завершена
Name[sk]=Dokončené nastavenie zariadenia
Name[sl]=Nastavitev naprave končana
......@@ -652,6 +653,7 @@ Comment[nn]=Bluetooth-eininga er no ferdig sett opp
Comment[pa]=ਬਲੂਟੁੱਥ ਡਿਵਾਈਸ ਸੈਟਅੱਪ ਕਾਮਯਾਬੀ ਨਾਲ ਪੂਰਾ ਹੋਇਆ
Comment[pt]=A configuração do dispositivo Bluetooth terminou com sucesso
Comment[pt_BR]=A configuração de um dispositivo Bluetooth foi concluída com sucesso
Comment[ro]=Configurarea unui dispozitiv Bluetooth s-a încheiat cu succes
Comment[ru]=Настройка устройства Bluetooth успешно завершена
Comment[sk]=Nastavenie Bluetooth zariadenia sa úspešne dokončilo
Comment[sl]=Nastavite Bluetooth naprave uspešno končana
......
......@@ -57,6 +57,9 @@ Comment[fr]=Gère les périphériques Bluetooth
Comment[ko]=블루투스 장치 관리
Comment[nl]=Bluetooth-apparaten beheren
Comment[pt]=Gerir os dispositivos Bluetooth
Comment[pt_BR]=Gerenciar dispositivos Bluetooth
Comment[ro]=Gestionează dispozitive Bluetooth
Comment[sl]=Upravljaj naprave Bluetooth
Comment[sv]=Hantera Blåtandsenheter
Comment[uk]=Керування пристроями Bluetooth
Comment[x-test]=xxManage bluetooth devicesxx
......
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