Commit aaeaf38f 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 fd4b9897
Pipeline #30058 skipped
......@@ -7,12 +7,18 @@
"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[pt_BR]": "Este plugin permite a você importar/exportar contatos 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 Windows Contact",
"Name[ca]": "Importa/exporta un Contact del Windows",
"Name[nl]": "Windowscontactpersoon importeren/exporteren",
"Name[pt_BR]": "Importação/Exportação de contatos do Windows",
"Name[sv]": "Importera och exportera Windows-kontakter",
"Name[x-test]": "xxImport/Export Windows Contactxx",
"ServiceTypes": [
"KAddressBook/ImportExportPlugin"
],
......
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