From e92309c802d4ad0dca072811c9162eea460bc18d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Sep 2016 12:50:09 +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"
---
 akonadiconsole/src/org.kde.akonadiconsole.desktop          | 2 --
 korganizer/src/kcmconfigs/korganizer_configplugins.desktop | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/akonadiconsole/src/org.kde.akonadiconsole.desktop b/akonadiconsole/src/org.kde.akonadiconsole.desktop
index 6dab013346..8266653ed3 100755
--- a/akonadiconsole/src/org.kde.akonadiconsole.desktop
+++ b/akonadiconsole/src/org.kde.akonadiconsole.desktop
@@ -26,7 +26,6 @@ Name[ko]=Akonadi 콘솔
 Name[lt]=Akonadi konsolė
 Name[lv]=Anokadi konsole
 Name[mr]=आकोनाडी कंसोल
-Name[nb]=Akonadi-konsoll
 Name[nds]=Akonadi-Konsool
 Name[nl]=Akonadi-console
 Name[pa]=ਅਕੌਂਡੀ ਕਨਸੋਲ
@@ -78,7 +77,6 @@ Comment[ko]=Akonadi 관리 및 디버깅 콘솔
 Comment[lt]=Akonadi tvarkymo ir išriktavimo konsolė
 Comment[lv]=Akonadi pārvaldības un atkļūdošanas konsole
 Comment[mr]=आकोनाडी व्यवस्थापन व डिबगिंग कंसोल
-Comment[nb]=Konsoll for Akonadi administrasjon og feilsøking
 Comment[nds]=Akonadi sien Pleeg- un Fehlersöök-Konsool
 Comment[nl]=Akonadi-beheer en debugging-console
 Comment[pa]=ਅਕੌਂਡੀ ਪਰਬੰਧ ਅਤੇ ਡੀਬੱਗ ਕਨਸੋਲ
diff --git a/korganizer/src/kcmconfigs/korganizer_configplugins.desktop b/korganizer/src/kcmconfigs/korganizer_configplugins.desktop
index 429b0debd8..61c156ffff 100644
--- a/korganizer/src/kcmconfigs/korganizer_configplugins.desktop
+++ b/korganizer/src/kcmconfigs/korganizer_configplugins.desktop
@@ -64,6 +64,7 @@ Name[pt]='Plugins'
 Name[pt_BR]=Plugins
 Name[ro]=Extensii
 Name[ru]=Модули
+Name[se]=Lassemoduvllat
 Name[sk]=Moduly
 Name[sl]=Vstavki
 Name[sr]=Прикључци
-- 
2.11.4.GIT