From: garvinhicking <garvinhicking>
Date: Tue, 3 Jan 2006 10:02:22 +0000 (+0000)
Subject:    * Fix server locale order to always first use the charset locale     instead of... 
X-Git-Tag: 1.0~193
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e08b02c92eb91404cbf3d083cd6987c7651f7ace;p=s9y.git

   * Fix server locale order to always first use the charset locale     instead of a generic locale. Fixes bug #1384978 (garvinhicking)
---

diff --git a/lang/UTF-8/recode.php b/lang/UTF-8/recode.php
index a47da18..68f2841 100644
--- a/lang/UTF-8/recode.php
+++ b/lang/UTF-8/recode.php
@@ -50,7 +50,7 @@ while (($file = readdir($dh)) !== false) {
     if (!preg_match('@lang_(.+)\.inc\.php$@i', $file, $extmatch)) {
         continue;
     }
-    
+
     if (!isset($ext[$extmatch[1]])) {
         echo "'$file' already is in UTF-8. Leaving untouched.\n";
     } else {
@@ -61,6 +61,8 @@ while (($file = readdir($dh)) !== false) {
         chmod($file, 0644);
         $fc = file_get_contents($file . '.new');
         $fc = preg_replace('@' . $set . '@i', 'UTF-8', $fc);
+        $fc = preg_replace('@' . str_replace('ISO-', 'ISO', $set) . '@i', 'UTF8', $fc);
+
         if (isset($htmlarea_iso[$extmatch[1]])) {
             $fc = preg_replace(
                 '@define\(\'WYSIWYG_LANG\',\s+\'[^\']+\'\);@i',
diff --git a/lang/UTF-8/serendipity_lang_bg.inc.php b/lang/UTF-8/serendipity_lang_bg.inc.php
index 86f9211..44f310c 100644
--- a/lang/UTF-8/serendipity_lang_bg.inc.php
+++ b/lang/UTF-8/serendipity_lang_bg.inc.php
@@ -6,7 +6,7 @@
 # Ognyan Kulev <ogi@fmi.uni-sofia.bg>, 2005
 /* vim: set sts=4 ts=4 expandtab : */
 
-@define('LANG_CHARSET', 'windows-1251');
+@define('LANG_CHARSET', 'UTF-8');
 @define('DATE_LOCALES', 'bg_BG');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_cn.inc.php b/lang/UTF-8/serendipity_lang_cn.inc.php
index a50305e..2723d29 100644
--- a/lang/UTF-8/serendipity_lang_cn.inc.php
+++ b/lang/UTF-8/serendipity_lang_cn.inc.php
@@ -1,10 +1,10 @@
-<?php # $Id: serendipity_lang_cn.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_cn.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'cn, zh, zh_CN.UTF-8');
+@define('DATE_LOCALES', 'zh_CN.UTF-8, cn, zh');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_cs.inc.php b/lang/UTF-8/serendipity_lang_cs.inc.php
index 8e2cd66..2b657d9 100644
--- a/lang/UTF-8/serendipity_lang_cs.inc.php
+++ b/lang/UTF-8/serendipity_lang_cs.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_cs.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_cs.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) 2005 Josef Klimosz <ok2wo@centrum.cz>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'Czech, cs, cs_CZ.UTF-8');
+@define('DATE_LOCALES', 'cs_CZ.UTF-8, czech, cs');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M');
 @define('WYSIWYG_LANG', 'cs-utf');
diff --git a/lang/UTF-8/serendipity_lang_cz.inc.php b/lang/UTF-8/serendipity_lang_cz.inc.php
index c5d2064..4b1652b 100644
--- a/lang/UTF-8/serendipity_lang_cz.inc.php
+++ b/lang/UTF-8/serendipity_lang_cz.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_cz.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_cz.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) 2004 Josef Klimosz <ok2wo@centrum.cz>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'Czech, cs, cs_CZ.UTF-8');
+@define('DATE_LOCALES', 'cs_CZ.UTF-8, cs_CZ.UTF8, czech, cs');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M');
 @define('WYSIWYG_LANG', 'cs-utf');
diff --git a/lang/UTF-8/serendipity_lang_da.inc.php b/lang/UTF-8/serendipity_lang_da.inc.php
index f95b1f7..89b7321 100644
--- a/lang/UTF-8/serendipity_lang_da.inc.php
+++ b/lang/UTF-8/serendipity_lang_da.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_da.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_da.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Tom Sommer, <ts@dreamcoder.dk>
@@ -7,7 +7,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'danish, da, da_DK, da_DK.ISO8859-1');
+@define('DATE_LOCALES', 'da_DK.UTF8, da_DK.UTF-8, danish, da, da_DK');
 @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'da-utf');
