Commit 6b015c8b 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 8bfefad0
Pipeline #29688 skipped
{
"KPlugin": {
"Description": "This plugin allows you to import/export Windows Contacts.",
"Description[ca@valencia]": "Aquest connector permet importar/exportar els contactes del Windows.",
"Description[ca]": "Aquest connector permet importar/exportar els contactes del 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.",
"Description[uk]": "За допомогою цього додатка можна імпортувати та експортувати дані у форматі записів контактів Windows.",
"Description[x-test]": "xxThis plugin allows you to import/export Windows Contacts.xx",
"EnabledByDefault": "true",
"Id": "kaddressbookimportexportwindowscontact",
"Name": "Import/Export CSV",
......
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