Commit d10e382c 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 79e78308
Pipeline #29938 skipped
......@@ -3,6 +3,8 @@
"Description": "This plugin allows you to import/export Windows Contacts.",
"Description[ca@valencia]": "Aquest connector permet importar/exportar els contactes de Windows.",
"Description[ca]": "Aquest connector permet importar/exportar els contactes de Windows.",
"Description[es]": "Este complemento le permite importar/exportar contactos de Windows.",
"Description[fr]": "Ce module externe vous permet d'importer / exporter des contacts « Windows ».",
"Description[nl]": "Deze plug-in stelt u in staat Windows-contactpersonen te importeren/exporteren.",
"Description[pt]": "Este 'plugin' permite-lhe importar/exportar contactos do Windows.",
"Description[sv]": "Insticksprogrammet gör det möjligt att importera och exportera Windows-kontakter.",
......
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