Commit 959be95b 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 2caefef2
Pipeline #79366 skipped
[KNewStuff3]
Name=KMail Header Theme
Name[ca]=Tema de capçalera del KMail
Name[ca@valencia]=Tema de capçalera per al KMail
Name[ca@valencia]=Tema de capçalera del KMail
Name[cs]=Motiv hlavičky KMailu
Name[da]=KMail header-tema
Name[de]=KMail-Vorspanndesign
......
......@@ -2,7 +2,7 @@
"KPlugin": {
"Description": "This plugin provides a default Grantlee mail header.",
"Description[ar]": "توفّر هذه الملحقة ترويسة بريد «غرانتلي» مبدئيّة.",
"Description[ca@valencia]": "Aquest connector proporciona una capçalera «Grantlee» predeterminada per al correu.",
"Description[ca@valencia]": "Aquest connector proporciona una capçalera «Grantlee» predeterminada de correu.",
"Description[ca]": "Aquest connector proporciona una capçalera «Grantlee» predeterminada de correu.",
"Description[cs]": "Tento modul poskytuje výchozí hlavičku e-mailu Grantlee.",
"Description[da]": "Dette plugin leverer en standard Grantlee-mail-header.",
......
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