From e80094694ef33b272727b97074df7ad1af05a207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 29 Apr 2014 08:51:04 +0200 Subject: [PATCH] Adjust kwin and killer to new ki18n Setting the ApplicationDomain to kwin, both use the kwin catalog. The left-over code for catalogs is removed. Note for adjustments: * scripting doesn't provide an own catalog * scripts are extracted but there are no scripts with i18n --- Messages.sh | 2 +- killer/killer.cpp | 1 + main.cpp | 7 +------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Messages.sh b/Messages.sh index 19e414cade..f05f27e15c 100644 --- a/Messages.sh +++ b/Messages.sh @@ -1,3 +1,3 @@ #! /usr/bin/env bash $EXTRACTRC *.kcfg >> rc.cpp -$XGETTEXT *.h *.cpp killer/*.cpp tabbox/*.cpp -o $podir/kwin.pot +$XGETTEXT *.h *.cpp killer/*.cpp tabbox/*.cpp scripting/*.cpp -o $podir/kwin.pot diff --git a/killer/killer.cpp b/killer/killer.cpp index 9165b387a4..0c3ca043ec 100644 --- a/killer/killer.cpp +++ b/killer/killer.cpp @@ -36,6 +36,7 @@ DEALINGS IN THE SOFTWARE. int main(int argc, char* argv[]) { + KLocalizedString::setApplicationDomain("kwin"); QApplication app(argc, argv); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("kwin"))); QCoreApplication::setApplicationName(QStringLiteral("kwin_killer_helper")); diff --git a/main.cpp b/main.cpp index 46a4829991..e8b68f15a5 100644 --- a/main.cpp +++ b/main.cpp @@ -413,6 +413,7 @@ KWIN_EXPORT int kdemain(int argc, char * argv[]) mallopt(M_TRIM_THRESHOLD, 5*pagesize); #endif // M_TRIM_THRESHOLD + KLocalizedString::setApplicationDomain("kwin"); QLoggingCategory::setFilterRules(QStringLiteral("aurorae.debug = true\n") + QStringLiteral("kwineffects.debug = true")); @@ -536,12 +537,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[]) KWin::SessionManager weAreIndeed; #endif KWin::SessionSaveDoneHelper helper; -#warning insertCatalog needs porting -#if KWIN_QT5_PORTING - KGlobal::locale()->insertCatalog("kwin_effects"); - KGlobal::locale()->insertCatalog("kwin_scripts"); - KGlobal::locale()->insertCatalog("kwin_scripting"); -#endif QString appname; if (KWin::screen_number == 0)