Commit b68c82a8 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 6d56f6a9
Pipeline #5187 passed with stage
in 8 minutes and 58 seconds
......@@ -18,6 +18,7 @@ Name[nn]=Send fil med KDE Connect-tenesta
Name[pl]=Wyślij plik przez usługę KDE Connect
Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect
Name[pt_BR]=Enviar arquivo via serviço do KDE Connect
Name[sk]=Poslať súbor cez KDE Connect
Name[sv]=Skicka fil via KDE:s anslutningstjänst
Name[uk]=Надіслати файл за допомогою служби KDE Connect
Name[x-test]=xxSend file via KDE Connect servicexx
......
......@@ -53,6 +53,7 @@
"Name[pl]": "Przedstawiający",
"Name[pt]": "Apresentação",
"Name[pt_BR]": "Apresentação",
"Name[sk]": "Prezentér",
"Name[sv]": "Presentatör",
"Name[uk]": "Презентатор",
"Name[x-test]": "xxPresenterxx",
......
......@@ -59,6 +59,7 @@
"Description[pl]": "Powiadamiaj o przychodzących rozmowach",
"Description[pt]": "Mostrar notificações para as chamadas recebidas",
"Description[pt_BR]": "Mostra notificações para chamadas recebidas",
"Description[sk]": "Zobraziť oznámenia pre prichádzajúce hovory",
"Description[sv]": "Visa underrättelser om inkommande samtal",
"Description[uk]": "Показ сповіщень щодо вхідних дзвінків",
"Description[x-test]": "xxShow notifications for incoming callsxx",
......
......@@ -13,6 +13,7 @@ Name[nn]=SMS-URL-handsamar for KDE Connect
Name[pl]=KDE Connect - obsługa URL SMSów
Name[pt]=Tratamento de URL's de SMS do KDE Connect
Name[pt_BR]=Tratamento de URLs de SMS do KDE Connect
Name[sk]=Spracovateľ KDE Connect SMS URL
Name[sv]=KDE-anslut hanterare av SMS-webbadress
Name[uk]=Обробник адрес у SMS KDE Connect
Name[x-test]=xxKDE Connect SMS URL Handlerxx
......
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