vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i18n: added disambiguation contexts to "none", "enabled" and "disabled" in KCMs. 

Due to sharing of translation space in KCMs, translations for these strings were
randomly fetched from all over the place, including base kdelibs catalogs.

svn path=/trunk/KDE/kdebase/workspace/; revision=1068781
icc-effect-5.14.5
Chusslove Illich 2010-01-02 01:01:42 +00:00
parent 14b7540b26
commit 0a497dfcec
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clients/oxygen/config/oxygenexceptiondialog.cpp
View File

@ -33,10 +33,6 @@
namespace Oxygen
{
//___________________________________________
const QString OxygenExceptionDialog::yes( i18n("Enabled") );
const QString OxygenExceptionDialog::no( i18n("Disabled") );
//___________________________________________
OxygenExceptionDialog::OxygenExceptionDialog( QWidget* parent ):
KDialog( parent ),
@ -96,13 +92,13 @@ namespace Oxygen
connect( ui.sizeGripCheckBox, SIGNAL( toggled( bool ) ), ui.sizeGripComboBox, SLOT( setEnabled( bool ) ) );
// outline active window title
ui.titleOutlineComboBox->insertItems(0, QStringList() << yes << no );
ui.titleOutlineComboBox->insertItems(0, QStringList() << i18nc( "outline window title", "Enabled" ) << i18nc( "outline window title", "Disabled" ) );
ui.titleOutlineComboBox->setEnabled( false );
checkboxes_.insert( std::make_pair( OxygenException::TitleOutline, ui.titleOutlineCheckBox ) );
connect( ui.titleOutlineCheckBox, SIGNAL( toggled( bool ) ), ui.titleOutlineComboBox, SLOT( setEnabled( bool ) ) );
// separator
ui.separatorComboBox->insertItems(0, QStringList() << yes << no );
ui.separatorComboBox->insertItems(0, QStringList() << i18nc( "draw separator", "Enabled" ) << i18nc( "draw separator", "Disabled" ) );
ui.separatorComboBox->setEnabled( false );
checkboxes_.insert( std::make_pair( OxygenException::DrawSeparator, ui.separatorCheckBox ) );
connect( ui.separatorCheckBox, SIGNAL( toggled( bool ) ), ui.separatorComboBox, SLOT( setEnabled( bool ) ) );
@ -122,8 +118,8 @@ namespace Oxygen
ui.frameBorderComboBox->setCurrentIndex( ui.frameBorderComboBox->findText( exception.frameBorderName( true ) ) );
ui.blendColorComboBox->setCurrentIndex( ui.blendColorComboBox->findText( exception.blendColorName( true ) ) );
ui.sizeGripComboBox->setCurrentIndex( ui.sizeGripComboBox->findText( exception.sizeGripModeName( true ) ) );
ui.separatorComboBox->setCurrentIndex( ui.separatorComboBox->findText( exception.drawSeparator() ? yes:no ) );
ui.titleOutlineComboBox->setCurrentIndex( ui.titleOutlineComboBox->findText( exception.drawTitleOutline() ? yes:no ) );
ui.separatorComboBox->setCurrentIndex( ui.separatorComboBox->findText( exception.drawSeparator() ? i18nc( "draw separator", "Enabled" ) : i18nc( "draw separator", "Disabled" ) ) );
ui.titleOutlineComboBox->setCurrentIndex( ui.titleOutlineComboBox->findText( exception.drawTitleOutline() ? i18nc( "outline window title", "Enabled" ) : i18nc( "outline window title", "Disabled" ) ) );
ui.hideTitleBar->setChecked( exception.hideTitleBar() );
// mask
@ -143,8 +139,8 @@ namespace Oxygen
exception.setSizeGripMode( OxygenException::sizeGripMode( ui.sizeGripComboBox->currentText(), true ) );
// flags
exception.setDrawSeparator( ui.separatorComboBox->currentText() == yes );
exception.setDrawTitleOutline( ui.titleOutlineComboBox->currentText() == yes );
exception.setDrawSeparator( ui.separatorComboBox->currentText() == i18nc( "draw separator", "Enabled" ) );
exception.setDrawTitleOutline( ui.titleOutlineComboBox->currentText() == i18nc( "outline window title", "Enabled" ) );
exception.setHideTitleBar( ui.hideTitleBar->isChecked() );
// mask

3
clients/oxygen/config/oxygenexceptiondialog.h
View File

@ -65,9 +65,6 @@ namespace Oxygen
private:
static const QString yes;
static const QString no;
Ui_OxygenExceptionWidget ui;
//! map mask and checkbox

2
effects/desktopgrid/desktopgrid_config.cpp
View File

@ -61,7 +61,7 @@ DesktopGridEffectConfig::DesktopGridEffectConfig(QWidget* parent, const QVariant
m_ui->shortcutEditor->addCollection( m_actionCollection );
m_alignmentItems.append( Qt::Alignment( 0 ));
m_ui->desktopNameAlignmentCombo->addItem( i18n( "Disabled" ));
m_ui->desktopNameAlignmentCombo->addItem( i18nc( "Desktop name alignment:", "Disabled" ));
m_alignmentItems.append( Qt::AlignHCenter | Qt::AlignTop );
m_ui->desktopNameAlignmentCombo->addItem( i18n( "Top" ));
m_alignmentItems.append( Qt::AlignRight | Qt::AlignTop );

6
kcmkwin/kwinoptions/windows.cpp
View File

@ -883,7 +883,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
QGridLayout *kLay = new QGridLayout(MagicBox);
BrdrSnap = new KIntNumInput(10, MagicBox);
BrdrSnap->setSpecialValueText( i18n("none") );
BrdrSnap->setSpecialValueText( i18nc("no border snap zone", "none") );
BrdrSnap->setRange( 0, MAX_BRDR_SNAP);
BrdrSnap->setSteps(1,10);
BrdrSnap->setWhatsThis( i18n("Here you can set the snap zone for screen borders, i.e."
@ -897,7 +897,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
kLay->addWidget(BrdrSnap, 0, 1);
WndwSnap = new KIntNumInput(10, MagicBox);
WndwSnap->setSpecialValueText( i18n("none") );
WndwSnap->setSpecialValueText( i18nc("no window snap zone", "none") );
WndwSnap->setRange( 0, MAX_WNDW_SNAP);
WndwSnap->setSteps(1,10);
WndwSnap->setWhatsThis( i18n("Here you can set the snap zone for windows, i.e."
@ -911,7 +911,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, const KCompone
kLay->addWidget(WndwSnap, 1, 1);
CntrSnap = new KIntNumInput(10, MagicBox);
CntrSnap->setSpecialValueText( i18n("none") );
CntrSnap->setSpecialValueText( i18nc("no center snap zone", "none") );
CntrSnap->setRange( 0, MAX_CNTR_SNAP);
CntrSnap->setSteps(1,10);
CntrSnap->setWhatsThis( i18n("Here you can set the snap zone for the screen center, i.e."

2
kcmkwin/kwinrules/ruleswidgetbase.ui
View File

@ -1900,7 +1900,7 @@
</property>
<item>
<property name="text" >
<string>None</string>
<string comment="no focus stealing prevention">None</string>
</property>
</item>
<item>