generic: drop currency and monetary support

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

CMakeLists.txt

@@ -367,7 +367,6 @@ add_subdirectory(kdirshare)
 add_subdirectory(keditfiletype)
 # Default settings, content and config
 add_subdirectory(l10n)
-add_subdirectory(localization)
 add_subdirectory(kde-menu)
 
 ########### install files ###############

kcontrol/locale/kcmlocale.cpp

@@ -38,7 +38,6 @@
 #include <KMessageBox>
 #include <KPluginFactory>
 #include <KStandardDirs>
-#include <KCurrencyCode>
 
 #include "ui_kcmlocalewidget.h"
 
@@ -49,7 +48,6 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
          : KCModule( KCMLocaleFactory::componentData(), parent, args ),
            m_userConfig( 0 ),
            m_kcmConfig( 0 ),
-           m_currentConfig( 0 ),
            m_defaultConfig( 0 ),
            m_groupConfig( 0 ),
            m_countryConfig( 0 ),
@@ -133,53 +131,6 @@ KCMLocale::KCMLocale( QWidget *parent, const QVariantList &args )
     connect( m_ui->m_buttonDefaultDigitSet, SIGNAL( clicked() ),
              this,                        SLOT( defaultNumericDigitSet() ) );
 
-    // Money tab
-
-    connect( m_ui->m_comboCurrencyCode,       SIGNAL( currentIndexChanged( int ) ),
-             this,                              SLOT( changedCurrencyCodeIndex( int ) ) );
-    connect( m_ui->m_buttonDefaultCurrencyCode, SIGNAL( clicked() ),
-             this,                              SLOT( defaultCurrencyCode() ) );
-
-    connect( m_ui->m_comboCurrencySymbol,       SIGNAL( currentIndexChanged( int ) ),
-             this,                              SLOT( changedCurrencySymbolIndex( int ) ) );
-    connect( m_ui->m_buttonDefaultCurrencySymbol, SIGNAL( clicked() ),
-             this,                              SLOT( defaultCurrencySymbol() ) );
-
-    connect( m_ui->m_comboMonetaryDigitGrouping,         SIGNAL( currentIndexChanged( int ) ),
-             this,                                       SLOT(   changedMonetaryDigitGroupingIndex( int ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryDigitGrouping, SIGNAL( clicked() ),
-             this,                                       SLOT(   defaultMonetaryDigitGrouping() ) );
-
-    connect( m_ui->m_comboMonetaryThousandsSeparator,       SIGNAL( editTextChanged( const QString & ) ),
-             this,                                          SLOT( changedMonetaryThousandsSeparator( const QString & ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryThousandsSeparator, SIGNAL( clicked() ),
-             this,                                          SLOT( defaultMonetaryThousandsSeparator() ) );
-
-    connect( m_ui->m_comboMonetaryDecimalSymbol,       SIGNAL( editTextChanged( const QString & ) ),
-             this,                                     SLOT( changedMonetaryDecimalSymbol( const QString & ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryDecimalSymbol, SIGNAL( clicked() ),
-             this,                                     SLOT( defaultMonetaryDecimalSymbol() ) );
-
-    connect( m_ui->m_intMonetaryDecimalPlaces,         SIGNAL( valueChanged( int ) ),
-             this,                                     SLOT( changedMonetaryDecimalPlaces( int ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryDecimalPlaces, SIGNAL( clicked() ),
-             this,                                     SLOT( defaultMonetaryDecimalPlaces() ) );
-
-    connect( m_ui->m_comboMonetaryPositiveFormat,       SIGNAL( currentIndexChanged( int ) ),
-             this,                                      SLOT( changedMonetaryPositiveFormatIndex( int ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryPositiveFormat, SIGNAL( clicked() ),
-             this,                                      SLOT( defaultMonetaryPositiveFormat() ) );
-
-    connect( m_ui->m_comboMonetaryNegativeFormat,       SIGNAL( currentIndexChanged( int ) ),
-             this,                                      SLOT( changedMonetaryNegativeFormatIndex( int ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryNegativeFormat, SIGNAL( clicked() ),
-             this,                                      SLOT( defaultMonetaryNegativeFormat() ) );
-
-    connect( m_ui->m_comboMonetaryDigitSet,       SIGNAL( currentIndexChanged( int ) ),
-             this,                                SLOT( changedMonetaryDigitSetIndex( int ) ) );
-    connect( m_ui->m_buttonDefaultMonetaryDigitSet, SIGNAL( clicked() ),
-             this,                                SLOT( defaultMonetaryDigitSet() ) );
-
     // Calendar tab
 
     connect( m_ui->m_comboCalendarSystem,       SIGNAL( currentIndexChanged( int ) ),
@@ -501,17 +452,6 @@ void KCMLocale::copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup, KC
     copySetting( fromGroup, toGroup, "PositiveSign", flags );
     copySetting( fromGroup, toGroup, "NegativeSign", flags );
     copySetting( fromGroup, toGroup, "DigitSet", flags );
-    copySetting( fromGroup, toGroup, "CurrencyCode", flags );
-    copySetting( fromGroup, toGroup, "CurrencySymbol", flags );
-    copySetting( fromGroup, toGroup, "MonetaryDecimalPlaces", flags );
-    copySetting( fromGroup, toGroup, "MonetaryDecimalSymbol", flags );
-    copySetting( fromGroup, toGroup, "MonetaryDigitGroupFormat", flags );
-    copySetting( fromGroup, toGroup, "MonetaryThousandsSeparator", flags );
-    copySetting( fromGroup, toGroup, "PositivePrefixCurrencySymbol", flags );
-    copySetting( fromGroup, toGroup, "NegativePrefixCurrencySymbol", flags );
-    copySetting( fromGroup, toGroup, "PositiveMonetarySignPosition", flags );
-    copySetting( fromGroup, toGroup, "NegativeMonetarySignPosition", flags );
-    copySetting( fromGroup, toGroup, "MonetaryDigitSet", flags );
     copySetting( fromGroup, toGroup, "CalendarSystem", flags );
     copySetting( fromGroup, toGroup, "TimeFormat", flags );
     QString eraKey = QString::fromLatin1("DayPeriod1");
@@ -699,16 +639,6 @@ void KCMLocale::initSettingsWidgets()
     initNumericNegativeSign();
     initNumericDigitSet();
 
-    //Monetary tab
-    initCurrencyCode();  // Also inits CurrencySymbol
-    initMonetaryDigitGrouping();
-    initMonetaryThousandsSeparator();
-    initMonetaryDecimalSymbol();
-    initMonetaryDecimalPlaces();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-    initMonetaryDigitSet();
-
     //Calendar tab
     initCalendarSystem();
     // this also inits all the Calendar System dependent settings
@@ -749,17 +679,6 @@ void KCMLocale::initResetButtons()
     m_ui->m_buttonDefaultNegativeSign->setGuiItem( defaultItem );
     m_ui->m_buttonDefaultDigitSet->setGuiItem( defaultItem );
 
-    //Monetary tab
-    m_ui->m_buttonDefaultCurrencyCode->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultCurrencySymbol->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryDigitGrouping->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryThousandsSeparator->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryDecimalSymbol->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryDecimalPlaces->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryPositiveFormat->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryNegativeFormat->setGuiItem( defaultItem );
-    m_ui->m_buttonDefaultMonetaryDigitSet->setGuiItem( defaultItem );
-
     //Calendar tab
     m_ui->m_buttonDefaultCalendarSystem->setGuiItem( defaultItem );
     m_ui->m_buttonDefaultCalendarGregorianUseCommonEra->setGuiItem( defaultItem );
@@ -956,7 +875,7 @@ void KCMLocale::initSeparatorCombo( KComboBox *seperatorCombo )
     seperatorCombo->addItem( ki18nc( "Space separator symbol", "Single Space" ).toString( m_kcmLocale ), QString(' ') );
 }
 
-// Generic utility to set up a DigitSet combo, used for numbers, dates, money
+// Generic utility to set up a DigitSet combo, used for numbers, dates
 void KCMLocale::initDigitSetCombo( KComboBox *digitSetCombo )
 {
     digitSetCombo->clear();
@@ -976,13 +895,13 @@ void KCMLocale::insertDigitGroupingItem( KComboBox *digitGroupingCombo,
     if ( digitGroupingKey == "DigitGroupFormat" ) {
         digitGroupingCombo->addItem( customLocale->formatNumber( 123456789.12 ), digitGroupingFormat );
     } else {
-        digitGroupingCombo->addItem( customLocale->formatMoney( 123456789.12 ), digitGroupingFormat );
+        Q_ASSERT(false);
     }
     groupingConfig->markAsClean();
     delete customLocale;
 }
 
-// Generic utility to set up a Digit Grouping combo, used for numbers and money
+// Generic utility to set up a Digit Grouping combo, used for numbers
 void KCMLocale::initDigitGroupingCombo( KComboBox *digitGroupingCombo, const QString &digitGroupingKey)
 {
     digitGroupingCombo->clear();
@@ -1000,10 +919,9 @@ void KCMLocale::initTabs()
     m_ui->m_tabWidgetSettings->setTabText( 0, ki18n( "Country" ).toString( m_kcmLocale ) );
     m_ui->m_tabWidgetSettings->setTabText( 1, ki18n( "Languages" ).toString( m_kcmLocale ) );
     m_ui->m_tabWidgetSettings->setTabText( 2, ki18n( "Numbers" ).toString( m_kcmLocale ) );
-    m_ui->m_tabWidgetSettings->setTabText( 3, ki18n( "Money" ).toString( m_kcmLocale ) );
-    m_ui->m_tabWidgetSettings->setTabText( 4, ki18n( "Calendar" ).toString( m_kcmLocale ) );
-    m_ui->m_tabWidgetSettings->setTabText( 5, ki18n( "Date && Time" ).toString( m_kcmLocale ) );
-    m_ui->m_tabWidgetSettings->setTabText( 6, ki18n( "Other" ).toString( m_kcmLocale ) );
+    m_ui->m_tabWidgetSettings->setTabText( 3, ki18n( "Calendar" ).toString( m_kcmLocale ) );
+    m_ui->m_tabWidgetSettings->setTabText( 4, ki18n( "Date && Time" ).toString( m_kcmLocale ) );
+    m_ui->m_tabWidgetSettings->setTabText( 5, ki18n( "Other" ).toString( m_kcmLocale ) );
 }
 
 void KCMLocale::initSample()
@@ -1016,14 +934,6 @@ void KCMLocale::initSample()
     m_ui->m_textNumbersNegativeSample->setToolTip( helpText );
     m_ui->m_textNumbersNegativeSample->setWhatsThis( helpText );
 
-    m_ui->m_labelMoneySample->setText( ki18n( "Money:" ).toString( m_kcmLocale ) );
-    helpText = ki18n( "This is how positive monetary values will be displayed.").toString( m_kcmLocale );
-    m_ui->m_textMoneyPositiveSample->setToolTip( helpText );
-    m_ui->m_textMoneyPositiveSample->setWhatsThis( helpText );
-    helpText = ki18n( "This is how negative monetary values will be displayed.").toString( m_kcmLocale );
-    m_ui->m_textMoneyNegativeSample->setToolTip( helpText );
-    m_ui->m_textMoneyNegativeSample->setWhatsThis( helpText );
-
     m_ui->m_labelDateSample->setText( ki18n( "Date:" ).toString( m_kcmLocale ) );
     helpText = ki18n( "This is how long dates will be displayed.").toString( m_kcmLocale );
     m_ui->m_textDateSample->setToolTip( helpText );
@@ -1050,9 +960,6 @@ void KCMLocale::updateSample()
     m_ui->m_textNumbersPositiveSample->setText( m_kcmLocale->formatNumber( 123456789.12 ) );
     m_ui->m_textNumbersNegativeSample->setText( m_kcmLocale->formatNumber( -123456789.12 ) );
 
-    m_ui->m_textMoneyPositiveSample->setText( m_kcmLocale->formatMoney( 123456789.12 ) );
-    m_ui->m_textMoneyNegativeSample->setText( m_kcmLocale->formatMoney( -123456789.12 ) );
-
     KDateTime dateTime = KDateTime::currentLocalDateTime();
     m_ui->m_textDateSample->setText( m_kcmLocale->formatDate( dateTime.date(), KLocale::LongDate ) );
     m_ui->m_textShortDateSample->setText( m_kcmLocale->formatDate( dateTime.date(), KLocale::ShortDate ) );
@@ -1272,8 +1179,7 @@ void KCMLocale::initNumericDigitGrouping()
 
     m_ui->m_labelNumericDigitGrouping->setText( ki18n( "Digit grouping:" ).toString( m_kcmLocale ) );
     QString helpText = ki18n( "<p>Here you can define the digit grouping used to display "
-                              "numbers.</p><p>Note that the digit grouping used to display "
-                              "monetary values has to be set separately (see the 'Money' tab).</p>" ).toString( m_kcmLocale );
+                              "numbers.</p>" ).toString( m_kcmLocale );
     m_ui->m_comboNumericDigitGrouping->setToolTip( helpText );
     m_ui->m_comboNumericDigitGrouping->setWhatsThis( helpText );
 
@@ -1314,8 +1220,7 @@ void KCMLocale::initNumericThousandsSeparator()
 
     m_ui->m_labelThousandsSeparator->setText( ki18n( "Group separator:" ).toString( m_kcmLocale ) );
     QString helpText = ki18n( "<p>Here you can define the digit group separator used to display "
-                              "numbers.</p><p>Note that the digit group separator used to display "
-                              "monetary values has to be set separately (see the 'Money' tab).</p>" ).toString( m_kcmLocale );
+                              "numbers.</p>" ).toString( m_kcmLocale );
     m_ui->m_comboThousandsSeparator->setToolTip( helpText );
     m_ui->m_comboThousandsSeparator->setWhatsThis( helpText );
 
@@ -1371,9 +1276,7 @@ void KCMLocale::initNumericDecimalSymbol()
 
     m_ui->m_labelDecimalSymbol->setText( ki18n( "Decimal separator:" ).toString( m_kcmLocale ) );
     QString helpText = ki18n( "<p>Here you can define the decimal separator used to display "
-                              "numbers (i.e. a dot or a comma in most countries).</p><p>Note "
-                              "that the decimal separator used to display monetary values has "
-                              "to be set separately (see the 'Money' tab).</p>" ).toString( m_kcmLocale );
+                              "numbers (i.e. a dot or a comma in most countries).</p>" ).toString( m_kcmLocale );
     m_ui->m_comboDecimalSymbol->setToolTip( helpText );
     m_ui->m_comboDecimalSymbol->setWhatsThis( helpText );
 
@@ -1423,9 +1326,7 @@ void KCMLocale::initNumericDecimalPlaces()
     m_ui->m_labelDecimalPlaces->setText( ki18n( "Decimal places:" ).toString( m_kcmLocale ) );
     QString helpText = ki18n( "<p>Here you can set the number of decimal places displayed for "
                               "numeric values, i.e. the number of digits <em>after</em> the "
-                              "decimal separator.</p><p>Note that the decimal places used "
-                              "to display monetary values has to be set separately (see the "
-                              "'Money' tab).</p>" ).toString( m_kcmLocale );
+                              "decimal separator.</p>" ).toString( m_kcmLocale );
     m_ui->m_intDecimalPlaces->setToolTip( helpText );
     m_ui->m_intDecimalPlaces->setWhatsThis( helpText );
 
@@ -1460,9 +1361,7 @@ void KCMLocale::initNumericPositiveSign()
 
     m_ui->m_labelPositiveFormat->setText( ki18n( "Positive sign:" ).toString( m_kcmLocale ) );
     QString helpText = ki18n( "<p>Here you can specify text used to prefix positive numbers. "
-                              "Most locales leave this blank.</p><p>Note that the positive sign "
-                              "used to display monetary values has to be set separately (see the "
-                              "'Money' tab).</p>" ).toString( m_kcmLocale );
+                              "Most locales leave this blank.</p>" ).toString( m_kcmLocale );
     m_ui->m_comboPositiveSign->setToolTip( helpText );
     m_ui->m_comboPositiveSign->setWhatsThis( helpText );
 
@@ -1494,8 +1393,6 @@ void KCMLocale::changedNumericPositiveSign( const QString &newValue )
 
     // Update the format samples to relect new setting
     initNumericDigitGrouping();
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
 }
 
 // Change programatically, does set edit text so user can see it
@@ -1507,8 +1404,6 @@ void KCMLocale::setNumericPositiveSign( const QString &newValue )
 
     // Update the format samples to relect new setting
     initNumericDigitGrouping();
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
 }
 
 void KCMLocale::initNumericNegativeSign()
@@ -1518,9 +1413,7 @@ void KCMLocale::initNumericNegativeSign()
     m_ui->m_labelNegativeFormat->setText( ki18n( "Negative sign:" ).toString( m_kcmLocale ) );
     QString helpText = ki18n( "<p>Here you can specify text used to prefix negative numbers. "
                               "This should not be empty, so you can distinguish positive and "
-                              "negative numbers. It is normally set to minus (-).</p><p>Note "
-                              "that the negative sign used to display monetary values has to "
-                              "be set separately (see the 'Money' tab).</p>" ).toString( m_kcmLocale );
+                              "negative numbers. It is normally set to minus (-).</p>" ).toString( m_kcmLocale );
     m_ui->m_comboNegativeSign->setToolTip( helpText );
     m_ui->m_comboNegativeSign->setWhatsThis( helpText );
 
@@ -1549,9 +1442,6 @@ void KCMLocale::changedNumericNegativeSign( const QString &newValue )
     setItem( "NegativeSign", useValue,
              m_ui->m_comboNegativeSign, m_ui->m_buttonDefaultNegativeSign );
     m_kcmLocale->setNegativeSign( m_kcmSettings.readEntry( "NegativeSign", QString() ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryNegativeFormat();
 }
 
 // Change programatically, does set edit text so user can see it
@@ -1560,9 +1450,6 @@ void KCMLocale::setNumericNegativeSign( const QString &newValue )
     setEditComboItem( "NegativeSign", newValue,
                       m_ui->m_comboNegativeSign, m_ui->m_buttonDefaultNegativeSign );
     m_kcmLocale->setNegativeSign( m_kcmSettings.readEntry( "NegativeSign", QString() ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryNegativeFormat();
 }
 
 void KCMLocale::initNumericDigitSet()
@@ -1573,9 +1460,7 @@ void KCMLocale::initNumericDigitSet()
     QString helpText = ki18n( "<p>Here you can define the set of digits used to display numbers. "
                               "If digits other than Arabic are selected, they will appear only if "
                               "used in the language of the application or the piece of text where "
-                              "the number is shown.</p> <p>Note that the set of digits used to "
-                              "display monetary values has to be set separately (see the 'Money' "
-                              "tab).</p>" ).toString( m_kcmLocale );
+                              "the number is shown.</p>" ).toString( m_kcmLocale );
     m_ui->m_comboDigitSet->setToolTip( helpText );
     m_ui->m_comboDigitSet->setWhatsThis( helpText );
 
@@ -1606,631 +1491,6 @@ void KCMLocale::setNumericDigitSet( int newValue )
     initNumericDigitGrouping();
 }
 
-void KCMLocale::initCurrencyCode()
-{
-    m_ui->m_comboCurrencyCode->blockSignals( true );
-
-    m_ui->m_labelCurrencyCode->setText( ki18n( "Currency:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can choose the currency to be used when displaying "
-                              "monetary values, e.g. United States Dollar or Pound Sterling.</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboCurrencyCode->setToolTip( helpText );
-    m_ui->m_comboCurrencyCode->setWhatsThis( helpText );
-
-    //Create the list of Currency Codes to choose from.
-    //Visible text will be localised name plus unlocalised code.
-    m_ui->m_comboCurrencyCode->clear();
-    //First put all the preferred currencies first in order of priority
-    QStringList currencyCodeList = m_kcmLocale->currencyCodeList();
-    foreach ( const QString &currencyCode, currencyCodeList ) {
-        QString text = ki18nc( "@item currency name and currency code", "%1 (%2)")
-                       .subs( m_kcmLocale->currency()->currencyCodeToName( currencyCode ) )
-                       .subs( currencyCode )
-                       .toString( m_kcmLocale );
-        m_ui->m_comboCurrencyCode->addItem( text, QVariant( currencyCode ) );
-    }
-    //Next put all currencies available in alphabetical name order
-    m_ui->m_comboCurrencyCode->insertSeparator(m_ui->m_comboCurrencyCode->count());
-    currencyCodeList = m_kcmLocale->currency()->allCurrencyCodesList();
-    QStringList currencyNameList;
-    foreach ( const QString &currencyCode, currencyCodeList ) {
-        currencyNameList.append( ki18nc( "@item currency name and currency code", "%1 (%2)")
-                                 .subs( m_kcmLocale->currency()->currencyCodeToName( currencyCode ) )
-                                 .subs( currencyCode )
-                                 .toString( m_kcmLocale ) );
-    }
-    currencyNameList.sort();
-    foreach ( const QString &name, currencyNameList ) {
-        m_ui->m_comboCurrencyCode->addItem( name, QVariant( name.mid( name.length()-4, 3 ) ) );
-    }
-
-    setCurrencyCode( m_kcmSettings.readEntry( "CurrencyCode", QString() ) );
-
-    m_ui->m_comboCurrencyCode->blockSignals( false );
-}
-
-void KCMLocale::defaultCurrencyCode()
-{
-    setCurrencyCode( m_defaultSettings.readEntry( "CurrencyCode", QString() ) );
-}
-
-void KCMLocale::changedCurrencyCodeIndex( int index )
-{
-    setCurrencyCode( m_ui->m_comboCurrencyCode->itemData( index ).toString() );
-}
-
-void KCMLocale::setCurrencyCode( const QString &newValue )
-{
-    setComboItem( "CurrencyCode", newValue,
-                  m_ui->m_comboCurrencyCode, m_ui->m_buttonDefaultCurrencyCode );
-    m_kcmLocale->setCurrencyCode( m_kcmSettings.readEntry( "CurrencyCode", QString() ) );
-    // Update the Currency dependent widgets with the new Currency details
-    initCurrencySymbol();
-}
-
-void KCMLocale::initCurrencySymbol()
-{
-    m_ui->m_comboCurrencySymbol->blockSignals( true );
-
-    m_ui->m_labelCurrencySymbol->setText( ki18n( "Currency symbol:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can choose the symbol to be used when displaying "
-                              "monetary values, e.g. $, US$ or USD.</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboCurrencySymbol->setToolTip( helpText );
-    m_ui->m_comboCurrencySymbol->setWhatsThis( helpText );
-
-    //Create the list of Currency Symbols for the selected Currency Code
-    m_ui->m_comboCurrencySymbol->clear();
-    QStringList currencySymbolList = m_kcmLocale->currency()->symbolList();
-    foreach ( const QString &currencySymbol, currencySymbolList ) {
-        if ( currencySymbol == m_kcmLocale->currency()->defaultSymbol() ) {
-            m_ui->m_comboCurrencySymbol->addItem( currencySymbol, QVariant( QString() ) );
-        } else {
-            m_ui->m_comboCurrencySymbol->addItem( currencySymbol, QVariant( currencySymbol ) );
-        }
-    }
-
-    if ( !currencySymbolList.contains( m_kcmSettings.readEntry( "CurrencySymbol", QString() ) ) ) {
-        m_kcmSettings.deleteEntry( "CurrencySymbol" );
-        m_userSettings.deleteEntry( "CurrencySymbol", KConfig::Persistent | KConfig::Global );
-    }
-
-    setCurrencySymbol( m_kcmSettings.readEntry( "CurrencySymbol", QString() ) );
-
-    m_ui->m_comboCurrencySymbol->blockSignals( false );
-}
-
-void KCMLocale::defaultCurrencySymbol()
-{
-    setCurrencySymbol( m_defaultSettings.readEntry( "CurrencySymbol", QString() ) );
-}
-
-void KCMLocale::changedCurrencySymbolIndex( int index )
-{
-    setCurrencySymbol( m_ui->m_comboCurrencySymbol->itemData( index ).toString() );
-}
-
-void KCMLocale::setCurrencySymbol( const QString &newValue )
-{
-    setComboItem( "CurrencySymbol", newValue,
-                  m_ui->m_comboCurrencySymbol, m_ui->m_buttonDefaultCurrencySymbol );
-    if ( m_kcmSettings.readEntry( "CurrencySymbol", QString() ) != QString() ) {
-        m_kcmLocale->setCurrencySymbol( m_kcmSettings.readEntry( "CurrencySymbol", QString() ) );
-    } else {
-        m_kcmLocale->setCurrencySymbol( m_kcmLocale->currency()->defaultSymbol() );
-    }
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-}
-
-void KCMLocale::initMonetaryDigitGrouping()
-{
-    m_ui->m_comboMonetaryDigitGrouping->blockSignals( true );
-
-    m_ui->m_labelMonetaryDigitGrouping->setText( ki18n( "Digit grouping:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can define the digit grouping used to display monetary "
-                              "values.</p><p>Note that the digit grouping used to display "
-                              "other numbers has to be defined separately (see the 'Numbers' tab)."
-                              "</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboMonetaryDigitGrouping->setToolTip( helpText );
-    m_ui->m_comboMonetaryDigitGrouping->setWhatsThis( helpText );
-
-    initDigitGroupingCombo( m_ui->m_comboMonetaryDigitGrouping, "MonetaryDigitGroupFormat" );
-
-    setMonetaryDigitGrouping( m_kcmSettings.readEntry( "MonetaryDigitGroupFormat", "3" ) );
-
-    m_ui->m_comboMonetaryDigitGrouping->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryDigitGrouping()
-{
-    setMonetaryDigitGrouping( m_defaultSettings.readEntry( "MonetaryDigitGroupFormat", "3" ) );
-}
-
-void KCMLocale::changedMonetaryDigitGroupingIndex( int index )
-{
-    setMonetaryDigitGrouping( m_ui->m_comboMonetaryDigitGrouping->itemData( index ).toString() );
-}
-
-void KCMLocale::setMonetaryDigitGrouping( const QString &newValue )
-{
-    setComboItem( "MonetaryDigitGroupFormat", newValue,
-                  m_ui->m_comboMonetaryDigitGrouping, m_ui->m_buttonDefaultMonetaryDigitGrouping );
-
-    // No api to set, so need to force reload the locale
-    m_kcmConfig->markAsClean();
-    m_kcmLocale->setCountry( m_kcmSettings.readEntry( "Country", QString() ), m_kcmConfig.data() );
-    updateSample();
-}
-
-void KCMLocale::initMonetaryThousandsSeparator()
-{
-    m_ui->m_comboMonetaryThousandsSeparator->blockSignals( true );
-
-    m_ui->m_labelMonetaryThousandsSeparator->setText( ki18n( "Group separator:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can define the group separator used to display monetary "
-                              "values.</p><p>Note that the thousands separator used to display "
-                              "other numbers has to be defined separately (see the 'Numbers' tab)."
-                              "</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboMonetaryThousandsSeparator->setToolTip( helpText );
-    m_ui->m_comboMonetaryThousandsSeparator->setWhatsThis( helpText );
-
-    initSeparatorCombo( m_ui->m_comboMonetaryThousandsSeparator );
-
-    setMonetaryThousandsSeparator( m_kcmSettings.readEntry( "MonetaryThousandsSeparator", QString() )
-                                                .remove( QString::fromLatin1("$0") ) );
-
-    m_ui->m_comboMonetaryThousandsSeparator->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryThousandsSeparator()
-{
-    setMonetaryThousandsSeparator( m_defaultSettings.readEntry( "MonetaryThousandsSeparator", QString() )
-                                                    .remove( QString::fromLatin1("$0") ) );
-}
-
-void KCMLocale::changedMonetaryThousandsSeparator( const QString &newValue )
-{
-    QString useValue = newValue;
-    int item = m_ui->m_comboMonetaryThousandsSeparator->findText( newValue );
-    if ( item >= 0 ) {
-        useValue = m_ui->m_comboMonetaryThousandsSeparator->itemData( item ).toString();
-        m_ui->m_comboMonetaryThousandsSeparator->setEditText( useValue );
-    }
-    if ( useValue == QString(' ') ) {
-        useValue = "$0 $0";
-    }
-    setItem( "MonetaryThousandsSeparator", useValue,
-             m_ui->m_comboMonetaryThousandsSeparator, m_ui->m_buttonDefaultMonetaryThousandsSeparator );
-    m_kcmLocale->setMonetaryThousandsSeparator( m_kcmSettings.readEntry( "MonetaryThousandsSeparator", QString() )
-                                                             .remove( QString::fromLatin1("$0") ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-    updateSample();
-}
-
-void KCMLocale::setMonetaryThousandsSeparator( const QString &newValue )
-{
-    changedMonetaryThousandsSeparator( newValue );
-    m_ui->m_comboMonetaryThousandsSeparator->setEditText( m_kcmSettings.readEntry( "MonetaryThousandsSeparator", QString() )
-                                                                       .remove( QString::fromLatin1("$0") ) );
-}
-
-void KCMLocale::initMonetaryDecimalSymbol()
-{
-    m_ui->m_comboMonetaryDecimalSymbol->blockSignals( true );
-
-    m_ui->m_labelMonetaryDecimalSymbol->setText( ki18n( "Decimal separator:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can define the decimal separator used to display "
-                              "monetary values.</p><p>Note that the decimal separator used to "
-                              "display other numbers has to be defined separately (see the "
-                              "'Numbers' tab).</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboMonetaryDecimalSymbol->setToolTip( helpText );
-    m_ui->m_comboMonetaryDecimalSymbol->setWhatsThis( helpText );
-
-    initSeparatorCombo( m_ui->m_comboMonetaryDecimalSymbol );
-
-    setMonetaryDecimalSymbol( m_kcmSettings.readEntry( "MonetaryDecimalSymbol", QString() ) );
-
-    m_ui->m_comboMonetaryDecimalSymbol->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryDecimalSymbol()
-{
-    setMonetaryDecimalSymbol( m_defaultSettings.readEntry( "MonetaryDecimalSymbol", QString() ) );
-}
-
-void KCMLocale::changedMonetaryDecimalSymbol( const QString &newValue )
-{
-    QString useValue = newValue;
-    int item = m_ui->m_comboMonetaryDecimalSymbol->findText( newValue );
-    if ( item >= 0 ) {
-        useValue = m_ui->m_comboMonetaryDecimalSymbol->itemData( item ).toString();
-    }
-    setItem( "MonetaryDecimalSymbol", useValue,
-             m_ui->m_comboMonetaryDecimalSymbol, m_ui->m_buttonDefaultMonetaryDecimalSymbol );
-    m_kcmLocale->setMonetaryDecimalSymbol( m_kcmSettings.readEntry( "MonetaryDecimalSymbol", QString() ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-}
-
-void KCMLocale::setMonetaryDecimalSymbol( const QString &newValue )
-{
-    setEditComboItem( "MonetaryDecimalSymbol", newValue,
-                      m_ui->m_comboMonetaryDecimalSymbol, m_ui->m_buttonDefaultMonetaryDecimalSymbol );
-    m_kcmLocale->setMonetaryDecimalSymbol( m_kcmSettings.readEntry( "MonetaryDecimalSymbol", QString() ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-}
-
-void KCMLocale::initMonetaryDecimalPlaces()
-{
-    m_ui->m_intMonetaryDecimalPlaces->blockSignals( true );
-
-    m_ui->m_labelMonetaryDecimalPlaces->setText( ki18n( "Decimal places:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can set the number of decimal places displayed for "
-                              "monetary values, i.e. the number of digits <em>after</em> the "
-                              "decimal separator.</p><p>Note that the decimal places used to "
-                              "display other numbers has to be defined separately (see the "
-                              "'Numbers' tab).</p>" ).toString( m_kcmLocale );
-    m_ui->m_intMonetaryDecimalPlaces->setToolTip( helpText );
-    m_ui->m_intMonetaryDecimalPlaces->setWhatsThis( helpText );
-
-    setMonetaryDecimalPlaces( m_kcmSettings.readEntry( "MonetaryDecimalPlaces", 0 ) );
-
-    m_ui->m_intMonetaryDecimalPlaces->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryDecimalPlaces()
-{
-    setMonetaryDecimalPlaces( m_defaultSettings.readEntry( "MonetaryDecimalPlaces", 0 ) );
-}
-
-void KCMLocale::changedMonetaryDecimalPlaces( int newValue )
-{
-    setMonetaryDecimalPlaces( newValue );
-}
-
-void KCMLocale::setMonetaryDecimalPlaces( int newValue )
-{
-    setIntItem( "MonetaryDecimalPlaces", newValue,
-                m_ui->m_intMonetaryDecimalPlaces, m_ui->m_buttonDefaultMonetaryDecimalPlaces );
-    m_kcmLocale->setMonetaryDecimalPlaces( m_kcmSettings.readEntry( "MonetaryDecimalPlaces", 0 ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-}
-
-void KCMLocale::insertMonetaryPositiveFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition )
-{
-    KLocale custom( *m_kcmLocale );
-    custom.setPositivePrefixCurrencySymbol( prefixCurrencySymbol );
-    custom.setPositiveMonetarySignPosition( signPosition );
-    QVariantList options;
-    options.append( QVariant( prefixCurrencySymbol ) );
-    options.append( QVariant( signPosition ) );
-    m_ui->m_comboMonetaryPositiveFormat->addItem( custom.formatMoney( 123456.78 ), options );
-}
-
-void KCMLocale::initMonetaryPositiveFormat()
-{
-    m_ui->m_comboMonetaryPositiveFormat->blockSignals( true );
-
-    m_ui->m_labelMonetaryPositiveFormat->setText( ki18n( "Positive format:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can set the format of positive monetary values.</p>"
-                              "<p>Note that the positive sign used to display other numbers has "
-                              "to be defined separately (see the 'Numbers' tab).</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboMonetaryPositiveFormat->setToolTip( helpText );
-    m_ui->m_comboMonetaryPositiveFormat->setWhatsThis( helpText );
-
-    m_ui->m_comboMonetaryPositiveFormat->clear();
-    // If the positive sign is null, then all the sign options will look the same, so only show a
-    // choice between parens and no sign, but preserve original position in case they do set sign
-    // Also keep options in same order, i.e. sign options then parens option
-    if ( m_kcmSettings.readEntry( "PositiveSign", QString() ).isEmpty() ) {
-        KLocale::SignPosition currentSignPosition = (KLocale::SignPosition) m_currentSettings.readEntry( "PositiveMonetarySignPosition", 0 );
-        KLocale::SignPosition kcmSignPosition = (KLocale::SignPosition) m_kcmSettings.readEntry( "PositiveMonetarySignPosition", 0 );
-        if ( currentSignPosition == KLocale::ParensAround && kcmSignPosition == KLocale::ParensAround ) {
-            //Both are parens, so also give a sign option
-            insertMonetaryPositiveFormat( true, KLocale::BeforeQuantityMoney );
-            insertMonetaryPositiveFormat( false, KLocale::BeforeQuantityMoney );
-            insertMonetaryPositiveFormat( true, kcmSignPosition );
-            insertMonetaryPositiveFormat( false, kcmSignPosition );
-        } else if ( kcmSignPosition == KLocale::ParensAround ) {
-            //kcm is parens, current is sign, use both in right order
-            insertMonetaryPositiveFormat( true, currentSignPosition );
-            insertMonetaryPositiveFormat( false, currentSignPosition );
-            insertMonetaryPositiveFormat( true, kcmSignPosition );
-            insertMonetaryPositiveFormat( false, kcmSignPosition );
-        } else {
-            // kcm is sign, current is parens, use both in right order
-            insertMonetaryPositiveFormat( true, kcmSignPosition );
-            insertMonetaryPositiveFormat( false, kcmSignPosition );
-            insertMonetaryPositiveFormat( true, currentSignPosition );
-            insertMonetaryPositiveFormat( false, currentSignPosition );
-        }
-    } else {
-        // Show the sign options first, then parens
-        // Could do a loop, but lets keep it simple
-        insertMonetaryPositiveFormat( true, KLocale::BeforeQuantityMoney );
-        insertMonetaryPositiveFormat( false, KLocale::BeforeQuantityMoney );
-        insertMonetaryPositiveFormat( true, KLocale::AfterQuantityMoney );
-        insertMonetaryPositiveFormat( false, KLocale::AfterQuantityMoney );
-        insertMonetaryPositiveFormat( true, KLocale::BeforeMoney );
-        insertMonetaryPositiveFormat( false, KLocale::BeforeMoney );
-        insertMonetaryPositiveFormat( true, KLocale::AfterMoney );
-        insertMonetaryPositiveFormat( false, KLocale::AfterMoney );
-        insertMonetaryPositiveFormat( true, KLocale::ParensAround );
-        insertMonetaryPositiveFormat( false, KLocale::ParensAround );
-    }
-
-    setMonetaryPositiveFormat( m_kcmSettings.readEntry( "PositivePrefixCurrencySymbol", false ),
-                               (KLocale::SignPosition) m_defaultSettings.readEntry( "PositiveMonetarySignPosition", 0 ) );
-
-    // These are the old strings, keep around for now in case new implementation isn't usable
-    QString format = ki18n( "Sign position:" ).toString( m_kcmLocale );
-    format = ki18n( "Parentheses Around" ).toString( m_kcmLocale );
-    format = ki18n( "Before Quantity Money" ).toString( m_kcmLocale );
-    format = ki18n( "After Quantity Money" ).toString( m_kcmLocale );
-    format = ki18n( "Before Money" ).toString( m_kcmLocale );
-    format = ki18n( "After Money" ).toString( m_kcmLocale );
-    format = ki18n( "Here you can select how a positive sign will be "
-                    "positioned. This only affects monetary values." ).toString( m_kcmLocale );
-
-    QString check = ki18n( "Prefix currency symbol" ).toString( m_kcmLocale );
-    check = ki18n( "If this option is checked, the currency sign "
-                    "will be prefixed (i.e. to the left of the "
-                    "value) for all positive monetary values. If "
-                    "not, it will be postfixed (i.e. to the right)." ).toString( m_kcmLocale );
-
-    m_ui->m_comboMonetaryPositiveFormat->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryPositiveFormat()
-{
-    setMonetaryPositiveFormat( m_defaultSettings.readEntry( "PositivePrefixCurrencySymbol", false ),
-                               (KLocale::SignPosition) m_defaultSettings.readEntry( "PositiveMonetarySignPosition", 0 ) );
-}
-
-void KCMLocale::changedMonetaryPositiveFormatIndex( int index )
-{
-    QVariantList options = m_ui->m_comboMonetaryPositiveFormat->itemData( index ).toList();
-    bool prefixCurrencySymbol = options.at( 0 ).toBool();
-    KLocale::SignPosition signPosition = (KLocale::SignPosition) options.at( 1 ).toInt();
-    setMonetaryPositiveFormat( prefixCurrencySymbol, signPosition );
-}
-
-void KCMLocale::setMonetaryFormat( const QString &prefixCurrencySymbolKey, bool prefixCurrencySymbol,
-                                   const QString &signPositionKey, KLocale::SignPosition signPosition,
-                                   QWidget *formatWidget, KPushButton *formatDefaultButton )
-{
-    // If either setting is locked down by Kiosk, then don't let the user make any changes, and disable the widgets
-    if ( m_userSettings.isEntryImmutable( prefixCurrencySymbolKey ) ||
-         m_userSettings.isEntryImmutable( signPositionKey ) ) {
-            formatWidget->setEnabled( false );
-            formatDefaultButton->setEnabled( false );
-    } else {
-        formatWidget->setEnabled( true );
-        formatDefaultButton->setEnabled( false );
-
-        m_kcmSettings.writeEntry( prefixCurrencySymbolKey, prefixCurrencySymbol );
-        m_kcmSettings.writeEntry( signPositionKey, (int) signPosition );
-
-        // If the new value is not the default (i.e. is set in user), then save it and enable the default button
-        if ( prefixCurrencySymbol != m_defaultSettings.readEntry( prefixCurrencySymbolKey, false ) ) {
-            m_userSettings.writeEntry( prefixCurrencySymbolKey, prefixCurrencySymbol, KConfig::Persistent | KConfig::Global );
-            formatDefaultButton->setEnabled( true );
-        } else {  // Is the default so delete any user setting
-            m_userSettings.deleteEntry( prefixCurrencySymbolKey, KConfig::Persistent | KConfig::Global );
-        }
-
-        // If the new value is not the default (i.e. is set in user), then save it and enable the default button
-        if ( signPosition != m_defaultSettings.readEntry( signPositionKey, 0 ) ) {
-            m_userSettings.writeEntry( signPositionKey, (int) signPosition, KConfig::Persistent | KConfig::Global );
-            formatDefaultButton->setEnabled( true );
-        } else {  // Is the default so delete any user setting
-            m_userSettings.deleteEntry( signPositionKey, KConfig::Persistent | KConfig::Global );
-        }
-
-        checkIfChanged();
-    }
-}
-
-void KCMLocale::setMonetaryPositiveFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition )
-{
-    setMonetaryFormat( "PositivePrefixCurrencySymbol", prefixCurrencySymbol,
-                       "PositiveMonetarySignPosition", signPosition,
-                       m_ui->m_comboMonetaryPositiveFormat, m_ui->m_buttonDefaultMonetaryPositiveFormat );
-
-    // Read back the kcm values and use them in the sample locale
-    prefixCurrencySymbol = m_kcmSettings.readEntry( "PositivePrefixCurrencySymbol", false );
-    signPosition = (KLocale::SignPosition) m_kcmSettings.readEntry( "PositiveMonetarySignPosition", 0 );
-    m_kcmLocale->setPositivePrefixCurrencySymbol( prefixCurrencySymbol );
-    m_kcmLocale->setPositiveMonetarySignPosition( signPosition );
-
-    // Set the combo to the kcm value
-    QVariantList options;
-    options.append( QVariant( prefixCurrencySymbol ) );
-    options.append( QVariant( signPosition ) );
-    int index = m_ui->m_comboMonetaryPositiveFormat->findData( options );
-    m_ui->m_comboMonetaryPositiveFormat->setCurrentIndex( index );
-}
-
-void KCMLocale::insertMonetaryNegativeFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition )
-{
-    KLocale custom( *m_kcmLocale );
-    custom.setNegativePrefixCurrencySymbol( prefixCurrencySymbol );
-    custom.setNegativeMonetarySignPosition( signPosition );
-    QVariantList options;
-    options.append( QVariant( prefixCurrencySymbol ) );
-    options.append( QVariant( signPosition ) );
-    m_ui->m_comboMonetaryNegativeFormat->addItem( custom.formatMoney( -123456.78 ), options );
-}
-
-void KCMLocale::initMonetaryNegativeFormat()
-{
-    m_ui->m_comboMonetaryNegativeFormat->blockSignals( true );
-
-    m_ui->m_labelMonetaryNegativeFormat->setText( ki18n( "Negative format:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can set the format of negative monetary values.</p>"
-                              "<p>Note that the negative sign used to display other numbers has "
-                              "to be defined separately (see the 'Numbers' tab).</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboMonetaryNegativeFormat->setToolTip( helpText );
-    m_ui->m_comboMonetaryNegativeFormat->setWhatsThis( helpText );
-
-    QString format = ki18n( "Sign position:" ).toString( m_kcmLocale );
-    format = ki18n( "Parentheses Around" ).toString( m_kcmLocale );
-    format = ki18n( "Before Quantity Money" ).toString( m_kcmLocale );
-    format = ki18n( "After Quantity Money" ).toString( m_kcmLocale );
-    format = ki18n( "Before Money" ).toString( m_kcmLocale );
-    format = ki18n( "After Money" ).toString( m_kcmLocale );
-    format = ki18n( "Here you can select how a negative sign will "
-                    "be positioned. This only affects monetary "
-                    "values." ).toString( m_kcmLocale );
-
-    QString check = ki18n( "Prefix currency symbol" ).toString( m_kcmLocale );
-    check = ki18n( "If this option is checked, the currency sign "
-                    "will be prefixed (i.e. to the left of the "
-                    "value) for all negative monetary values. If "
-                    "not, it will be postfixed (i.e. to the right)." ).toString( m_kcmLocale );
-
-    m_ui->m_comboMonetaryNegativeFormat->clear();
-    // If the negative sign is null, then all the sign options will look the same, so only show a
-    // choice between parens and no sign, but preserve original position in case they do set sign
-    // Also keep options in same order, i.e. sign options then parens option
-    if ( m_kcmSettings.readEntry( "NegativeSign", QString() ).isEmpty() ) {
-        KLocale::SignPosition currentSignPosition = (KLocale::SignPosition) m_currentSettings.readEntry( "NegativeMonetarySignPosition", 0 );
-        KLocale::SignPosition kcmSignPosition = (KLocale::SignPosition) m_kcmSettings.readEntry( "NegativeMonetarySignPosition", 0 );
-        if ( currentSignPosition == KLocale::ParensAround && kcmSignPosition == KLocale::ParensAround ) {
-            //Both are parens, so also give a sign option
-            insertMonetaryNegativeFormat( true, KLocale::BeforeQuantityMoney );
-            insertMonetaryNegativeFormat( false, KLocale::BeforeQuantityMoney );
-            insertMonetaryNegativeFormat( true, kcmSignPosition );
-            insertMonetaryNegativeFormat( false, kcmSignPosition );
-        } else if ( kcmSignPosition == KLocale::ParensAround ) {
-            //kcm is parens, current is sign, use both in right order
-            insertMonetaryNegativeFormat( true, currentSignPosition );
-            insertMonetaryNegativeFormat( false, currentSignPosition );
-            insertMonetaryNegativeFormat( true, kcmSignPosition );
-            insertMonetaryNegativeFormat( false, kcmSignPosition );
-        } else {
-            // kcm is sign, current is parens, use both in right order
-            insertMonetaryNegativeFormat( true, kcmSignPosition );
-            insertMonetaryNegativeFormat( false, kcmSignPosition );
-            insertMonetaryNegativeFormat( true, currentSignPosition );
-            insertMonetaryNegativeFormat( false, currentSignPosition );
-        }
-    } else {
-        // Show the sign options first, then parens
-        insertMonetaryNegativeFormat( true, KLocale::BeforeQuantityMoney );
-        insertMonetaryNegativeFormat( false, KLocale::BeforeQuantityMoney );
-        insertMonetaryNegativeFormat( true, KLocale::AfterQuantityMoney );
-        insertMonetaryNegativeFormat( false, KLocale::AfterQuantityMoney );
-        insertMonetaryNegativeFormat( true, KLocale::BeforeMoney );
-        insertMonetaryNegativeFormat( false, KLocale::BeforeMoney );
-        insertMonetaryNegativeFormat( true, KLocale::AfterMoney );
-        insertMonetaryNegativeFormat( false, KLocale::AfterMoney );
-        insertMonetaryNegativeFormat( true, KLocale::ParensAround );
-        insertMonetaryNegativeFormat( false, KLocale::ParensAround );
-    }
-
-    setMonetaryNegativeFormat( m_kcmSettings.readEntry( "NegativePrefixCurrencySymbol", false ),
-                               (KLocale::SignPosition) m_defaultSettings.readEntry( "NegativeMonetarySignPosition", 0 ) );
-
-    m_ui->m_comboMonetaryNegativeFormat->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryNegativeFormat()
-{
-    setMonetaryNegativeFormat( m_defaultSettings.readEntry( "NegativePrefixCurrencySymbol", false ),
-                               (KLocale::SignPosition) m_defaultSettings.readEntry( "NegativeMonetarySignPosition", 0 ) );
-}
-
-void KCMLocale::changedMonetaryNegativeFormatIndex( int index )
-{
-    QVariantList options = m_ui->m_comboMonetaryNegativeFormat->itemData( index ).toList();
-    bool prefixCurrencySymbol = options.at( 0 ).toBool();
-    KLocale::SignPosition signPosition = (KLocale::SignPosition) options.at( 1 ).toInt();
-    setMonetaryNegativeFormat( prefixCurrencySymbol, signPosition );
-}
-
-void KCMLocale::setMonetaryNegativeFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition )
-{
-    setMonetaryFormat( "NegativePrefixCurrencySymbol", prefixCurrencySymbol,
-                       "NegativeMonetarySignPosition", signPosition,
-                       m_ui->m_comboMonetaryNegativeFormat, m_ui->m_buttonDefaultMonetaryNegativeFormat );
-
-    // Read back the kcm values and use them in the sample locale
-    prefixCurrencySymbol = m_kcmSettings.readEntry( "NegativePrefixCurrencySymbol", false );
-    signPosition = (KLocale::SignPosition) m_kcmSettings.readEntry( "NegativeMonetarySignPosition", 0 );
-    m_kcmLocale->setNegativePrefixCurrencySymbol( prefixCurrencySymbol );
-    m_kcmLocale->setNegativeMonetarySignPosition( signPosition );
-
-    // Set the combo to the kcm value
-    QVariantList options;
-    options.append( QVariant( prefixCurrencySymbol ) );
-    options.append( QVariant( signPosition ) );
-    int index = m_ui->m_comboMonetaryNegativeFormat->findData( options );
-    m_ui->m_comboMonetaryNegativeFormat->setCurrentIndex( index );
-
-    updateSample();
-}
-
-void KCMLocale::initMonetaryDigitSet()
-{
-    m_ui->m_comboMonetaryDigitSet->blockSignals( true );
-
-    m_ui->m_labelMonetaryDigitSet->setText( ki18n( "Digit set:" ).toString( m_kcmLocale ) );
-    QString helpText = ki18n( "<p>Here you can define the set of digits used to display monetary "
-                              "values. If digits other than Arabic are selected, they will appear "
-                              "only if used in the language of the application or the piece of "
-                              "text where the number is shown.</p><p>Note that the set of digits "
-                              "used to display other numbers has to be defined separately (see the "
-                              "'Numbers' tab).</p>" ).toString( m_kcmLocale );
-    m_ui->m_comboMonetaryDigitSet->setToolTip( helpText );
-    m_ui->m_comboMonetaryDigitSet->setWhatsThis( helpText );
-
-    initDigitSetCombo( m_ui->m_comboMonetaryDigitSet );
-
-    setMonetaryDigitSet( m_kcmSettings.readEntry( "MonetaryDigitSet", 0 ) );
-
-    m_ui->m_comboMonetaryDigitSet->blockSignals( false );
-}
-
-void KCMLocale::defaultMonetaryDigitSet()
-{
-    setMonetaryDigitSet( m_defaultSettings.readEntry( "MonetaryDigitSet", 0 ) );
-}
-
-void KCMLocale::changedMonetaryDigitSetIndex( int index )
-{
-    setMonetaryDigitSet( m_ui->m_comboMonetaryDigitSet->itemData( index ).toInt() );
-}
-
-void KCMLocale::setMonetaryDigitSet( int newValue )
-{
-    setComboItem( "MonetaryDigitSet", newValue,
-                  m_ui->m_comboMonetaryDigitSet, m_ui->m_buttonDefaultMonetaryDigitSet );
-    m_kcmLocale->setMonetaryDigitSet( (KLocale::DigitSet) m_kcmSettings.readEntry( "MonetaryDigitSet", 0 ) );
-
-    // Update the monetary format samples to relect new setting
-    initMonetaryDigitGrouping();
-    initMonetaryPositiveFormat();
-    initMonetaryNegativeFormat();
-}
-
 void KCMLocale::initCalendarSystem()
 {
     m_ui->m_comboCalendarSystem->blockSignals( true );
@@ -3113,8 +2373,8 @@ void KCMLocale::initDateTimeDigitSet()
                               "times.  If digits other than Arabic are selected, they will appear "
                               "only if used in the language of the application or the piece of "
                               "text where the date or time is shown.</p><p>Note that the set of "
-                              "digits used to display numeric and monetary values have to be set "
-                              "separately (see the 'Numbers' or 'Money' tabs).</p>" ).toString( m_kcmLocale );
+                              "digits used to display numeric values have to be set "
+                              "separately (see the 'Numbers' tab).</p>" ).toString( m_kcmLocale );
     m_ui->m_comboDateTimeDigitSet->setToolTip( helpText );
     m_ui->m_comboDateTimeDigitSet->setWhatsThis( helpText );
 

kcontrol/locale/kcmlocale.h

@@ -126,9 +126,6 @@ private:
                      KIntNumInput *itemInput, KPushButton *itemDefaultButton );
     void setCheckItem( const QString &itemKey, bool itemValue,
                        QCheckBox *itemCheck, KPushButton *itemDefaultButton );
-    void setMonetaryFormat( const QString &prefixCurrencySymbolKey, bool prefixCurrencySymbol,
-                            const QString &signPositionKey, KLocale::SignPosition signPosition,
-                            QWidget *formatWidget, KPushButton *formatDefaultButton );
 
     // Check if the chaged flag needs to be set
     void checkIfChanged();
@@ -141,8 +138,6 @@ private:
     void insertDigitGroupingItem( KComboBox *digitGroupingCombo,
                                   KSharedConfigPtr groupingConfig, KConfigGroup *groupingSettings,
                                   const QString &digitGroupingKey, const QString &digitGroupingFormat);
-    void insertMonetaryPositiveFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition );
-    void insertMonetaryNegativeFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition );
 
     void initAllWidgets();
     void initSettingsWidgets();
@@ -186,35 +181,6 @@ private:
     void initNumericDigitSet();
     void setNumericDigitSet( int newValue );
 
-    //Monetary tab
-
-    void initCurrencyCode();
-    void setCurrencyCode( const QString &newValue );
-
-    void initCurrencySymbol();
-    void setCurrencySymbol( const QString &newValue );
-
-    void initMonetaryDigitGrouping();
-    void setMonetaryDigitGrouping( const QString &newValue );
-
-    void initMonetaryThousandsSeparator();
-    void setMonetaryThousandsSeparator( const QString &newValue );
-
-    void initMonetaryDecimalSymbol();
-    void setMonetaryDecimalSymbol( const QString &newValue );
-
-    void initMonetaryDecimalPlaces();
-    void setMonetaryDecimalPlaces( int newValue );
-
-    void initMonetaryPositiveFormat();
-    void setMonetaryPositiveFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition );
-
-    void initMonetaryNegativeFormat();
-    void setMonetaryNegativeFormat( bool prefixCurrencySymbol, KLocale::SignPosition signPosition );
-
-    void initMonetaryDigitSet();
-    void setMonetaryDigitSet( int newValue );
-
     //Calendar Tab
 
     void initCalendarSystem();
@@ -314,35 +280,6 @@ private Q_SLOTS:
     void defaultNumericDigitSet();
     void changedNumericDigitSetIndex( int index );
 
-    //Monetary tab
-
-    void defaultCurrencyCode();
-    void changedCurrencyCodeIndex( int index );
-
-    void defaultCurrencySymbol();
-    void changedCurrencySymbolIndex( int index );
-
-    void defaultMonetaryDigitGrouping();
-    void changedMonetaryDigitGroupingIndex( int index );
-
-    void defaultMonetaryThousandsSeparator();
-    void changedMonetaryThousandsSeparator( const QString &newValue );
-
-    void defaultMonetaryDecimalSymbol();
-    void changedMonetaryDecimalSymbol( const QString &newValue );
-
-    void defaultMonetaryDecimalPlaces();
-    void changedMonetaryDecimalPlaces( int newValue );
-
-    void defaultMonetaryPositiveFormat();
-    void changedMonetaryPositiveFormatIndex( int index );
-
-    void defaultMonetaryNegativeFormat();
-    void changedMonetaryNegativeFormatIndex( int index );
-
-    void defaultMonetaryDigitSet();
-    void changedMonetaryDigitSetIndex( int index );
-
     //Calendar Tab
 
     void defaultCalendarSystem();

kcontrol/locale/kcmlocalewidget.ui

@@ -266,9 +266,6 @@
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
-         <property name="buddy">
-          <cstring>m_intMonetaryDecimalPlaces</cstring>
-         </property>
         </widget>
        </item>
        <item row="3" column="1">
@@ -311,9 +308,6 @@
          <property name="text">
           <string>Positive sign:</string>
          </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryPositiveFormat</cstring>
-         </property>
         </widget>
        </item>
        <item row="4" column="1">
@@ -353,9 +347,6 @@
          <property name="text">
           <string>Negative sign:</string>
          </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryNegativeFormat</cstring>
-         </property>
         </widget>
        </item>
        <item row="5" column="1">
@@ -422,361 +413,6 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="m_tabMoney">
-      <attribute name="title">
-       <string>Money</string>
-      </attribute>
-      <layout class="QFormLayout" name="formLayout">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::ExpandingFieldsGrow</enum>
-       </property>
-       <item row="0" column="0">
-        <widget class="QLabel" name="m_labelCurrencyCode">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Currency:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboCurrencyCode</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="KComboBox" name="m_comboCurrencyCode">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="whatsThis">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultCurrencyCode"/>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="m_labelCurrencySymbol">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Currency symbol:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboCurrencySymbol</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="KComboBox" name="m_comboCurrencySymbol">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultCurrencySymbol"/>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="m_labelMonetaryDigitGrouping">
-         <property name="text">
-          <string>Digit grouping:</string>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryDigitGrouping</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_38">
-         <item>
-          <widget class="KComboBox" name="m_comboMonetaryDigitGrouping">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryDigitGrouping"/>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="m_labelMonetaryThousandsSeparator">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Group separator:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryThousandsSeparator</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_4">
-         <item>
-          <widget class="KComboBox" name="m_comboMonetaryThousandsSeparator">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryThousandsSeparator"/>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
-        <widget class="QLabel" name="m_labelMonetaryDecimalSymbol">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Decimal separator:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryDecimalSymbol</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_3">
-         <item>
-          <widget class="KComboBox" name="m_comboMonetaryDecimalSymbol">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="editable">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryDecimalSymbol"/>
-         </item>
-        </layout>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="m_labelMonetaryDecimalPlaces">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Decimal places:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>m_intMonetaryDecimalPlaces</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
-         <item>
-          <widget class="KIntNumInput" name="m_intMonetaryDecimalPlaces">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="whatsThis">
-            <string/>
-           </property>
-           <property name="minimum">
-            <number>0</number>
-           </property>
-           <property name="maximum">
-            <number>10</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryDecimalPlaces"/>
-         </item>
-        </layout>
-       </item>
-       <item row="6" column="0">
-        <widget class="QLabel" name="m_labelMonetaryPositiveFormat">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Positive format:</string>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryPositiveFormat</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_6">
-         <item>
-          <widget class="KComboBox" name="m_comboMonetaryPositiveFormat">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="whatsThis">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryPositiveFormat"/>
-         </item>
-        </layout>
-       </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="m_labelMonetaryNegativeFormat">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Negative format:</string>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryNegativeFormat</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_7">
-         <item>
-          <widget class="KComboBox" name="m_comboMonetaryNegativeFormat">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip">
-            <string/>
-           </property>
-           <property name="whatsThis">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryNegativeFormat"/>
-         </item>
-        </layout>
-       </item>
-       <item row="8" column="0">
-        <widget class="QLabel" name="m_labelMonetaryDigitSet">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="whatsThis">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Digit set:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>m_comboMonetaryDigitSet</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <item>
-          <widget class="KComboBox" name="m_comboMonetaryDigitSet">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="KPushButton" name="m_buttonDefaultMonetaryDigitSet"/>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
      <widget class="QWidget" name="m_tabCalendar">
       <attribute name="title">
        <string>Calendar</string>
@@ -1546,63 +1182,42 @@
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QLabel" name="m_labelMoneySample">
-        <property name="text">
-         <string>Money:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QLabel" name="m_textMoneyPositiveSample">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
        <widget class="QLabel" name="m_labelDateSample">
         <property name="text">
          <string>Date:</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" colspan="2">
+      <item row="1" column="1" colspan="2">
        <widget class="QLabel" name="m_textDateSample">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
+      <item row="2" column="0">
        <widget class="QLabel" name="m_labelShortDateSample">
         <property name="text">
          <string>Short date:</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="QLabel" name="m_textShortDateSample">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
+      <item row="3" column="0">
        <widget class="QLabel" name="m_labelTimeSample">
         <property name="text">
          <string>Time:</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="QLabel" name="m_textTimeSample">
+      <item row="2" column="1" colspan="2">
+       <widget class="QLabel" name="m_textShortDateSample">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="m_textMoneyNegativeSample">
+      <item row="3" column="1" colspan="2">
+       <widget class="QLabel" name="m_textTimeSample">
         <property name="text">
          <string/>
         </property>
@@ -1662,22 +1277,6 @@
   <tabstop>m_buttonDefaultNegativeSign</tabstop>
   <tabstop>m_comboDigitSet</tabstop>
   <tabstop>m_buttonDefaultDigitSet</tabstop>
-  <tabstop>m_comboCurrencyCode</tabstop>
-  <tabstop>m_buttonDefaultCurrencyCode</tabstop>
-  <tabstop>m_comboCurrencySymbol</tabstop>
-  <tabstop>m_buttonDefaultCurrencySymbol</tabstop>
-  <tabstop>m_comboMonetaryThousandsSeparator</tabstop>
-  <tabstop>m_buttonDefaultMonetaryThousandsSeparator</tabstop>
-  <tabstop>m_comboMonetaryDecimalSymbol</tabstop>
-  <tabstop>m_buttonDefaultMonetaryDecimalSymbol</tabstop>
-  <tabstop>m_intMonetaryDecimalPlaces</tabstop>
-  <tabstop>m_buttonDefaultMonetaryDecimalPlaces</tabstop>
-  <tabstop>m_comboMonetaryPositiveFormat</tabstop>
-  <tabstop>m_buttonDefaultMonetaryPositiveFormat</tabstop>
-  <tabstop>m_comboMonetaryNegativeFormat</tabstop>
-  <tabstop>m_buttonDefaultMonetaryNegativeFormat</tabstop>
-  <tabstop>m_comboMonetaryDigitSet</tabstop>
-  <tabstop>m_buttonDefaultMonetaryDigitSet</tabstop>
   <tabstop>m_comboCalendarSystem</tabstop>
   <tabstop>m_buttonDefaultCalendarSystem</tabstop>
   <tabstop>m_checkCalendarGregorianUseCommonEra</tabstop>

kcontrol/locale/language.desktop

@@ -193,22 +193,22 @@ Comment[x-test]=xxLanguage, numeric, and time settings for your particular regio
 Comment[zh_CN]=您所在地区的语言、数字和时间设置
 Comment[zh_TW]=您所在地區的語言、數字和時間設定
 
-X-KDE-Keywords=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
 X-KDE-Keywords[ar]=لغة,ترجمة,هيئة الرقم,محلي,دولة,أطقم محارف,أطقم محارف,رمز عشري,آلآف,فواصل,رمز,موجب,سالب,العملة,مال,أرقام كسرية,تقويم,وقت,تأريخ,تنسيقات,أسبوع,بداية الأسبوع,أول,ورقة,حجم,رسالة,ِA4,قياس,متري,إنجليزية,إمبراطوري
-X-KDE-Keywords[bg]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,език,превод,числа,формат,страна, държава,кодова таблица,кодировка,десетичен знак,разделител,валута,пари,календар,време,дата, седмица,работен ден,мерна единица,печат,размер
-X-KDE-Keywords[bn]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
-X-KDE-Keywords[bs]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,jezik,prevođenje,format brojeva,lokalizacija,skup znakova,decimalni simboli,separator hiljada,predznak,valuta,razlomak,kalendat,vrijem,datum,papir.,mjere
+X-KDE-Keywords[bg]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,език,превод,числа,формат,страна, държава,кодова таблица,кодировка,десетичен знак,разделител,валута,пари,календар,време,дата, седмица,работен ден,мерна единица,печат,размер
+X-KDE-Keywords[bn]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[bs]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,jezik,prevođenje,format brojeva,lokalizacija,skup znakova,decimalni simboli,separator hiljada,predznak,valuta,razlomak,kalendat,vrijem,datum,papir.,mjere
 X-KDE-Keywords[ca]=idioma,traducció,format numèric,regional,país,jocs de caràcters,joc de caràcters,símbol decimal,separador de milers,símbol,separador,signe,positiu,negatiu,moneda,diners,dígits fraccionaris,calendari,hora,data,formats,setmana,inici de setmana,primer,paper,mida,carta,A4,mesura,mètric,Anglès,Imperial
 X-KDE-Keywords[ca@valencia]=idioma,traducció,format numèric,regional,país,jocs de caràcters,joc de caràcters,símbol decimal,separador de milers,símbol,separador,signe,positiu,negatiu,moneda,diners,dígits fraccionaris,calendari,hora,data,formats,setmana,inici de setmana,primer,paper,mida,carta,A4,mesura,mètric,Anglés,Imperial
 X-KDE-Keywords[cs]=jazyk,překlad,formát čísel,locale,Země,znakové sady,sady znaků,Decimální symbol,Oddělovač tisíců,symbol,oddělovač,znaménko,kladné,záporné,měna,peníze,zlomky,kalendář,čas,datum,formáty,týden,začátek týdne,první,papír,velikost,dopis,A4,míry,metrické,Anglické,Imperiální
 X-KDE-Keywords[da]=sprog,oversættelse,talformat,locale,lokalitet,land,tegnsæt,decimalsymbol,tusindtalsseparator,symbol,separator,positive,negative,valuta,penge,brøktal,kalender,tid,dato,formater,uge,ugestart,første,papir,størrelse,letter,A4,måleenhed,metrisk,Engelsk,Imperial
 X-KDE-Keywords[de]=Sprachen,Übersetzung,Zahlenformat,Währung,Zeit,Datum,Formate,Regionales,Land,Zeichensätze,Dezimalzeichen,Tausendertrennzeichen,Symbole,Zeichen,Vorzeichen,Positiv,Negativ,Bruchzahlen,Wochenanfang,Papierformat,A4,Letter,Metrisch,Imperial,Maßeinheiten
 X-KDE-Keywords[el]=γλώσσα,μετάφραση,μορφή αριθμού,εντοπιότητα,χώρα,charsets,σύνολα χαρακτήρων,δεκαδικό σύμβολο,διαχωριστικό χιλιάδων,σύμβολο,διαχωριστικό,πρόσημο,θετικό,αρνητικό,νόμισμα,χρήμα,δεκαδικά ψηφία,ημερολόγιο,ώρα,ημερομηνία,μορφές,εβδομάδα,αρχή εβδομάδας,πρώτη,χαρτί,μέγεθος,letter,A4,μέτρηση,μετρικό,Αγγλικό,Αγγλοσαξονικό
-X-KDE-Keywords[en_GB]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[en_GB]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
 X-KDE-Keywords[es]=idioma,traducción,formato de número,local,País,codificación,separador de decimales,separador de miles,símbolo,separador,signo,positivo,negativo,moneda,divisa,dígitos decimales,calendario,hora,fecha,formatos,semana,primer día de la semana,primero,papel,tamaño,carta,A4,medida,métrico,Inglés,Imperial
 X-KDE-Keywords[et]=keel,tõlkimine,arvuvorming,lokaat,riik,kodeering,kooditabel,kümnendkoht,tuhandete eraldaja,sümbol,eraldaja,märk,positiivne,negatiivne,raha,valuuta,murdarvud,kalender,kellaaeg,aeg,kuupäev,vormingud,nädal,nadala algus,paber,suurus,letter,A4,mõõtühikud,meetersüsteem,inglise süsteem
 X-KDE-Keywords[eu]=hizkuntza,itzulpena,zenbaki-formatua,eskualde-ezarpenak,Herrialdea,karaktere-jokoak,karaktere-jokoak,Ikur dezimala,Milakoen bereizlea,ikurra,bereizlea,zeinua,positiboa,negatiboa,moneta,dirua,zatikizko zifrak,egutegia,ordua,data,formatuak,astea,aste-hasiera,lehena,papera,tamaina,gutuna,A4,neurria,metrikoa,Ingelesa,Inperiala
-X-KDE-Keywords[fa]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[fa]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
 X-KDE-Keywords[fi]=kieli,käännös,kääntäminen,lukujen muotoilu,numeroiden muotoilu,locale,alue,alueasetukset,maa,merkistöt,desimaalierotin,tuhaterotin,symboli,erotin,merkki,positiivinen,negatiivinen,valuutta,raha,desimaalipaikkoja,desimaalipaikat,kalenteri,aika,kellonaika,päiväys,päivämäärä,muodot,viikko,viikon alku,viikon ensimmäinen päivä,ensimmäinen,paperi,koko,letter,A4,mittajärjestelmä,mittaaminen,metrinen,Anglosaksinen
 X-KDE-Keywords[fr]=langue, traduction, format numérique, localisation, pays, ensemble de caractères,symbole décimal, séparateur des milliers, symbole, séparateur, signe, positif, négatif, monnaie, argent, chiffres après la virgule, calendrier, heure, date, formats, semaine, premier jour de la semaine, premier, papier,taille, lettre, A4, mesure, métrique, Anglais, Impérial
 X-KDE-Keywords[ga]=teanga,aistriúchán,formáid uimhreacha,logchaighdeán,Tír,tacair carachtar,siombail dheachúlach,deighilteoir mílte,siombail,deighilteoir,comhartha,deimhneach,diúltach,airgeadra,airgead,digití,féilire,am,dáta,formáidí,seachtain,tús na seachtaine,tús,páipéar,méid,litir,A4,tomhas,méadrach,Béarla,Impiriúil
@@ -220,10 +220,10 @@ X-KDE-Keywords[ia]=linguage,traduction,formato de numero,locale,Pais,charsets,in
 X-KDE-Keywords[id]=bahasa,terjemahan,format angka,locale,Negara,set karakter,set karakter,Simbol desimal,Pemisah ribuan,simbol,pemisah,tanda,positif,negatif,mata uang,uang,digit fraksi,kalender,waktu,tanggal,format,minggu,awal minggu,pertama,kertas,ukuran,surat,A4,satuan,metrik,Inggris,Imperial
 X-KDE-Keywords[is]=tungumál,þýðing,talnasnið,staðfærsla,Land,stafasett,stafatafla,tugatákn,þúsund,tákn,aðgreinir,merki,jákvætt,neikvætt,gjaldmiðill,peningar,tugabrot,dagatal,tími,dagsetning,snið,vika,upphafsdagur,fyrst,pappír,size,bréf,A4,mál,metra,Enskt,Imperial
 X-KDE-Keywords[it]=language,translation,number format,locale,nazione,codifica,insieme dei caratteri,simbolo decimale,separatore delle migliaia,simbolo,separatore,segno,positivo,negativo,moneta,cifre decimali,calendario,ora,data,formati,settimana,inizio settimana,primo,carta,dimensione,lettera,A4,misura,metrico,inglese,imperiale
-X-KDE-Keywords[ja]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
-X-KDE-Keywords[kk]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
-X-KDE-Keywords[km]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
-X-KDE-Keywords[ko]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,언어,번역,로캘,국가,나라,인코딩,문지 집합,소수점,천,기호,구분자,부호,양수,음수,통화,돈,달력,날짜,시간,주,용지,측정,미터법
+X-KDE-Keywords[ja]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[kk]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[km]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[ko]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,언어,번역,로캘,국가,나라,인코딩,문지 집합,소수점,천,기호,구분자,부호,양수,음수,통화,돈,달력,날짜,시간,주,용지,측정,미터법
 X-KDE-Keywords[lv]=valoda,tulkojums,skaitļu formāts,lokāle,valsts,rakstzīmju kopas,decimālais simbols,tūkstošu atdalītājs,simbols,atdalītājs,zīme,pozitīvs,negatīvs,valūta, nauda,daļskaitļi,kalendārs,laiks,datums,formāti,nedēļa,nedēļas sākums, pirmais,papīrs,izmērs,vēstule,A4,mērvienības,metriskā,angļu,imperiālā
 X-KDE-Keywords[mr]=भाषा, भाषांतर, संख्या पद्धत, स्थानिक, देश, अक्षर संच, दशमान चिन्ह, सहस्त्र विभाजक, चिन्ह, विभाजक, निशाणी, पैसा, अपूर्णांक संख्या, दिनदर्शिका, वेळ, दिनांक, पद्धत, आठवडा, प्रथम, पान, आकार, A4, दशमान, इंग्रजी, शाही
 X-KDE-Keywords[nb]=språk,oversettelse,tallformat,lokale,Land,tegnsett,desimalsymbol,tusenseparator,symbol,separator,fortegn,positivt,negativt,valuta.penger,brøktall, tid,dato,formater,uke,ukestart,først,papir,letter,A4,mål.metrisk,engelsk,imperial
@@ -235,22 +235,22 @@ X-KDE-Keywords[pl]=język,tłumaczenie,format liczb,regionalność,kraj,zestaw z
 X-KDE-Keywords[pt]=língua,tradução,formato de números,localização,país,codificações,codificações de caracteres,símbolo decimal,separador de milhares,símbolo,separador,sinal,positivo,negativo,moeda,monetário,casas decimais,hora,data,formatos,semana,início da semana,primeiro,papel,tamanho,carta,A4,medida,medir,Inglês,Imperial
 X-KDE-Keywords[pt_BR]=idioma,tradução,formato de números,localização,país,codificações,codificações de caracteres,símbolo decimal,separador de milhares,símbolo,separador,sinal,positivo,negativo,moeda,monetário,casas decimais,calendário,hora,data,formatos,semana,início da semana,primeiro,papel,tamanho,carta,A4,medida,medir,Inglês,Imperial
 X-KDE-Keywords[ro]=limbă,traducere,format număr,localizare,țară,set de caractere,seturi de caractere,simbol decimal, separator de mii,simbol,separator,semn,pozitiv,negativ,monedă,bani,zecimale,calendar,timp,dată,formate, început,săptămînă,prima,hîrtie,dimensiune,A4,măsură,metric,unități,Imperial
-X-KDE-Keywords[ru]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,язык,перевод,формат чисел,локаль,страна,кодировка,наборы символов,десятичный разделитель,тысячный разделитель,символ,разделитель,подпись,положительный, отрицательный,валюта, деньги, дробные цифры, календарь, время, дата,формат, неделя,начало недели,бумага,размер, буквы,измерение,система мера,метрика
+X-KDE-Keywords[ru]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,язык,перевод,формат чисел,локаль,страна,кодировка,наборы символов,десятичный разделитель,тысячный разделитель,символ,разделитель,подпись,положительный, отрицательный,валюта, деньги, дробные цифры, календарь, время, дата,формат, неделя,начало недели,бумага,размер, буквы,измерение,система мера,метрика
 X-KDE-Keywords[sk]=jazyk,preklad,number format,locale,Krajina,charsets,character sets,Decimal symbol,Thousands separator,symbol,oddeľovač,znamienko,kladný,záporný,mena,peniaze,fractional digits,kalendár,čas,dátum,formáty,týždeň,week start,prvý,papier,veľkosť,letter,A4,measure,metric,English,Imperial
 X-KDE-Keywords[sl]=jezik,jeziki,prevod,prevodi,oblika števil,krajevne nastavitve,država,znaki,nabori znakov,decimalno ločilo,ločilo skupin,simbol,ločilo,ločilnik,negativno,pozitivno,oznaka,valuta,denar,decimalke,decimalna mesta,koledar,datum,oblike,teden,začetek tedna,prvi,papir,velikost,letter,a4,mere,mera,metrika,merski sistem,enote,enota
-X-KDE-Keywords[sr]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,језик,превод,формат бројева,локалитет,држава,кодирање,децимални симбол,раздвајач хиљада,раздвајач,симбол,знак,позитивно,негативно,валута,новац,разломак,календар,време,датум,формати,седмица,почетак седмице,недеља,папир,величина,А4,летер,метрички,империјални
-X-KDE-Keywords[sr@ijekavian]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,језик,превод,формат бројева,локалитет,држава,кодирање,децимални симбол,раздвајач хиљада,раздвајач,симбол,знак,позитивно,негативно,валута,новац,разломак,календар,време,датум,формати,седмица,почетак седмице,недеља,папир,величина,А4,летер,метрички,империјални
-X-KDE-Keywords[sr@ijekavianlatin]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,jezik,prevod,format brojeva,lokalitet,država,kodiranje,decimalni simbol,razdvajač hiljada,razdvajač,simbol,znak,pozitivno,negativno,valuta,novac,razlomak,kalendar,vreme,datum,formati,sedmica,početak sedmice,nedelja,papir,veličina,A4,leter,metrički,imperijalni
-X-KDE-Keywords[sr@latin]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,jezik,prevod,format brojeva,lokalitet,država,kodiranje,decimalni simbol,razdvajač hiljada,razdvajač,simbol,znak,pozitivno,negativno,valuta,novac,razlomak,kalendar,vreme,datum,formati,sedmica,početak sedmice,nedelja,papir,veličina,A4,leter,metrički,imperijalni
-X-KDE-Keywords[sv]=språk,översättning,nummerformat,plats,Land,teckenuppsättningar,decimalsymbol,tusentalsavgränsare,symbol,avgränsare,tecken,positivt,negativt,valuta,pengar,bråkdelssiffror,kalender,tid,datum,format,vecka, veckostart,först,papper,storlek,letter,A4,mått,meter,engelska
+X-KDE-Keywords[sr]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,језик,превод,формат бројева,локалитет,држава,кодирање,децимални симбол,раздвајач хиљада,раздвајач,симбол,знак,позитивно,негативно,валута,новац,разломак,календар,време,датум,формати,седмица,почетак седмице,недеља,папир,величина,А4,летер,метрички,империјални
+X-KDE-Keywords[sr@ijekavian]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,језик,превод,формат бројева,локалитет,држава,кодирање,децимални симбол,раздвајач хиљада,раздвајач,симбол,знак,позитивно,негативно,валута,новац,разломак,календар,време,датум,формати,седмица,почетак седмице,недеља,папир,величина,А4,летер,метрички,империјални
+X-KDE-Keywords[sr@ijekavianlatin]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,jezik,prevod,format brojeva,lokalitet,država,kodiranje,decimalni simbol,razdvajač hiljada,razdvajač,simbol,znak,pozitivno,negativno,valuta,novac,razlomak,kalendar,vreme,datum,formati,sedmica,početak sedmice,nedelja,papir,veličina,A4,leter,metrički,imperijalni
+X-KDE-Keywords[sr@latin]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,jezik,prevod,format brojeva,lokalitet,država,kodiranje,decimalni simbol,razdvajač hiljada,razdvajač,simbol,znak,pozitivno,negativno,valuta,novac,razlomak,kalendar,vreme,datum,formati,sedmica,početak sedmice,nedelja,papir,veličina,A4,leter,metrički,imperijalni
+X-KDE-Keywords[sv]=språk,versättning,nummerformat,plats,Land,teckenuppsättningar,decimalsymbol,tusentalsavgränsare,symbol,avgränsare,tecken,positivt,negativt,valuta,pengar,bråkdelssiffror,kalender,tid,datum,format,vecka, veckostart,först,papper,storlek,letter,A4,mått,meter,engelska
 X-KDE-Keywords[tg]=забон,тарҷума,формати рақамҳо,маҳаллисозӣ,Мамлакат,рамзгузорӣ,маҷмӯъи ҳарфҳо,аломати даҳӣ,Ҷудокунандаи ҳазорҳо,ишора,ҷудокунанда,аломат,мусбат,манфӣ,асъор,пул,рақамҳои касрӣ,тақвим,вақт,сана,форматҳо,ҳафта,оғози ҳафта,якум,коғаз,андоза,мактуб,A4,меъёр,метрикӣ,Тоҷикӣ,Импералӣ
 X-KDE-Keywords[tr]=dil,çeviri,sayısal biçim,yerel,Ülke,karakter seti,karakter setleri,Ondalık sembolü,binler basamağı ayırıcı,sembol,ayırıcı,işaret,pozitif,negatif,para birimi,para,kesir,takvim,saat,tarih,biçimler,hafta,hafta başı,ilk,kağıt,boyut,A4,mektup,ölçü,metrik,İngiliz
 X-KDE-Keywords[ug]=تىل،تەرجىمە،سانلارنىڭ يېزىلىشى،يەرلەشمە،دۆلەت،ھەرپ توپى، ھەرپ توپى،ئونلۇق بەلگىلەر،مىڭلار خانە ئايرىغۇچ، بەلگە،ئايرىغۇچ،ئالامەت،مۇسبەت،مەنپىي،پۇل،كەسىرسان،يىلنامە،ۋاقىت،چېسلا،پىچىملار،ھەپتە،ھەپتە بېشى،تۇنجى،قەغەز،چوڭلۇق،خەت،A4،ئۆلچەش،ئۇزۇنلۇق بىرلىكى،English، خانلىق
-X-KDE-Keywords[uk]=language;translation;number format;locale;Country;charsets;character sets;Decimal symbol;Thousands separator;symbol;separator;sign;positive;negative;currency;money;fractional digits;calendar;time;date;formats;week;week start;first;paper;size;letter;A4;measure;metric;English;Imperial;мова;мови;переклад;переклади;числа;формат;число;локаль;країна;набір;символ;кодування;розряд;тисяч;дробовий;дробова частина;роздільник;символ;знак;додатне;додатний;додатній;від’ємний;від’ємне;валюта;гроші;грошова одиниця;календар;час;дата;формати;тиждень;робочий тиждень;початок тижня;перший;папір;аркуш;вимір;виміри;вимірювання;одиниці вимірювання;метричний;метричні;метр;англійські;імперські
-X-KDE-Keywords[vi]=ngôn ngữ,dịch,định dạng số,tiền tệ,thời gian,ngày,định dạng,miền địa phương,Nước,quốc gia,bộ ký tự,bảng mã,ký hiệu thập phân,dấu cách hàng nghìn,ký hiệu,dấu phân cách,dấu,dương,âm,phân số,tuần,bắt đầu tuần,language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[uk]=language;translation;number format;locale;Country;charsets;character sets;Decimal symbol;Thousands separator;symbol;separator;sign;positive;negative;fractional digits;calendar;time;date;formats;week;week start;first;paper;size;letter;A4;measure;metric;English;Imperial;мова;мови;переклад;переклади;числа;формат;число;локаль;країна;набір;символ;кодування;розряд;тисяч;дробовий;дробова частина;роздільник;символ;знак;додатне;додатний;додатній;від’ємний;від’ємне;валюта;гроші;грошова одиниця;календар;час;дата;формати;тиждень;робочий тиждень;початок тижня;перший;папір;аркуш;вимір;виміри;вимірювання;одиниці вимірювання;метричний;метричні;метр;англійські;імперські
+X-KDE-Keywords[vi]=ngôn ngữ,dịch,định dạng số,tiền tệ,thời gian,ngày,định dạng,miền địa phương,Nước,quốc gia,bộ ký tự,bảng mã,ký hiệu thập phân,dấu cách hàng nghìn,ký hiệu,dấu phân cách,dấu,dương,âm,phân số,tuần,bắt đầu tuần,language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
 X-KDE-Keywords[wa]=lingaedje,ratournaedje,cogne des nombes,locåle,Payi,payis,djeus d' caracteres,djeus di caracteres,simbole des decimåles,separateu des meyes,simbole,separateu,sene,pôzitif,negatif,manoye,cwårs,çanses,liårds,liyårds,caracteres di fraccions,calindrî,eure,date,cognes,samwinne,cominçmint del samwinne,prumî djoû del samwinne,kimince del samwinne,prumî,papî,grandeu,grandeur,lete,A4,mezeure,muzeure,metrike,Inglès,Imperiå
-X-KDE-Keywords[x-test]=xxlanguage,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperialxx
-X-KDE-Keywords[zh_CN]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,语言,翻译,数字格式,语系,国家,字符集,千分符,十进制符号,符号,分隔符,正数,负数,现金,钱,日历,分号,时间,日期,星期,周,第一,纸张,大小,信件,度量,度量衡,英制,公制
-X-KDE-Keywords[zh_TW]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
+X-KDE-Keywords[x-test]=xxlanguage,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperialxx
+X-KDE-Keywords[zh_CN]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,语言,翻译,数字格式,语系,国家,字符集,千分符,十进制符号,符号,分隔符,正数,负数,现金,钱,日历,分号,时间,日期,星期,周,第一,纸张,大小,信件,度量,度量衡,英制,公制
+X-KDE-Keywords[zh_TW]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
 
 Categories=Qt;KDE;X-KDE-settings-accessibility;

l10n/C/entry.desktop

@@ -106,18 +106,6 @@ PositiveSign=
 NegativeSign=-
 DigitSet=0
 
-CurrencyCode=USD
-CurrencyCodesInUse=USD
-#CurrencySymbol=$ Don't default as will use default for CurrencyCode
-MonetaryDecimalPlaces=2
-MonetaryDecimalSymbol=.
-MonetaryDigitGroupFormat=3
-MonetaryThousandsSeparator=,
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
-MonetaryDigitSet=0
 
 CalendarSystem=gregorian
 

l10n/README

@@ -1,8 +1,8 @@
 GENERAL
 =======
 
-In KDE we support localization of calendars, dates, time, numbers and
-money. KDE will use this when displaying such information, giving you
+In KDE we support localization of calendars, dates, time, numbers.
+KDE will use this when displaying such information, giving you
 a feeling that KDE was written to fit your national standards. To make
 this possible, we need to gather some information on your national
 standards. Currently there are some 237 countries supported. If your
@@ -122,81 +122,18 @@ between the entry name and the value.
 
 	Default: 0
 
-
-* CurrencyCode
-    The ISO Code of the primary currency used in the country.
-
-    Default: "USD"
-
-* CurrencyCodesInUse
-    A list of ISO Codes of all the currencies used in the country.
-
-    Default: "USD"
-
-* MonetaryDecimalSymbol
-	The symbol that separates the decimals from the rest of the number
-	when displaying.
-
-	Default: "."
-
-* MonetaryDecimalPlaces
-    The number of decimal places to display in a formatted money amount
-
-    Default: 2
-
-* MonetaryThousandsSeparator
-	Thousands separator for money.
-
-	Default: ","
-
-* MonetaryDigitSet
-	The set of digits used to display money amounts.
-
-	See DigitSet for possible values.
-
-	Default: 0
-
 * PositiveSign
-	Positive sign for money.
-	Note: this will be used for formatting numbers. Do not add "+" if
-	      you don't really want numbers to be formatted that way.
+	Positive sign for numbers.
+	Note: Do not add "+" if you don't really want numbers to be
+	      formatted that way.
 
 	Default: ""
 
 * NegativeSign
-	Negative sign for money.
+	Negative sign for numbers.
 
 	Default: "-"
 
-* PositivePrefixCurrencySymbol
-	If currency symbol should be prepended (if not, it will be
-	appended). This is for non-negative money values.
-
-	Default: true
-
-* NegativePrefixCurrencySymbol
-	If currency symbol should be prepended (if not, it will be
-	appended). This is for negative money values.
-
-	Default: true
-
-* PositiveMonetarySignPosition
-	Defines which type and where the sign (if it's positive or
-	negative) should be placed. This is for non-negative money values.
-
-	0 ParensAround
-	1 BeforeQuantityMoney
-	2 AfterQuantityMoney
-	3 BeforeMoney
-	4 AfterMoney
-
-	Default: 1
-
-* NegativeMonetarySignPosition
-	Same as PositiveMonetarySignPosition, but for negative numbers.
-
-	Default: 0
-
 * DateFormat[language code]
 	This defines how a date is formated. The date string will be
     contructed from this string and the sequences below will be

l10n/ad/entry.desktop

@@ -95,14 +95,8 @@ Region=westeurope
 Languages=ca,fr,es
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=ca,fr,es
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/ae/entry.desktop

@@ -96,6 +96,3 @@ Languages=ar
 DecimalSymbol=,
 DateFormatShort=%y/%m/%d
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AED
-CurrencyCode=AED

l10n/af/entry.desktop

@@ -95,14 +95,8 @@ Region=centralasia
 #Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -113,6 +107,3 @@ WeekDayOfPray=5
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AFA
-CurrencyCode=AFA

l10n/ag/entry.desktop

@@ -95,14 +95,8 @@ Region=caribbean
 Languages=en_GB,en_US
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[en_US]=%A %d %b %Y
 DateFormat[en_GB]=%A %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
@@ -110,6 +104,3 @@ DateFormatShort=%d/%m/%Y
 TimeFormat=%I:%M:%S %p
 WeekStartDay=7
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XCD
-CurrencyCode=XCD

l10n/ai/entry.desktop

@@ -95,14 +95,8 @@ Region=caribbean
 #Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Region=caribbean
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XCD
-CurrencyCode=XCD

l10n/al/entry.desktop

@@ -95,14 +95,8 @@ Region=southeurope
 Languages=sq,el
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=3
-NegativeMonetarySignPosition=3
 DateFormat[sq]=%a, %d %B %Y
 DateFormatShort=%Y-%m-%d
 TimeFormat=%l.%M.%S.%p
@@ -110,6 +104,3 @@ WeekStartDay=7
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=ALL
-CurrencyCode=ALL

l10n/am/entry.desktop

@@ -96,14 +96,8 @@ Languages=hy
 DecimalSymbol=,
 ThousandsSeparator=.
 # FIXME Name is Dram, symbol is unknown
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 DateFormat[hy]=%A,%B %e, %Y
 DateFormatShort=%m/%d/%y
 TimeFormat=%H:%M:%S
@@ -111,6 +105,3 @@ WeekStartDay=7
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AMD
-CurrencyCode=AMD

l10n/an/entry.desktop

@@ -93,14 +93,8 @@ Region=caribbean
 Languages=nl,en_GB,es
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -108,6 +102,3 @@ Languages=nl,en_GB,es
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=ANG
-CurrencyCode=ANG

l10n/ao/entry.desktop

@@ -95,14 +95,8 @@ Region=southafrica
 Languages=pt
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=pt
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AOA
-CurrencyCode=AOA

l10n/ar/entry.desktop

@@ -96,14 +96,8 @@ Region=southamerica
 Languages=es
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
@@ -114,6 +108,3 @@ AddressFormat=%0(%cm\n)%0(%n\n)%0(Casilla de Correo %p\n)%0(%s\n)%z%w%l
 AddressCountryPosition=below
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=ARS
-CurrencyCode=ARS

l10n/as/entry.desktop

@@ -94,14 +94,8 @@ Region=oceania
 Languages=en_US
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%m/%d/%y
 TimeFormat=%I:%M:%S %p
@@ -109,6 +103,3 @@ WeekStartDay=7
 PageSize=2
 MeasureSystem=1
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=USD
-CurrencyCode=USD

l10n/at/entry.desktop

@@ -96,14 +96,8 @@ Region=centraleurope
 Languages=de
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[de]=%A, %e. %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d.%m.%Y
@@ -115,6 +109,3 @@ AddressFormat=%0(%n\n)%0(%cm\n)%0(Postfach %p\n)%0(%s\n)%0(%z)%w%l
 BusinessAddressFormat=%0(%cm\n)%0(z.Hd. %n\n)%0(Postfach %p\n)%0(%s\n)%0(%z)%w%l
 AddressCountryPosition=below
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/au/entry.desktop

@@ -96,14 +96,8 @@ Region=oceania
 Languages=en_GB,en
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=
-#PositiveMonetarySignPosition=
-#NegativeMonetarySignPosition=
 DateFormat[en_GB]=%a, %e %b %Y
 DateFormat[en]=%a, %e %b %Y
 DateFormat[en_US]=%a, %e %b %Y
@@ -119,6 +113,3 @@ TimeFormat[eo]=%H:%M:%S
 AddressFormat=%0(%n\n)%0(%cm\n)%0(%s\n)%0(PO BOX %p\n)%0(%L%w%w%R%w%w)%z
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AUD
-CurrencyCode=AUD

l10n/aw/entry.desktop

@@ -95,14 +95,8 @@ Region=caribbean
 Languages=nl,en_GB,sp
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=nl,en_GB,sp
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AWG
-CurrencyCode=AWG

l10n/ax/entry.desktop

@@ -92,14 +92,8 @@ Region=northeurope
 Languages=sv,se
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[sv]=%Aen den %e %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormat[se]=%A, %B %e. b. %Y
@@ -111,6 +105,3 @@ MeasureSystem=0
 AddressFormat=%0(%cm\n)%0(%n\n)%0(PB %p\n)%0(%s\n)%z%w%L
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/az/entry.desktop

@@ -97,14 +97,8 @@ Region=middleeast
 Languages=az
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[az]=%A %d %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d-%m-%Y
@@ -113,6 +107,3 @@ TimeFormat=%H:%M:%S
 #WorkingWeekEndDay=
 WeekDayOfPray=5
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AZN
-CurrencyCode=AZN

l10n/ba/entry.desktop

@@ -95,14 +95,8 @@ Region=southeurope
 Languages=bs,hr,sr
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[bs]=%a, %d %B %Y.
 DateFormat[hr]=%a, %d %B %Y.
 DateFormat[sr]=%a, %d %B %Y.
@@ -110,6 +104,3 @@ DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d.%m.%Y.
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BAM
-CurrencyCode=BAM

l10n/bb/entry.desktop

@@ -96,14 +96,8 @@ Region=caribbean
 Languages=en_GB,en_US
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[en_US]=%A %d %b %Y
 DateFormat[en_GB]=%A %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
@@ -111,6 +105,3 @@ DateFormatShort=%d/%m/%Y
 TimeFormat=%I:%M:%S %p
 WeekStartDay=7
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BBD
-CurrencyCode=BBD

l10n/bd/entry.desktop

@@ -94,7 +94,6 @@ Name[zh_CN]=孟加拉国
 Name[zh_TW]=孟加拉
 Region=southasia
 Languages=bn,en_GB
-NegativeMonetarySignPosition=1
 DateFormat=%A %d %b %Y
 DateFormatShort=%d/%m/%Y
 TimeFormat=%l:%M:%S %p
@@ -104,6 +103,3 @@ WorkingWeekStartDay=7
 WorkingWeekEndDay=4
 WeekDayOfPray=5
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BDT
-CurrencyCode=BDT

l10n/be/entry.desktop

@@ -96,14 +96,8 @@ Region=westeurope
 Languages=nl_BE,fr_BE,de_BE,nl,fr,de,wa
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[nl]=%A %e %B %Y
 DateFormat[fr]=%A %e %B %Y
 DateFormat[de]=%A %e. %B %Y
@@ -115,9 +109,6 @@ TimeFormat=%H:%M:%S
 PageSize=0
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR
 AddressFormat=%0(%cm\n)%0(%n\n)%0(%s\n)%0(PO Box %p\n)%z%w%L
 AddressFormat[fr]=%0(%cm\n)%0(%n\n)%0(%s\n)%0(BP %p\n)%z%w%L
 AddressFormat[de]=%0(%cm\n)%0(%n\n)%0(%s\n)%0(Postfach %p\n)%z%w%L

l10n/bf/entry.desktop

@@ -95,14 +95,8 @@ Region=westafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XOF
-CurrencyCode=XOF

l10n/bg/entry.desktop

@@ -96,14 +96,8 @@ Region=easteurope
 Languages=bg
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[bg]=%e.%n.%Y
 DateFormat[eo]=%A, %e %B %Y
 DateFormatShort=%e.%n.%Y
@@ -111,6 +105,3 @@ TimeFormat=%H:%M:%S
 PageSize=0
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BGN
-CurrencyCode=BGN

l10n/bh/entry.desktop

@@ -100,6 +100,3 @@ WorkingWeekStartDay=7
 WorkingWeekEndDay=4
 WeekDayOfPray=7
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BHD
-CurrencyCode=BHD

l10n/bi/entry.desktop

@@ -95,14 +95,8 @@ Region=centralafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BIF
-CurrencyCode=BIF

l10n/bj/entry.desktop

@@ -95,14 +95,8 @@ Region=westafrica
 #Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Region=westafrica
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XOF
-CurrencyCode=XOF

l10n/bl/entry.desktop

@@ -69,14 +69,8 @@ Region=caribbean
 Languages=fr
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat=%A %e %B %Y
 DateFormatShort=%d/%m/%Y
 TimeFormat=%H:%M:%S
@@ -86,6 +80,3 @@ MeasureSystem=0
 AddressFormat=%0(%cm\n)%0(%n\n)%0(%s\n)%0(BP %p\n)%z%w%L
 AddressCountryPosition=BELOW
 DecimalPlaces=2
-MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/bm/entry.desktop

@@ -95,14 +95,8 @@ Region=northamerica
 Languages=en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BMD
-CurrencyCode=BMD

l10n/bn/entry.desktop

@@ -96,14 +96,8 @@ Region=southeastasia
 Languages=ms,zn_CN
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -114,6 +108,3 @@ WeekDayOfPray=5
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BND
-CurrencyCode=BND

l10n/bo/entry.desktop

@@ -96,20 +96,11 @@ Region=southamerica
 Languages=es
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eu]=%a, %Yeko %bren %da
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BOB
-CurrencyCode=BOB

l10n/br/entry.desktop

@@ -96,14 +96,8 @@ Region=southamerica
 Languages=pt_BR
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[pt_BR]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d-%m-%Y
@@ -111,6 +105,3 @@ TimeFormat=%H:%M:%S
 WeekStartDay=7
 AddressFormat=%0(%cm\n)%0(%n\n)%0(Caixa Postal %p\n)%0(%s\n)%l%0( - %r)%0(\n%z)
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BRL
-CurrencyCode=BRL

l10n/bs/entry.desktop

@@ -95,14 +95,8 @@ Region=caribbean
 Languages=en_GB,es
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=en_GB,es
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BSD
-CurrencyCode=BSD

l10n/bt/entry.desktop

@@ -96,14 +96,8 @@ Region=southasia
 Languages=dz,en
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[en]=%A %d %B %Y
 DateFormat[dz]=སྤྱི་ལོ་%Y ཟླ%n ཚེ་%d
 DateFormatShort=%Y-%m-%d
@@ -112,6 +106,3 @@ WeekStartDay=7
 PageSize=0
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BTN,INR
-CurrencyCode=BTN

l10n/bw/entry.desktop

@@ -95,14 +95,8 @@ Region=southafrica
 Languages=en_GB,ts
 DecimalSymbol=.
 ThousandsSeparator=.
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=3
-NegativeMonetarySignPosition=3
 DateFormat[en_GB]=%A %d %B %Y
 DateFormatShort=%d/%m/%Y
 TimeFormat=%l.%M.%S %p
@@ -110,6 +104,3 @@ WeekStartDay=7
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BWP
-CurrencyCode=BWP

l10n/by/entry.desktop

@@ -97,14 +97,8 @@ Region=easteurope
 Languages=be,ru
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat=%e %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
@@ -114,6 +108,3 @@ MeasureSystem=0
 PageSize=0
 CalendarSystem=gregorian
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BYR
-CurrencyCode=BYR

l10n/bz/entry.desktop

@@ -95,14 +95,8 @@ Region=centralamerica
 Languages=en_GB,es
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=en_GB,es
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=BZD
-CurrencyCode=BZD

l10n/ca/entry.desktop

@@ -100,18 +100,8 @@ Languages=en_GB,fr,en_US
 DecimalSymbol=.
 ThousandsSeparator=,
 ThousandsSeparator[fr]=$0 $0
-MonetaryDecimalSymbol=.
-MonetaryDecimalSymbol[fr]=,
-MonetaryThousandsSeparator=,
-MonetaryThousandsSeparator[fr]=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositivePrefixCurrencySymbol[fr]=false
-NegativePrefixCurrencySymbol[fr]=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[en_GB]=%B %e, %Y
 DateFormat[fr]=%e %B %Y
 DateFormat[en_US]=%B %e, %Y
@@ -129,6 +119,3 @@ MeasureSystem=0
 AddressFormat=%0(%N\n)%0(%CM\n)%0(%S\n)%0(PO BOX %p\n)%0(%L%w%R)%,%z
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CAD
-CurrencyCode=CAD

l10n/cc/entry.desktop

@@ -94,14 +94,8 @@ Region=southeastasia
 Languages=ms,en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -109,6 +103,3 @@ Languages=ms,en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AUD
-CurrencyCode=AUD

l10n/cd/entry.desktop

@@ -92,14 +92,8 @@ Region=centralafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -107,6 +101,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CDF
-CurrencyCode=CDF

l10n/cf/entry.desktop

@@ -94,14 +94,8 @@ Region=centralafrica
 #Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -109,6 +103,3 @@ Region=centralafrica
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XAF
-CurrencyCode=XAF

l10n/cg/entry.desktop

@@ -95,14 +95,8 @@ Region=centralafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XAF
-CurrencyCode=XAF

l10n/ch/entry.desktop

@@ -96,17 +96,8 @@ Region=centraleurope
 Languages=de,fr,it
 DecimalSymbol=.
 ThousandsSeparator=$0 $0
-CurrencySymbol[de]=Fr.
-CurrencySymbol[fr]=F
-CurrencySymbol[it]=F
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[de]=%A, %e. %B %Y
 DateFormat[fr]=%A, %e %B %Y
 DateFormat[it]=%A, %e %B %Y
@@ -122,6 +113,3 @@ AddressFormat[fr]=%0(%cm\n)%0(%n\n)%0(Case postale %p\n)%0(%s\n)%z%w%l
 AddressFormat[it]=%0(%cm\n)%0(%n\n)%0(Casella postale %p\n)%0(%s\n)%z%w%l
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CHF
-CurrencyCode=CHF

l10n/ci/entry.desktop

@@ -94,14 +94,8 @@ Region=westafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -109,6 +103,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XOF
-CurrencyCode=XOF

l10n/ck/entry.desktop

@@ -93,14 +93,8 @@ Region=oceania
 Languages=ms,en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -108,6 +102,3 @@ Languages=ms,en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=NZD
-CurrencyCode=

l10n/cl/entry.desktop

@@ -96,19 +96,10 @@ Region=southamerica
 Languages=es
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CLP,CLF
-CurrencyCode=CLP

l10n/cm/entry.desktop

@@ -95,14 +95,8 @@ Region=centralafrica
 Languages=fr,en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=fr,en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XAF
-CurrencyCode=XAF

l10n/cn/entry.desktop

@@ -97,14 +97,8 @@ Region=eastasia
 Languages=zh_CN
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[zh_CN]=%Y年%n月%e日 %A
 DateFormat[zh_TW]=%Y年%n月%e日 %A
 #DateFormat[de]=%A %e. %B %Y
@@ -118,6 +112,3 @@ WeekDayOfPray=0
 MeasureSystem=0
 PageSize=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CNY
-CurrencyCode=CNY

l10n/co/entry.desktop

@@ -96,19 +96,10 @@ Region=southamerica
 Languages=es
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=COP,COU
-CurrencyCode=COP

l10n/country.template

@@ -8,17 +8,9 @@
 #Languages=
 #DecimalSymbol=
 #ThousandsSeparator=
-#CurrencySymbol=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
 #DecimalPlaces=
-#MonetaryDecimalPlaces=
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=
-#PositiveMonetarySignPosition=
-#NegativeMonetarySignPosition=
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=

l10n/cr/entry.desktop

@@ -96,14 +96,8 @@ Region=centralamerica
 Languages=es
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%A, %e de %B de %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%I:%M:%S %p
@@ -111,6 +105,3 @@ WeekStartDay=1
 PageSize=2
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CRC
-CurrencyCode=CRC

l10n/cu/entry.desktop

@@ -96,14 +96,8 @@ Region=caribbean
 Languages=es
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%A, %e de %B de %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%I:%M:%S %p
@@ -111,6 +105,3 @@ WeekStartDay=1
 PageSize=2
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CUP,CUC
-CurrencyCode=CUP

l10n/cv/entry.desktop

@@ -95,14 +95,8 @@ Region=westafrica
 Languages=pt
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=pt
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CVE
-CurrencyCode=CVE

l10n/cx/entry.desktop

@@ -94,14 +94,8 @@ Region=southeastasia
 Languages=en_GB,zh_CN,ms
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -109,6 +103,3 @@ Languages=en_GB,zh_CN,ms
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=AUD
-CurrencyCode=AUD

l10n/cy/entry.desktop

@@ -95,14 +95,8 @@ Region=southeurope
 Languages=el,tr,en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=el,tr,en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/cz/entry.desktop

@@ -91,14 +91,8 @@ Region=centraleurope
 Languages=cs
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=−
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[cs]=%a %e. %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%e. %n. %Y
@@ -108,6 +102,3 @@ DateMonthNamePossessive=true
 AddressFormat=%0(%cm\n)%0(%n\n)%0(p. p. %p\n)%0(%s\n)%z%w%w%l
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=CZK
-CurrencyCode=CZK

l10n/de/entry.desktop

@@ -97,15 +97,8 @@ Languages=de,nds
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
 ThousandsSeparator[nds]=$0.$0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
-MonetaryThousandsSeparator[nds]=$0.$0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[de]=%A, %e. %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormat[nds]=%A, de %e. %B %Y
@@ -119,6 +112,3 @@ AddressFormat=%0(%cm\n)%0(%n\n)%0(Postfach %p\n)%0(%s\n)%z%w%l
 AddressFormat[nds]=%0(%n\n)%0(- %cm -\n)%0(Postfach %p\n)%0(%s\n)%z%w%l
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/dj/entry.desktop

@@ -100,6 +100,3 @@ WorkingWeekStartDay=6
 WorkingWeekEndDay=4
 WeekDayOfPray=5
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=DJF
-CurrencyCode=DJF

l10n/dk/entry.desktop

@@ -97,14 +97,8 @@ Region=northeurope
 Languages=da
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[da]=%A den %e. %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%e/%n-%Y
@@ -115,6 +109,3 @@ MeasureSystem=0
 AddressFormat=%0(%n\n)%0(%cm\n)%0(%s\n)%0(Postboks %p\n)%z%w%l
 AddressCountryPosition=below
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=DKK
-CurrencyCode=DKK

l10n/dm/entry.desktop

@@ -95,14 +95,8 @@ Region=caribbean
 Languages=en_GB,fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=en_GB,fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XCD
-CurrencyCode=XCD

l10n/do/entry.desktop

@@ -95,19 +95,10 @@ Region=caribbean
 Languages=es
 DecimalSymbol=.
 ThousandsSeparator=
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=DOP
-CurrencyCode=DOP

l10n/dz/entry.desktop

@@ -100,6 +100,3 @@ WorkingWeekStartDay=6
 WorkingWeekEndDay=3
 WeekDayOfPray=7
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=DZD
-CurrencyCode=DZD

l10n/ec/entry.desktop

@@ -83,19 +83,10 @@ Region=southamerica
 Languages=es
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=USD
-CurrencyCode=USD

l10n/ee/entry.desktop

@@ -96,19 +96,10 @@ Region=northeurope
 Languages=et
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[et]=%A, %e. %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d.%m.%Y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/eg/entry.desktop

@@ -100,6 +100,3 @@ WorkingWeekStartDay=6
 WorkingWeekEndDay=4
 WeekDayOfPray=5
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EGP
-CurrencyCode=EGP

l10n/eh/entry.desktop

@@ -93,14 +93,8 @@ Region=northafrica
 Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -108,6 +102,3 @@ Languages=
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=MAD
-CurrencyCode=MAD

l10n/er/entry.desktop

@@ -95,14 +95,8 @@ Region=northafrica
 Languages=ti,ar
 DecimalSymbol=.
 ThousandsSeparator=.
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=3
-NegativeMonetarySignPosition=3
 #DateFormat[ti]=
 DateFormatShort=%d/%m/%Y
 TimeFormat=%l:%M:%S %p
@@ -110,6 +104,3 @@ WeekStartDay=7
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=ERN
-CurrencyCode=ERN

l10n/es/entry.desktop

@@ -96,14 +96,8 @@ Region=westeurope
 Languages=es,ca,eu,gl
 DecimalSymbol=,
 ThousandsSeparator=
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%A, %e de %B de %Y
 DateFormat[eu]=%a, %Yeko %bren %da
 DateFormat[gl]=%A, %e de %B de %Y
@@ -117,6 +111,3 @@ PageSize=0
 MeasureSystem=0
 AddressFormat=%0(%cm\n)%0(%n\n)%0(Apartado Postal %p\n)%0(%s\n)%z%w%l%0(\n%r)
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/et/entry.desktop

@@ -95,14 +95,8 @@ Region=northafrica
 Languages=en_GB,am,om,so,ti
 DecimalSymbol=.
 ThousandsSeparator=.
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=3
-NegativeMonetarySignPosition=3
 #DateFormat[??]=
 DateFormatShort=%d/%m/%Y
 TimeFormat=%l:%M:%S %p
@@ -110,6 +104,3 @@ WeekStartDay=7
 PageSize=0
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=ETB
-CurrencyCode=ETB

l10n/fi/entry.desktop

@@ -97,14 +97,8 @@ Region=northeurope
 Languages=fi,sv,se
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[fi]=%A, %e. %Bta %Y
 DateFormat[sv]=%Aen den %e %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
@@ -118,6 +112,3 @@ MeasureSystem=0
 AddressFormat=%0(%cm\n)%0(%n\n)%0(PB %p\n)%0(%s\n)%z%w%L
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/fj/entry.desktop

@@ -95,14 +95,8 @@ Region=oceania
 Languages=en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=FJD
-CurrencyCode=FJD

l10n/fk/entry.desktop

@@ -93,14 +93,8 @@ Region=southamerica
 Languages=en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -108,6 +102,3 @@ Languages=en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=FKP
-CurrencyCode=FKP

l10n/fm/entry.desktop

@@ -92,14 +92,8 @@ Region=oceania
 Languages=en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -107,6 +101,3 @@ Languages=en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=USD
-CurrencyCode=USD

l10n/fo/entry.desktop

@@ -94,14 +94,8 @@ Region=northeurope
 Languages=fa,da
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[fo]=%A %d %B %Y
 DateFormatShort=%d/%m/%Y
 TimeFormat=%l:%M:%S %p
@@ -109,6 +103,3 @@ WeekStartDay=7
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=DKK
-CurrencyCode=DKK

l10n/fr/entry.desktop

@@ -97,14 +97,8 @@ Region=westeurope
 Languages=fr,br,eu,ca,oc,de
 DecimalSymbol=,
 ThousandsSeparator=$0 $0
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=$0 $0
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[fr]=%A %e %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%Y
@@ -115,6 +109,3 @@ MeasureSystem=0
 AddressFormat=%0(%cm\n)%0(%n\n)%0(%s\n)%0(BP %p\n)%z%w%L
 AddressCountryPosition=BELOW
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/ga/entry.desktop

@@ -95,14 +95,8 @@ Region=centralafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XAF
-CurrencyCode=XAF

l10n/gb/entry.desktop

@@ -94,7 +94,6 @@ Name[zh_CN]=英国
 Name[zh_TW]=聯合王國
 Region=westeurope
 Languages=en_GB,cy
-NegativeMonetarySignPosition=1
 DateFormat[en_GB]=%A %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%Y
@@ -103,8 +102,5 @@ PageSize=0
 MeasureSystem=0
 WeekStartDay=7
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GBP
-CurrencyCode=GBP
 AddressFormat=%0(%n\n)%0(%cm\n)%0(PO Box %p\n)%0(%s\n)%0(%L\n)%0(%r\n)%0(%z\n)
 AddressCountryPosition=BELOW

l10n/gd/entry.desktop

@@ -96,14 +96,8 @@ Region=caribbean
 Languages=en_GB,en_US
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[en_US]=%A %d %b %Y
 DateFormat[en_GB]=%A %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
@@ -111,6 +105,3 @@ DateFormatShort=%d/%m/%Y
 TimeFormat=%I:%M:%S %p
 WeekStartDay=7
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XCD
-CurrencyCode=XCD

l10n/ge/entry.desktop

@@ -95,14 +95,8 @@ Region=easteurope
 Languages=ka,ru
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat=%Y წლის %e %B, %A
 DateFormatShort=%d.%m.%Y
 TimeFormat=%H:%M:%S
@@ -110,6 +104,3 @@ WeekStartDay=1
 PageSize=A4
 MeasureSystem=Metric
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GEL
-CurrencyCode=GEL

l10n/gf/entry.desktop

@@ -75,14 +75,8 @@ Region=southamerica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -90,6 +84,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/gg/entry.desktop

@@ -67,7 +67,6 @@ Name[zh_CN]=Guernsey
 Name[zh_TW]=Guernsey
 Region=westeurope
 Languages=en_GB,fr
-NegativeMonetarySignPosition=1
 DateFormat=%A %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%Y
@@ -76,6 +75,3 @@ PageSize=0
 MeasureSystem=0
 WeekStartDay=7
 DecimalPlaces=2
-MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GBP
-CurrencyCode=GBP

l10n/gh/entry.desktop

@@ -96,18 +96,9 @@ Region=westafrica
 Languages=en_GB
 DecimalSymbol=.
 ThousandsSeparator=,
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[en_GB]=%A, %e %B %Y
 DateFormatShort=%d/%m/%Y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GHS
-CurrencyCode=GHS

l10n/gi/entry.desktop

@@ -95,14 +95,8 @@ Region=westeurope
 #Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Region=westeurope
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GIP
-CurrencyCode=GIP

l10n/gl/entry.desktop

@@ -95,14 +95,8 @@ Region=northamerica
 Languages=kl,da
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 #DateFormat[gl]=%A den %e. %B %Y
 DateFormat[da]=%A den %e. %B %Y
 DateFormat[eo]=%A, la %ea de %B %Y
@@ -114,6 +108,3 @@ MeasureSystem=0
 AddressFormat=%0(%n\n)%0(%cm\n)%0(%s\n)%0(Postboks %p\n)%z%w%l
 AddressCountryPosition=below
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=DKK
-CurrencyCode=DKK

l10n/gm/entry.desktop

@@ -95,14 +95,8 @@ Region=westafrica
 Languages=en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -113,6 +107,3 @@ WeekDayOfPray=7
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GMD
-CurrencyCode=GMD

l10n/gn/entry.desktop

@@ -95,14 +95,8 @@ Region=westafrica
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -113,6 +107,3 @@ WeekDayOfPray=5
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GNF
-CurrencyCode=GNF

l10n/gp/entry.desktop

@@ -94,14 +94,8 @@ Region=caribbean
 Languages=fr
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -109,6 +103,3 @@ Languages=fr
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR

l10n/gq/entry.desktop

@@ -94,14 +94,8 @@ Region=centralafrica
 Languages=es,fr,en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -109,6 +103,3 @@ Languages=es,fr,en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XAF
-CurrencyCode=XAF

l10n/gr/entry.desktop

@@ -96,14 +96,8 @@ Region=southeurope
 Languages=el
 DecimalSymbol=,
 ThousandsSeparator=.
-MonetaryDecimalSymbol=,
-MonetaryThousandsSeparator=.
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=false
-NegativePrefixCurrencySymbol=false
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 NounDeclension=true
 DateMonthNamePossessive=true
 DateFormat[el]=%a %d %b %Y
@@ -111,8 +105,5 @@ DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%Y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=EUR
-CurrencyCode=EUR
 AddressFormat=%0(%n\n)%0(%cm\n)%0(%S\n)%0(P.O. BOX %p\n)%z%w%L
 AddressCountryPosition=BELOW

l10n/gt/entry.desktop

@@ -96,19 +96,10 @@ Region=centralamerica
 Languages=es
 DecimalSymbol=.
 ThousandsSeparator=
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GTQ
-CurrencyCode=GTQ

l10n/gu/entry.desktop

@@ -95,14 +95,8 @@ Region=oceania
 #Languages=
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Region=oceania
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=USD
-CurrencyCode=USD

l10n/gw/entry.desktop

@@ -95,14 +95,8 @@ Region=westafrica
 Languages=es
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -113,6 +107,3 @@ WeekDayOfPray=5
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=XOF
-CurrencyCode=XOF

l10n/gy/entry.desktop

@@ -95,14 +95,8 @@ Region=southamerica
 Languages=en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ Languages=en_GB
 #PageSize=
 #MeasureSystem=
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=GYD
-CurrencyCode=GYD

l10n/hk/entry.desktop

@@ -92,14 +92,8 @@ Region=eastasia
 Languages=zh_TW,en_GB
 #DecimalSymbol=,
 #ThousandsSeparator=
-#MonetaryDecimalSymbol=
-#MonetaryThousandsSeparator=
 #PositiveSign=
 #NegativeSign=-
-#PositivePrefixCurrencySymbol=
-#NegativePrefixCurrencySymbol=true
-#PositiveMonetarySignPosition=1
-#NegativeMonetarySignPosition=1
 #DateFormat[??]=
 #DateFormatShort=
 #TimeFormat=
@@ -110,6 +104,3 @@ WeekDayOfPray=0
 PageSize=0
 MeasureSystem=0
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=HKD
-CurrencyCode=HKD

l10n/hn/entry.desktop

@@ -96,19 +96,10 @@ Region=centralamerica
 Languages=es
 DecimalSymbol=.
 ThousandsSeparator=
-MonetaryDecimalSymbol=.
-MonetaryThousandsSeparator=,
 PositiveSign=
 NegativeSign=-
-PositivePrefixCurrencySymbol=true
-NegativePrefixCurrencySymbol=true
-PositiveMonetarySignPosition=1
-NegativeMonetarySignPosition=1
 DateFormat[es]=%a %d %b %Y
 DateFormat[eo]=%A, la %ea de %B %Y
 DateFormatShort=%d/%m/%y
 TimeFormat=%H:%M:%S
 #DecimalPlaces=2
-#MonetaryDecimalPlaces=2
-CurrencyCodesInUse=HNL
-CurrencyCode=HNL