Commit f532c064 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 aa7a1b89
Pipeline #34540 skipped
......@@ -6,6 +6,7 @@
"Description[cs]": "Tento modul umožňuje import/export kontaktů 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[it]": "Questa estensione permette di importare ed esportare contatti di Windows.",
"Description[ko]": "이 플러그인은 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.",
......@@ -22,6 +23,7 @@
"Name[cs]": "Importovat/Exportovat kontakty Windows",
"Name[es]": "Importar/Exportar contactos de Windows",
"Name[fr]": "Import / export de contacts « Windows »",
"Name[it]": "Importa/esporta contatti di Windows",
"Name[ko]": "Windows 연락처 가져오기/내보내기",
"Name[nl]": "Windowscontactpersoon importeren/exporteren",
"Name[pt]": "Importação/Exportação do Contacto do 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