From 66d7db7d1c0eaab1b92e3fcf3da55da9d2d67b6c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Mar 2017 05:30:30 +0100 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop index c9a81ad6d..7df23020c 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -87,6 +87,7 @@ Comment=Settings Plugins Comment[ca]=Arranjament dels connectors Comment[ca@valencia]=Arranjament dels connectors Comment[cs]=Moduly Nastavení +Comment[da]=Plugins til indstillinger Comment[de]=Einstellungsmodul Comment[en_GB]=Settings Plugins Comment[es]=Preferencias de complementos @@ -110,6 +111,7 @@ X-KDE-Keywords=kmail,plugins X-KDE-Keywords[ca]=kmail,connectors X-KDE-Keywords[ca@valencia]=kmail,connectors X-KDE-Keywords[cs]=kmail,moduly +X-KDE-Keywords[da]=kmail,plugins X-KDE-Keywords[de]=KMail,Module X-KDE-Keywords[en_GB]=kmail,plugins X-KDE-Keywords[es]=kmail,complementos