Commit 52cec6f8 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 b7abfee5
Pipeline #30220 skipped
...@@ -14,8 +14,10 @@ ...@@ -14,8 +14,10 @@
"EnabledByDefault": "true", "EnabledByDefault": "true",
"Id": "kaddressbookimportexportwindowscontact", "Id": "kaddressbookimportexportwindowscontact",
"Name": "Import/Export Windows Contact", "Name": "Import/Export Windows Contact",
"Name[ca@valencia]": "Importa/exporta un Contact del Windows",
"Name[ca]": "Importa/exporta un Contact del Windows", "Name[ca]": "Importa/exporta un Contact del Windows",
"Name[nl]": "Windowscontactpersoon importeren/exporteren", "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[pt_BR]": "Importação/Exportação de contatos do Windows",
"Name[sv]": "Importera och exportera Windows-kontakter", "Name[sv]": "Importera och exportera Windows-kontakter",
"Name[uk]": "Імпортування та експортування записів контактів Windows", "Name[uk]": "Імпортування та експортування записів контактів Windows",
......
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