From 1b50d57dc6cfb3c05569d41539a44c1cd5eee790 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 22 Nov 2016 06:12:28 +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 fef6eaa1d..7e5739e75 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -90,6 +90,7 @@ Comment[de]=Einstellungsmodul Comment[en_GB]=Settings Plugins Comment[es]=Preferencias de complementos Comment[et]=Seadistusplugin +Comment[fi]=Asetusliitännäiset Comment[it]=Estensioni per le impostazioni Comment[nl]=Plug-ins voor instellingen Comment[pl]=Wtyczki ustawień @@ -106,6 +107,7 @@ X-KDE-Keywords[de]=KMail,Module X-KDE-Keywords[en_GB]=kmail,plugins X-KDE-Keywords[es]=kmail,complementos X-KDE-Keywords[et]=kmail,pluginad +X-KDE-Keywords[fi]=kmail,liitännäiset X-KDE-Keywords[it]=kmail,estensioni X-KDE-Keywords[nl]=kmail,plug-ins X-KDE-Keywords[pl]=kmail,wtyczki