From 8106a5030956eb41979edeb0c846b4a1dca39fd2 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 24 Aug 2009 07:31:29 +0000 Subject: [PATCH] fix i18n svn path=/trunk/KDE/kdebase/workspace/; revision=1014901 --- .../config/nitrogenconfigurationui.cpp | 36 +++++++++---------- .../config/nitrogenexceptiondialog.cpp | 24 ++++++------- .../config/nitrogenexceptionlistdialog.cpp | 10 +++--- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/clients/nitrogen/config/nitrogenconfigurationui.cpp b/clients/nitrogen/config/nitrogenconfigurationui.cpp index 00c639fc03..d933ab757f 100644 --- a/clients/nitrogen/config/nitrogenconfigurationui.cpp +++ b/clients/nitrogen/config/nitrogenconfigurationui.cpp @@ -80,7 +80,7 @@ namespace Nitrogen // title alignment QLabel* label; - gridLayout->addWidget( label = new QLabel( tr2i18n("Title alignment:"), box ), 0, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n("Title alignment:"), box ), 0, 0, 1, 1 ); gridLayout->addWidget( titleAlignment = new QComboBox(box), 0, 1, 1, 1 ); titleAlignment->setObjectName(QString::fromUtf8("titleAlignment")); titleAlignment->insertItems(0, QStringList() @@ -93,7 +93,7 @@ namespace Nitrogen label->setBuddy( titleAlignment ); // button size - gridLayout->addWidget( label = new QLabel( tr2i18n("Button size:"), box ), 1, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n("Button size:"), box ), 1, 0, 1, 1 ); gridLayout->addWidget( buttonSize = new QComboBox(box), 1, 1, 1, 1 ); buttonSize->setObjectName(QString::fromUtf8("buttonSize")); buttonSize->insertItems(0, QStringList() @@ -107,7 +107,7 @@ namespace Nitrogen label->setBuddy( buttonSize ); // button type - gridLayout->addWidget( label = new QLabel( tr2i18n("Button style:"), box ), 2, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n("Button style:"), box ), 2, 0, 1, 1 ); gridLayout->addWidget( buttonType = new QComboBox(box), 2, 1, 1, 1 ); buttonType->setObjectName(QString::fromUtf8("buttonType")); buttonType->insertItems(0, QStringList() @@ -119,7 +119,7 @@ namespace Nitrogen label->setBuddy( buttonType ); // frame border - gridLayout->addWidget( label = new QLabel( tr2i18n("Border size:"), box ), 3, 0, 1, 1); + gridLayout->addWidget( label = new QLabel( i18n("Border size:"), box ), 3, 0, 1, 1); gridLayout->addWidget( frameBorder = new QComboBox(box), 3, 1, 1, 1); frameBorder->setObjectName(QString::fromUtf8("frameBorder")); frameBorder->insertItems(0, QStringList() @@ -134,7 +134,7 @@ namespace Nitrogen label->setBuddy( frameBorder ); // title bar blending - gridLayout->addWidget( label = new QLabel( tr2i18n("Title bar blending:" ), box ), 4, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n("Title bar blending:" ), box ), 4, 0, 1, 1 ); gridLayout->addWidget( blendColor = new QComboBox(box), 4, 1, 1, 1 ); blendColor->setObjectName(QString::fromUtf8("blendColor")); blendColor->insertItems(0, QStringList() @@ -151,33 +151,33 @@ namespace Nitrogen box->setLayout( vboxLayout ); // oxygen shadow - vboxLayout->addWidget( useOxygenShadows = new QCheckBox( tr2i18n("Glow active window", 0 ), this ) ); + vboxLayout->addWidget( useOxygenShadows = new QCheckBox( i18n("Glow active window", 0 ), this ) ); useOxygenShadows->setObjectName(QString::fromUtf8("useOxygenShadows")); - useOxygenShadows->setWhatsThis(tr2i18n( + useOxygenShadows->setWhatsThis(i18n( "When this option is enabled, oxygen signature blue glow is used for the active window shadow.", 0)); // draw separator - vboxLayout->addWidget( drawSeparator = new QCheckBox( tr2i18n("Draw separator between title bar and window contents", 0), this ) ); + vboxLayout->addWidget( drawSeparator = new QCheckBox( i18n("Draw separator between title bar and window contents", 0), this ) ); drawSeparator->setObjectName(QString::fromUtf8("drawSeparator")); - drawSeparator->setWhatsThis(tr2i18n( + drawSeparator->setWhatsThis(i18n( "When enabled, this option makes an horizontal separator appear between the window title bar and the window contents.", 0)); // show stripes - vboxLayout->addWidget( showStripes = new QCheckBox( tr2i18n("Show stripes next to the title", 0), this) ); + vboxLayout->addWidget( showStripes = new QCheckBox( i18n("Show stripes next to the title", 0), this) ); showStripes->setObjectName(QString::fromUtf8("showStripes")); - showStripes->setWhatsThis(tr2i18n( + showStripes->setWhatsThis(i18n( "When enabled, this option increases the visibility of the window titlebar by showing stripes", 0)); // overwrite colors - vboxLayout->addWidget( overwriteColors = new QCheckBox( tr2i18n("Blend title bar colors with window contents", 0), this) ); + vboxLayout->addWidget( overwriteColors = new QCheckBox( i18n("Blend title bar colors with window contents", 0), this) ); overwriteColors->setObjectName(QString::fromUtf8("overwriteColors")); - overwriteColors->setWhatsThis(tr2i18n( + overwriteColors->setWhatsThis(i18n( "When enabled, window colors are used in place of default title bar colors to draw the decoration", 0)); // draw size grip - vboxLayout->addWidget( drawSizeGrip = new QCheckBox( tr2i18n("Draw size grip widget in bottom-right corner of windows", 0), this ) ); + vboxLayout->addWidget( drawSizeGrip = new QCheckBox( i18n("Draw size grip widget in bottom-right corner of windows", 0), this ) ); drawSizeGrip->setObjectName(QString::fromUtf8("drawSizeGrip")); - drawSizeGrip->setWhatsThis(tr2i18n( + drawSizeGrip->setWhatsThis(i18n( "When this option is enabled, a small triangular widget is drawn in bottom-right corner of every window \n" "that allow to resize the window. This the \"No Border\" border size is selected.", 0)); @@ -185,12 +185,12 @@ namespace Nitrogen mainLayout->addLayout( hboxLayout = new QHBoxLayout() ); hboxLayout->addStretch( 1 ); - hboxLayout->addWidget( showExceptions = new QPushButton( tr2i18n("Exceptions ..." ), box ) ); - showExceptions->setToolTip(tr2i18n("Raise a dialog to store blending type exceptions based on window title.", 0)); + hboxLayout->addWidget( showExceptions = new QPushButton( i18n("Exceptions ..." ), box ) ); + showExceptions->setToolTip(i18n("Raise a dialog to store blending type exceptions based on window title.", 0)); // about // this is disabled until I find a suitable icon for nitrogen. - // hboxLayout->addWidget( aboutNitrogen = new QPushButton( tr2i18n("About Nitrogen" ), box ) ); + // hboxLayout->addWidget( aboutNitrogen = new QPushButton( i18n("About Nitrogen" ), box ) ); QMetaObject::connectSlotsByName(this); diff --git a/clients/nitrogen/config/nitrogenexceptiondialog.cpp b/clients/nitrogen/config/nitrogenexceptiondialog.cpp index 6b2a5b861c..8719ba5ae2 100644 --- a/clients/nitrogen/config/nitrogenexceptiondialog.cpp +++ b/clients/nitrogen/config/nitrogenexceptiondialog.cpp @@ -48,7 +48,7 @@ namespace Nitrogen // exception definition QGroupBox* box; - widget->layout()->addWidget( box = new QGroupBox( tr2i18n( "Definition" ), widget ) ); + widget->layout()->addWidget( box = new QGroupBox( i18n( "Definition" ), widget ) ); QGridLayout* gridLayout = new QGridLayout(); gridLayout->setSpacing(5); @@ -58,29 +58,29 @@ namespace Nitrogen QLabel *label; // exception type - gridLayout->addWidget( label = new QLabel( tr2i18n( "Exception type: " ), box ), 0, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n( "Exception type: " ), box ), 0, 0, 1, 1 ); gridLayout->addWidget( type_combobox_ = new QComboBox(box), 0, 1, 1, 1 ); type_combobox_->insertItems(0, QStringList() << NitrogenException::typeName( NitrogenException::WindowClassName ) << NitrogenException::typeName( NitrogenException::WindowTitle ) ); - type_combobox_->setToolTip( tr2i18n( + type_combobox_->setToolTip( i18n( "Select here the window caracteristic used to \n" "identify windows to which the exception apply." ) ); label->setAlignment( Qt::AlignRight ); // regular expression - gridLayout->addWidget( label = new QLabel( tr2i18n( "Regular expression to match: " ), box ), 1, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n( "Regular expression to match: " ), box ), 1, 0, 1, 1 ); gridLayout->addWidget( editor_ = new KLineEdit( box ), 1, 1, 1, 1 ); editor_->setClearButtonShown( true ); - editor_->setToolTip( tr2i18n( + editor_->setToolTip( i18n( "Type here the regular expression used to \n" "identify windows to which the exception apply." ) ); label->setAlignment( Qt::AlignRight ); // decoration flags - widget->layout()->addWidget( box = new QGroupBox( tr2i18n( "Decoration" ), widget ) ); + widget->layout()->addWidget( box = new QGroupBox( i18n( "Decoration" ), widget ) ); gridLayout = new QGridLayout(); gridLayout->setSpacing(5); gridLayout->setMargin(5); @@ -89,7 +89,7 @@ namespace Nitrogen QCheckBox* checkbox; // border size - gridLayout->addWidget( checkbox = new QCheckBox( tr2i18n("Border size:" ), box ), 2, 0, 1, 1 ); + gridLayout->addWidget( checkbox = new QCheckBox( i18n("Border size:" ), box ), 2, 0, 1, 1 ); gridLayout->addWidget( frame_border_combobox_ = new QComboBox(box), 2, 1, 1, 1 ); frame_border_combobox_->insertItems(0, QStringList() << NitrogenException::frameBorderName( NitrogenException::BorderNone ) @@ -103,7 +103,7 @@ namespace Nitrogen connect( checkbox, SIGNAL( toggled( bool ) ), frame_border_combobox_, SLOT( setEnabled( bool ) ) ); // blend color - gridLayout->addWidget( checkbox = new QCheckBox( tr2i18n("Title bar blending:" ), box ), 3, 0, 1, 1 ); + gridLayout->addWidget( checkbox = new QCheckBox( i18n("Title bar blending:" ), box ), 3, 0, 1, 1 ); gridLayout->addWidget( blend_combobox_ = new QComboBox(box), 3, 1, 1, 1 ); blend_combobox_->insertItems(0, QStringList() << NitrogenException::blendColorName( NitrogenException::NoBlending ) @@ -114,22 +114,22 @@ namespace Nitrogen connect( checkbox, SIGNAL( toggled( bool ) ), blend_combobox_, SLOT( setEnabled( bool ) ) ); // separator - gridLayout->addWidget( label = new QLabel( tr2i18n( "Draw separator :" ), box ), 4, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n( "Draw separator :" ), box ), 4, 0, 1, 1 ); gridLayout->addWidget( draw_separator_combobox_ = new ComboBox( box ), 4, 1, 1, 1 ); label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); // stripes - gridLayout->addWidget( label = new QLabel( tr2i18n( "Show stripes :" ), box ), 5, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n( "Show stripes :" ), box ), 5, 0, 1, 1 ); gridLayout->addWidget( show_stripes_combobox_ = new ComboBox( box ), 5, 1, 1, 1 ); label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); // overwrite colors - gridLayout->addWidget( label = new QLabel( tr2i18n( "Overwrite default title bar colors:" ), box ), 6, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n( "Overwrite default title bar colors:" ), box ), 6, 0, 1, 1 ); gridLayout->addWidget( overwrite_colors_combobox_ = new ComboBox( box ), 6, 1, 1, 1 ); label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); // size grip - gridLayout->addWidget( label = new QLabel( tr2i18n( "Draw size grip :" ), box ), 7, 0, 1, 1 ); + gridLayout->addWidget( label = new QLabel( i18n( "Draw size grip :" ), box ), 7, 0, 1, 1 ); gridLayout->addWidget( draw_size_grip_combobox_ = new ComboBox( box ), 7, 1, 1, 1 ); label->setAlignment( Qt::AlignRight|Qt::AlignVCenter ); } diff --git a/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp b/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp index 675c260dbf..f3b97a51b9 100644 --- a/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp +++ b/clients/nitrogen/config/nitrogenexceptionlistdialog.cpp @@ -75,23 +75,23 @@ namespace Nitrogen v_layout->addWidget( up_button_ = new KPushButton( KIcon( "arrow-up", icon_loader ), - tr2i18n("Move &Up"), widget ) ); + i18n("Move &Up"), widget ) ); v_layout->addWidget( down_button_ = new KPushButton( KIcon( "arrow-down", icon_loader ), - tr2i18n("Move &Down"), widget ) ); + i18n("Move &Down"), widget ) ); v_layout->addWidget( add_button_ = new KPushButton( KIcon( "list-add", icon_loader ), - tr2i18n("&Add"), widget ) ); + i18n("&Add"), widget ) ); v_layout->addWidget( remove_button_ = new KPushButton( KIcon( "list-remove", icon_loader ), - tr2i18n("&Remove"), widget ) ); + i18n("&Remove"), widget ) ); v_layout->addWidget( edit_button_ = new KPushButton( KIcon( "edit-rename", icon_loader ), - tr2i18n("&Edit"), widget ) ); + i18n("&Edit"), widget ) ); v_layout->addStretch();