generic: adjust to KLocale changes

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

dolphin/plugins/git/fileviewgitplugin.cpp

@@ -25,6 +25,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <QDir>
+#include <QTextCodec>
 
 #include <git2/errors.h>
 #include <git2/global.h>

dolphin/src/kitemviews/kfileitemmodel.cpp

@@ -1533,9 +1533,7 @@ QList<QPair<int, QVariant> > KFileItemModel::dateRoleGroups() const
         }
         previousModifiedDate = modifiedDate;
 
-        const int daysDistance = modifiedDate.daysTo(currentDate);
+        QString newGroupValue = KGlobal::locale()->formatDate(modifiedDate, QLocale::NarrowFormat);
-
-        QString newGroupValue = KGlobal::locale()->formatDateTime(modifiedDate, KLocale::FancyLongDate);
         if (newGroupValue != groupValue) {
             groupValue = newGroupValue;
             groups.append(QPair<int, QVariant>(i, newGroupValue));

drkonqi/drkonqidialog.cpp

@@ -136,9 +136,9 @@ void DrKonqiDialog::buildIntroWidget()
                                              crashedApp->pid(),
                                              crashedApp->signalName(),
                                              crashedApp->signalNumber(),
-                                             KGlobal::locale()->formatDate(crashedApp->datetime().date(), KLocale::ShortDate),
+                                             KGlobal::locale()->formatDate(crashedApp->datetime().date()),
 
-                                             KGlobal::locale()->formatTime(crashedApp->datetime().time(), true)
+                                             KGlobal::locale()->formatTime(crashedApp->datetime().time())
                                              ));
 }
 

kate/part/utils/kateprinter.cpp

@@ -235,11 +235,11 @@ bool KatePrinter::print (KateDocument *doc)
         KUser u (KUser::UseRealUserID);
         tags["u"] = u.loginName();
 
-        tags["d"] = KGlobal::locale()->formatDateTime(dt, KLocale::ShortDate);
+        tags["d"] = KGlobal::locale()->formatDateTime(dt, QLocale::ShortFormat);
-        tags["D"] =  KGlobal::locale()->formatDateTime(dt, KLocale::LongDate);
+        tags["D"] =  KGlobal::locale()->formatDateTime(dt, QLocale::LongFormat);
-        tags["h"] =  KGlobal::locale()->formatTime(dt.time(), false);
+        tags["h"] =  KGlobal::locale()->formatTime(dt.time(), QLocale::ShortFormat);
-        tags["y"] =  KGlobal::locale()->formatDate(dt.date(), KLocale::ShortDate);
+        tags["y"] =  KGlobal::locale()->formatDate(dt.date(), QLocale::ShortFormat);
-        tags["Y"] =  KGlobal::locale()->formatDate(dt.date(), KLocale::LongDate);
+        tags["Y"] =  KGlobal::locale()->formatDate(dt.date(), QLocale::LongFormat);
         tags["f"] =  doc->url().fileName();
         tags["U"] =  doc->url().pathOrUrl();
         if ( selectionOnly )

kcminit/main.cpp

@@ -239,7 +239,6 @@ int main(int argc, char *argv[])
   KApplication app;
   QDBusConnection::sessionBus().interface()->registerService( "org.kde.kcminit",
       QDBusConnectionInterface::DontQueueService );
-  KLocale::setMainCatalog(0);
   KCMInit kcminit( KCmdLineArgs::parsedArgs());
   return 0;
 }

kcontrol/dateandtime/dtime.cpp

@@ -95,7 +95,7 @@ Dtime::Dtime(QWidget * parent)
 
   timeEdit = new QTimeEdit( timeBox );
   timeEdit->setWrapping(true);
-  timeEdit->setDisplayFormat(KGlobal::locale()->use12Clock() ? "hh:mm:ss ap" : "HH:mm:ss");
+  timeEdit->setDisplayFormat(KGlobal::locale()->timeFormat(QLocale::ShortFormat));
   v3->addWidget(timeEdit);
 
   v3->addStretch();

kcontrol/locale/AUTHORS

@@ -1,2 +0,0 @@
-Matthias Hoelzer (hoelzer@physik.uni-wuerzburg.de)
-Hans Petter Bieker <bieker@kde.org>

kcontrol/locale/countryselectordialog.cpp

