Commit 7ec2662a 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 81e8d3a7
Pipeline #8249 passed with stage
in 8 minutes and 53 seconds
......@@ -23,7 +23,7 @@ Name[pl]=Wskaźnik KDE Connect
Name[pt]=Indicador do KDE Connect
Name[pt_BR]=Indicador do KDE Connect
Name[ru]=Индикатор KDE Connect
Name[sk]=Ukozaovateľ KDE Connect
Name[sk]=Ukazovateľ KDE Connect
Name[sr]=КДЕ‑конекцијин показатељ
Name[sr@ijekavian]=КДЕ‑конекцијин показатељ
Name[sr@ijekavianlatin]=KDE‑konekcijin pokazatelj
......
......@@ -239,7 +239,7 @@ Comment[pt]=Alguém está a ligar-lhe
Comment[pt_BR]=Alguém está chamando você
Comment[ro]=Cineva vă apelează
Comment[ru]=Вам кто-то звонит
Comment[sk]=Niekto vám volá
Comment[sk]=Niekto Vám volá
Comment[sr]=Неко вас зове
Comment[sr@ijekavian]=Неко вас зове
Comment[sr@ijekavianlatin]=Neko vas zove
......
......@@ -18,7 +18,7 @@ Name[pl]=Znajdywanie mojego urządzenia
Name[pt]= Procurar o meu dispositivo
Name[pt_BR]= Localizar meu dispositivo
Name[ru]= Найти устройство
Name[sk]=Nájsť moje zariadenie
Name[sk]= Nájsť moje zariadenie
Name[sv]=Hitta min apparat
Name[uk]=Знайти пристрій
Name[x-test]=xx Find my devicexx
......
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