From 23fe603d7f22103f4bd260f7afa15e965a505ed2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Sep 2016 09:36:30 +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" --- src/data/kmail_config_plugins.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop index 200c740d2..9b81ee8d1 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -94,6 +94,7 @@ Comment[x-test]=xxSettings Pluginsxx X-KDE-Keywords=kmail,plugins X-KDE-Keywords[ca]=kmail,connectors X-KDE-Keywords[ca@valencia]=kmail,connectors +X-KDE-Keywords[de]=KMail,Module X-KDE-Keywords[et]=kmail,pluginad X-KDE-Keywords[nl]=kmail,plug-ins X-KDE-Keywords[pl]=kmail,wtyczki