@@ -1,363 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Albert Astals Cid <aacid@kde.org>               *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- ***************************************************************************/
-
-#include "countryselectordialog.h"
-
-#include "kcontrollocale.h"
-
-#include <KStandardDirs>
-
-#include <QAbstractItemModel>
-#include <QHBoxLayout>
-#include <QtGui/qevent.h>
-#include <QListView>
-#include <QScrollBar>
-
-struct CountryModelItem
-{
-    CountryModelItem()
-    {
-    }
-
-    CountryModelItem( CountryModelItem *p, const QString &theText, const QString &theTag )
-     : parent(p), text(theText), tag(theTag)
-    {
-    }
-
-    ~CountryModelItem()
-    {
-        qDeleteAll(children);
-    }
-
-    int row() const
-    {
-        if (parent) return parent->children.indexOf(const_cast<CountryModelItem*>(this));
-        return 0;
-    }
-
-    CountryModelItem *parent;
-    QList< CountryModelItem* > children;
-
-    QString text, tag;
-    KIcon icon;
-};
-
-
-
-bool CountryModelItemLessThan(CountryModelItem *s1, CountryModelItem *s2)
-{
-    return s1->text < s2->text;
-}
-
-
-
-class CountryModel : public QAbstractItemModel
-{
-    public:
-        CountryModel(QObject *parent) : QAbstractItemModel(parent)
-        {
-            m_rootItem = new CountryModelItem(NULL, QString(), QString());
-        }
-
-        CountryModel(CountryModelItem *rootItem, QObject *parent) : QAbstractItemModel(parent)
-        {
-            m_rootItem = rootItem;
-        }
-
-        ~CountryModel()
-        {
-            if (m_rootItem->parent == NULL) delete m_rootItem;
-        }
-
-        void addRegion(const QString &name, const QString &tag)
-        {
-            CountryModelItem *cmi = new CountryModelItem(m_rootItem, name, tag);
-            m_rootItem->children.append(cmi);
-        }
-
-        void addSubRegion(const KIcon &flag, const QString &name, const QString &tag, const QString &superRegion)
-        {
-            CountryModelItem *parent = NULL;
-            foreach(CountryModelItem *cm, m_rootItem->children)
-            {
-                if (cm->tag == superRegion) parent = cm;
-            }
-            if (parent)
-            {
-                CountryModelItem *cmi = new CountryModelItem(parent, name, tag);
-                cmi->icon = flag;
-                parent->children.append(cmi);
-            }
-        }
-
-        void sort()
-        {
-            qSort(m_rootItem->children.begin(), m_rootItem->children.end(), CountryModelItemLessThan);
-            foreach(CountryModelItem *cm, m_rootItem->children)
-            {
-                qSort(cm->children.begin(), cm->children.end(), CountryModelItemLessThan);
-            }
-        }
-
-        int rowCount(const QModelIndex &parent) const
-        {
-            if (parent.column() > 0)
-                return 0;
-
-            CountryModelItem *parentItem;
-            if (!parent.isValid())
-                parentItem = m_rootItem;
-            else
-                parentItem = static_cast<CountryModelItem*>(parent.internalPointer());
-
-            return parentItem->children.count();
-        }
-
-        int columnCount(const QModelIndex &parent) const
-        {
-            if (!parent.isValid()) return 1;
-            else
-            {
-                CountryModelItem *p = static_cast<CountryModelItem*>(parent.internalPointer());
-                if (p->parent) return 1;
-                else return 0;
-            }
-        }
-
-        QModelIndex index(int row, int column, const QModelIndex &parent) const
-        {
-            if (!hasIndex(row, column, parent))
-                return QModelIndex();
-
-            CountryModelItem *parentItem;
-            if (!parent.isValid())
-                parentItem = m_rootItem;
-            else
-                parentItem = static_cast<CountryModelItem*>(parent.internalPointer());
-
-            CountryModelItem *childItem = parentItem->children.at(row);
-            if (childItem)
-                return createIndex(row, column, childItem);
-            else
-                return QModelIndex();
-        }
-
-        QModelIndex parent(const QModelIndex &index) const
-        {
-            if (!index.isValid())
-                return QModelIndex();
-
-            CountryModelItem *childItem = static_cast<CountryModelItem*>(index.internalPointer());
-            CountryModelItem *parentItem = childItem->parent;
-
-            if (parentItem == m_rootItem)
-                return QModelIndex();
-
-            return createIndex(parentItem->row(), 0, parentItem);
-        }
-
-        QVariant data(const QModelIndex &index, int role) const
-        {
-            if (index.isValid())
-            {
-                CountryModelItem *cmi = static_cast<CountryModelItem*>(index.internalPointer());
-                if (role == Qt::DisplayRole)
-                {
-                    return cmi->text;
-                }
-                else if (role == Qt::DecorationRole)
-                {
-                    if (cmi->parent->parent) return cmi->icon;
-                }
-            }
-            return QVariant();
-        }
-
-    private:
-        CountryModelItem *m_rootItem;
-};
-
-
-
-class CSDListView : public QListView
-{
-    public:
-        CSDListView(QWidget *parent) : QListView(parent)
-        {
-        }
-
-        void setOtherWidget(QWidget *widget, Qt::Key key)
-        {
-            m_other = widget;
-            m_key = key;
-        }
-
-    protected:
-        void keyPressEvent(QKeyEvent *event)
-        {
-            if (event->key() == m_key) m_other->setFocus();
-            else QListView::keyPressEvent(event);
-        }
-
-    private:
-        QWidget *m_other;
-        Qt::Key m_key;
-};
-
-
-
-CountrySelectorDialog::CountrySelectorDialog(QWidget *parent) : KDialog(parent)
-{
-    setCaption( i18n("Country Selector") );
-    setButtons( KDialog::Ok | KDialog::Cancel );
-
-    QWidget *widget = new QWidget(this);
-    setMainWidget(widget);
-}
-
-bool CountrySelectorDialog::editCountry(KControlLocale *locale)
-{
-    QHBoxLayout *hbl = new QHBoxLayout(mainWidget());
-    CSDListView *lv1 = new CSDListView(mainWidget());
-    m_countriesView = new CSDListView(mainWidget());
-    hbl->addWidget(lv1);
-    hbl->addWidget(m_countriesView);
-    lv1->setOtherWidget(m_countriesView, Qt::Key_Right);
-    m_countriesView->setOtherWidget(lv1, Qt::Key_Left);
-
-    QString country, region;
-    country = locale->country();
-
-    CountryModel *cm = new CountryModel(this);
-
-    QStringList regionlist = KGlobal::dirs()->findAllResources("locale",
-                                 QString::fromLatin1("l10n/*.desktop"),
-                                 KStandardDirs::NoDuplicates);
-
-    QFontMetrics fm(lv1->font());
-    int lv1Width = 0;
-
-    foreach(const QString &region, regionlist)
-    {
-        QString tag = region;
-        int index;
-
-        index = tag.lastIndexOf('/');
-        if (index != -1)
-            tag = tag.mid(index + 1);
-
-        index = tag.lastIndexOf('.');
-        if (index != -1)
-            tag.truncate(index);
-
-        KConfig entry(region);
-        KConfigGroup cg = entry.group("KCM Locale");
-        QString name = cg.readEntry("Name", ki18n("without name").toString(locale));
-
-        cm->addRegion(name, tag);
-        QString spacedName = name + "  ";
-        lv1Width = qMax(lv1Width, fm.width(spacedName));
-    }
-
-    // add all languages to the list
-    QStringList countrylist = KGlobal::dirs()->findAllResources("locale",
-                                 sub + QString::fromLatin1("l10n/*/entry.desktop"),
-                                 KStandardDirs::NoDuplicates);
-    foreach(const QString &countryFile, countrylist)
-    {
-        KConfig entry(countryFile);
-        KConfigGroup cg = entry.group("KCM Locale");
-        QString name = cg.readEntry("Name", ki18n("without name").toString(locale));
-        QString parentRegion = cg.readEntry("Region");
-
-        QString tag = countryFile;
-        int index = tag.lastIndexOf('/');
-        tag.truncate(index);
-        index = tag.lastIndexOf('/');
-        tag = tag.mid(index + 1);
-
-        QString flag( KStandardDirs::locate( "locale", QString::fromLatin1( "l10n/%1/flag.png" ).arg(tag) ) );
-        cm->addSubRegion(KIcon(flag), name, tag, parentRegion);
-        if (tag == country) region = parentRegion;
-    }
-
-    cm->sort();
-
-    cm->addRegion(i18nc("@item:inlistbox Country", "Not set (Generic English)"), "C");
-    if (country == "C") region = "C";
-
-    lv1->setModel(cm);
-    lv1->setFixedWidth(lv1Width + lv1->verticalScrollBar()->height());
-    // + 2 because 1 is "Not set (Generic English)" and the other is for spacing
-    lv1->setMinimumHeight((regionlist.count() + 2) * fm.height());
-
-    connect(lv1->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), SLOT(regionChanged(const QModelIndex &)));
-    connect(lv1, SIGNAL(activated(const QModelIndex &)), SLOT(regionActivated()));
-    connect(m_countriesView, SIGNAL(activated(const QModelIndex &)), SLOT(accept()));
-
-    for(int i = 0; i < lv1->model()->rowCount(); ++i)
-    {
-        const QModelIndex &current = lv1->model()->index(i, 0);
-        CountryModelItem *cmi = static_cast<CountryModelItem*>(current.internalPointer());
-        if (cmi->tag == region)
-        {
-            lv1->selectionModel()->setCurrentIndex(current, QItemSelectionModel::SelectCurrent);
-        }
-    }
-    if (m_countriesView->model() != NULL)
-    {
-        for(int i = 0; i < m_countriesView->model()->rowCount(); ++i)
-        {
-            const QModelIndex &current = m_countriesView->model()->index(i, 0);
-            CountryModelItem *cmi = static_cast<CountryModelItem*>(current.internalPointer());
-            if (cmi->tag == country)
-            {
-                m_countriesView->selectionModel()->setCurrentIndex(current, QItemSelectionModel::SelectCurrent);
-            }
-        }
-        m_countriesView->setFocus();
-    }
-    else lv1->setFocus();
-
-    if (exec() == QDialog::Accepted)
-    {
-        const QModelIndex &current = m_countriesView->currentIndex();
-        if (current.isValid())
-        {
-            CountryModelItem *cmi = static_cast<CountryModelItem*>(current.internalPointer());
-            return locale->setCountry(cmi->tag);
-        }
-        else if (m_countriesView->model() == NULL)
-        {
-            return locale->setCountry("C");
-        }
-    }
-    return false;
-}
-
-void CountrySelectorDialog::regionChanged(const QModelIndex &current)
-{
-    delete m_countriesView->model();
-    CountryModelItem *cmi = static_cast<CountryModelItem*>(current.internalPointer());
-    if (!cmi->children.isEmpty())
-    {
-        CountryModel *cm = new CountryModel(cmi, this);
-        m_countriesView->setModel(cm);
-    }
-    else
-    {
-        m_countriesView->setModel(NULL);
-    }
-}
-
-void CountrySelectorDialog::regionActivated()
-{
-    if (m_countriesView->model() != NULL) m_countriesView->setFocus();
-    else accept();
-}

kcontrol/locale/countryselectordialog.h

@@ -1,37 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Albert Astals Cid <aacid@kde.org>               *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- ***************************************************************************/
-
-#ifndef COUNTRYSELECTORDIALOG_H
-#define COUNTRYSELECTORDIALOG_H
-
-#include <KDialog>
-
-class CSDListView;
-
-class KControlLocale;
-
-#include <QModelIndex>
-
-class CountrySelectorDialog : public KDialog
-{
-Q_OBJECT
-    public:
-        CountrySelectorDialog(QWidget *parent);
-
-        bool editCountry(KControlLocale *locale);
-
-    private slots:
-        void regionChanged(const QModelIndex &current);
-        void regionActivated();
-
-    private:
-        CSDListView *m_countriesView;
-};
-
-#endif

kcontrol/locale/kcmlocale.h

@@ -1,391 +1,69 @@
 /*  This file is part of the KDE libraries
- *  Copyright 2010 John Layt <john@layt.net>
+    Copyright (C) 2023 Ivailo Monev <xakepa10@gmail.com>
- *
+
- *  This library is free software; you can redistribute it and/or
+    This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
+    modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
+    License version 2, as published by the Free Software Foundation.
- *  version 2 of the License, or (at your option) any later version.
+
- *
+    This library is distributed in the hope that it will be useful,
- *  This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
- *  Library General Public License for more details.
+
- *
+    You should have received a copy of the GNU Library General Public License
- *  You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
- *  along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
- *  Boston, MA 02110-1301, USA.
+*/
- */
 
 #ifndef KCMLOCALE_H
 #define KCMLOCALE_H
 
 #include <KCModule>
-#include <KSharedConfig>
+#include <KComboBox>
-#include <KConfigGroup>
+#include <KLineEdit>
-#include <KLocale>
+#include <QGridLayout>
-#include <QListWidgetItem>
+#include <QLabel>
-#include <QCheckBox>
+#include <QGroupBox>
-#include <QMap>
-
-class KPushButton;
-class KComboBox;
-class KIntNumInput;
-
-QT_BEGIN_NAMESPACE
-class Ui_KCMLocaleWidget;
-QT_END_NAMESPACE
 
 /**
  * @short A KCM to configure locale settings
- *
- * This module is for changing the User's Locale settings, which may override their Group and
- * Country defaults.
- *
- * The settings hierarchy is as follows:
- * - User settings from kdeglobals
- * - Group settings from $KDEDIRS
- * - Country settings from l10n
- * - C default settings from l10n
- *
- * The settings that apply to the User are a merger of all these.
- *
- * This may be restricted by Kiosk Group settings locking the user from updating some/all settings.
- *
- * The KCM starts by loading the fully merged settings including the User settings
- * In KCM terms, to Reload is to load the fully merged settings including the User settings
- * In KCM terms, to reset to Defaults is to remove the User settings only.
- * The user can also reset to Default each individual setting.
  */