diff --git a/lang/UTF-8/serendipity_lang_de.inc.php b/lang/UTF-8/serendipity_lang_de.inc.php
index 73d8c5b..880dd75 100644
--- a/lang/UTF-8/serendipity_lang_de.inc.php
+++ b/lang/UTF-8/serendipity_lang_de.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_de.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_de.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) Jannis Hermanns, Garvin Hicking and others
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'german, de_DE, de, de_DE.UTF-8, de_DE@euro, de_DE.ISO8859-1');
+@define('DATE_LOCALES', 'de_DE.UTF-8, de_DE.UTF8, german, de_DE, de_DE@euro, de');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'de-utf');
diff --git a/lang/UTF-8/serendipity_lang_en.inc.php b/lang/UTF-8/serendipity_lang_en.inc.php
index 5171285..f1b68f4 100644
--- a/lang/UTF-8/serendipity_lang_en.inc.php
+++ b/lang/UTF-8/serendipity_lang_en.inc.php
@@ -1,10 +1,10 @@
-<?php # $Id: serendipity_lang_en.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_en.inc.php 811 2005-12-29 22:08:19Z jmatos $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'english, en, en_US');
+@define('DATE_LOCALES', 'en_US-UTF-8, en_US-UTF8, english, en, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
@@ -801,4 +801,4 @@
 @define('INSTALL_TRACKREF_DESC', 'Enabling the referrer tracking will show you which sites refer to your articles. Today this is often abused for spamming, so you can disable it if you want.');
 @define('CATEGORIES_HIDE_PARENT', 'Hide the selected parent category?');
 @define('CATEGORIES_HIDE_PARENT_DESC', 'If you restrict the listing of categories to a specific category, by default you will see that parent category within the output listing. If you disable this option, the parent category name will not be displayed.');
-@define('WARNING_NO_GROUPS_SELECTED', 'Warning: You did not select any group memberships. This would effectively log you out of the usergroup management, and thus your group memberships werde not changed.');
+@define('WARNING_NO_GROUPS_SELECTED', 'Warning: You did not select any group memberships. This would effectively log you out of the usergroup management, and thus your group memberships were not changed.');
diff --git a/lang/UTF-8/serendipity_lang_es.inc.php b/lang/UTF-8/serendipity_lang_es.inc.php
index bce85ec..0d695b8 100644
--- a/lang/UTF-8/serendipity_lang_es.inc.php
+++ b/lang/UTF-8/serendipity_lang_es.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_es.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_es.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Luis Cervantes <LuisCervantes@ono.com>,
@@ -8,7 +8,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'spanish, sp, es, es_ES, es_ES.ISO_8859-1, es_ES.ISO8859-1, es-ES');
+@define('DATE_LOCALES', 'es_ES.ISO_8859-15, es_ES.UTF8, es_ES.ISO_8859-1, es_ES.ISO8859-1, spanish, sp, es, es_ES, es-ES');
 @define('DATE_FORMAT_ENTRY', '%A, %e de %B del %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'es-utf');
diff --git a/lang/UTF-8/serendipity_lang_fa.inc.php b/lang/UTF-8/serendipity_lang_fa.inc.php
index a809b3e..c6ef036 100644
--- a/lang/UTF-8/serendipity_lang_fa.inc.php
+++ b/lang/UTF-8/serendipity_lang_fa.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fa.inc.php 796 2005-12-24 12:41:10Z omidmottaghi $
+<?php # $Id: serendipity_lang_fa.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved. See LICENSE file for licensing details
 # this translation, translated by Omid Mottaghi <http://oxygenws.com>
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'fa_IR, persian, fa');
+@define('DATE_LOCALES', 'fa_IR.UTF-8, fa_IR, persian, fa');
 @define('DATE_FORMAT_ENTRY', '%A، %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_fi.inc.php b/lang/UTF-8/serendipity_lang_fi.inc.php
index 2ee7ae7..8799eb2 100644
--- a/lang/UTF-8/serendipity_lang_fi.inc.php
+++ b/lang/UTF-8/serendipity_lang_fi.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_fi.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_fi.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Mauri Sahlberg <mos@iki.fi>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'finnish, fi, fi_FI.UTF-8');
+@define('DATE_LOCALES', 'fi_FI.UTF-8, finnish, fi');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'fi');
diff --git a/lang/UTF-8/serendipity_lang_fr.inc.php b/lang/UTF-8/serendipity_lang_fr.inc.php
index 7ff7d29..0b0d575 100644
--- a/lang/UTF-8/serendipity_lang_fr.inc.php
+++ b/lang/UTF-8/serendipity_lang_fr.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_fr.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_fr.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Sebastian Mordziol <argh@php-tools.net>
@@ -8,7 +8,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'french, fr, fr_FR, fr_FR.UTF-8, fr_FR@euro, fr_FR.ISO8859-1, en_US');
+@define('DATE_LOCALES', 'fr_FR.UTF-8, fr_FR.UTF8, french, fr, fr_FR, fr_FR@euro, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'fr-utf');
diff --git a/lang/UTF-8/serendipity_lang_hu.inc.php b/lang/UTF-8/serendipity_lang_hu.inc.php
index 66edb86..78be591 100644
--- a/lang/UTF-8/serendipity_lang_hu.inc.php
+++ b/lang/UTF-8/serendipity_lang_hu.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'hungarian, hu, hu_HU');
+@define('DATE_LOCALES', 'hu_HU-UTF-8, hu_HU-UTF8, hungarian, hu, hu_HU');
 @define('DATE_FORMAT_ENTRY', '%Y. %B %e. (%A) ');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_is.inc.php b/lang/UTF-8/serendipity_lang_is.inc.php
