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 · 8a4065fcd0
parent 542d405220
commit 8a4065fcd0
1 changed files with 7 additions and 0 deletions
--- a/src/data/org.kde.kmail2.desktop
+++ b/src/data/org.kde.kmail2.desktop
@ -197,6 +197,13 @@ Actions=Composer;CheckMail;

 [Desktop Action Composer]
 Name=New Message...
+Name[ca]=Missatge nou...
+Name[nl]=Nieuw bericht...
+Name[pt]=Nova Mensagem...
+Name[sl]=Novo sporočilo ...
+Name[sv]=Nytt brev...
+Name[uk]=Нове повідомлення…
+Name[x-test]=xxNew Message...xx
 Icon=mail-message-new
 Exec=kmail --composer