-
 class KCMLocale : public KCModule
 {
     Q_OBJECT
-
 public:
-    KCMLocale(QWidget *parent, const QVariantList &);
+    KCMLocale(QWidget *parent, const QVariantList &args);
-    virtual ~KCMLocale();
+    ~KCMLocale();
 
-    virtual void load();
+    void load() final;
-    virtual void save();
+    void save() final;
-    virtual void defaults();
+    void defaults() final;
-    virtual QString quickHelp() const;
+    QString quickHelp() const final;
-
-private:
-
-    //Common load/save utilities
-
-    // Initialise the different settings groups
-    void initSettings();
-    void initCountrySettings( const QString &countryCode );
-    void initCalendarSettings();
-
-    // Merge the different settings groups into the effective settings
-    void mergeSettings();
-    void mergeCalendarSettings();
-
-    // Copy the supported settings between settings groups
-    void copySettings( KConfigGroup *fromGroup, KConfigGroup *toGroup,
-                       KConfig::WriteConfigFlags flags = KConfig::Normal );
-    void copyCalendarSettings( KConfigGroup *fromGroup, KConfigGroup *toGroup,
-                               KConfig::WriteConfigFlags flags = KConfig::Normal );
-    void copySetting( KConfigGroup *fromGroup, KConfigGroup *toGroup, const QString &key,
-                      KConfig::WriteConfigFlags flags = KConfig::Normal );
-
-    // Enable / Disable an item in the gui
-    void enableItemWidgets( const QString &itemKey, KConfigGroup *userSettings,
-                            KConfigGroup *kcmSettings, KConfigGroup *defaultSettings,
-                            QWidget *itemWidget, KPushButton *itemDefaultButton );
-
-    // Set the item value in the required settings groups
-    void setItemValue( const QString &itemKey, const QString &itemValue,
-                       KConfigGroup *userSettings, KConfigGroup *kcmSettings, KConfigGroup *defaultSettings );
-
-    // Set an item: set the item value, enable the widgets, set the changed flag, don't update the widget
-    void setItem( const QString &itemKey, const QString &itemValue,
-                  QWidget *itemWidget, KPushButton *itemDefaultButton );
-    void setItem( const QString &itemKey, int itemValue,
-                  QWidget *itemWidget, KPushButton *itemDefaultButton );
-    void setItem( const QString &itemKey, bool itemValue,
-                  QWidget *itemWidget, KPushButton *itemDefaultButton );
-    void setCalendarItem( const QString &itemKey, const QString &itemValue,
-                          QWidget *itemWidget, KPushButton *itemDefaultButton );
-    void setCalendarItem( const QString &itemKey, int itemValue,
-                          QWidget *itemWidget, KPushButton *itemDefaultButton );
-    void setCalendarItem( const QString &itemKey, bool itemValue,
-                          QWidget *itemWidget, KPushButton *itemDefaultButton );
-
-    // Set an item: set the item value, enable the widgets, set the changed flag, update the widget
-    void setComboItem( const QString &itemKey, const QString &itemValue,
-                       KComboBox *itemCombo, KPushButton *itemDefaultButton );
-    void setComboItem( const QString &itemKey, int itemValue,
-                       KComboBox *itemCombo, KPushButton *itemDefaultButton );
-    void setEditComboItem( const QString &itemKey, const QString &itemValue,
-                           KComboBox *itemCombo, KPushButton *itemDefaultButton );
-    void setIntItem( const QString &itemKey, int itemValue,
-                     KIntNumInput *itemInput, KPushButton *itemDefaultButton );
-    void setCheckItem( const QString &itemKey, bool itemValue,
-                       QCheckBox *itemCheck, KPushButton *itemDefaultButton );
-
-    // Check if the chaged flag needs to be set
-    void checkIfChanged();
-
-    //Common init utilities
-    void initSeparatorCombo( KComboBox *separatorCombo );
-    void initWeekDayCombo( KComboBox *dayCombo );
-    void initDigitSetCombo( KComboBox *digitSetCombo );
-    void initDigitGroupingCombo( KComboBox *digitGroupingCombo, const QString &digitGroupingKey);
-    void insertDigitGroupingItem( KComboBox *digitGroupingCombo,
-                                  KSharedConfigPtr groupingConfig, KConfigGroup *groupingSettings,
-                                  const QString &digitGroupingKey, const QString &digitGroupingFormat);
-
-    void initAllWidgets();
-    void initSettingsWidgets();
-    void initResetButtons();
-    void initTabs();
-    void initSample();
-
-    //Country tab
-
-    void initCountry();
-    void setCountry( const QString &newValue );
-
-    //Translations/Languages tab
-
-    void initTranslations();
-    void setTranslations( const QString &newValue );
-
-    //Numeric tab
-
-    void initNumericDigitGrouping();
-    void setNumericDigitGrouping( const QString &newValue );
-
-    void initNumericThousandsSeparator();
-    void setNumericThousandsSeparator( const QString &newValue );
-
-    void initNumericDecimalSymbol();
-    void setNumericDecimalSymbol( const QString &newValue );
-
-    void initNumericDecimalPlaces();
-    void setNumericDecimalPlaces( int newValue );
-
-    void initNumericPositiveSign();
-    void setNumericPositiveSign( const QString &newValue );
-
-    void initNumericNegativeSign();
-    void setNumericNegativeSign( const QString &newValue );
-
-    void initNumericDigitSet();
-    void setNumericDigitSet( int newValue );
-
-    //Calendar Tab
-
-    void initCalendarSystem();
-    void setCalendarSystem( const QString &newValue );
-
-    void initUseCommonEra();
-    void setUseCommonEra( bool newValue );
-
-    void initShortYearWindow();
-    void setShortYearWindow( int newValue );
-
-    void initWeekNumberSystem();
-    void setWeekNumberSystem( int newValue );
-
-    void initWeekStartDay();
-    void setWeekStartDay( int newValue );
-
-    //Date/Time tab
-
-    void initTimeFormat();
-    void setTimeFormat( const QString &newValue );
-
-    void initAmPmSymbols();
-    void setAmPmPeriods( const QString &amValue, const QString &pmValue );
-
-    void initDateFormat();
-    void setDateFormat( const QString &newValue );
-
-    void initShortDateFormat();
-    void setShortDateFormat( const QString &newValue );
-
-    void initMonthNamePossessive();
-    void setMonthNamePossessive( bool newValue );
-
-    void initDateTimeDigitSet();
-    void setDateTimeDigitSet( int newValue );
-
-    //Other Tab
-
-    void initPageSize();
-    void setPageSize( int newValue );
-
-    void initMeasureSystem();
-    void setMeasureSystem( int newValue );
-
-    void initBinaryUnitDialect();
-    void setBinaryUnitDialect( int newValue );
 
 private Q_SLOTS:
-
+    void slotLanguageChanged(const int index);
-    void updateSample();
+    void slotBinaryChanged(const int index);
-
+    void slotMeasureChanged(const int index);
-    //Country tab
+    void slotDateOrTimeChanged(const QString &text);
-
-    void defaultCountry();
-    void changedCountryIndex( int index );
-
-    //Translations/Languages tab
-
-    void defaultTranslations();
-    void changedTranslations();
-    void changedTranslationsAvailable( QListWidgetItem * item );
-    void changedTranslationsSelected( QListWidgetItem * item );
-
-    //Numeric tab
-
-    void defaultNumericDigitGrouping();
-    void changedNumericDigitGroupingIndex( int index );
-
-    void defaultNumericThousandsSeparator();
-    void changedNumericThousandsSeparator( const QString &newValue );
-
-    void defaultNumericDecimalSymbol();
-    void changedNumericDecimalSymbol( const QString &newValue );
-
-    void defaultNumericDecimalPlaces();
-    void changedNumericDecimalPlaces( int newValue );
-
-    void defaultNumericPositiveSign();
-    void changedNumericPositiveSign( const QString &newValue );
-
-    void defaultNumericNegativeSign();
-    void changedNumericNegativeSign( const QString &newValue );
-
-    void defaultNumericDigitSet();
-    void changedNumericDigitSetIndex( int index );
-
-    //Calendar Tab
-
-    void defaultCalendarSystem();
-    void changedCalendarSystemIndex( int index );
-
-    void defaultUseCommonEra();
-    void changedUseCommonEra( bool newValue );
-
-    void defaultShortYearWindow();
-    void changedShortYearWindow( int newValue );
-
-    void defaultWeekNumberSystem();
-    void changedWeekNumberSystemIndex( int index );
-
-    void defaultWeekStartDay();
-    void changedWeekStartDayIndex( int index );
-
-    //Date/Time tab
-
-    void defaultTimeFormat();
-    void changedTimeFormat( const QString &newValue );
-
-    void defaultAmSymbol();
-    void changedAmSymbol( const QString &newValue );
-
-    void defaultPmSymbol();
-    void changedPmSymbol( const QString &newValue );
-
-    void defaultDateFormat();
-    void changedDateFormat( const QString &newValue );
-
-    void defaultShortDateFormat();
-    void changedShortDateFormat( const QString &newValue );
-
-    void defaultMonthNamePossessive();
-    void changedMonthNamePossessive( bool newValue );
-
-    void defaultDateTimeDigitSet();
-    void changedDateTimeDigitSetIndex( int index );
-
-    //Other Tab
-
-    void defaultPageSize();
-    void changedPageSizeIndex( int index );
-
-    void defaultMeasureSystem();
-    void changedMeasureSystemIndex( int index );
-
-    void defaultBinaryUnitDialect();
-    void changedBinaryUnitDialectIndex( int index );
 
 private:
-    // Date/Time format map utilities
+    void loadLocaleSettings();
-    QString posixToUserDate( const QString &posixFormat ) const;
-    QString posixToUserTime( const QString &posixFormat ) const;
-    QString posixToUser( const QString &posixFormat, const QMap<QString, QString> &map ) const;
-    QString userToPosixDate( const QString &userFormat ) const;
-    QString userToPosixTime( const QString &userFormat ) const;
-    QString userToPosix( const QString &userFormat, const QMap<QString, QString> &map ) const;
 
-    // Day Period utilities
+    QGridLayout* m_layout;
-    QString dayPeriodText( const QString &dayPeriod );
+    QLabel* m_languagelabel;
-    QString amPeriod( const QString &longName, const QString &shortName, const QString &narrowName );
+    KComboBox* m_languagebox;
-    QString pmPeriod( const QString &longName, const QString &shortName, const QString &narrowName );
+    QLabel* m_binarylabel;
-
+    KComboBox* m_binarybox;
-    // The current User settings from .kde/share/config/kdeglobals
+    QLabel* m_measurelabel;
-    // This gets updated with the users changes in the kcm and saved when requested
+    KComboBox* m_measurebox;
-    KSharedConfigPtr m_userConfig;
+    QLabel* m_dateshortlabel;
-    KConfigGroup m_userSettings;
+    KLineEdit* m_dateshortedit;
-    KConfigGroup m_userCalendarSettings;
+    QLabel* m_datelonglabel;
-    // The kcm config/settings, a merger of C, Country, Group and User settings
+    KLineEdit* m_datelongedit;
-    // This is used to build the displayed settings and to initialise the sample locale, but never saved
+    QLabel* m_datenarrowlabel;
-    KSharedConfigPtr m_kcmConfig;
+    KLineEdit* m_datenarrowedit;
-    KConfigGroup m_kcmSettings;
+    QSpacerItem* m_spacer;
-    KConfigGroup m_kcmCalendarSettings;
-    // The currently saved user config/settings
-    // This is used to check if anything has changed, but never saved
-    KSharedConfigPtr m_currentConfig;
-    KConfigGroup m_currentSettings;
-    KConfigGroup m_currentCalendarSettings;
-    // The KCM Default settings, a merger of C, Country, and Group, i.e. excluding User
-    KSharedConfigPtr m_defaultConfig;
-    KConfigGroup m_defaultSettings;
-    KConfigGroup m_defaultCalendarSettings;
-
-    // The current Group settings, i.e. does NOT include the User or Country settings
-    KSharedConfigPtr m_groupConfig;
-    KConfigGroup m_groupSettings;
-    KConfigGroup m_groupCalendarSettings;
-    // The Country Locale config from l10n/<country>/entry.desktop
-    KSharedConfigPtr m_countryConfig;
-    KConfigGroup m_countrySettings;
-    KConfigGroup m_countryCalendarSettings;
-    // The default C Locale config/settings from l10n/C/entry.desktop
-    KSharedConfigPtr m_cConfig;
-    KConfigGroup m_cSettings;
-    KConfigGroup m_cCalendarSettings;
-
-    QMap<QString, QString> m_dateFormatMap;
-    QMap<QString, QString> m_timeFormatMap;
-
-    // The system country, not the KDE one
-    QString m_systemCountry;
-
-    // NOTE: we need to mantain our own language list instead of using KLocale's
-    // because KLocale does not add a language if there is no translation
-    // for the current application so it would not be possible to set
-    // a language which has no systemsettings/kcontrol module translation
-    // The list of translations used in the kcm, is users list plus us_EN
-    QStringList m_kcmTranslations;
-    // The currently saved list of user translations, used to check if value changed
-    QString m_currentTranslations;
-    // The currently installed translations, used to check if users translations are valid
-    QStringList m_installedTranslations;
-
-    // The locale we use when displaying the sample output, not used for anything else
-    KLocale *m_kcmLocale;
-    // The locale for the current defaults, needed for am/pm as the defaults are hard coded in KLocale
-    KLocale *m_defaultLocale;
-
-    Ui_KCMLocaleWidget *m_ui;
 };
 