index f0f04b7..62c14fa 100644
--- a/lang/UTF-8/serendipity_lang_is.inc.php
+++ b/lang/UTF-8/serendipity_lang_is.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_is.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_is.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation by Örn Arnarson <orn@arnarson.net>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'icelandic, is, is_IS');
+@define('DATE_LOCALES', 'is_IS-UTF-8, is_IS-UTF8, icelandic, is, is_IS');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%y %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_it.inc.php b/lang/UTF-8/serendipity_lang_it.inc.php
index d99ea02..877fb37 100644
--- a/lang/UTF-8/serendipity_lang_it.inc.php
+++ b/lang/UTF-8/serendipity_lang_it.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_it.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_it.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Alessandro Pellizzari <alex@amiran.it>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'italiano, it, it_IT');
+@define('DATE_LOCALES', 'it_IT-UTF-8, it_IT-UTF8, italiano, it, it_IT');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M');
 @define('WYSIWYG_LANG', 'it-utf');
diff --git a/lang/UTF-8/serendipity_lang_ja.inc.php b/lang/UTF-8/serendipity_lang_ja.inc.php
index ef20db6..bf90f18 100644
--- a/lang/UTF-8/serendipity_lang_ja.inc.php
+++ b/lang/UTF-8/serendipity_lang_ja.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_ja.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_ja.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) Tadashi Jokagi <elf2000@users.sourceforge.net>, 2004-2005.
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'ja,jp,ja_JP.UTF-8');
+@define('DATE_LOCALES', 'ja_JP.UTF-8,ja,jp');
 @define('DATE_FORMAT_ENTRY', '%Yå¹´ %B %e(%A)');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'ja-utf8');
diff --git a/lang/UTF-8/serendipity_lang_ko.inc.php b/lang/UTF-8/serendipity_lang_ko.inc.php
index f009fe3..d04ffd2 100644
--- a/lang/UTF-8/serendipity_lang_ko.inc.php
+++ b/lang/UTF-8/serendipity_lang_ko.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ko.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_ko.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by: Wesley Hwang-Chung <wesley96@gmail.com>
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'korean, ko, ko_KR, ko_KR.UTF-8');
+@define('DATE_LOCALES', 'ko_KR.UTF-8, korean, ko, ko_KR');
 @define('DATE_FORMAT_ENTRY', '%Y년 %B %e일 %A');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_nl.inc.php b/lang/UTF-8/serendipity_lang_nl.inc.php
