diff --git a/korganizer/plugins/lunarphases/lunarphases.desktop b/korganizer/plugins/lunarphases/lunarphases.desktop
index e8665d73..6055baed 100644
--- a/korganizer/plugins/lunarphases/lunarphases.desktop
+++ b/korganizer/plugins/lunarphases/lunarphases.desktop
@@ -1,37 +1,39 @@
 [Desktop Entry]
 X-KDE-Library=korg_lunarphases
 Name=Lunar Phases Plugin for Calendars
 Name[ca]=Connector de fases lunars pels calendaris
 Name[ca@valencia]=Connector de fases lunars pels calendaris
 Name[cs]=Modul pro lunární fáze v kalendáři
 Name[de]=Mondphasen-Modul für Kalender
 Name[en_GB]=Lunar Phases Plugin for Calendars
 Name[es]=Complemento de fases de la luna para calendarios
 Name[fr]=Module de phases lunaires pour les agendas
+Name[gl]=Complemento para as fases lunares para os calendarios
 Name[it]=Estensione fasi lunari per i calendari
 Name[nl]=Plug-in voor maanfasen voor kalenders
 Name[pt]='Plugin' de Fases da Lua para os Calendários
 Name[sv]=Månfasinsticksprogram för kalendrar
 Name[uk]=Додаток фаз місяця для календарів
 Name[x-test]=xxLunar Phases Plugin for Calendarsxx
 Name[zh_CN]=日历的月相插件
 Name[zh_TW]=適用於行事曆的月相附加元件
 Comment=This plugin shows the day's lunar phase (New, First, Last, Full)
 Comment[ca]=Aquest connector mostra la fase lunar del dia (Nova, Creixent, Plena, Minvant)
 Comment[ca@valencia]=Aquest connector mostra la fase lunar del dia (Nova, Creixent, Plena, Minvant)
 Comment[de]=Dieses Modul zeigt die Mondphasen (Neumond, Erstes Viertel, Letztes Viertel, Vollmond)
 Comment[en_GB]=This plugin shows the day's lunar phase (New, First, Last, Full)
 Comment[es]=Este complemento muestra el día de la fase de la luna (nueva, creciente, menguante, llena)
 Comment[fr]=Ce module affiche la phase lunaire des jours (nouvelle lune, premier quartier, pleine lune, dernier quartier)
+Comment[gl]=O complemento mostra a fase lunar do día (lúa nova, cuarto crecente, lúa chea, cuarto minguante).
 Comment[it]=Questa estensione mostra la fase lunare del giorno (nuova, primo quarto, ultimo quarto, piena)
 Comment[nl]=Deze plug-in toont de maanfase van de dag (Nieuwe, Eerste, Laatste, Volle)
 Comment[pt]=Este 'plugin' mostra a fase da Lua do dia (Nova, Minguante, Crescente, Cheia)
 Comment[sv]=Insticksprogrammet visar dagens månfas (ny, första, sista, full)
 Comment[uk]=Цей додаток показує фазу місяця (новий, перша чверть, остання чверть, повня)
 Comment[x-test]=xxThis plugin shows the day's lunar phase (New, First, Last, Full)xx
 Comment[zh_CN]=这个插件显示每日的月相（新月、弦月、盈凸月、满月）
 Comment[zh_TW]=這個附加元件展示了這一天的月相（新月、上弦月、下弦月、滿月）
 Type=Service
 X-KDE-ServiceTypes=Calendar/Plugin,Calendar/Decoration
 X-KDE-KOrganizer-HasSettings=false
 X-KDE-PluginInterfaceVersion=2
diff --git a/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp b/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
index 66304453..51cb1be9 100644
--- a/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
+++ b/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleinterface.cpp
@@ -1,66 +1,66 @@
 /*
    Copyright (C) 2015-2018 Montel Laurent <montel@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "grantleeheaderstyleinterface.h"
 #include "messageviewer/headerstyleplugin.h"
 #include "messageviewer/headerstyle.h"
 #include <grantleetheme/grantleethememanager.h>
 #include <KToggleAction>
 
 using namespace MessageViewer;
 GrantleeHeaderStyleInterface::GrantleeHeaderStyleInterface(MessageViewer::HeaderStylePlugin *plugin, QObject *parent)
     : MessageViewer::HeaderStyleInterface(plugin, parent)
     , mThemeManager(nullptr)
 {
 }
 
 GrantleeHeaderStyleInterface::~GrantleeHeaderStyleInterface()
 {
 }
 
 void GrantleeHeaderStyleInterface::createAction(KActionMenu *menu, QActionGroup *actionGroup, KActionCollection *ac)
 {
     mThemeManager = new GrantleeTheme::ThemeManager(QStringLiteral("mail"),
                                                     QStringLiteral("header.desktop"), ac,
-                                                    QStringLiteral("messageviewer/themes/"));
+                                                    QStringLiteral("messageviewer/themes/"), this);
     mThemeManager->setDownloadNewStuffConfigFile(QStringLiteral("messageviewer_header_themes.knsrc"));
     connect(mThemeManager, &GrantleeTheme::ThemeManager::grantleeThemeSelected, this, &GrantleeHeaderStyleInterface::slotGrantleeHeaders);
     connect(mThemeManager, &GrantleeTheme::ThemeManager::updateThemes, this, &HeaderStyleInterface::styleUpdated);
 
     mThemeManager->setActionGroup(actionGroup);
     mThemeManager->setThemeMenu(menu);
     const QString themeName = mThemeManager->configuredThemeName();
     mHeaderStylePlugin->headerStyle()->setTheme(mThemeManager->theme(themeName));
     addActionToMenu(menu, actionGroup);
 }
 
 void GrantleeHeaderStyleInterface::activateAction()
 {
     KToggleAction *act = mThemeManager->actionForTheme();
     if (act) {
         act->setChecked(true);
     }
 }
 
 void GrantleeHeaderStyleInterface::slotGrantleeHeaders()
 {
     const QString themeName = mThemeManager->configuredThemeName();
     mHeaderStylePlugin->headerStyle()->setTheme(mThemeManager->theme(themeName));
     slotStyleChanged();
 }