-#endif //KCMLOCALE_H
+#endif // KCMLOCALE_H

keditbookmarks/globalbookmarkmanager.cpp

@@ -100,8 +100,8 @@ QString GlobalBookmarkManager::makeTimeStr(int b)
     QDateTime dt;
     dt.setTime_t(b);
     return (dt.daysTo(QDateTime::currentDateTime()) > 31)
-        ? KGlobal::locale()->formatDate(dt.date(), KLocale::LongDate)
+        ? KGlobal::locale()->formatDate(dt.date())
-        : KGlobal::locale()->formatDateTime(dt, KLocale::LongDate);
+        : KGlobal::locale()->formatDateTime(dt);
 }
 
 #include "moc_globalbookmarkmanager.cpp"

kfind/kdatecombo.cpp

@@ -71,7 +71,7 @@ KDateCombo::~KDateCombo()
 
 QString KDateCombo::date2String(const QDate & date)
 {
-  return(KGlobal::locale()->formatDate(date, KLocale::ShortDate));
+  return(KGlobal::locale()->formatDate(date));
 }
 
 QDate & KDateCombo::string2Date(const QString & str, QDate *qd)

kfind/kftabdlg.cpp

@@ -29,7 +29,6 @@
 #include <QApplication>
 #include <QDesktopWidget>
 
-#include <kcalendarsystem.h>
 #include <kglobal.h>
 #include <kcombobox.h>
 #include <kurlcombobox.h>
@@ -177,7 +176,7 @@ KfindTabWidget::KfindTabWidget(QWidget *parent)
     betweenType->setCurrentIndex(1);
     updateDateLabels(1, 1);
 
-    QDate dt = KGlobal::locale()->calendar()->addYears(QDate::currentDate(), -1);
+    QDate dt = QDate::currentDate().addYears(-1);
 
     fromDate = new KDateCombo(dt, pages[1] );
     fromDate->setObjectName( QLatin1String( "fromDate" ) );
