From f8a19e92da4cb1331a41080d6f69285fbcd14453 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 4 Jun 2016 09:49:09 +0000
Subject: [PATCH] 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"
---
 .../akregator_config_webengineurlinterceptor.desktop     |  2 ++
 kmail/src/data/org.kde.kmail.desktop                     | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/akregator/configuration/akregator_config_webengineurlinterceptor.desktop b/akregator/configuration/akregator_config_webengineurlinterceptor.desktop
index afda209d2f..d266fafbe4 100644
--- a/akregator/configuration/akregator_config_webengineurlinterceptor.desktop
+++ b/akregator/configuration/akregator_config_webengineurlinterceptor.desktop
@@ -14,6 +14,7 @@ Name[ca]=Connectors motor web i interceptor de l'URL
 Name[ca@valencia]=Connectors motor web i interceptor de l'URL
 Name[de]=WebEngine-Module zum Abfangen von Adressen
 Name[nl]=Plug-ins voor webengine voor interceptie van URL's
+Name[pl]=Wtyczki interceptora URL WebEngine
 Name[pt]='Plugins' de Intersecção de URL's do Motor Web
 Name[sk]=Pluginy url interceptora webového enginu
 Name[sv]=Insticksprogram för webbgränssnittets webbadressinfångning
@@ -24,6 +25,7 @@ Comment[ca]=Configura els connectors motor web i interceptor de l'URL
 Comment[ca@valencia]=Configura els connectors motor web i interceptor de l'URL
 Comment[de]=WebEngine-Module zum Abfangen von Adressen einrichten
 Comment[nl]=Plug-ins voor webengine voor interceptie van URL's instellen
+Comment[pl]=Ustaw wtyczki interceptora URL WebEngine
 Comment[pt]=Configurar os 'Plugins' de Intersecção de URL's do Motor Web
 Comment[sk]=Nastaviť pluginy url interceptora webového enginu
 Comment[sv]=Anpassa insticksprogram för webbgränssnittets webbadressinfångning
diff --git a/kmail/src/data/org.kde.kmail.desktop b/kmail/src/data/org.kde.kmail.desktop
index 15025848be..d8a5875271 100755
--- a/kmail/src/data/org.kde.kmail.desktop
+++ b/kmail/src/data/org.kde.kmail.desktop
@@ -195,10 +195,26 @@ Actions=Composer;CheckMail;
 
 [Desktop Action Composer]
 Name=New Message
+Name[ca]=Missatge nou
+Name[de]=Neue Nachricht
+Name[nl]=Nieuw bericht
+Name[pl]=Nowa wiadomość
+Name[pt]=Nova Mensagem
+Name[sv]=Nytt brev
+Name[uk]=Нове повідомлення
+Name[x-test]=xxNew Messagexx
 Icon=mail-message-new
 Exec=kmail --composer
 
 [Desktop Action CheckMail]
 Name=Check Mail
+Name[ca]=Comprova el correu
+Name[de]=Nach E-Mail sehen
+Name[nl]=E-mail controleren
+Name[pl]=Sprawdź pocztę
+Name[pt]=Verificar o Correio
+Name[sv]=Kontrollera brev
+Name[uk]=Перевірити пошту
+Name[x-test]=xxCheck Mailxx
 Icon=mail-receive
 Exec=kmail --check
-- 
2.11.4.GIT