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
This commit is contained in:
Martin Gräßlin 2014-04-29 08:51:04 +02:00
parent 5e7d1d586c
commit e80094694e
3 changed files with 3 additions and 7 deletions

View file

@ -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

View file

@ -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"));

View file

@ -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)