@@ -546,7 +545,7 @@ void KfindTabWidget::slotSizeBoxChanged(int index)
 
 void KfindTabWidget::setDefaults()
 {
-    QDate dt = KGlobal::locale()->calendar()->addYears(QDate::currentDate(), -1);
+    QDate dt = QDate::currentDate().addYears(-1);
 
     fromDate ->setDate(dt);
     toDate ->setDate(QDate::currentDate());
@@ -761,7 +760,7 @@ void KfindTabWidget::setQuery(KQuery *query)
 }
 
 QString KfindTabWidget::date2String(const QDate & date) {
-  return(KGlobal::locale()->formatDate(date, KLocale::ShortDate));
+  return(KGlobal::locale()->formatDate(date));
 }
 
 QDate &KfindTabWidget::string2Date(const QString & str, QDate *qd) {

kinfocenter/main.cpp

@@ -36,8 +36,6 @@ KicApp::KicApp() : KApplication()
 
 int main(int argc, char *argv[])
 {
-	KLocale::setMainCatalog("kinfocenter");
-
 	KAboutData aboutKInfoCenter( "kinfocenter", 0, ki18n("KDE Info Center"),
 		KDE_VERSION_STRING, ki18n("The KDE Info Center"), KAboutData::License_GPL,
 		ki18n("(c) 2009-2010, The KDE SC KInfocenter Development Team"));

kwin/effects/windowgeometry/windowgeometry.cpp

@@ -124,13 +124,13 @@ void WindowGeometryEffect::slotWindowFinishUserMovedResized(EffectWindow *w)
 static inline QString number(int n)
 {
     QString sign;
+    const QLocale locale = KGlobal::locale()->toLocale();
     if (n >= 0) {
-        sign = KGlobal::locale()->positiveSign();
+        sign = locale.positiveSign();
         if (sign.isEmpty()) sign = '+';
-    }
+    } else {
-    else {
         n = -n;
-        sign = KGlobal::locale()->negativeSign();
+        sign = locale.negativeSign();
         if (sign.isEmpty()) sign = '-';
     }
     return  sign + QString::number(n);

l10n/README

@@ -61,173 +61,6 @@ between the entry name and the value.
 
 	Default: blank
 
-* Region
-
-    Defines which submenu the country belongs to. Currently there are 20 different regions
-    conforming to the United Nations statistical regions, excluding the Oceania sub-divisions,
-    but adding Central Europe. See http://unstats.un.org/unsd/methods/m49/m49regin.htm for details.
-
-        centralasia    (Central Asia)
-        eastasia       (East Asia)
-        southasia      (South Asia)
-        southeastasia  (South-East Asia)
-        middleeast     (Middle-East/West Asia)
-        centralafrica  (Central Africa)
-        northafrica    (Northern Africa)
-        southafrica    (Southern Africa)
-        westafrica     (Western Africa)
-        eastafrica     (Eastern Africa)
-        easteurope     (Eastern Europe)
-        westeurope     (Western Europe)
-        southeurope    (Southern Europe)
-        northeurope    (Northern Europe)
-        centraleurope  (Central Europe)
-        northamerica   (North America)
-        southamerica   (South America)
-        centralemarica (Central America)
-        caribbean      (Caribbean)
-        oceania        (Oceania)
-
-	Default: blank
-
-* Languages
-	A comma separated list of locale codes for the official languages
-	of the country.
-
-	Default: blank
-
-* DecimalSymbol
-	The symbol that separates the decimals from the rest of the
-	number.
-
-	Default: "."
-
-* DecimalPlaces
-    The number of decimal places to display in a formatted number
-
-    Default: 2
-
-* ThousandsSeparator
-	Thousands separator.
-
-	Default: ","
-
-* DigitSet
-	The set of digits used to display numbers.
-
-	0 Arabic
-	1 Arabic-Indic
-	2 Eastern Arabic-Indic
-	3 Devenagari
-
-	Default: 0
-
-* PositiveSign
-	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 numbers.
-
-	Default: "-"
-
-* 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
-    replaced. This should be marked with a language code as well for
-    each supported language.
-
-	%Y The year with century as a decimal number.
-	%y The year without century as a decimal number (00-99).
-	%m The month as a decimal number (01-12).
-	%n The month as a decimal number (1-12).
-	%b The national representation of the abbreviated month name,
-	   where the abbreviation is the first three characters.
-	%B The national representation of the full month name.
-	%d The day of month as a decimal number (01-31).
-	%e The day of month as a decimal number (1-31).
-	%a The national representation of the abbreviated weekday name,
-	   where the abbreviation is the first three characters.
-	%A The national representation of the full weekday name.
-
-	Default: "%A %d %B %Y"
-
-* DateFormatShort
-	This is the same as DateFormat, but is used when the program asks
-	for a short date. Usally this is used when listing files etc.
-
-	Default: "%Y-%m-%d"
-
-* TimeFormat
-	This defines how a times are formated. The date string will be
-    contructed from this string and the sequences below will be
-    replaced.
-
-	%H The hour as a decimal number using a 24-hour clock (range 00 to
-		   23).
-	%k The hour (24-hour clock) as a decimal number (range 0 to 23).
-	%I The hour as a decimal number using a 12-hour clock (range 01 to
-           12).
-	%l The hour (12-hour clock) as a decimal number (range 1 to 12).
-	%M The minute as a decimal number (range 00 to 59).
-	%S The second as a decimal number (range 00 to 59).
-	%p Either AM or PM according to the given time value. AM or PM are
-           translating to the current language. Noon is treated as PM
-           and midnight as AM.
-
-	Default: "%H:%M:%S"
-
-* DateTimeDigitSet
-	The set of digits used to display date and time numbers.
-
-	See DigitSet for possible values.
-
-	Default: 0
-
-* WeekStartDay
-	This defines which day is the first of the week. Accepted value is
-	an integer number where 1 means Monday, 2 Tuesday, and so on.
-
-	Default: 1
-
-* MeasureSystem
-	This defines which measure system we should use. There are two
-	values here, 0 for Metric and 1 for Imperial. Metric would give
-	you meters (or cm/mm), while Imperial would give you inches.
-
-	Default: 0
-
-* PageSize
-	This defines which page size we should use by default. It should
-	be the number of the item in the QPrinter::PageSize enum. Here are
-	some values:
-
-	0	A4
-	1	B5
-	2	US Letter
-	...and so on
-
-	Default: 0
-
-* CalendarSystem
-	This defines which calendar system to use. Available systems are:
-
-	gregorian
-	gregorian-proleptic
-	julian
-
-	Default: gregorian
-
-* AddressFormat
-* BusinessAddressFormat
-* AddressCountryPosition
-	These fields define the formatting of postal addresses. For
-	detailled information on these fields' format, please refer to
-	kdepimlibs/kabc/README.AddressFormat
-
 Hans Petter Bieker <bieker@kde.org>
 Lukas Tinkl <lukas@kde.org>
 John Layt <john@layt.net>

l10n/ad/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Andore
 Name[x-test]=xxAndorraxx
 Name[zh_CN]=安道尔
 Name[zh_TW]=安道爾
-Region=westeurope
-Languages=ca,fr,es
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ae/entry.desktop

@@ -91,8 +91,3 @@ Name[xh]=United Arab Emirates
 Name[x-test]=xxUnited Arab Emiratesxx
 Name[zh_CN]=阿联酋
 Name[zh_TW]=阿拉伯聯合大公國
-Region=middleeast
-Languages=ar
-DecimalSymbol=,
-DateFormatShort=%y/%m/%d
-#DecimalPlaces=2

l10n/af/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Afganistan
 Name[x-test]=xxAfghanistanxx
 Name[zh_CN]=阿富汗
 Name[zh_TW]=阿富汗
-Region=centralasia
-#Languages=
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ag/entry.desktop

@@ -91,16 +91,3 @@ Name[xh]=Antigua ne Barbuda
 Name[x-test]=xxAntigua and Barbudaxx
 Name[zh_CN]=安提瓜和巴布达
 Name[zh_TW]=安地瓜島和巴布達島
-Region=caribbean
-Languages=en_GB,en_US
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[en_US]=%A %d %b %Y
-DateFormat[en_GB]=%A %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%I:%M:%S %p
-WeekStartDay=7
-#DecimalPlaces=2

l10n/ai/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Anguila
 Name[x-test]=xxAnguillaxx
 Name[zh_CN]=安圭拉
 Name[zh_TW]=安圭拉
-Region=caribbean
-#Languages=
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/al/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Albaneye
 Name[x-test]=xxAlbaniaxx
 Name[zh_CN]=阿尔巴尼亚
 Name[zh_TW]=阿爾巴尼亞
-Region=southeurope
-Languages=sq,el
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat[sq]=%a, %d %B %Y
-DateFormatShort=%Y-%m-%d
-TimeFormat=%l.%M.%S.%p
-WeekStartDay=7
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/am/entry.desktop

@@ -91,17 +91,3 @@ Name[wa]=Årmeneye
 Name[x-test]=xxArmeniaxx
 Name[zh_CN]=亚美尼亚
 Name[zh_TW]=亞美尼亞
-Region=middleeast
-Languages=hy
-DecimalSymbol=,
-ThousandsSeparator=.
-# FIXME Name is Dram, symbol is unknown
-PositiveSign=
-NegativeSign=-
-DateFormat[hy]=%A,%B %e, %Y
-DateFormatShort=%m/%d/%y
-TimeFormat=%H:%M:%S
-WeekStartDay=7
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/an/entry.desktop

@@ -89,16 +89,3 @@ Name[wa]=Antiyes Neyerlandesses
 Name[x-test]=xxNetherlands Antillesxx
 Name[zh_CN]=荷属安的列斯群岛
 Name[zh_TW]=荷屬安地列斯群島
-Region=caribbean
-Languages=nl,en_GB,es
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ao/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Angola
 Name[x-test]=xxAngolaxx
 Name[zh_CN]=安哥拉
 Name[zh_TW]=安哥拉
-Region=southafrica
-Languages=pt
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ar/entry.desktop

@@ -92,19 +92,3 @@ Name[xh]=Argentina
 Name[x-test]=xxArgentinaxx
 Name[zh_CN]=阿根廷
 Name[zh_TW]=阿根廷
-Region=southamerica
-Languages=es
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%a %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-WeekStartDay=7
-PageSize=0
-AddressFormat=%0(%cm\n)%0(%n\n)%0(Casilla de Correo %p\n)%0(%s\n)%z%w%l
-AddressCountryPosition=below
-#MeasureSystem=
-#DecimalPlaces=2

l10n/as/entry.desktop

@@ -90,16 +90,3 @@ Name[wa]=Samowa Amerikinne
 Name[x-test]=xxAmerican Samoaxx
 Name[zh_CN]=美属萨摩亚
 Name[zh_TW]=美屬薩摩亞
-Region=oceania
-Languages=en_US
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%m/%d/%y
-TimeFormat=%I:%M:%S %p
-WeekStartDay=7
-PageSize=2
-MeasureSystem=1
-#DecimalPlaces=2

l10n/at/entry.desktop

@@ -92,20 +92,3 @@ Name[xh]=Austria
 Name[x-test]=xxAustriaxx
 Name[zh_CN]=奥地利
 Name[zh_TW]=奧地利
-Region=centraleurope
-Languages=de
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[de]=%A, %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d.%m.%Y
-TimeFormat=%H:%M:%S
-#WeekStartDay=
-PageSize=0
-MeasureSystem=0
-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

l10n/au/entry.desktop

@@ -92,24 +92,3 @@ Name[xh]=Australia
 Name[x-test]=xxAustraliaxx
 Name[zh_CN]=澳大利亚
 Name[zh_TW]=澳大利亞
-Region=oceania
-Languages=en_GB,en
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[en_GB]=%a, %e %b %Y
-DateFormat[en]=%a, %e %b %Y
-DateFormat[en_US]=%a, %e %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat[en_GB]=%I:%M:%S %p
-TimeFormat[en]=%I:%M:%S %p
-TimeFormat[en_US]=%I:%M:%S %p
-TimeFormat[eo]=%H:%M:%S
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-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

l10n/aw/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Arouba
 Name[x-test]=xxArubaxx
 Name[zh_CN]=阿鲁巴
 Name[zh_TW]=阿魯巴
-Region=caribbean
-Languages=nl,en_GB,sp
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ax/entry.desktop

@@ -88,20 +88,3 @@ Name[wa]=Iyes Ålande
 Name[x-test]=xxÅland Islandsxx
 Name[zh_CN]=阿兰群岛
 Name[zh_TW]=奧蘭群島
-Region=northeurope
-Languages=sv,se
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[sv]=%Aen den %e %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormat[se]=%A, %B %e. b. %Y
-DateFormatShort=%Y-%m-%d
-TimeFormat=%H.%M.%S
-WeekStartDay=1
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%cm\n)%0(%n\n)%0(PB %p\n)%0(%s\n)%z%w%L
-AddressCountryPosition=BELOW
-#DecimalPlaces=2

l10n/az/entry.desktop

@@ -92,15 +92,3 @@ Name[xh]=Azerbaijan
 Name[x-test]=xxAzerbaijanxx
 Name[zh_CN]=阿塞拜疆
 Name[zh_TW]=亞塞拜然
-
-Region=middleeast
-Languages=az
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[az]=%A %d %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d-%m-%Y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/ba/entry.desktop

@@ -91,16 +91,3 @@ Name[xh]=Bosnia ne Herzegovina
 Name[x-test]=xxBosnia and Herzegovinaxx
 Name[zh_CN]=波斯尼亚和黑塞哥维那
 Name[zh_TW]=波士尼亞與赫塞哥維納
-Region=southeurope
-Languages=bs,hr,sr
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[bs]=%a, %d %B %Y.
-DateFormat[hr]=%a, %d %B %Y.
-DateFormat[sr]=%a, %d %B %Y.
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d.%m.%Y.
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/bb/entry.desktop

@@ -92,16 +92,3 @@ Name[xh]=Barbados
 Name[x-test]=xxBarbadosxx
 Name[zh_CN]=巴巴多斯
 Name[zh_TW]=巴貝多
-Region=caribbean
-Languages=en_GB,en_US
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[en_US]=%A %d %b %Y
-DateFormat[en_GB]=%A %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%I:%M:%S %p
-WeekStartDay=7
-#DecimalPlaces=2

l10n/bd/entry.desktop

@@ -92,11 +92,3 @@ Name[xh]=Bangladesh
 Name[x-test]=xxBangladeshxx
 Name[zh_CN]=孟加拉国
 Name[zh_TW]=孟加拉
-Region=southasia
-Languages=bn,en_GB
-DateFormat=%A %d %b %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%l:%M:%S %p
-PageSize=0
-MeasureSystem=1
-#DecimalPlaces=2

l10n/be/entry.desktop

@@ -93,24 +93,3 @@ Name[x-test]=xxBelgiumxx
 Name[zh_CN]=比利时
 Name[zh_TW]=比利時
 Region=westeurope
-Languages=nl_BE,fr_BE,de_BE,nl,fr,de,wa
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[nl]=%A %e %B %Y
-DateFormat[fr]=%A %e %B %Y
-DateFormat[de]=%A %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormat[wa]=%A %e di %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-#WeekStartDay=
-PageSize=0
-MeasureSystem=0
-#DecimalPlaces=2
-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
-AddressFormat[nl]=%0(%cm\n)%0(%n\n)%0(%s\n)%0(Postbus %p\n)%z%w%L
-AddressCountryPosition=BELOW

l10n/bf/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Bourkina Fasso
 Name[x-test]=xxBurkina Fasoxx
 Name[zh_CN]=布基纳法索
 Name[zh_TW]=布吉納法索
-Region=westafrica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/bg/entry.desktop

@@ -92,16 +92,3 @@ Name[xh]=Bulgaria
 Name[x-test]=xxBulgariaxx
 Name[zh_CN]=保加利亚
 Name[zh_TW]=保加利亞
-Region=easteurope
-Languages=bg
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[bg]=%e.%n.%Y
-DateFormat[eo]=%A, %e %B %Y
-DateFormatShort=%e.%n.%Y
-TimeFormat=%H:%M:%S
-PageSize=0
-MeasureSystem=0
-#DecimalPlaces=2

l10n/bh/entry.desktop

@@ -92,8 +92,3 @@ Name[xh]=Bahrain
 Name[x-test]=xxBahrainxx
 Name[zh_CN]=巴林
 Name[zh_TW]=巴林
-Region=middleeast
-Languages=ar
-DecimalSymbol=,
-DateFormatShort=%y/%m/%d
-#DecimalPlaces=2

l10n/bi/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Bouroundi
 Name[x-test]=xxBurundixx
 Name[zh_CN]=布隆迪
 Name[zh_TW]=浦隆地
-Region=centralafrica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/bj/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Benin
 Name[x-test]=xxBeninxx
 Name[zh_CN]=贝宁
 Name[zh_TW]=貝南
-Region=westafrica
-#Languages=
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/bl/entry.desktop

@@ -65,18 +65,3 @@ Name[wa]=Sint Bartelemi
 Name[x-test]=xxSaint Barthélemyxx
 Name[zh_CN]=Saint Barthélemy
 Name[zh_TW]=Saint Barthélemy
-Region=caribbean
-Languages=fr
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat=%A %e %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%cm\n)%0(%n\n)%0(%s\n)%0(BP %p\n)%z%w%L
-AddressCountryPosition=BELOW
-DecimalPlaces=2

l10n/bm/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Bermudes
 Name[x-test]=xxBermudaxx
 Name[zh_CN]=百慕大
 Name[zh_TW]=百慕達
-Region=northamerica
-Languages=en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/bn/entry.desktop

@@ -92,16 +92,3 @@ Name[wa]=Bruney Darussalam
 Name[x-test]=xxBrunei Darussalamxx
 Name[zh_CN]=文莱达鲁萨兰
 Name[zh_TW]=文萊達魯薩蘭
-Region=southeastasia
-Languages=ms,zn_CN
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/bo/entry.desktop

@@ -92,15 +92,3 @@ Name[xh]=Bolivia
 Name[x-test]=xxBoliviaxx
 Name[zh_CN]=玻利维亚
 Name[zh_TW]=玻利維亞
-Region=southamerica
-Languages=es
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-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

l10n/br/entry.desktop

@@ -92,16 +92,3 @@ Name[xh]=Brazil
 Name[x-test]=xxBrazilxx
 Name[zh_CN]=巴西
 Name[zh_TW]=巴西
-Region=southamerica
-Languages=pt_BR
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat[pt_BR]=%a %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d-%m-%Y
-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

l10n/bs/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Bahamas
 Name[x-test]=xxBahamasxx
 Name[zh_CN]=巴哈马
 Name[zh_TW]=巴哈馬
-Region=caribbean
-Languages=en_GB,es
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/bt/entry.desktop

@@ -92,17 +92,3 @@ Name[wa]=Boutan
 Name[x-test]=xxBhutanxx
 Name[zh_CN]=不丹
 Name[zh_TW]=不丹
-Region=southasia
-Languages=dz,en
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[en]=%A %d %B %Y
-DateFormat[dz]=སྤྱི་ལོ་%Y ཟླ%n ཚེ་%d
-DateFormatShort=%Y-%m-%d
-TimeFormat=%I:%M:%S %p
-WeekStartDay=7
-PageSize=0
-MeasureSystem=0
-#DecimalPlaces=2

l10n/bw/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Boswana
 Name[x-test]=xxBotswanaxx
 Name[zh_CN]=博茨瓦纳
 Name[zh_TW]=波札那
-Region=southafrica
-Languages=en_GB,ts
-DecimalSymbol=.
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat[en_GB]=%A %d %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%l.%M.%S %p
-WeekStartDay=7
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/by/entry.desktop

@@ -93,18 +93,3 @@ Name[xh]=Belarus
 Name[x-test]=xxBelarusxx
 Name[zh_CN]=白俄罗斯
 Name[zh_TW]=白俄羅斯
-Region=easteurope
-Languages=be,ru
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat=%e %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-MeasureSystem=0
-PageSize=0
-CalendarSystem=gregorian
-#DecimalPlaces=2

l10n/bz/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Belize
 Name[x-test]=xxBelizexx
 Name[zh_CN]=伯利兹
 Name[zh_TW]=貝里斯
-Region=centralamerica
-Languages=en_GB,es
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ca/entry.desktop

@@ -95,27 +95,3 @@ Name[xh]=Canada
 Name[x-test]=xxCanadaxx
 Name[zh_CN]=加拿大
 Name[zh_TW]=加拿大
-Region=northamerica
-Languages=en_GB,fr,en_US
-DecimalSymbol=.
-ThousandsSeparator=,
-ThousandsSeparator[fr]=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[en_GB]=%B %e, %Y
-DateFormat[fr]=%e %B %Y
-DateFormat[en_US]=%B %e, %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort[en_GB]=%d/%m/%y
-DateFormatShort[fr]=%Y-%m-%d
-DateFormatShort[en_US]=%d/%m/%y
-TimeFormat[en_GB]=%I:%M:%S %p
-TimeFormat[fr]=%H:%M:%S
-TimeFormat[en_US]=%I:%M:%S %p
-TimeFormat[eo]=%H:%M:%S
-WeekStartDay=7
-PageSize=2
-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

l10n/cc/entry.desktop

@@ -90,16 +90,3 @@ Name[wa]=Iyes Cocos
 Name[x-test]=xxCocos (Keeling) Islandsxx
 Name[zh_CN]=科科斯群岛
 Name[zh_TW]=可可斯群島
-Region=southeastasia
-Languages=ms,en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cd/entry.desktop

@@ -88,16 +88,3 @@ Name[wa]=Congo, republike democratike
 Name[x-test]=xxCongo, The Democratic Republic of thexx
 Name[zh_CN]=刚果民主共和国
 Name[zh_TW]=剛果民主共和國
-Region=centralafrica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cf/entry.desktop

@@ -90,16 +90,3 @@ Name[wa]=Cintrafrike
 Name[x-test]=xxCentral African Republicxx
 Name[zh_CN]=中非共和国
 Name[zh_TW]=中非共和國
-Region=centralafrica
-#Languages=
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cg/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Congo
 Name[x-test]=xxCongoxx
 Name[zh_CN]=刚果
 Name[zh_TW]=剛果
-Region=centralafrica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ch/entry.desktop

@@ -92,24 +92,3 @@ Name[xh]=Switzerland
 Name[x-test]=xxSwitzerlandxx
 Name[zh_CN]=瑞士
 Name[zh_TW]=瑞士
-Region=centraleurope
-Languages=de,fr,it
-DecimalSymbol=.
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[de]=%A, %e. %B %Y
-DateFormat[fr]=%A, %e %B %Y
-DateFormat[it]=%A, %e %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d.%m.%Y
-TimeFormat=%H.%M:%S
-#WeekStartDay=
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%cm\n)%0(%n\n)%0(P.O. Box %p\n)%0(%s\n)%z%w%l
-AddressFormat[de]=%0(%cm\n)%0(%n\n)%0(Postfach %p\n)%0(%s\n)%z%w%l
-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

