Commit ef73ce6f 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 198789e6
Pipeline #27946 skipped
......@@ -7,6 +7,7 @@
"Name[ca@valencia]": "Aditya Mehra",
"Name[ca]": "Aditya Mehra",
"Name[cs]": "Aditya Mehra",
"Name[da]": "Aditya Mehra",
"Name[en_GB]": "Aditya Mehra",
"Name[es]": "Aditya Mehra",
"Name[et]": "Aditya Mehra",
......@@ -31,6 +32,7 @@
"Description[ca@valencia]": "Connector de la Bigscreen",
"Description[ca]": "Connector de la Bigscreen",
"Description[cs]": "Modul pro velkou obrazovku",
"Description[da]": "Plugin til storskærm",
"Description[en_GB]": "Bigscreen Plugin",
"Description[es]": "Complemento Bigscreen",
"Description[et]": "Suurekraani plugin",
......@@ -57,6 +59,7 @@
"Name[ca@valencia]": "Bigscreen",
"Name[ca]": "Bigscreen",
"Name[cs]": "Velká obrazovka",
"Name[da]": "Storskærm",
"Name[en_GB]": "Bigscreen",
"Name[es]": "Bigscreen",
"Name[et]": "Suurekraan",
......@@ -3,6 +3,7 @@ Name=KDE Connect URL Handler
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[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