Commit 343a39b2 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 40ae15f1
......@@ -4,6 +4,7 @@
"Description[ca@valencia]": "Integra el KIO del GDrive",
"Description[ca]": "Integra el KIO del GDrive",
"Description[cs]": "Integrovat KIO gdrive",
"Description[da]": "Integrér KIO gdrive",
"Description[en_GB]": "Integrate KIO gdrive",
"Description[es]": "Integra KIO gdrive",
"Description[et]": "KIO GDrive'i lõimimine",
......
......@@ -9,6 +9,7 @@
"Name[ca@valencia]": "Acció «Copia l'URL de Google al porta-retalls»",
"Name[ca]": "Acció «Copia l'URL de Google al porta-retalls»",
"Name[cs]": "Činnost 'Kopírovat URL Google do schránky'",
"Name[da]": "Handlingen \"Kopiér Google-URL til udklipsholder\"",
"Name[de]": "Aktion „Google-URL in die Zwischenablage kopieren“",
"Name[en_GB]": "'Copy Google URL to clipboard' action",
"Name[es]": "Acción «Copiar URL de Google en el portapapeles»",
......
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