l10n/ci/entry.desktop

@@ -90,16 +90,3 @@ Name[wa]=Coisse d' Ivwere
 Name[x-test]=xxCote d'ivoirexx
 Name[zh_CN]=科特迪瓦
 Name[zh_TW]=象牙海岸
-Region=westafrica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/ck/entry.desktop

@@ -89,16 +89,3 @@ Name[wa]=Iyes Cook
 Name[x-test]=xxCook islandsxx
 Name[zh_CN]=库克群岛
 Name[zh_TW]=庫克群島
-Region=oceania
-Languages=ms,en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cl/entry.desktop

@@ -92,14 +92,3 @@ Name[xh]=Chile
 Name[x-test]=xxChilexx
 Name[zh_CN]=智利
 Name[zh_TW]=智利
-Region=southamerica
-Languages=es
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%a %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/cm/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Camrone
 Name[x-test]=xxCameroonxx
 Name[zh_CN]=喀麦隆
 Name[zh_TW]=喀麥隆
-Region=centralafrica
-Languages=fr,en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cn/entry.desktop

@@ -93,19 +93,3 @@ Name[xh]=China
 Name[x-test]=xxChinaxx
 Name[zh_CN]=中国
 Name[zh_TW]=中國
-Region=eastasia
-Languages=zh_CN
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[zh_CN]=%Y年%n月%e日 %A
-DateFormat[zh_TW]=%Y年%n月%e日 %A
-#DateFormat[de]=%A %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%Y-%m-%d
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-MeasureSystem=0
-PageSize=0
-#DecimalPlaces=2

