From d0eb91660e18b6fe00879ee1dadd6dd63ca5a6fc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 23 Feb 2017 06:19:39 +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 34f343bc1..c9a81ad6d 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -86,6 +86,7 @@ Name[zh_TW]=外掛程式 Comment=Settings Plugins Comment[ca]=Arranjament dels connectors Comment[ca@valencia]=Arranjament dels connectors +Comment[cs]=Moduly Nastavení Comment[de]=Einstellungsmodul Comment[en_GB]=Settings Plugins Comment[es]=Preferencias de complementos @@ -108,6 +109,7 @@ Comment[zh_CN]=设置插件 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[de]=KMail,Module X-KDE-Keywords[en_GB]=kmail,plugins X-KDE-Keywords[es]=kmail,complementos