Commit 20bc389d 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 7bd27041
Pipeline #31166 skipped
......@@ -8,6 +8,7 @@
"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[sl]": "Ta vstavek omogoča uvoz/izvoz stikov Windows Contacts.",
"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",
......@@ -21,6 +22,7 @@
"Name[nl]": "Windowscontactpersoon importeren/exporteren",
"Name[pt]": "Importação/Exportação do Contacto do Windows",
"Name[pt_BR]": "Importação/Exportação de contatos do Windows",
"Name[sl]": "Uvozi/izvozi stike Windows Contact",
"Name[sv]": "Importera och exportera Windows-kontakter",
"Name[uk]": "Імпортування та експортування записів контактів Windows",
"Name[x-test]": "xxImport/Export Windows Contactxx",
......
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