From dd641f9caee77a66e22c3446b9dde307291238a5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 4 Aug 2019 05:16:47 +0200
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"
---
 .../org.kde.kmail-refresh-settings.desktop                  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop
index 3ad272e78..ad6608e2e 100755
--- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop
+++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=KMail Refresh Settings
 Name[ca]=Actualització dels ajustaments del KMail
+Name[en_GB]=KMail Refresh Settings
 Name[es]=Preferencias de refresco de KMail
 Name[fi]=KMailin asetusten virkistys
+Name[fr]=Rafraîchissement des paramètres de KMail
 Name[it]=Rinnovo delle impostazioni di KMail
 Name[nl]=Vernieuwen van instellingen van KMail
 Name[pl]=Odświeżanie ustawień KMaila
@@ -18,8 +20,10 @@ Icon=kmail
 X-DocPath=kmail2/index.html
 GenericName=KMail refresh settings
 GenericName[ca]=Actualització dels ajustaments del KMail
+GenericName[en_GB]=KMail refresh settings
 GenericName[es]=Preferencias de refresco de KMail
 GenericName[fi]=KMailin asetusten virkistys
+GenericName[fr]=Rafraîchissement des paramètres de KMail
 GenericName[it]=Rinnovo delle impostazioni di KMail
 GenericName[nl]=Instellingen van vernieuwen KMail
 GenericName[pl]=Odświeżanie ustawień KMaila
@@ -31,8 +35,10 @@ GenericName[uk]=Оновити параметри KMail
 GenericName[x-test]=xxKMail refresh settingsxx
 Comment=Refresh KMail settings
 Comment[ca]=Actualitza els ajustaments del KMail
+Comment[en_GB]=Refresh KMail settings
 Comment[es]=Refrescar preferencias de KMail
 Comment[fi]=Virkistä KMail-asetukset
+Comment[fr]=Rafraîchir les paramètres de KMail
 Comment[it]=Rinnova le impostazioni di KMail
 Comment[nl]=KMail-instellingen vernieuwen
 Comment[pl]=Ustawienia odświeżania KMaila