l10n/co/entry.desktop

@@ -92,14 +92,3 @@ Name[xh]=Columbia
 Name[x-test]=xxColombiaxx
 Name[zh_CN]=哥伦比亚
 Name[zh_TW]=哥倫比亞
-Region=southamerica
-Languages=es
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%a %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/cr/entry.desktop

@@ -92,16 +92,3 @@ Name[xh]=Costa Rica
 Name[x-test]=xxCosta Ricaxx
 Name[zh_CN]=哥斯达黎加
 Name[zh_TW]=哥斯大黎加
-Region=centralamerica
-Languages=es
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%A, %e de %B de %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%I:%M:%S %p
-WeekStartDay=1
-PageSize=2
-MeasureSystem=0
-#DecimalPlaces=2

l10n/cu/entry.desktop

@@ -92,16 +92,3 @@ Name[xh]=Cuba
 Name[x-test]=xxCubaxx
 Name[zh_CN]=古巴
 Name[zh_TW]=古巴
-Region=caribbean
-Languages=es
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%A, %e de %B de %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%I:%M:%S %p
-WeekStartDay=1
-PageSize=2
-MeasureSystem=0
-#DecimalPlaces=2

l10n/cv/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Cap Vert
 Name[x-test]=xxCape Verdexx
 Name[zh_CN]=佛得角
 Name[zh_TW]=維德角
-Region=westafrica
-Languages=pt
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cx/entry.desktop

@@ -90,16 +90,3 @@ Name[wa]=Iyes Christmas
 Name[x-test]=xxChristmas Islandxx
 Name[zh_CN]=圣诞岛
 Name[zh_TW]=聖誕島
-Region=southeastasia
-Languages=en_GB,zh_CN,ms
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cy/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Chîpe
 Name[x-test]=xxCyprusxx
 Name[zh_CN]=塞浦路斯
 Name[zh_TW]=賽普勒斯
-Region=southeurope
-Languages=el,tr,en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/cz/entry.desktop

@@ -87,17 +87,3 @@ Name[wa]=Tchekeye
 Name[x-test]=xxCzech Republicxx
 Name[zh_CN]=捷克共和国
 Name[zh_TW]=捷克共和國
-Region=centraleurope
-Languages=cs
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=−
-DateFormat[cs]=%a %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%e. %n. %Y
-TimeFormat=%H:%M:%S
-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

l10n/de/entry.desktop

@@ -92,23 +92,3 @@ Name[xh]=Germany
 Name[x-test]=xxGermanyxx
 Name[zh_CN]=德国
 Name[zh_TW]=德國
-Region=centraleurope
-Languages=de,nds
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-ThousandsSeparator[nds]=$0.$0
-PositiveSign=
-NegativeSign=-
-DateFormat[de]=%A, %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormat[nds]=%A, de %e. %B %Y
-DateFormatShort=%d.%m.%Y
-TimeFormat=%H:%M:%S
-TimeFormat[nds]=%H.%M:%S
-#WeekStartDay=
-PageSize=0
-MeasureSystem=0
-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

l10n/dj/entry.desktop

@@ -92,8 +92,3 @@ Name[xh]=Djibouti
 Name[x-test]=xxDjiboutixx
 Name[zh_CN]=吉布提
 Name[zh_TW]=吉布地
-Region=northafrica
-Languages=ar
-DecimalSymbol=,
-DateFormatShort=%y/%m/%d
-#DecimalPlaces=2

l10n/dk/entry.desktop

@@ -93,19 +93,3 @@ Name[xh]=Denmark
 Name[x-test]=xxDenmarkxx
 Name[zh_CN]=丹麦
 Name[zh_TW]=丹麥
-Region=northeurope
-Languages=da
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat[da]=%A den %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%e/%n-%Y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%n\n)%0(%cm\n)%0(%s\n)%0(Postboks %p\n)%z%w%l
-AddressCountryPosition=below
-#DecimalPlaces=2

l10n/dm/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Dominike
 Name[x-test]=xxDominicaxx
 Name[zh_CN]=多米尼加
 Name[zh_TW]=多明尼加
-Region=caribbean
-Languages=en_GB,fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/do/entry.desktop

@@ -91,14 +91,3 @@ Name[xh]=IRepublic yeDominican
 Name[x-test]=xxDominican Republicxx
 Name[zh_CN]=多米尼加共和国
 Name[zh_TW]=多明尼加共和國
-Region=caribbean
-Languages=es
-DecimalSymbol=.
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%a %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/dz/entry.desktop

@@ -92,8 +92,3 @@ Name[xh]=Algeria
 Name[x-test]=xxAlgeriaxx
 Name[zh_CN]=阿尔及利亚
 Name[zh_TW]=阿爾及利亞
-Region=northafrica
-Languages=ar
-DecimalSymbol=,
-DateFormatShort=%y/%m/%d
-#DecimalPlaces=2

l10n/ec/entry.desktop

@@ -79,14 +79,3 @@ Name[wa]=Ecwåteur
 Name[x-test]=xxEcuadorxx
 Name[zh_CN]=厄瓜多尔
 Name[zh_TW]=厄瓜多
-Region=southamerica
-Languages=es
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%a %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/ee/entry.desktop

@@ -92,14 +92,3 @@ Name[xh]=Estonia
 Name[x-test]=xxEstoniaxx
 Name[zh_CN]=爱沙尼亚
 Name[zh_TW]=愛沙尼亞
-Region=northeurope
-Languages=et
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[et]=%A, %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d.%m.%Y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/eg/entry.desktop

