Commit 120218b7 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 bf089f34
Pipeline #35508 skipped
......@@ -42,6 +42,7 @@
"Name[ca]": "Envia el fitxer a través del KDE Connect",
"Name[cs]": "Poslat soubor přes KDE Connect",
"Name[da]": "Send fil via KDE Connect",
"Name[de]": "Datei mit KDE Connect versenden",
"Name[en_GB]": "Send file via KDE Connect",
"Name[es]": "Enviar archivo con KDE Connect",
"Name[et]": "Faili saatmine KDE Connecti kaudu",
......@@ -9,6 +9,7 @@
"Name[ca]": "Aditya Mehra",
"Name[cs]": "Aditya Mehra",
"Name[da]": "Aditya Mehra",
"Name[de]": "Aditya Mehra",
"Name[en_GB]": "Aditya Mehra",
"Name[es]": "Aditya Mehra",
"Name[et]": "Aditya Mehra",
......@@ -82,7 +82,7 @@
"Name[ca]": "Troba aquest dispositiu",
"Name[cs]": "Najít toto zařízení",
"Name[da]": "Find denne enhed",
"Name[de]": "Diese Gerät suchen",
"Name[de]": "Dieses Gerät suchen",
"Name[en_GB]": "Find this device",
"Name[es]": "Encontrar este dispositivo",
"Name[et]": "Seadme leidmine",
......@@ -11,7 +11,7 @@ Name[ca]=Arranjament del KDE Connect
Name[ca@valencia]=Arranjament del KDE Connect
Name[cs]=Nastavení KDE Connect
Name[da]=Indstilling af KDE Connect
Name[de]=KDE Connect-Einstellungen
Name[el]=Ρυθμίσεις KDE Connect
Name[en_GB]=KDE Connect Settings
Name[es]=Ajustes de KDE Connect
......@@ -6,7 +6,7 @@ Name[ca]=SMS del KDE Connect
Name[ca@valencia]=SMS del KDE Connect
Name[cs]=KDE Connect SMS
Name[da]=KDE Connect SMS
Name[de]=KDE Connect-SMS
Name[en_GB]=KDE Connect SMS
Name[es]=SMS de KDE Connect
Name[et]=KDE Connecti SMS
......@@ -5,6 +5,7 @@ Name[ca]=Gestor d'URL del KDE Connect
Name[ca@valencia]=Gestor d'URL del KDE Connect
Name[cs]=Nástroj pro práci s URL v KDE Connect
Name[da]=URL-håndtering til KDE Connect
Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen)
Name[en_GB]=KDE Connect URL Handler
Name[es]=Controlador de URL de KDE Connect
Name[et]=KDE Connecti URL-ide käitleja
Supports Markdown
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