index fe1d216..5c07634 100644
--- a/lang/UTF-8/serendipity_lang_nl.inc.php
+++ b/lang/UTF-8/serendipity_lang_nl.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_nl.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_nl.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Christiaan Heerze <webmaster@heimp.nl>
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'dutch, nl_BE, nl, nl_BE.ISO8859-1');
+@define('DATE_LOCALES', 'nl_BE.UTF8, nl_BE.UTF-8, dutch, nl_BE, nl');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M');
 @define('WYSIWYG_LANG', 'nl-utf');
diff --git a/lang/UTF-8/serendipity_lang_no.inc.php b/lang/UTF-8/serendipity_lang_no.inc.php
index df8d46f..faca757 100644
--- a/lang/UTF-8/serendipity_lang_no.inc.php
+++ b/lang/UTF-8/serendipity_lang_no.inc.php
@@ -1,11 +1,11 @@
-<?php # $Id: serendipity_lang_no.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_no.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Jo Christian Oterhals <oterhals@gmail.com>
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'norwegian, no, no_NO, no_NO.UTF-8, no_NO.ISO8859-1, no_');
+@define('DATE_LOCALES', 'no_NO.UTF-8, no_NO.UTF8, norwegian, no, no_NO, no_');
 @define('DATE_FORMAT_ENTRY', '%A - %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'no-utf');
diff --git a/lang/UTF-8/serendipity_lang_pt.inc.php b/lang/UTF-8/serendipity_lang_pt.inc.php
index c3585a3..6895597 100644
--- a/lang/UTF-8/serendipity_lang_pt.inc.php
+++ b/lang/UTF-8/serendipity_lang_pt.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_pt.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_pt.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translation (c) by Agner Olson <agner@agner.net>
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'portuguese brazilian, pt, pt_BR');
+@define('DATE_LOCALES', 'pt_BR-UTF-8, pt_BR-UTF8, pt_BR, portuguese brazilian, pt');
 @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y');
 @define('WYSIWYG_LANG', 'pt_pt-utf');
 @define('LANG_DIRECTION', 'ltr');
diff --git a/lang/UTF-8/serendipity_lang_pt_PT.inc.php b/lang/UTF-8/serendipity_lang_pt_PT.inc.php
index 715d713..347ba87 100644
--- a/lang/UTF-8/serendipity_lang_pt_PT.inc.php
+++ b/lang/UTF-8/serendipity_lang_pt_PT.inc.php
@@ -8,7 +8,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'pt, pt_PT, european portuguese');
+@define('DATE_LOCALES', 'pt_PT-UTF-8, pt_PT-UTF8, pt, pt_PT, european portuguese');
 @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'pt_pt-utf');
@@ -809,4 +809,4 @@
 @define('INSTALL_TRACKREF_DESC', 'A activação da localização do referenciador permite mostrar que sítios se referem aos seus artigos. Hoje em dia esta possibilidade é abusada para spam, de maneira que pode desligá-la se quiser.');
 @define('CATEGORIES_HIDE_PARENT', 'Esconder a categoria mãe seleccionada?');
 @define('CATEGORIES_HIDE_PARENT_DESC', 'Se restringir a listagem de categorias a uma categoria específica, por omissão verá a categoria mãe na listagem de saída. Se desactivar esta opção, o nome da categoria mãe não será mostrado.');
-@define('WARNING_NO_GROUPS_SELECTED', 'Warning: You did not select any group memberships. This would effectively log you out of the usergroup management, and thus your group memberships werde not changed.');
+@define('WARNING_NO_GROUPS_SELECTED', 'Aviso: Não seleccionou afiliações em grupos. Isto encerrou a sua gestão de grupos, e as suas afiliações em grupos não foram alteradas.');
diff --git a/lang/UTF-8/serendipity_lang_ro.inc.php b/lang/UTF-8/serendipity_lang_ro.inc.php
index b0f7562..9a71b77 100644
--- a/lang/UTF-8/serendipity_lang_ro.inc.php
+++ b/lang/UTF-8/serendipity_lang_ro.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'romanian, ro, ro_RO');
+@define('DATE_LOCALES', 'ro_RO.UTF-8, romanian, ro, ro_RO');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M');
 @define('WYSIWYG_LANG', 'ro');
