Commit e41f91ad 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 b77c1123
......@@ -42,6 +42,7 @@ Comment=Add Your Online Accounts
Comment[ca]=Afegiu els vostres comptes en línia
Comment[ca@valencia]=Afegiu els vostres comptes en línia
Comment[cs]=Přidejte svoje účty online
Comment[da]=Tilføj dine onlinekonti
Comment[de]=Fügen Sie Ihre Online-Zugänge hinzu
Comment[en_GB]=Add Your Online Accounts
Comment[es]=Añadir cuentas con conexión
......
......@@ -4,6 +4,7 @@
"Description[ca@valencia]": "Gestor de comptes",
"Description[ca]": "Gestor de comptes",
"Description[cs]": "Správa účtů",
"Description[da]": "Håndtering af konti",
"Description[en_GB]": "Accounts management",
"Description[es]": "Gestión de cuentas",
"Description[et]": "Kontohaldus",
......
......@@ -4,6 +4,7 @@
"Description[ca@valencia]": "Munta comparticions WebDAV amb el KIO",
"Description[ca]": "Munta comparticions WebDAV amb el KIO",
"Description[cs]": "Připojování úložišť WebDAV pomocí KIO",
"Description[da]": "Montér WebDAV-ressourcer med 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",
......@@ -31,6 +32,7 @@
"Name[ca@valencia]": "KIO WebDAV",
"Name[ca]": "KIO WebDAV",
"Name[cs]": "KIO WebDAV",
"Name[da]": "KIO WebDAV",
"Name[en_GB]": "KIO WebDAV",
"Name[es]": "KIO WebDAV",
"Name[et]": "WebDAV-i KIO-moodul",
......
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