Commit 624268ec 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 ad64198b
......@@ -4,6 +4,7 @@
"Description[ca@valencia]": "Gestor de comptes",
"Description[ca]": "Gestor de comptes",
"Description[cs]": "Správa účtů",
"Description[en_GB]": "Accounts management",
"Description[es]": "Gestión de cuentas",
"Description[et]": "Kontohaldus",
"Description[eu]": "Kontu kudeaketa",
......@@ -23,6 +24,7 @@
"Name[ca@valencia]": "Comptes",
"Name[ca]": "Comptes",
"Name[cs]": "Účty",
"Name[en_GB]": "Accounts",
"Name[es]": "Cuentas",
"Name[et]": "Kontod",
"Name[eu]": "Kontuak",
......
......@@ -3,6 +3,7 @@
"Description": "Mount WebDAV shares with KIO",
"Description[ca@valencia]": "Munta comparticions WebDAV amb el KIO",
"Description[ca]": "Munta comparticions WebDAV amb el KIO",
"Description[en_GB]": "Mount WebDAV shares with KIO",
"Description[es]": "Montar recursos compartidos WebDAV con KIO",
"Description[et]": "WebDAV-i jagatud ressursside ühendamine KIO-mooduli abil",
"Description[eu]": "Muntatu WebDAV partekatzeak KIO erabiliz",
......@@ -23,6 +24,7 @@
"Name": "KIO WebDAV",
"Name[ca@valencia]": "KIO WebDAV",
"Name[ca]": "KIO WebDAV",
"Name[en_GB]": "KIO WebDAV",
"Name[es]": "KIO WebDAV",
"Name[et]": "WebDAV-i KIO-moodul",
"Name[eu]": "KIO WebDAV",
......
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