Use common twin clients translations catalog for twin styles.

Exclude commmon strings of twin cliens from translations.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/17/head
Slávek Banko 3 years ago
parent 98e42e5e21
commit fed5a8d5ad
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1,6 +1,10 @@
##### create translation templates ############## ##### create translation templates ##############
tde_l10n_create_template( "twin_art_clients" ) tde_l10n_create_template(
CATALOG "twin_art_clients"
SOURCES .
X-POT ${CMAKE_SOURCE_DIR}/../tde-i18n/template/messages/tdebase/twin_clients.pot
)
tde_l10n_create_template( tde_l10n_create_template(
CATALOG "desktop_files/twin-styles-desktops/" CATALOG "desktop_files/twin-styles-desktops/"

@ -27,6 +27,7 @@
#include <tqdrawutil.h> #include <tqdrawutil.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <tqapplication.h> #include <tqapplication.h>
#include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeconfig.h> #include <tdeconfig.h>
@ -210,6 +211,8 @@ static void readConfig(CdeClientFactory *f)
CdeClientFactory::CdeClientFactory() CdeClientFactory::CdeClientFactory()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
CDE::readConfig(this); CDE::readConfig(this);
} }

@ -24,8 +24,9 @@ CdeConfig::CdeConfig( TDEConfig* conf, TQWidget* parent )
: TQObject( parent ) : TQObject( parent )
{ {
cdeConfig = new TDEConfig("twincderc"); cdeConfig = new TDEConfig("twincderc");
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients"); TDEGlobal::locale()->insertCatalogue("twin_art_clients");
groupBox = new TQVBox( parent ); groupBox = new TQVBox( parent );
bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox ); bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox );

@ -55,7 +55,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
: TQObject(parent) : TQObject(parent)
{ {
_glowConfig = new TDEConfig("twinglowrc"); _glowConfig = new TDEConfig("twinglowrc");
TDEGlobal::locale()->insertCatalogue("twin_glow_config"); TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
_main_group_box = new TQWidget(parent); _main_group_box = new TQWidget(parent);
TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box); TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box);

@ -134,6 +134,9 @@ TQString GlowClientGlobals::getPixmapName(PixmapType type, bool isActive)
GlowClientGlobals::GlowClientGlobals() GlowClientGlobals::GlowClientGlobals()
: KDecorationFactory() : KDecorationFactory()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
_button_factory = new GlowButtonFactory(); _button_factory = new GlowButtonFactory();
readConfig(); readConfig();
readTheme (); readTheme ();

@ -59,6 +59,7 @@ IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent )
: TQObject( parent ) : TQObject( parent )
{ {
icewmConfig = new TDEConfig("twinicewmrc"); icewmConfig = new TDEConfig("twinicewmrc");
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients"); TDEGlobal::locale()->insertCatalogue("twin_art_clients");
mainWidget = new TQVBox( parent ); mainWidget = new TQVBox( parent );

@ -153,6 +153,9 @@ bool validPixmaps( TQPixmap* p[] )
ThemeHandler::ThemeHandler() ThemeHandler::ThemeHandler()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
initialized = false; initialized = false;
// Prevent having globals objects (use pointers to objects) // Prevent having globals objects (use pointers to objects)

@ -11,6 +11,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <tqdrawutil.h> #include <tqdrawutil.h>
#include <tqbitmap.h> #include <tqbitmap.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <tqdatetime.h> #include <tqdatetime.h>
@ -739,6 +740,8 @@ void StdToolClient::resize( const TQSize& s )
StdFactory::StdFactory() StdFactory::StdFactory()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
create_pixmaps(); create_pixmaps();
} }

@ -7,6 +7,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kdebug.h> #include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
@ -922,6 +923,8 @@ bool NextClient::drawbound(const TQRect& geom, bool /* clear */)
NextClientFactory::NextClientFactory() NextClientFactory::NextClientFactory()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
create_pixmaps(this); create_pixmaps(this);
} }

@ -35,6 +35,7 @@
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include "OpenLook.h" #include "OpenLook.h"
@ -55,6 +56,8 @@ static uint titleHeight;
DecorationFactory::DecorationFactory() DecorationFactory::DecorationFactory()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
} }
DecorationFactory::~DecorationFactory() DecorationFactory::~DecorationFactory()

@ -31,6 +31,8 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <kdecoration.h> #include <kdecoration.h>
#include <tdeglobal.h>
#include <tdelocale.h>
// #include <ksimpleconfig.h> // #include <ksimpleconfig.h>
@ -62,6 +64,8 @@ Static* Static::instance_ = NULL;
Static::Static() Static::Static()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
instance_ = this; instance_ = this;
_init(); _init();
} }

@ -30,7 +30,8 @@ smoothblendConfig::smoothblendConfig(TDEConfig* config, TQWidget* parent)
: TQObject(parent), config_(0), dialog_(0) { : TQObject(parent), config_(0), dialog_(0) {
// create the configuration object // create the configuration object
config_ = new TDEConfig("twinsmoothblendrc"); config_ = new TDEConfig("twinsmoothblendrc");
TDEGlobal::locale()->insertCatalogue("twin_smoothblend_config"); TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
// create and show the configuration dialog // create and show the configuration dialog
dialog_ = new ConfigDialog(parent); dialog_ = new ConfigDialog(parent);

@ -11,6 +11,7 @@
#include <tdeversion.h> #include <tdeversion.h>
#include <tdeglobal.h> #include <tdeglobal.h>
#include <tdeglobalsettings.h> #include <tdeglobalsettings.h>
#include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kimageeffect.h> #include <kimageeffect.h>
@ -68,6 +69,8 @@ extern "C" KDecorationFactory* create_factory() {
// Constructor // Constructor
smoothblendFactory::smoothblendFactory() { smoothblendFactory::smoothblendFactory() {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
readConfig(); readConfig();
initialized_ = true; initialized_ = true;
} }

@ -9,6 +9,7 @@
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kdrawutil.h> #include <kdrawutil.h>
#include <tdeglobal.h>
#include <tdelocale.h> #include <tdelocale.h>
#include <tdeapplication.h> #include <tdeapplication.h>
#include <kdebug.h> #include <kdebug.h>
@ -684,6 +685,8 @@ void SystemClient::borders(int& left, int& right, int& top, int& bottom) const
SystemDecoFactory::SystemDecoFactory() SystemDecoFactory::SystemDecoFactory()
{ {
TDEGlobal::locale()->insertCatalogue("twin_clients");
TDEGlobal::locale()->insertCatalogue("twin_art_clients");
create_pixmaps(); create_pixmaps();
} }

Loading…
Cancel
Save