Commit 7634e826 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 2742f786
Pipeline #976 passed with stage
in 12 minutes and 39 seconds
......@@ -94,7 +94,7 @@
"Name[eu]": "Bateriaren monitorea",
"Name[fi]": "Akkuvalvonta",
"Name[fr]": "Moniteur de batterie",
"Name[gl]": "Vixilante da batería",
"Name[gl]": "Monitor da batería",
"Name[hu]": "Akkumulátorfigyelő",
"Name[ia]": "Controlator de batteria",
"Name[id]": "Battery monitor",
......@@ -10,6 +10,7 @@ Name[pt]= Procurar o meu dispositivo
Name[sv]=Hitta min apparat
Name[uk]=Знайти пристрій
Name[x-test]=xx Find my devicexx
Name[zh_TW]= 尋找我的裝置
Comment=Ring connected devices
Comment[ca]=Fa sonar als dispositius connectats
Comment[ca@valencia]=Fa sonar als dispositius connectats
......@@ -21,6 +22,7 @@ Comment[pt]=Tocar os dispositivos ligados
Comment[sv]=Ring anslutna apparater
Comment[uk]=Дзвінок на з'єднаних пристроях
Comment[x-test]=xxRing connected devicesxx
......@@ -10,6 +10,7 @@ Name[pt]=Executar um comando
Name[sv]=Kör kommando
Name[uk]=Виконати команду
Name[x-test]=xxRun commandxx
Comment=Run commands on connected devices
Comment[ca]=Executa les ordres als dispositius connectats
Comment[ca@valencia]=Executa les ordres als dispositius connectats
......@@ -21,6 +22,7 @@ Comment[pt]=Executar comandos nos dispositivos ligados
Comment[sv]=Kör kommando på anslutna apparater
Comment[uk]=Виконання команд на з'єднаних пристроях
Comment[x-test]=xxRun commands on connected 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