From 60542d35e87348604d4c68b35a93179ef1a79172 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Tue, 25 Feb 2003 12:13:51 +0000 Subject: [PATCH] Removed problematic %e from $datefmt / fixed some inconsistences. --- ChangeLog | 6 ++++++ lang/bulgarian-koi8-r.inc.php3 | 2 +- lang/bulgarian-utf-8.inc.php3 | 2 +- lang/bulgarian-windows-1251.inc.php3 | 2 +- lang/czech-iso-8859-2.inc.php3 | 2 +- lang/czech-utf-8.inc.php3 | 2 +- lang/czech-windows-1250.inc.php3 | 2 +- lang/dutch-iso-8859-1.inc.php3 | 5 ++--- lang/dutch-utf-8.inc.php3 | 5 ++--- lang/japanese-euc.inc.php3 | 5 ++--- lang/japanese-sjis.inc.php3 | 7 +++---- lang/japanese-utf-8.inc.php3 | 5 ++--- lang/swedish-iso-8859-1.inc.php3 | 2 +- lang/swedish-utf-8.inc.php3 | 2 +- lang/thai-tis-620.inc.php3 | 2 +- lang/thai-utf-8.inc.php3 | 2 +- 16 files changed, 27 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bdc98329..936ef0ab1 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-02-24 Alexander M. Turek + * lang/bulgarian-*.inc.php3, lang/czech-*.inc.php3, lang/dutch-*.inc.php3, + lang/swedish-*.inc.php3, lang/thai-*.inc.php3: Removed problematic %e from + $datefmt. + * lang/japanese-*.inc.php3: Fixed some inconsistences. + 2003-02-25 Garvin Hicking * tbl_properties.inc.php3: Fixed duped display of comments due to merging diff conflict. diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index 26e2e9da4..8dc1d307a 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -18,7 +18,7 @@ $day_of_week = array(' $month = array('', '', '', '', '', '', '', '', '', '', '', ''); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y %H:%M'; +$datefmt = '%d %B %Y %H:%M'; $strAccessDenied = ' '; $strAction = ''; diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 13beab80c..7edd032a1 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -19,7 +19,7 @@ $day_of_week = array('нед', 'пон', 'вт', 'ср', 'чет', 'пет', 'с $month = array('януари', 'февруари', 'март', 'април', 'май', 'юни', 'юли', 'август', 'септември', 'окомври', 'ноември', 'декември'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y в %H:%M'; +$datefmt = '%d %B %Y в %H:%M'; $strAccessDenied = 'Отказан достъп'; $strAction = 'Действие'; diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index 9898de178..eac638f74 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -18,7 +18,7 @@ $day_of_week = array(' $month = array('', '', '', '', '', '', '', '', '', '', '', ''); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y %H:%M'; +$datefmt = '%d %B %Y %H:%M'; $strAccessDenied = ' '; $strAction = ''; diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index a4391dd53..cf4287643 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -19,7 +19,7 @@ $day_of_week = array('Ned $month = array('ledna', 'nora', 'bezna', 'dubna', 'kvtna', 'ervna', 'ervence', 'srpna', 'z', 'jna', 'listopadu', 'prosince'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%a %e. %b %Y, %H:%M'; +$datefmt = '%a %d. %b %Y, %H:%M'; $timespanfmt = '%s dn, %s hodin, %s minut a %s sekund'; diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index 06d21f643..77faafec3 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -20,7 +20,7 @@ $day_of_week = array('Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', ' $month = array('ledna', 'února', 'března', 'dubna', 'května', 'června', 'července', 'srpna', 'září', 'října', 'listopadu', 'prosince'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%a %e. %b %Y, %H:%M'; +$datefmt = '%a %d. %b %Y, %H:%M'; $timespanfmt = '%s dnů, %s hodin, %s minut a %s sekund'; diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index 147a2fb22..e8543bac1 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -19,7 +19,7 @@ $day_of_week = array('Ned $month = array('ledna', 'nora', 'bezna', 'dubna', 'kvtna', 'ervna', 'ervence', 'srpna', 'z', 'jna', 'listopadu', 'prosince'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%a %e. %b %Y, %H:%M'; +$datefmt = '%a %d. %b %Y, %H:%M'; $timespanfmt = '%s dn, %s hodin, %s minut a %s sekund'; diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index 53bb68fa0..2fcb4511c 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -18,8 +18,7 @@ $day_of_week = array('Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za'); $month = array('Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = ' %e %B %Y om %H:%M'; - +$datefmt = '%d %B %Y om %H:%M'; $timespanfmt = '%s dagen, %s uren, %s minuten and %s seconden'; $strAPrimaryKey = 'Een primaire sleutel is toegevoegd aan %s'; @@ -77,7 +76,7 @@ $strBzError = 'phpMyAdmin is er niet in geslaagd om de dump te comprimeren doord $strBzip = '"ge-bzipt"'; $strCannotLogin = 'Kan niet inloggen op de MySQL server'; -$strCantLoad = 'Kan de %s extentie niet laden,
Controleer de PHP Configuratie'; +$strCantLoad = 'Kan de %s extentie niet laden,
Controleer de PHP Configuratie'; $strCantLoadMySQL = 'kan de MySQL extensie niet laden,
controleer de PHP configuratie.'; $strCantLoadRecodeIconv = 'Kan iconv of recode extenties niet laden die nodig zijn voor de Karakterset conversie, configureer php om deze extensies toe te laten of schakel Karakterset conversie uit in phpMyAdmin'; $strCantRenameIdxToPrimary = 'Kan index niet naar PRIMARY hernoemen'; diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index 14bc912d1..cab00dc52 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -19,8 +19,7 @@ $day_of_week = array('Zo', 'Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za'); $month = array('Jan', 'Feb', 'Mar', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = ' %e %B %Y om %H:%M'; - +$datefmt = '%d %B %Y om %H:%M'; $timespanfmt = '%s dagen, %s uren, %s minuten and %s seconden'; $strAPrimaryKey = 'Een primaire sleutel is toegevoegd aan %s'; @@ -78,7 +77,7 @@ $strBzError = 'phpMyAdmin is er niet in geslaagd om de dump te comprimeren doord $strBzip = '"ge-bzipt"'; $strCannotLogin = 'Kan niet inloggen op de MySQL server'; -$strCantLoad = 'Kan de %s extentie niet laden,
Controleer de PHP Configuratie'; +$strCantLoad = 'Kan de %s extentie niet laden,
Controleer de PHP Configuratie'; $strCantLoadMySQL = 'kan de MySQL extensie niet laden,
controleer de PHP configuratie.'; $strCantLoadRecodeIconv = 'Kan iconv of recode extenties niet laden die nodig zijn voor de Karakterset conversie, configureer php om deze extensies toe te laten of schakel Karakterset conversie uit in phpMyAdmin'; $strCantRenameIdxToPrimary = 'Kan index niet naar PRIMARY hernoemen'; diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index e4d36d5a2..104a9fb61 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -19,9 +19,6 @@ $month = array('1 // See http://www.php.net/manual/en/function.strftime.php to define the // variable below $datefmt = '%Yǯ %B %d %H:%M'; - -// japanese only - $timespanfmt = '%s , %s , %s ʬ %s '; $strAPrimaryKey = '祭%sɲäޤ'; @@ -573,6 +570,8 @@ $strYes = ' $strZeroRemovesTheLimit = ': ץ 0 ()ꤹ¤ʤʤޤ'; $strZip = '"zip"'; +// To translate + $strDbSpecific = 'database-specific'; //to translate $strGlobal = 'global'; //to translate diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index db158f667..bbc04075c 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -19,9 +19,6 @@ $month = array('1 // See http://www.php.net/manual/en/function.strftime.php to define the // variable below $datefmt = '%YN %B %d %H:%M'; - -// japanese only - $timespanfmt = '%s , %s , %s %s b'; $strAPrimaryKey = 'L[%sɒlj܂B'; @@ -310,7 +307,7 @@ $strNoQuery = 'SQL $strNoRights = 'ݓĂȂ̂łɓ܂B'; $strNoTablesFound = '݂DBɃe[u͂܂B'; $strNoUsersFound = 'Y[U[͌‚܂łB'; -$strNoUsersSelected = '[U[IĂ܂B'; +$strNoUsersSelected = '[U[IĂ܂B'; $strNoValidateSQL = 'SQL؂XLbv'; $strNone = ''; $strNotNumber = '͔ԍł͂܂B'; @@ -573,6 +570,8 @@ $strYes = ' $strZeroRemovesTheLimit = ': IvV 0 ([)ɐݒ肷ƐȂȂ܂B'; $strZip = '"zip"'; +// To translate + $strDbSpecific = 'database-specific'; //to translate $strGlobal = 'global'; //to translate diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index 498e36a02..fe9c2c5f1 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -20,9 +20,6 @@ $month = array('1月','2月','3月','4月','5月','6月','7月','8月','9月','1 // See http://www.php.net/manual/en/function.strftime.php to define the // variable below $datefmt = '%Y年 %B %d日 %H:%M'; - -// japanese only - $timespanfmt = '%s 日, %s 時, %s 分 %s 秒'; $strAPrimaryKey = '主キーが%sに追加されました。'; @@ -574,6 +571,8 @@ $strYes = 'はい'; $strZeroRemovesTheLimit = '注意: オプションを 0 (ゼロ)に設定すると制限がなくなります。'; $strZip = '"zipされる"'; +// To translate + $strDbSpecific = 'database-specific'; //to translate $strGlobal = 'global'; //to translate diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index 243d1ee6e..64b6d8ed9 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -14,7 +14,7 @@ $day_of_week = array('S $month = array('januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y kl %H:%M'; +$datefmt = '%d %B %Y kl %H:%M'; $timespanfmt = '%s dagar, %s timmar, %s minuter och %s sekunder'; $strAPrimaryKey = 'En primr nyckel har lagts till fr %s'; diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index 3fccd2e43..d975311fc 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -15,7 +15,7 @@ $day_of_week = array('Sön', 'Mån', 'Tis', 'Ons', 'Tors', 'Fre', 'Lör'); $month = array('januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y kl %H:%M'; +$datefmt = '%d %B %Y kl %H:%M'; $timespanfmt = '%s dagar, %s timmar, %s minuter och %s sekunder'; $strAPrimaryKey = 'En primär nyckel har lagts till för %s'; diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index 26943df48..0ac9d0497 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -17,7 +17,7 @@ $day_of_week = array(' $month = array('..', '..', '..', '..', '..', '..', '..', '..', '..', '..', '..', '..'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y %R.'; +$datefmt = '%d %B %Y %R.'; $timespanfmt = '%s ѹ, %s , %s ҷ, %s Թҷ'; diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index 546999b3f..e216e4e4d 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -18,7 +18,7 @@ $day_of_week = array('อา.', 'จ.', 'อ.', 'พ.', 'พฤ.', 'ศ.', 'ส. $month = array('ม.ค.', 'ก.พ.', 'มี.ค.', 'เม.ย.', 'พ.ค.', 'มิ.ย.', 'ก.ค.', 'ส.ค.', 'ก.ย.', 'ต.ค.', 'พ.ย.', 'ธ.ค.'); // See http://www.php.net/manual/en/function.strftime.php to define the // variable below -$datefmt = '%e %B %Y %Rน.'; +$datefmt = '%d %B %Y %Rน.'; $timespanfmt = '%s วัน, %s ชั่วโมง, %s นาที, %s วินาที';