diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index a41ec689..cda1576e 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -74,11 +74,6 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
connect( m_ui->m_buttonDefaultCountry, SIGNAL( clicked() ),
this, SLOT( defaultCountry() ) );
- connect( m_ui->m_comboCountryDivision, SIGNAL( activated( int ) ),
- this, SLOT( changedCountryDivisionIndex( int ) ) );
- connect( m_ui->m_buttonDefaultCountryDivision, SIGNAL( clicked() ),
- this, SLOT( defaultCountryDivision() ) );
-
// Translations tab
// User has changed the translations selection in some way
@@ -158,21 +153,6 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
connect( m_ui->m_buttonDefaultWeekStartDay, SIGNAL( clicked() ),
this, SLOT( defaultWeekStartDay() ) );
- connect( m_ui->m_comboWorkingWeekStartDay, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( changedWorkingWeekStartDayIndex( int ) ) );
- connect( m_ui->m_buttonDefaultWorkingWeekStartDay, SIGNAL( clicked() ),
- this, SLOT( defaultWorkingWeekStartDay() ) );
-
- connect( m_ui->m_comboWorkingWeekEndDay, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( changedWorkingWeekEndDayIndex( int ) ) );
- connect( m_ui->m_buttonDefaultWorkingWeekEndDay, SIGNAL( clicked() ),
- this, SLOT( defaultWorkingWeekEndDay() ) );
-
- connect( m_ui->m_comboWeekDayOfPray, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( changedWeekDayOfPrayIndex( int ) ) );
- connect( m_ui->m_buttonDefaultWeekDayOfPray, SIGNAL( clicked() ),
- this, SLOT( defaultWeekDayOfPray() ) );
-
// Date / Time tab
connect( m_ui->m_comboTimeFormat, SIGNAL( editTextChanged( const QString & ) ),
@@ -443,7 +423,6 @@ void KCMLocale::defaults()
void KCMLocale::copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup, KConfig::WriteConfigFlags flags )
{
copySetting( fromGroup, toGroup, "Country", flags );
- copySetting( fromGroup, toGroup, "CountryDivision", flags );
copySetting( fromGroup, toGroup, "Language", flags );
copySetting( fromGroup, toGroup, "DecimalPlaces", flags );
copySetting( fromGroup, toGroup, "DecimalSymbol", flags );
@@ -466,9 +445,6 @@ void KCMLocale::copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup, KC
copySetting( fromGroup, toGroup, "DateMonthNamePossessive", flags );
copySetting( fromGroup, toGroup, "WeekNumberSystem", flags );
copySetting( fromGroup, toGroup, "WeekStartDay", flags );
- copySetting( fromGroup, toGroup, "WorkingWeekStartDay", flags );
- copySetting( fromGroup, toGroup, "WorkingWeekEndDay", flags );
- copySetting( fromGroup, toGroup, "WeekDayOfPray", flags );
copySetting( fromGroup, toGroup, "DateTimeDigitSet", flags );
copySetting( fromGroup, toGroup, "BinaryUnitDialect", flags );
copySetting( fromGroup, toGroup, "PageSize", flags );
@@ -618,7 +594,6 @@ void KCMLocale::initAllWidgets()
//Country tab
initCountry();
- initCountryDivision();
//Translations tab
initTranslations();
@@ -665,7 +640,6 @@ void KCMLocale::initResetButtons()
//Country tab
m_ui->m_buttonDefaultCountry->setGuiItem( defaultItem );
- m_ui->m_buttonDefaultCountryDivision->setGuiItem( defaultItem );
//Translations tab
m_ui->m_buttonDefaultTranslations->setGuiItem( defaultItem );
@@ -685,9 +659,6 @@ void KCMLocale::initResetButtons()
m_ui->m_buttonDefaultShortYearWindow->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWeekNumberSystem->setGuiItem( defaultItem );
m_ui->m_buttonDefaultWeekStartDay->setGuiItem( defaultItem );
- m_ui->m_buttonDefaultWorkingWeekStartDay->setGuiItem( defaultItem );
- m_ui->m_buttonDefaultWorkingWeekEndDay->setGuiItem( defaultItem );
- m_ui->m_buttonDefaultWeekDayOfPray->setGuiItem( defaultItem );
//Date/Time tab
m_ui->m_buttonDefaultTimeFormat->setGuiItem( defaultItem );
@@ -1026,44 +997,6 @@ void KCMLocale::setCountry( const QString &newValue )
m_ui->m_comboCountry, m_ui->m_buttonDefaultCountry );
}
-void KCMLocale::initCountryDivision()
-{
- m_ui->m_comboCountryDivision->blockSignals( true );
-
- m_ui->m_labelCountryDivision->setText( ki18n( "Subdivision:" ).toString( m_kcmLocale ) );
- QString helpText = ki18n( "This is the country subdivision where you live, e.g. your state "
- "or province. The KDE Workspace will use this setting for local "
- "information services such as holidays.
" ).toString( m_kcmLocale );
- m_ui->m_comboCountryDivision->setToolTip( helpText );
- m_ui->m_comboCountryDivision->setWhatsThis( helpText );
-
- setCountryDivision( m_kcmSettings.readEntry( "CountryDivision", QString() ) );
-
- m_ui->m_labelCountryDivision->setHidden( true );
- m_ui->m_comboCountryDivision->setHidden( true );
- m_ui->m_buttonDefaultCountryDivision->setEnabled( false );
- m_ui->m_buttonDefaultCountryDivision->setHidden( true );
-
- m_ui->m_comboCountryDivision->blockSignals( false );
-}
-
-void KCMLocale::defaultCountryDivision()
-{
- setCountryDivision( m_defaultSettings.readEntry( "CountryDivision", QString() ) );
-}
-
-void KCMLocale::changedCountryDivisionIndex( int index )
-{
- setCountryDivision( m_ui->m_comboCountryDivision->itemData( index ).toString() );
-}
-
-void KCMLocale::setCountryDivision( const QString &newValue )
-{
- setComboItem( "CountryDivision", newValue,
- m_ui->m_comboCountryDivision, m_ui->m_buttonDefaultCountryDivision );
- m_kcmLocale->setCountryDivisionCode( m_kcmSettings.readEntry( "CountryDivision", QString() ) );
-}
-
void KCMLocale::initTranslations()
{
m_ui->m_selectTranslations->blockSignals( true );
@@ -1541,9 +1474,6 @@ void KCMLocale::setCalendarSystem( const QString &newValue )
initShortYearWindow();
initWeekNumberSystem();
initWeekStartDay();
- initWorkingWeekStartDay();
- initWorkingWeekEndDay();
- initWeekDayOfPray();
updateSample();
}
@@ -1730,109 +1660,6 @@ void KCMLocale::setWeekStartDay( int newValue )
m_kcmLocale->setWeekStartDay( m_kcmSettings.readEntry( "WeekStartDay", 0 ) );
}
-void KCMLocale::initWorkingWeekStartDay()
-{
- m_ui->m_comboWorkingWeekStartDay->blockSignals( true );
-
- m_ui->m_labelWorkingWeekStartDay->setText( ki18n( "First working day of week:" ).toString( m_kcmLocale ) );
- QString helpText = ki18n( "This option determines which day will be considered as the first "
- "working day of the week.
" ).toString( m_kcmLocale );
- m_ui->m_comboWorkingWeekStartDay->setToolTip( helpText );
- m_ui->m_comboWorkingWeekStartDay->setWhatsThis( helpText );
-
- initWeekDayCombo( m_ui->m_comboWorkingWeekStartDay );
-
- setWorkingWeekStartDay( m_kcmSettings.readEntry( "WorkingWeekStartDay", 0 ) );
-
- m_ui->m_comboWorkingWeekStartDay->blockSignals( false );
-}
-
-void KCMLocale::defaultWorkingWeekStartDay()
-{
- setWorkingWeekStartDay( m_defaultSettings.readEntry( "WorkingWeekStartDay", 0 ) );
-}
-
-void KCMLocale::changedWorkingWeekStartDayIndex( int index )
-{
- setWorkingWeekStartDay( m_ui->m_comboWorkingWeekStartDay->itemData( index ).toInt() );
-}
-
-void KCMLocale::setWorkingWeekStartDay( int newValue )
-{
- setComboItem( "WorkingWeekStartDay", newValue,
- m_ui->m_comboWorkingWeekStartDay, m_ui->m_buttonDefaultWorkingWeekStartDay );
- m_kcmLocale->setWorkingWeekStartDay( m_kcmSettings.readEntry( "WorkingWeekStartDay", 0 ) );
-}
-
-void KCMLocale::initWorkingWeekEndDay()
-{
- m_ui->m_comboWorkingWeekEndDay->blockSignals( true );
-
- m_ui->m_labelWorkingWeekEndDay->setText( ki18n( "Last working day of week:" ).toString( m_kcmLocale ) );
- QString helpText = ki18n( "This option determines which day will be considered as the last "
- "working day of the week.
" ).toString( m_kcmLocale );
- m_ui->m_comboWorkingWeekEndDay->setToolTip( helpText );
- m_ui->m_comboWorkingWeekEndDay->setWhatsThis( helpText );
-
- initWeekDayCombo( m_ui->m_comboWorkingWeekEndDay );
-
- setWorkingWeekEndDay( m_kcmSettings.readEntry( "WorkingWeekEndDay", 0 ) );
-
- m_ui->m_comboWorkingWeekEndDay->blockSignals( false );
-}
-
-void KCMLocale::defaultWorkingWeekEndDay()
-{
- setWorkingWeekEndDay( m_defaultSettings.readEntry( "WorkingWeekEndDay", 0 ) );
-}
-
-void KCMLocale::changedWorkingWeekEndDayIndex( int index )
-{
- setWorkingWeekEndDay( m_ui->m_comboWorkingWeekEndDay->itemData( index ).toInt() );
-}
-
-void KCMLocale::setWorkingWeekEndDay( int newValue )
-{
- setComboItem( "WorkingWeekEndDay", newValue,
- m_ui->m_comboWorkingWeekEndDay, m_ui->m_buttonDefaultWorkingWeekEndDay );
- m_kcmLocale->setWorkingWeekEndDay( m_kcmSettings.readEntry( "WorkingWeekEndDay", 0 ) );
-}
-
-void KCMLocale::initWeekDayOfPray()
-{
- m_ui->m_comboWeekDayOfPray->blockSignals( true );
-
- m_ui->m_labelWeekDayOfPray->setText( ki18n( "Week day for special religious observance:" ).toString( m_kcmLocale ) );
- QString helpText = ki18n( "This option determines which day if any will be considered as "
- "the day of the week for special religious observance.
" ).toString( m_kcmLocale );
- m_ui->m_comboWeekDayOfPray->setToolTip( helpText );
- m_ui->m_comboWeekDayOfPray->setWhatsThis( helpText );
-
- initWeekDayCombo( m_ui->m_comboWeekDayOfPray );
- m_ui->m_comboWeekDayOfPray->insertItem( 0, ki18nc( "Day name list, option for no special day of religious observance", "None / None in particular" ).toString( m_kcmLocale ) );
-
- setWeekDayOfPray( m_kcmSettings.readEntry( "WeekDayOfPray", 0 ) );
-
- m_ui->m_comboWeekDayOfPray->blockSignals( false );
-}
-
-void KCMLocale::defaultWeekDayOfPray()
-{
- setWeekDayOfPray( m_defaultSettings.readEntry( "WeekDayOfPray", 0 ) );
-}
-
-void KCMLocale::changedWeekDayOfPrayIndex( int index )
-{
- setWeekDayOfPray( m_ui->m_comboWeekDayOfPray->itemData( index ).toInt() );
-}
-
-void KCMLocale::setWeekDayOfPray( int newValue )
-{
- setComboItem( "WeekDayOfPray", newValue,
- m_ui->m_comboWeekDayOfPray, m_ui->m_buttonDefaultWeekDayOfPray );
- m_kcmLocale->setWeekDayOfPray( m_kcmSettings.readEntry( "WeekDayOfPray", 0 ) );
-}
-
void KCMLocale::initTimeFormat()
{
m_ui->m_comboTimeFormat->blockSignals( true );
diff --git a/kcontrol/locale/kcmlocale.h b/kcontrol/locale/kcmlocale.h
index 5adb5dd4..a234fa2f 100644
--- a/kcontrol/locale/kcmlocale.h
+++ b/kcontrol/locale/kcmlocale.h
@@ -150,9 +150,6 @@ private:
void initCountry();
void setCountry( const QString &newValue );
- void initCountryDivision();
- void setCountryDivision( const QString &newValue );
-
//Translations/Languages tab
void initTranslations();
@@ -198,15 +195,6 @@ private:
void initWeekStartDay();
void setWeekStartDay( int newValue );
- void initWorkingWeekStartDay();
- void setWorkingWeekStartDay( int newValue );
-
- void initWorkingWeekEndDay();
- void setWorkingWeekEndDay( int newValue );
-
- void initWeekDayOfPray();
- void setWeekDayOfPray( int newValue );
-
//Date/Time tab
void initTimeFormat();
@@ -247,9 +235,6 @@ private Q_SLOTS:
void defaultCountry();
void changedCountryIndex( int index );
- void defaultCountryDivision();
- void changedCountryDivisionIndex( int index );
-
//Translations/Languages tab
void defaultTranslations();
@@ -297,15 +282,6 @@ private Q_SLOTS:
void defaultWeekStartDay();
void changedWeekStartDayIndex( int index );
- void defaultWorkingWeekStartDay();
- void changedWorkingWeekStartDayIndex( int index );
-
- void defaultWorkingWeekEndDay();
- void changedWorkingWeekEndDayIndex( int index );
-
- void defaultWeekDayOfPray();
- void changedWeekDayOfPrayIndex( int index );
-
//Date/Time tab
void defaultTimeFormat();
diff --git a/kcontrol/locale/kcmlocalewidget.ui b/kcontrol/locale/kcmlocalewidget.ui
index 5e68ab9f..0abff3d2 100644
--- a/kcontrol/locale/kcmlocalewidget.ui
+++ b/kcontrol/locale/kcmlocalewidget.ui
@@ -60,43 +60,6 @@
- -
-
-
- false
-
-
- Subdivision:
-
-
- m_comboCountryDivision
-
-
-
- -
-
-
-
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- false
-
-
-
-
-
@@ -630,123 +593,6 @@
- -
-
-
-
-
-
-
-
-
- First working day of week:
-
-
- m_comboWorkingWeekStartDay
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
- Last working day of week:
-
-
- m_comboWorkingWeekEndDay
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
-
- Week day for special religious observance:
-
-
- m_comboWeekDayOfPray
-
-
-
@@ -1265,8 +1111,6 @@
m_tabWidgetSettings
m_comboCountry
m_buttonDefaultCountry
- m_comboCountryDivision
- m_buttonDefaultCountryDivision
m_buttonDefaultThousandsSeparator
m_buttonDefaultDecimalSymbol
m_intDecimalPlaces
diff --git a/l10n/C/entry.desktop b/l10n/C/entry.desktop
index caa3925b..0103ad6b 100644
--- a/l10n/C/entry.desktop
+++ b/l10n/C/entry.desktop
@@ -95,7 +95,6 @@ Name[zh_TW]=預設
Region=
Languages=en_US
-NounDeclension=false
LanguageSensitiveDigits=true
DecimalPlaces=2
@@ -114,9 +113,6 @@ DateFormat=%A %d %B %Y
DateFormatShort=%Y-%m-%d
DateMonthNamePossessive=false
WeekStartDay=1
-WorkingWeekStartDay=1
-WorkingWeekEndDay=5
-WeekDayOfPray=7
WeekNumberSystem=0
DateTimeDigitSet=0
diff --git a/l10n/README b/l10n/README
index 90678796..1d6111da 100644
--- a/l10n/README
+++ b/l10n/README
@@ -193,25 +193,6 @@ between the entry name and the value.
Default: 1
-* WorkingWeekStartDay
- This defines which day is the first working day of the week. Accepted
- value is an integer number where 1 means Monday, 2 Tuesday, and so on.
-
- Default: 1
-
-* WorkingWeekEndDay
- This defines which day is the last working day of the week. Accepted
- value is an integer number where 1 means Monday, 2 Tuesday, and so on.
-
- Default: 5
-
-* WeekDayOfPray
- This defines which day is the day of the week for religious observance.
- Accepted value is an integer number where 1 means Monday, 2 Tuesday,
- and so on. A special value of 0 means no day of religious observance.
-
- Default: 7
-
* MeasureSystem
This defines which measure system we should use. There are two
values here, 0 for Metric and 1 for Imperial. Metric would give
diff --git a/l10n/af/entry.desktop b/l10n/af/entry.desktop
index 5ca095ed..d25188fc 100644
--- a/l10n/af/entry.desktop
+++ b/l10n/af/entry.desktop
@@ -101,9 +101,6 @@ Region=centralasia
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-WorkingWeekStartDay=6
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/az/entry.desktop b/l10n/az/entry.desktop
index d6c43ed6..7830658e 100644
--- a/l10n/az/entry.desktop
+++ b/l10n/az/entry.desktop
@@ -103,7 +103,4 @@ DateFormat[az]=%A %d %B %Y
DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%d-%m-%Y
TimeFormat=%H:%M:%S
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/bd/entry.desktop b/l10n/bd/entry.desktop
index 82c9e803..967f01f6 100644
--- a/l10n/bd/entry.desktop
+++ b/l10n/bd/entry.desktop
@@ -99,7 +99,4 @@ DateFormatShort=%d/%m/%Y
TimeFormat=%l:%M:%S %p
PageSize=0
MeasureSystem=1
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/bh/entry.desktop b/l10n/bh/entry.desktop
index 4d9e6e34..9df8444e 100644
--- a/l10n/bh/entry.desktop
+++ b/l10n/bh/entry.desktop
@@ -96,7 +96,4 @@ Region=middleeast
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=7
#DecimalPlaces=2
diff --git a/l10n/bn/entry.desktop b/l10n/bn/entry.desktop
index 15478b1c..a8a0782a 100644
--- a/l10n/bn/entry.desktop
+++ b/l10n/bn/entry.desktop
@@ -102,9 +102,6 @@ Languages=ms,zn_CN
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-WorkingWeekStartDay=1
-WorkingWeekEndDay=6
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/cn/entry.desktop b/l10n/cn/entry.desktop
index f7cdc11b..f0691785 100644
--- a/l10n/cn/entry.desktop
+++ b/l10n/cn/entry.desktop
@@ -106,9 +106,6 @@ DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%Y-%m-%d
TimeFormat=%H:%M:%S
WeekStartDay=1
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=0
MeasureSystem=0
PageSize=0
#DecimalPlaces=2
diff --git a/l10n/country.template b/l10n/country.template
index 94441044..e72e6c38 100644
--- a/l10n/country.template
+++ b/l10n/country.template
@@ -15,9 +15,6 @@
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-#WeekDayOfPray=
#PageSize=
#MeasureSystem=
#CalendarSystem=
diff --git a/l10n/cz/entry.desktop b/l10n/cz/entry.desktop
index 754e1c06..bfda3bf9 100644
--- a/l10n/cz/entry.desktop
+++ b/l10n/cz/entry.desktop
@@ -97,7 +97,6 @@ DateFormat[cs]=%a %e. %B %Y
DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%e. %n. %Y
TimeFormat=%H:%M:%S
-NounDeclension=true
DateMonthNamePossessive=true
AddressFormat=%0(%cm\n)%0(%n\n)%0(p. p. %p\n)%0(%s\n)%z%w%w%l
AddressCountryPosition=BELOW
diff --git a/l10n/dj/entry.desktop b/l10n/dj/entry.desktop
index 5560105e..bb393879 100644
--- a/l10n/dj/entry.desktop
+++ b/l10n/dj/entry.desktop
@@ -96,7 +96,4 @@ Region=northafrica
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=6
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/dz/entry.desktop b/l10n/dz/entry.desktop
index ff4486a0..e32dfe26 100644
--- a/l10n/dz/entry.desktop
+++ b/l10n/dz/entry.desktop
@@ -96,7 +96,4 @@ Region=northafrica
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=6
-WorkingWeekEndDay=3
-WeekDayOfPray=7
#DecimalPlaces=2
diff --git a/l10n/eg/entry.desktop b/l10n/eg/entry.desktop
index 6e1c9934..ffaa4aa4 100644
--- a/l10n/eg/entry.desktop
+++ b/l10n/eg/entry.desktop
@@ -96,7 +96,4 @@ Region=northafrica
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=6
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/gm/entry.desktop b/l10n/gm/entry.desktop
index fd8fd157..ed6d7dea 100644
--- a/l10n/gm/entry.desktop
+++ b/l10n/gm/entry.desktop
@@ -101,9 +101,6 @@ Languages=en_GB
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=7
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/gn/entry.desktop b/l10n/gn/entry.desktop
index 60eae196..34805efa 100644
--- a/l10n/gn/entry.desktop
+++ b/l10n/gn/entry.desktop
@@ -101,9 +101,6 @@ Languages=fr
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/gr/entry.desktop b/l10n/gr/entry.desktop
index ef00522e..622349c2 100644
--- a/l10n/gr/entry.desktop
+++ b/l10n/gr/entry.desktop
@@ -98,7 +98,6 @@ DecimalSymbol=,
ThousandsSeparator=.
PositiveSign=
NegativeSign=-
-NounDeclension=true
DateMonthNamePossessive=true
DateFormat[el]=%a %d %b %Y
DateFormat[eo]=%A, la %ea de %B %Y
diff --git a/l10n/gw/entry.desktop b/l10n/gw/entry.desktop
index 210907c2..6ef4c60c 100644
--- a/l10n/gw/entry.desktop
+++ b/l10n/gw/entry.desktop
@@ -101,9 +101,6 @@ Languages=es
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/hk/entry.desktop b/l10n/hk/entry.desktop
index 29e599c9..5a955f53 100644
--- a/l10n/hk/entry.desktop
+++ b/l10n/hk/entry.desktop
@@ -98,9 +98,6 @@ Languages=zh_TW,en_GB
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=0
PageSize=0
MeasureSystem=0
#DecimalPlaces=2
diff --git a/l10n/id/entry.desktop b/l10n/id/entry.desktop
index c9013084..a37989f0 100644
--- a/l10n/id/entry.desktop
+++ b/l10n/id/entry.desktop
@@ -102,7 +102,4 @@ DateFormat[id]=%A, %d %B %Y
DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%e/%m/%Y
TimeFormat=%H:%M:%S
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/il/entry.desktop b/l10n/il/entry.desktop
index 53ac6f32..e36825af 100644
--- a/l10n/il/entry.desktop
+++ b/l10n/il/entry.desktop
@@ -104,9 +104,6 @@ DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%e/%n/%Y
TimeFormat=%H:%M:%S
WeekStartDay=7
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=6
#PageSize=
#MeasureSystem=
#Civil calendar is Gregorian, religious is Hebrew
diff --git a/l10n/in/entry.desktop b/l10n/in/entry.desktop
index 5e62fd64..4a844dc6 100644
--- a/l10n/in/entry.desktop
+++ b/l10n/in/entry.desktop
@@ -98,9 +98,6 @@ DateFormat=%A %d %b %Y
DateFormatShort=%d/%m/%Y
TimeFormat=%l:%M:%S %p
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=0
PageSize=0
MeasureSystem=0
#DecimalPlaces=2
diff --git a/l10n/iq/entry.desktop b/l10n/iq/entry.desktop
index 67970483..6984e176 100644
--- a/l10n/iq/entry.desktop
+++ b/l10n/iq/entry.desktop
@@ -97,6 +97,4 @@ Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
WeekStartDay=7
-WorkingWeekStartDay=4
-WorkingWeekEndDay=5
#DecimalPlaces=2
diff --git a/l10n/ir/entry.desktop b/l10n/ir/entry.desktop
index f5f241ac..83f9d411 100644
--- a/l10n/ir/entry.desktop
+++ b/l10n/ir/entry.desktop
@@ -103,8 +103,5 @@ TimeFormat=%H:%M:%S
MeasureSystem=0
PageSize=0
WeekStartDay=6
-WorkingWeekStartDay=6
-WorkingWeekEndDay=4
-WeekDayOfPray=5
CalendarSystem=jalali
#DecimalPlaces=2
diff --git a/l10n/jo/entry.desktop b/l10n/jo/entry.desktop
index 9230cfda..282193d4 100644
--- a/l10n/jo/entry.desktop
+++ b/l10n/jo/entry.desktop
@@ -96,7 +96,4 @@ Region=middleeast
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/jp/entry.desktop b/l10n/jp/entry.desktop
index 9e99a079..7705219d 100644
--- a/l10n/jp/entry.desktop
+++ b/l10n/jp/entry.desktop
@@ -103,9 +103,6 @@ DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%Y-%m-%d
TimeFormat=%H:%M:%S
WeekStartDay=7
-WorkingWeekStartDay=1
-WorkingWeekEndDay=5
-WeekDayOfPray=0
PageSize=0
MeasureSystem=0
AddressFormat=%0(%z%w%r)%w%l%0(\n%s)%0(\n%cm)%0(\n%n)
diff --git a/l10n/kg/entry.desktop b/l10n/kg/entry.desktop
index ee519025..5d6f8882 100644
--- a/l10n/kg/entry.desktop
+++ b/l10n/kg/entry.desktop
@@ -101,9 +101,6 @@ Languages=ru
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/km/entry.desktop b/l10n/km/entry.desktop
index 9c8fb743..78769003 100644
--- a/l10n/km/entry.desktop
+++ b/l10n/km/entry.desktop
@@ -101,9 +101,6 @@ Languages=fr,ar
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/kp/entry.desktop b/l10n/kp/entry.desktop
index d6270007..4afb8071 100644
--- a/l10n/kp/entry.desktop
+++ b/l10n/kp/entry.desktop
@@ -96,7 +96,4 @@ DateFormat[ko]=%Y %B %e %A
DateFormat[eo]=%A, la %ea de %B %Y
#DateFormatShort=
TimeFormat=%H:%M:%S
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=0
#DecimalPlaces=2
diff --git a/l10n/kr/entry.desktop b/l10n/kr/entry.desktop
index 24abd27e..77e01f4a 100644
--- a/l10n/kr/entry.desktop
+++ b/l10n/kr/entry.desktop
@@ -99,7 +99,4 @@ NegativeSign=-
DateFormat=%Y년 %B %e일 %A
DateFormatShort=%Y. %n. %e
TimeFormat=%p %l:%M:%S
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=0
#DecimalPlaces=2
diff --git a/l10n/kw/entry.desktop b/l10n/kw/entry.desktop
index 7d708748..5a5dec7c 100644
--- a/l10n/kw/entry.desktop
+++ b/l10n/kw/entry.desktop
@@ -96,7 +96,4 @@ Region=middleeast
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/la/entry.desktop b/l10n/la/entry.desktop
index c744c63c..63df575c 100644
--- a/l10n/la/entry.desktop
+++ b/l10n/la/entry.desktop
@@ -100,9 +100,6 @@ Languages=fr,en
#DateFormatShort=
#TimeFormat=
#WeekStartDay=
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=0
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/lb/entry.desktop b/l10n/lb/entry.desktop
index a7788186..712ff408 100644
--- a/l10n/lb/entry.desktop
+++ b/l10n/lb/entry.desktop
@@ -96,7 +96,4 @@ Region=middleeast
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-#WorkingWeekStartDay=
-#WorkingWeekEndDay=
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/ly/entry.desktop b/l10n/ly/entry.desktop
index b5870461..441ff159 100644
--- a/l10n/ly/entry.desktop
+++ b/l10n/ly/entry.desktop
@@ -95,7 +95,4 @@ Region=northafrica
Languages=ar
DecimalSymbol=,
DateFormatShort=%y/%m/%d
-WorkingWeekStartDay=7
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#DecimalPlaces=2
diff --git a/l10n/pl/entry.desktop b/l10n/pl/entry.desktop
index 0550f84e..2c39d5ed 100644
--- a/l10n/pl/entry.desktop
+++ b/l10n/pl/entry.desktop
@@ -102,6 +102,5 @@ DateFormat[pl]=%A, %e %B %Y
DateFormatShort=%d/%m/%Y
DateFormat[eo]=%A, la %ea de %B %Y
TimeFormat=%H:%M:%S
-NounDeclension=true
DateMonthNamePossessive=true
#DecimalPlaces=2
diff --git a/l10n/ps/entry.desktop b/l10n/ps/entry.desktop
index aff0ee32..e6514701 100644
--- a/l10n/ps/entry.desktop
+++ b/l10n/ps/entry.desktop
@@ -98,9 +98,6 @@ ThousandsSeparator=.
DateFormatShort=%y/%m/%d
#TimeFormat=
#WeekStartDay=
-WorkingWeekStartDay=6
-WorkingWeekEndDay=4
-WeekDayOfPray=5
#PageSize=
#MeasureSystem=
#DecimalPlaces=2
diff --git a/l10n/si/entry.desktop b/l10n/si/entry.desktop
index e33b7f7e..6cf5cdc8 100644
--- a/l10n/si/entry.desktop
+++ b/l10n/si/entry.desktop
@@ -103,8 +103,6 @@ DateFormat[sl]=%A, %e. %B %Y
DateFormat[eo]=%A, la %ea de %B %Y
DateFormatShort=%d. %m. %y
TimeFormat=%H:%M:%S
-WeekDayOfPray=0
-NounDeclension=true
DateMonthNamePossessive=true
#DecimalPlaces=2
AddressFormat=%n\n%s\n%0(p.p. %p\n)%z %l
diff --git a/l10n/tr/entry.desktop b/l10n/tr/entry.desktop
index 6a292e98..ef6f207a 100644
--- a/l10n/tr/entry.desktop
+++ b/l10n/tr/entry.desktop
@@ -102,5 +102,4 @@ DateFormat[tr]=%d %B %Y %A
DateFormat[eo]=%A,la %ea de %B %Y
DateFormatShort=%d-%m-%Y
TimeFormat=%H:%M:%S
-WeekDayOfPray=0
#DecimalPlaces=2
diff --git a/plasma/declarativeimports/locale/locale.cpp b/plasma/declarativeimports/locale/locale.cpp
index 5421aca2..c082ce6e 100644
--- a/plasma/declarativeimports/locale/locale.cpp
+++ b/plasma/declarativeimports/locale/locale.cpp
@@ -30,13 +30,6 @@ Locale::Locale(QObject* parent)
m_locale = KGlobal::locale();
}
-bool Locale::setCountryDivisionCode(const QString &countryDivisionCode)
-{
- bool ok = m_locale->setCountryDivisionCode(countryDivisionCode);
- emit countryDivisionCodeChanged();
- return ok;
-}
-
bool Locale::isApplicationTranslatedInto(const QString &lang)
{
return m_locale->isApplicationTranslatedInto(lang);
@@ -58,11 +51,6 @@ QString Locale::country() const
return m_locale->country();
}
-QString Locale::countryDivisionCode() const
-{
- return m_locale->countryDivisionCode();
-}
-
QString Locale::translateQt(const char *context, const char *sourceText) const
{
return m_locale->translateQt(context, sourceText);
@@ -99,21 +87,6 @@ int Locale::weekStartDay() const
return m_locale->weekStartDay();
}
-int Locale::workingWeekStartDay() const
-{
- return m_locale->workingWeekStartDay();
-}
-
-int Locale::workingWeekEndDay() const
-{
- return m_locale->workingWeekEndDay();
-}
-
-int Locale::weekDayOfPray() const
-{
- return m_locale->weekDayOfPray();
-}
-
int Locale::decimalPlaces() const
{
return m_locale->decimalPlaces();
@@ -266,24 +239,6 @@ void Locale::setWeekStartDay(int day)
emit weekStartDayChanged();
}
-void Locale::setWorkingWeekStartDay(int day)
-{
- m_locale->setWorkingWeekStartDay(day);
- emit workingWeekStartDayChanged();
-}
-
-void Locale::setWorkingWeekEndDay(int day)
-{
- m_locale->setWorkingWeekEndDay(day);
- emit workingWeekEndDayChanged();
-}
-
-void Locale::setWeekDayOfPray(int day)
-{
- m_locale->setWeekDayOfPray(day);
- emit weekDayOfPrayChanged();
-}
-
QString Locale::dateFormat() const
{
return m_locale->dateFormat();
diff --git a/plasma/declarativeimports/locale/locale_p.h b/plasma/declarativeimports/locale/locale_p.h
index 1ac2bcf9..d4b504cc 100644
--- a/plasma/declarativeimports/locale/locale_p.h
+++ b/plasma/declarativeimports/locale/locale_p.h
@@ -82,7 +82,6 @@ Q_ENUMS(WeekNumberSystem)
Q_PROPERTY(BinaryUnitDialect binaryUnitDialect READ binaryUnitDialect WRITE setBinaryUnitDialect NOTIFY binaryUnitDialectChanged)
Q_PROPERTY(Locale::CalendarSystem calendarSystem READ calendarSystem WRITE setCalendarSystem NOTIFY calendarSystemChanged)
Q_PROPERTY(QString country READ country CONSTANT) //read-only
-Q_PROPERTY(QString countryDivisionCode READ countryDivisionCode WRITE setCountryDivisionCode NOTIFY countryDivisionCodeChanged)
Q_PROPERTY(QString dateFormat READ dateFormat WRITE setDateFormat NOTIFY dateFormatChanged)
Q_PROPERTY(QString dateFormatShort READ dateFormatShort WRITE setDateFormat NOTIFY dateFormatShortChanged)
Q_PROPERTY(QString timeFormat READ timeFormat WRITE setTimeFormat NOTIFY timeFormatChanged)
@@ -97,11 +96,8 @@ Q_PROPERTY(QString negativeSign READ negativeSign WRITE setNegativeSign NOTIFY n
Q_PROPERTY(int pageSize READ pageSize WRITE setPageSize NOTIFY pageSizeChanged)
Q_PROPERTY(QString positiveSign READ positiveSign WRITE setPositiveSign NOTIFY positiveSignChanged)
Q_PROPERTY(QString thousandsSeparator READ thousandsSeparator WRITE setThousandsSeparator NOTIFY thousandsSeparatorChanged)
-Q_PROPERTY(int weekDayOfPray READ weekDayOfPray WRITE setWeekDayOfPray NOTIFY weekDayOfPrayChanged)
Q_PROPERTY(Locale::WeekNumberSystem weekNumberSystem READ weekNumberSystem WRITE setWeekNumberSystem NOTIFY WeekNumberSystemChanged)
Q_PROPERTY(int weekStartDay READ weekStartDay WRITE setWeekStartDay NOTIFY weekStartDayChanged)
-Q_PROPERTY(int workingWeekEndDay READ workingWeekEndDay WRITE setWorkingWeekEndDay NOTIFY workingWeekEndDayChanged)
-Q_PROPERTY(int workingWeekStartDay READ workingWeekStartDay WRITE setWorkingWeekStartDay NOTIFY workingWeekStartDayChanged)
Q_PROPERTY(bool use12Clock READ use12Clock CONSTANT)
Q_PROPERTY(QString defaultLanguage READ defaultLanguage CONSTANT)//read-only
Q_PROPERTY(QString defaultCountry READ defaultCountry CONSTANT)//read-only
@@ -662,27 +658,6 @@ public:
*/
int weekStartDay() const;
- /**
- * Use this to determine which day is the first working day of the week.
- *
- * @return an integer (Monday=1..Sunday=7)
- */
- int workingWeekStartDay() const;
-
- /**
- * Use this to determine which day is the last working day of the week.
- *
- * @return an integer (Monday=1..Sunday=7)
- */
- int workingWeekEndDay() const;
-
- /**
- * Use this to determine which day is reserved for religious observance
- *
- * @return day number (None = 0, Monday = 1, ..., Sunday = 7)
- */
- int weekDayOfPray() const;
-
/**
*
* Returns the type of Calendar System used in this Locale
@@ -843,25 +818,6 @@ public:
*/
QString country() const;
- /**
- *
- * Returns the Country Division Code of the Country where the user lives.
- * When no value is set, then the Country Code will be returned.
- *
- * The returned code complies with the ISO 3166-2 standard.
- * See http://en.wikipedia.org/wiki/ISO_3166-2 for details.
- *
- * Note that unlike country() this method will return the correct case,
- * i.e. normally uppercase..
- *
- * In KDE 4.6 it is the apps responsibility to obtain a translation for the
- * code, translation and other services will be priovided in KDE 4.7.
- *
- * @return the Country Division Code for the user
- * @see setCountryDivisionCode
- */
- QString countryDivisionCode() const;
-
/**
* Returns the language codes selected by user, ordered by decreasing
* priority.
@@ -967,27 +923,6 @@ public:
*/
void setWeekStartDay(int day);
- /**
- * Changes how KLocale defines the first working day in week.
- *
- * @param day first working day of the week (Monday=1..Sunday=7) as integer
- */
- void setWorkingWeekStartDay(int day);
-
- /**
- * Changes how KLocale defines the last working day in week.
- *
- * @param day last working day of the week (Monday=1..Sunday=7) as integer
- */
- void setWorkingWeekEndDay(int day);
-
- /**
- * Changes how KLocale defines the day reserved for religious observance.
- *
- * @param day day of the week for religious observance (None=0,Monday=1..Sunday=7) as integer
- */
- void setWeekDayOfPray(int day);
-
/**
* Returns the currently selected date format.
*
@@ -1213,22 +1148,6 @@ public:
*/
Q_INVOKABLE bool isApplicationTranslatedInto(const QString & language);
- /**
- *
- * Sets the Country Division Code of the Country where the user lives.
- *
- * The code must comply with the ISO 3166-2 standard.
- * See http://en.wikipedia.org/wiki/ISO_3166-2 for details.
- *
- * In KDE 4.6 it is the apps responsibility to validate the input,
- * full validation and other services will be provided in KDE 4.7.
- *
- * @param countryDivision the Country Division Code for the user
- * @return @c true on success, @c false on failure
- * @see countryDivisionCode
- */
- bool setCountryDivisionCode(const QString & countryDivision);
-
/**
*
* Removes accelerator marker from a UI text label.
@@ -1279,7 +1198,6 @@ private:
Q_SIGNALS:
void binaryUnitDialectChanged();
void calendarSystemChanged();
- void countryDivisionCodeChanged();
void decimalSymbolChanged();
void dateFormatChanged();
void dateFormatShortChanged();
@@ -1293,11 +1211,8 @@ Q_SIGNALS:
void positiveSignChanged();
void thousandsSeparatorChanged();
void timeFormatChanged();
- void weekDayOfPrayChanged();
void WeekNumberSystemChanged();
void weekStartDayChanged();
- void workingWeekEndDayChanged();
- void workingWeekStartDayChanged();
};
#endif