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 · 1a4dc1f03a
parent b85e8ef6ab
commit 1a4dc1f03a
1 changed files with 2 additions and 0 deletions
--- a/src/data/org.kde.kmail2.desktop
+++ b/src/data/org.kde.kmail2.desktop
@ -199,8 +199,10 @@ Actions=Composer;CheckMail;
 Name=New Message...
 Name[ca]=Missatge nou...
 Name[ca@valencia]=Missatge nou...
+Name[es]=Nuevo mensaje...
 Name[it]=Nuovo messaggio...
 Name[nl]=Nieuw bericht...
+Name[pl]=Nowa wiadomość...
 Name[pt]=Nova Mensagem...
 Name[sl]=Novo sporočilo ...
 Name[sv]=Nytt brev...