Commit ca421515 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 f32a1b28
Pipeline #33114 skipped
......@@ -4,7 +4,7 @@
"Description[ar]": "تتيح لك هذه الملحقة استيراد وتصدير متراسلي LDAP.",
"Description[ca@valencia]": "Aquest connector permet importar o exportar els contactes LDAP.",
"Description[ca]": "Aquest connector permet importar o exportar els contactes LDAP.",
"Description[cs]": "Tento modul umožňuje import/export kontakt; LDAP.",
"Description[cs]": "Tento modul umožňuje import/export kontaktů LDAP.",
"Description[de]": "Mit diesem Modul können Sie LDAP-Kontakte importieren oder exportieren.",
"Description[en_GB]": "This plugin allows you to import/export LDAP contacts.",
"Description[es]": "Este complemento le permite importar/exportar contactos LDAP.",
......
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