diff --git a/lang/UTF-8/serendipity_lang_ru.inc.php b/lang/UTF-8/serendipity_lang_ru.inc.php
index 45424c8..b95601d 100644
--- a/lang/UTF-8/serendipity_lang_ru.inc.php
+++ b/lang/UTF-8/serendipity_lang_ru.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_ru.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_ru.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
diff --git a/lang/UTF-8/serendipity_lang_se.inc.php b/lang/UTF-8/serendipity_lang_se.inc.php
index 72c5c1b..12d88f2 100644
--- a/lang/UTF-8/serendipity_lang_se.inc.php
+++ b/lang/UTF-8/serendipity_lang_se.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'swedish, sv, sv_SV, sv_SV.ISO8859-1');
+@define('DATE_LOCALES', 'sv_SV.UTF8, sv_SV.UTF-8, swedish, sv, sv_SV');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'se-utf');
diff --git a/lang/UTF-8/serendipity_lang_tn.inc.php b/lang/UTF-8/serendipity_lang_tn.inc.php
index 7aed7fe..fd4f7f6 100644
--- a/lang/UTF-8/serendipity_lang_tn.inc.php
+++ b/lang/UTF-8/serendipity_lang_tn.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_tn.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_tn.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by CapriSkye <admin@capriskye.com>
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'tw, zh, zh-TW.UTF-8, zh_TW.UTF-8');
+@define('DATE_LOCALES', 'zh-TW.UTF-8, zh_TW.UTF-8, tw, zh');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/UTF-8/serendipity_lang_tw.inc.php b/lang/UTF-8/serendipity_lang_tw.inc.php
index 44e0c71..cb9cc9c 100644
--- a/lang/UTF-8/serendipity_lang_tw.inc.php
+++ b/lang/UTF-8/serendipity_lang_tw.inc.php
@@ -1,4 +1,4 @@
-<?php # $Id: serendipity_lang_tw.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_tw.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 # Translated by CapriSkye <admin@capriskye.com>
diff --git a/lang/UTF-8/serendipity_lang_zh.inc.php b/lang/UTF-8/serendipity_lang_zh.inc.php
index e8a0f15..0356e53 100644
--- a/lang/UTF-8/serendipity_lang_zh.inc.php
+++ b/lang/UTF-8/serendipity_lang_zh.inc.php
@@ -1,10 +1,10 @@
-<?php # $Id: serendipity_lang_zh.inc.php 769 2005-12-10 21:11:44Z garvinhicking $
+<?php # $Id: serendipity_lang_zh.inc.php 808 2005-12-28 19:47:37Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'cn, zh, zh_CN.UTF-8, zh_GB, zh_CN');
+@define('DATE_LOCALES', 'zh_CN.UTF-8, cn, zh, zh_GB, zh_CN');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php
index a09ad3b..5ff6f47 100644
--- a/lang/serendipity_lang_cn.inc.php
+++ b/lang/serendipity_lang_cn.inc.php
@@ -4,7 +4,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'cn, zh, zh_CN.UTF-8');
+@define('DATE_LOCALES', 'zh_CN.UTF-8, cn, zh');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php
index 5e120f0..62290eb 100644
--- a/lang/serendipity_lang_cs.inc.php
+++ b/lang/serendipity_lang_cs.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'windows-1250');
-@define('DATE_LOCALES', 'Czech, cs, cs_CZ.windows-1250');
+@define('DATE_LOCALES', 'cs_CZ.windows-1250, czech, cs');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M');
 @define('WYSIWYG_LANG', 'cs-win');
diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php
index 6e8e974..1d14912 100644
--- a/lang/serendipity_lang_cz.inc.php
+++ b/lang/serendipity_lang_cz.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-2');
-@define('DATE_LOCALES', 'Czech, cs, cs_CZ.ISO-8859-2');
+@define('DATE_LOCALES', 'cs_CZ.ISO-8859-2, cs_CZ.ISO8859-2, czech, cs');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d/%m/%Y %H.%M');
 @define('WYSIWYG_LANG', 'cs-iso');
diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php
index f875105..355e6ed 100644
--- a/lang/serendipity_lang_da.inc.php
+++ b/lang/serendipity_lang_da.inc.php
@@ -7,7 +7,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'danish, da, da_DK, da_DK.ISO8859-1');
+@define('DATE_LOCALES', 'da_DK.ISO8859-1, da_DK.ISO-8859-1, danish, da, da_DK');
 @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'da');
diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php
index cc78b9c..687d84f 100644
--- a/lang/serendipity_lang_de.inc.php
+++ b/lang/serendipity_lang_de.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'german, de_DE, de, de_DE.ISO-8859-1, de_DE@euro, de_DE.ISO8859-1');
+@define('DATE_LOCALES', 'de_DE.ISO-8859-1, de_DE.ISO8859-1, german, de_DE, de_DE@euro, de');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'de');
diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index bd4baa0..f4cbe99 100644
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -4,7 +4,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'english, en, en_US');
+@define('DATE_LOCALES', 'en_US-ISO-8859-1, en_US-ISO8859-1, english, en, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php
index 4df1289..dcd066b 100644
--- a/lang/serendipity_lang_es.inc.php
+++ b/lang/serendipity_lang_es.inc.php
@@ -8,7 +8,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-15');
-@define('DATE_LOCALES', 'spanish, sp, es, es_ES, es_ES.ISO_8859-1, es_ES.ISO8859-1, es-ES');
+@define('DATE_LOCALES', 'es_ES.ISO_8859-15, es_ES.ISO8859-15, es_ES.ISO_8859-1, es_ES.ISO8859-1, spanish, sp, es, es_ES, es-ES');
 @define('DATE_FORMAT_ENTRY', '%A, %e de %B del %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'es');
diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php
index eb5da94..af5318f 100644
--- a/lang/serendipity_lang_fa.inc.php
+++ b/lang/serendipity_lang_fa.inc.php
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'fa_IR, persian, fa');
+@define('DATE_LOCALES', 'fa_IR.UTF-8, fa_IR, persian, fa');
 @define('DATE_FORMAT_ENTRY', '%A، %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php
index ac80e5e..2821bb3 100644
--- a/lang/serendipity_lang_fi.inc.php
+++ b/lang/serendipity_lang_fi.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'finnish, fi, fi_FI.UTF-8');
+@define('DATE_LOCALES', 'fi_FI.UTF-8, finnish, fi');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'fi');
diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php
index 821279e..a754d7e 100644
--- a/lang/serendipity_lang_fr.inc.php
+++ b/lang/serendipity_lang_fr.inc.php
@@ -8,7 +8,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'french, fr, fr_FR, fr_FR.ISO-8859-1, fr_FR@euro, fr_FR.ISO8859-1, en_US');
+@define('DATE_LOCALES', 'fr_FR.ISO-8859-1, fr_FR.ISO8859-1, french, fr, fr_FR, fr_FR@euro, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'fr');
diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php
index 5deaec3..2e236d2 100644
--- a/lang/serendipity_lang_hu.inc.php
+++ b/lang/serendipity_lang_hu.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-2');
-@define('DATE_LOCALES', 'hungarian, hu, hu_HU');
+@define('DATE_LOCALES', 'hu_HU-ISO-8859-2, hu_HU-ISO8859-2, hungarian, hu, hu_HU');
 @define('DATE_FORMAT_ENTRY', '%Y. %B %e. (%A) ');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php
index 74392d4..2886a9a 100644
--- a/lang/serendipity_lang_is.inc.php
+++ b/lang/serendipity_lang_is.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'icelandic, is, is_IS');
+@define('DATE_LOCALES', 'is_IS-ISO-8859-1, is_IS-ISO8859-1, icelandic, is, is_IS');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%y %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php
index 8a61702..49cbab2 100644
--- a/lang/serendipity_lang_it.inc.php
+++ b/lang/serendipity_lang_it.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'italiano, it, it_IT');
+@define('DATE_LOCALES', 'it_IT-ISO-8859-1, it_IT-ISO8859-1, italiano, it, it_IT');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M');
 @define('WYSIWYG_LANG', 'it');
diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php
index f35083f..07e1d82 100644
--- a/lang/serendipity_lang_ja.inc.php
+++ b/lang/serendipity_lang_ja.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'ja,jp,ja_JP.UTF-8');
+@define('DATE_LOCALES', 'ja_JP.UTF-8,ja,jp');
 @define('DATE_FORMAT_ENTRY', '%Yå¹´ %B %e(%A)');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'ja-utf8');
diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php
index 239b030..62e9a9e 100644
--- a/lang/serendipity_lang_ko.inc.php
+++ b/lang/serendipity_lang_ko.inc.php
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'korean, ko, ko_KR, ko_KR.UTF-8');
+@define('DATE_LOCALES', 'ko_KR.UTF-8, korean, ko, ko_KR');
 @define('DATE_FORMAT_ENTRY', '%Y년 %B %e일 %A');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php
index 41322af..a90a2ec 100644
--- a/lang/serendipity_lang_nl.inc.php
+++ b/lang/serendipity_lang_nl.inc.php
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'dutch, nl_BE, nl, nl_BE.ISO8859-1');
+@define('DATE_LOCALES', 'nl_BE.ISO8859-1, nl_BE.ISO-8859-1, dutch, nl_BE, nl');
 @define('DATE_FORMAT_ENTRY', '%A, %e %B %Y');
 @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M');
 @define('WYSIWYG_LANG', 'nl');
diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php
index 41fbbba..8def933 100644
--- a/lang/serendipity_lang_no.inc.php
+++ b/lang/serendipity_lang_no.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'norwegian, no, no_NO, no_NO.ISO-8859-1, no_NO.ISO8859-1, no_');
+@define('DATE_LOCALES', 'no_NO.ISO-8859-1, no_NO.ISO8859-1, norwegian, no, no_NO, no_');
 @define('DATE_FORMAT_ENTRY', '%A - %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'no');
diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php
index b76aac3..a874e8b 100644
--- a/lang/serendipity_lang_pt.inc.php
+++ b/lang/serendipity_lang_pt.inc.php
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'portuguese brazilian, pt, pt_BR');
+@define('DATE_LOCALES', 'pt_BR-ISO-8859-1, pt_BR-ISO8859-1, pt_BR, portuguese brazilian, pt');
 @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y');
 @define('WYSIWYG_LANG', 'pt_pt');
 @define('LANG_DIRECTION', 'ltr');
diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php
index 0a6f37b..60f46c7 100644
--- a/lang/serendipity_lang_pt_PT.inc.php
+++ b/lang/serendipity_lang_pt_PT.inc.php
@@ -8,7 +8,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'pt, pt_PT, european portuguese');
+@define('DATE_LOCALES', 'pt_PT-ISO-8859-1, pt_PT-ISO8859-1, pt, pt_PT, european portuguese');
 @define('DATE_FORMAT_ENTRY', '%A, %e de %B de %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'pt_pt');
diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php
index b0f7562..9a71b77 100644
--- a/lang/serendipity_lang_ro.inc.php
+++ b/lang/serendipity_lang_ro.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'romanian, ro, ro_RO');
+@define('DATE_LOCALES', 'ro_RO.UTF-8, romanian, ro, ro_RO');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%d-%m-%Y %H:%M');
 @define('WYSIWYG_LANG', 'ro');
diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php
index 4a04719..8b25ad9 100644
--- a/lang/serendipity_lang_se.inc.php
+++ b/lang/serendipity_lang_se.inc.php
@@ -5,7 +5,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'swedish, sv, sv_SV, sv_SV.ISO8859-1');
+@define('DATE_LOCALES', 'sv_SV.ISO8859-1, sv_SV.ISO-8859-1, swedish, sv, sv_SV');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'se');
diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php
index 3988946..ae7977b 100644
--- a/lang/serendipity_lang_tn.inc.php
+++ b/lang/serendipity_lang_tn.inc.php
@@ -6,7 +6,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'UTF-8');
-@define('DATE_LOCALES', 'tw, zh, zh-TW.UTF-8, zh_TW.UTF-8');
+@define('DATE_LOCALES', 'zh-TW.UTF-8, zh_TW.UTF-8, tw, zh');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php
index c5ab6f6..e1d6c87 100644
--- a/lang/serendipity_lang_zh.inc.php
+++ b/lang/serendipity_lang_zh.inc.php
@@ -4,7 +4,7 @@
 /* vim: set sts=4 ts=4 expandtab : */
 
 @define('LANG_CHARSET', 'gb2312');
-@define('DATE_LOCALES', 'cn, zh, zh_CN.GB2312, zh_GB, zh_CN');
+@define('DATE_LOCALES', 'zh_CN.GB2312, cn, zh, zh_GB, zh_CN');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
 @define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');