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"
8 years ago · 0cb461fc19
parent e0f50b7aa6
commit 0cb461fc19
1 changed files with 1 additions and 0 deletions
--- a/src/data/org.kde.kmail2.desktop
+++ b/src/data/org.kde.kmail2.desktop
@ -198,6 +198,7 @@ Actions=Composer;CheckMail;
 [Desktop Action Composer]
 Name=New Message...
 Name[ca]=Missatge nou...
+Name[ca@valencia]=Missatge nou...
 Name[nl]=Nieuw bericht...
 Name[pt]=Nova Mensagem...
 Name[sl]=Novo sporočilo ...