@@ -92,8 +92,3 @@ Name[xh]=Egypt
 Name[x-test]=xxEgyptxx
 Name[zh_CN]=埃及
 Name[zh_TW]=埃及
-Region=northafrica
-Languages=ar
-DecimalSymbol=,
-DateFormatShort=%y/%m/%d
-#DecimalPlaces=2

l10n/eh/entry.desktop

@@ -89,16 +89,3 @@ Name[wa]=Sara Coûtchantrece
 Name[x-test]=xxWestern Saharaxx
 Name[zh_CN]=西撒哈拉
 Name[zh_TW]=西盛哈拉
-Region=northafrica
-Languages=
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/er/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Eritrêye
 Name[x-test]=xxEritreaxx
 Name[zh_CN]=厄立特里亚
 Name[zh_TW]=厄利垂亞
-Region=northafrica
-Languages=ti,ar
-DecimalSymbol=.
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-#DateFormat[ti]=
-DateFormatShort=%d/%m/%Y
-TimeFormat=%l:%M:%S %p
-WeekStartDay=7
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/es/entry.desktop

@@ -92,22 +92,3 @@ Name[xh]=Spain
 Name[x-test]=xxSpainxx
 Name[zh_CN]=西班牙
 Name[zh_TW]=西班牙
-Region=westeurope
-Languages=es,ca,eu,gl
-DecimalSymbol=,
-ThousandsSeparator=
-PositiveSign=
-NegativeSign=-
-DateFormat[es]=%A, %e de %B de %Y
-DateFormat[eu]=%a, %Yeko %bren %da
-DateFormat[gl]=%A, %e de %B de %Y
-DateFormat[ca]=%A, %e %B de %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateMonthNamePossessive[ca]=true
-DateFormatShort=%d-%m-%y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-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

l10n/et/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Etiopeye
 Name[x-test]=xxEthiopiaxx
 Name[zh_CN]=埃塞俄比亚
 Name[zh_TW]=衣索比亞
-Region=northafrica
-Languages=en_GB,am,om,so,ti
-DecimalSymbol=.
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-#DateFormat[??]=
-DateFormatShort=%d/%m/%Y
-TimeFormat=%l:%M:%S %p
-WeekStartDay=7
-PageSize=0
-MeasureSystem=0
-#DecimalPlaces=2

l10n/fi/entry.desktop

@@ -93,22 +93,3 @@ Name[xh]=Finland
 Name[x-test]=xxFinlandxx
 Name[zh_CN]=芬兰
 Name[zh_TW]=芬蘭
-Region=northeurope
-Languages=fi,sv,se
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[fi]=%A, %e. %Bta %Y
-DateFormat[sv]=%Aen den %e %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormat[se]=%A, %B %e. b. %Y
-DateFormatShort=%d.%m.%Y
-DateFormatShort[se]=%Y-%m-%d
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%cm\n)%0(%n\n)%0(PB %p\n)%0(%s\n)%z%w%L
-AddressCountryPosition=BELOW
-#DecimalPlaces=2

l10n/fj/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Fidji
 Name[x-test]=xxFijixx
 Name[zh_CN]=斐济
 Name[zh_TW]=菲濟
-Region=oceania
-Languages=en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/fk/entry.desktop

@@ -89,16 +89,3 @@ Name[wa]=Iyes Malouwines
 Name[x-test]=xxFalkland Islands (Malvinas)xx
 Name[zh_CN]=福克兰群岛(马尔维纳斯)
 Name[zh_TW]=福克蘭群島 (馬爾維納斯)
-Region=southamerica
-Languages=en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/fm/entry.desktop

@@ -88,16 +88,3 @@ Name[wa]=Micronezeye
 Name[x-test]=xxMicronesia, Federated States ofxx
 Name[zh_CN]=密克罗尼西亚联邦
 Name[zh_TW]=密克羅尼西亞聯邦
-Region=oceania
-Languages=en_GB
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/fo/entry.desktop

@@ -90,16 +90,3 @@ Name[wa]=Iye Faeroyé
 Name[x-test]=xxFaroe Islandsxx
 Name[zh_CN]=法罗群岛
 Name[zh_TW]=法羅群島
-Region=northeurope
-Languages=fa,da
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat[fo]=%A %d %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%l:%M:%S %p
-WeekStartDay=7
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/fr/entry.desktop

@@ -93,19 +93,3 @@ Name[xh]=Fransi
 Name[x-test]=xxFrancexx
 Name[zh_CN]=法国
 Name[zh_TW]=法國
-Region=westeurope
-Languages=fr,br,eu,ca,oc,de
-DecimalSymbol=,
-ThousandsSeparator=$0 $0
-PositiveSign=
-NegativeSign=-
-DateFormat[fr]=%A %e %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%cm\n)%0(%n\n)%0(%s\n)%0(BP %p\n)%z%w%L
-AddressCountryPosition=BELOW
-#DecimalPlaces=2

l10n/ga/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Gabon
 Name[x-test]=xxGabonxx
 Name[zh_CN]=加蓬
 Name[zh_TW]=加彭
-Region=centralafrica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/gb/entry.desktop

@@ -93,14 +93,3 @@ Name[x-test]=xxUnited Kingdomxx
 Name[zh_CN]=英国
 Name[zh_TW]=聯合王國
 Region=westeurope
-Languages=en_GB,cy
-DateFormat[en_GB]=%A %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%H:%M:%S
-PageSize=0
-MeasureSystem=0
-WeekStartDay=7
-#DecimalPlaces=2
-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

@@ -92,16 +92,3 @@ Name[xh]=Grenada
 Name[x-test]=xxGrenadaxx
 Name[zh_CN]=格林纳达
 Name[zh_TW]=格瑞那達
-Region=caribbean
-Languages=en_GB,en_US
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[en_US]=%A %d %b %Y
-DateFormat[en_GB]=%A %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%I:%M:%S %p
-WeekStartDay=7
-#DecimalPlaces=2

l10n/ge/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Djeyordjeye
 Name[x-test]=xxGeorgiaxx
 Name[zh_CN]=格鲁吉亚
 Name[zh_TW]=喬治亞
-Region=easteurope
-Languages=ka,ru
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-DateFormat=%Y წლის %e %B, %A
-DateFormatShort=%d.%m.%Y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-PageSize=A4
-MeasureSystem=Metric
-#DecimalPlaces=2

l10n/gf/entry.desktop

@@ -70,17 +70,3 @@ Name[wa]=Guyane francesse
 Name[x-test]=xxFrench Guianaxx
 Name[zh_CN]=法属圭亚那
 Name[zh_TW]=法屬圭亞那
-
-Region=southamerica
-Languages=fr
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/gg/entry.desktop

@@ -65,13 +65,3 @@ Name[wa]=Guernzey
 Name[x-test]=xxGuernseyxx
 Name[zh_CN]=Guernsey
 Name[zh_TW]=Guernsey
-Region=westeurope
-Languages=en_GB,fr
-DateFormat=%A %d %b %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%H:%M:%S
-PageSize=0
-MeasureSystem=0
-WeekStartDay=7
-DecimalPlaces=2

l10n/gh/entry.desktop

@@ -92,13 +92,3 @@ Name[xh]=Ghana
 Name[x-test]=xxGhanaxx
 Name[zh_CN]=加纳
 Name[zh_TW]=迦納
-Region=westafrica
-Languages=en_GB
-DecimalSymbol=.
-ThousandsSeparator=,
-PositiveSign=
-NegativeSign=-
-DateFormat[en_GB]=%A, %e %B %Y
-DateFormatShort=%d/%m/%Y
-TimeFormat=%H:%M:%S
-#DecimalPlaces=2

l10n/gi/entry.desktop

@@ -91,16 +91,3 @@ Name[wa]=Djibraltar
 Name[x-test]=xxGibraltarxx
 Name[zh_CN]=直布罗陀
 Name[zh_TW]=直布羅陀
-Region=westeurope
-#Languages=
-#DecimalSymbol=,
-#ThousandsSeparator=
-#PositiveSign=
-#NegativeSign=-
-#DateFormat[??]=
-#DateFormatShort=
-#TimeFormat=
-#WeekStartDay=
-#PageSize=
-#MeasureSystem=
-#DecimalPlaces=2

l10n/gl/entry.desktop

@@ -91,20 +91,3 @@ Name[wa]=Groenlande
 Name[x-test]=xxGreenlandxx
 Name[zh_CN]=格陵兰
 Name[zh_TW]=格陵蘭
-Region=northamerica
-Languages=kl,da
-DecimalSymbol=,
-ThousandsSeparator=.
-PositiveSign=
-NegativeSign=-
-#DateFormat[gl]=%A den %e. %B %Y
-DateFormat[da]=%A den %e. %B %Y
-DateFormat[eo]=%A, la %ea de %B %Y
-DateFormatShort=%e/%n-%Y
-TimeFormat=%H:%M:%S
-WeekStartDay=1
-PageSize=0
-MeasureSystem=0
-AddressFormat=%0(%n\n)%0(%cm\n)%0(%s\n)%0(Postboks %p\n)%z%w%l
-AddressCountryPosition=below
-#DecimalPlaces=2