Commit fe02874c 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 da6da3f5
Pipeline #2541 passed with stage
in 12 minutes and 15 seconds
......@@ -2,7 +2,9 @@
Type=Service
Name=Send file via KDE Connect service
Name[ca]=Envia el fitxer a través del servei KDE Connect
Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect
Name[nl]=Bestand via KDE Connect-service versturen
Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect
Name[sv]=Skicka fil via KDE:s anslutningstjänst
Name[uk]=Надіслати файл за допомогою служби KDE Connect
Name[x-test]=xxSend file via KDE Connect servicexx
......@@ -13,6 +15,7 @@ X-KDE-Submenu[ar]=اتّصل,اتصل
X-KDE-Submenu[bg]=Свързване
X-KDE-Submenu[bs]=Uspostavi vezu
X-KDE-Submenu[ca]=Connecta
X-KDE-Submenu[ca@valencia]=Connecta
X-KDE-Submenu[da]=Forbind
X-KDE-Submenu[de]=Verbinden
X-KDE-Submenu[el]=Σύνδεση
......@@ -30,6 +33,7 @@ X-KDE-Submenu[it]=Connetti
X-KDE-Submenu[ko]=연결
X-KDE-Submenu[nl]=Verbinden
X-KDE-Submenu[pl]=Połącz
X-KDE-Submenu[pt]=Connect
X-KDE-Submenu[ru]=KDE Connect
X-KDE-Submenu[sk]=Pripojiť
X-KDE-Submenu[sv]=Anslut
......
[Desktop Entry]
Name=KDE Connect SMS URL Handler
Name[ca]=Gestor d'URL de SMS del KDE Connect
Name[ca@valencia]=Gestor d'URL de SMS del KDE Connect
Name[en_GB]=KDE Connect SMS URL Handler
Name[es]=Controlador de URL de SMS de KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-SMS
......
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