$languages are moved to locale/<localename>/setup.php files.

SquirrelMail locales cvs should support in any package from 1.4.6 and 1.5.1.

Code can't be used for 1.4.x stable, if XTRA_CODE fixes are not backported.

functions/i18n.php

@@ -16,6 +16,9 @@
  * @subpackage i18n
  */
 
+/** @ignore */
+if (! defined('SM_PATH')) define('SM_PATH','../');
+
 /** Everything uses global.php... */
 require_once(SM_PATH . 'functions/global.php');
 
@@ -508,267 +511,6 @@ function set_my_charset(){
     }
 }
 
-/**************************
- * Japanese extra functions
- **************************/
-
-/**
- * Japanese decoding function
- *
- * converts string to euc-jp, if string uses JIS, EUC-JP, ShiftJIS or UTF-8
- * charset. Needs mbstring support in php.
- * @param string $ret text, that has to be converted
- * @return string converted string
- * @since 1.5.1
- */
-function japanese_xtra_decode($ret) {
-    if (function_exists('mb_detect_encoding')) {
-        $detect_encoding = @mb_detect_encoding($ret);
-        if ($detect_encoding == 'JIS' ||
-            $detect_encoding == 'EUC-JP' ||
-            $detect_encoding == 'SJIS' ||
-            $detect_encoding == 'UTF-8') {
-
-            $ret = mb_convert_kana(mb_convert_encoding($ret, 'EUC-JP', 'AUTO'), "KV");
-        }
-    }
-    return $ret;
-}
-
-/**
- * Japanese encoding function
- *
- * converts string to jis, if string uses JIS, EUC-JP, ShiftJIS or UTF-8
- * charset. Needs mbstring support in php.
- * @param string $ret text, that has to be converted
- * @return string converted text
- * @since 1.5.1
- */
-function japanese_xtra_encode($ret) {
-    if (function_exists('mb_detect_encoding')) {
-        $detect_encoding = @mb_detect_encoding($ret);
-        if ($detect_encoding == 'JIS' ||
-            $detect_encoding == 'EUC-JP' ||
-            $detect_encoding == 'SJIS' ||
-            $detect_encoding == 'UTF-8') {
-
-            $ret = mb_convert_encoding(mb_convert_kana($ret, "KV"), 'JIS', 'AUTO');
-        }
-    }
-    return $ret;
-}
-
-/**
- * Japanese header encoding function
- *
- * creates base64 encoded header in iso-2022-jp charset
- * @param string $ret text, that has to be converted
- * @return string mime base64 encoded string
- * @since 1.5.1
- */
-function japanese_xtra_encodeheader($ret) {
-    if (function_exists('mb_detect_encoding')) {
-        $result = '';
-        if (strlen($ret) > 0) {
-            $tmpstr = mb_substr($ret, 0, 1);
-            $prevcsize = strlen($tmpstr);
-            for ($i = 1; $i < mb_strlen($ret); $i++) {
-                $tmp = mb_substr($ret, $i, 1);
-                if (strlen($tmp) == $prevcsize) {
-                    $tmpstr .= $tmp;
-                } else {
-                    if ($prevcsize == 1) {
-                        $result .= $tmpstr;
-                    } else {
-                        $result .= str_replace(' ', '',
-                                               mb_encode_mimeheader($tmpstr,'iso-2022-jp','B',''));
-                    }
-                    $tmpstr = $tmp;
-                    $prevcsize = strlen($tmp);
-                }
-            }
-            if (strlen($tmpstr)) {
-                if (strlen(mb_substr($tmpstr, 0, 1)) == 1)
-                    $result .= $tmpstr;
-                else
-                    $result .= str_replace(' ', '',
-                                           mb_encode_mimeheader($tmpstr,'iso-2022-jp','B',''));
-            }
-        }
-        $ret = $result;
-    }
-    return $ret;
-}
-
-/**
- * Japanese header decoding function
- *
- * return human readable string from mime header. string is returned in euc-jp
- * charset.
- * @param string $ret header string
- * @return string decoded header string
- * @since 1.5.1
- */
-function japanese_xtra_decodeheader($ret) {
-    if (function_exists('mb_detect_encoding')) {
-        $ret = str_replace("\t", "", $ret);
-        if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', $ret))
-            $ret = @mb_decode_mimeheader($ret);
-        $ret = @mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
-    }
-    return $ret;
-}
-
-/**
- * Japanese downloaded filename processing function
- *
- * Returns shift-jis or euc-jp encoded file name
- * @param string $ret string
- * @param string $useragent browser
- * @return string converted string
- * @since 1.5.1
- */
-function japanese_xtra_downloadfilename($ret,$useragent) {
-    if (function_exists('mb_detect_encoding')) {
-        if (strstr($useragent, 'Windows') !== false ||
-            strstr($useragent, 'Mac_') !== false) {
-            $ret = mb_convert_encoding($ret, 'SJIS', 'AUTO');
-        } else {
-            $ret = mb_convert_encoding($ret, 'EUC-JP', 'AUTO');
-        }
-    }
-    return $ret;
-}
-
-/**
- * Japanese wordwrap function
- *
- * wraps text at set number of symbols
- * @param string $ret text
- * @param integer $wrap number of symbols per line
- * @return string wrapped text
- * @since 1.5.1
- */
-function japanese_xtra_wordwrap($ret,$wrap) {
-    if (function_exists('mb_detect_encoding')) {
-        $no_begin = "\x21\x25\x29\x2c\x2e\x3a\x3b\x3f\x5d\x7d\xa1\xf1\xa1\xeb\xa1" .
-            "\xc7\xa1\xc9\xa2\xf3\xa1\xec\xa1\xed\xa1\xee\xa1\xa2\xa1\xa3\xa1\xb9" .
-            "\xa1\xd3\xa1\xd5\xa1\xd7\xa1\xd9\xa1\xdb\xa1\xcd\xa4\xa1\xa4\xa3\xa4" .
-            "\xa5\xa4\xa7\xa4\xa9\xa4\xc3\xa4\xe3\xa4\xe5\xa4\xe7\xa4\xee\xa1\xab" .
-            "\xa1\xac\xa1\xb5\xa1\xb6\xa5\xa1\xa5\xa3\xa5\xa5\xa5\xa7\xa5\xa9\xa5" .
-            "\xc3\xa5\xe3\xa5\xe5\xa5\xe7\xa5\xee\xa5\xf5\xa5\xf6\xa1\xa6\xa1\xbc" .
-            "\xa1\xb3\xa1\xb4\xa1\xaa\xa1\xf3\xa1\xcb\xa1\xa4\xa1\xa5\xa1\xa7\xa1" .
-            "\xa8\xa1\xa9\xa1\xcf\xa1\xd1";
-        // This don't appear to be used... is it safe to remove?
-        $no_end = "\x5c\x24\x28\x5b\x7b\xa1\xf2\x5c\xa1\xc6\xa1\xc8\xa1\xd2\xa1" .
-            "\xd4\xa1\xd6\xa1\xd8\xa1\xda\xa1\xcc\xa1\xf0\xa1\xca\xa1\xce\xa1\xd0\xa1\xef";
-
-        if (strlen($ret) >= $wrap &&
-            substr($ret, 0, 1) != '>' &&
-            strpos($ret, 'http://') === FALSE &&
-            strpos($ret, 'https://') === FALSE &&
-            strpos($ret, 'ftp://') === FALSE) {
-
-            $ret = mb_convert_kana($ret, "KV");
-
-            $line_new = '';
-            $ptr = 0;
-
-            while ($ptr < strlen($ret) - 1) {
-                $l = mb_strcut($ret, $ptr, $wrap);
-                $ptr += strlen($l);
-                $tmp = $l;
-
-                $l = mb_strcut($ret, $ptr, 2);
-                while (strlen($l) != 0 && mb_strpos($no_begin, $l) !== FALSE ) {
-                    $tmp .= $l;
-                    $ptr += strlen($l);
-                    $l = mb_strcut($ret, $ptr, 1);
-                }
-                $line_new .= $tmp;
-                if ($ptr < strlen($ret) - 1)
-                    $line_new .= "\n";
-            }
-            $ret = $line_new;
-        }
-    }
-    return $ret;
-}
-
-/**
- * Japanese imap folder name encoding function
- *
- * converts folder name from euc-jp to utf7-imap
- * @param string $ret folder name
- * @return string converted folder name
- * @since 1.5.1
- */
-function japanese_xtra_utf7_imap_encode($ret){
-    if (function_exists('mb_detect_encoding')) {
-        $ret = mb_convert_encoding($ret, 'UTF7-IMAP', 'EUC-JP');
-    }
-    return $ret;
-}
-
-/**
- * Japanese imap folder name decoding function
- *
- * converts folder name from utf7-imap to euc-jp.
- * @param string $ret folder name in utf7-imap
- * @return string converted folder name
- * @since 1.5.1
- */
-function japanese_xtra_utf7_imap_decode($ret) {
-    if (function_exists('mb_detect_encoding')) {
-        $ret = mb_convert_encoding($ret, 'EUC-JP', 'UTF7-IMAP');
-    }
-    return $ret;
-}
-
-/**
- * Japanese string trimming function
- *
- * trims string to defined number of symbols
- * @param string $ret string
- * @param integer $width number of symbols
- * @return string trimmed string
- * @since 1.5.1
- */
-function japanese_xtra_strimwidth($ret,$width) {
-    if (function_exists('mb_detect_encoding')) {
-        $ret = mb_strimwidth($ret, 0, $width, '...');
-    }
-    return $ret;
-}
-
-/********************************
- * Korean charset extra functions
- ********************************/
-
-/**
- * Korean downloaded filename processing functions
- *
- * @param string default return value
- * @return string
- * @since 1.5.1
- */
-function korean_xtra_downloadfilename($ret) {
-    $ret = str_replace("\x0D\x0A", '', $ret);  /* Hanmail's CR/LF Clear */
-    for ($i=0;$i<strlen($ret);$i++) {
-        if ($ret[$i] >= "\xA1" && $ret[$i] <= "\xFE") {   /* 0xA1 - 0XFE are Valid */
-            $i++;
-            continue;
-        } else if (($ret[$i] >= 'a' && $ret[$i] <= 'z') || /* From Original ereg_replace in download.php */
-                   ($ret[$i] >= 'A' && $ret[$i] <= 'Z') ||
-                   ($ret[$i] == '.') || ($ret[$i] == '-')) {
-            continue;
-        } else {
-            $ret[$i] = '_';
-        }
-    }
-    return $ret;
-}
-
 /**
  * Replaces non-braking spaces inserted by some browsers with regular space
  *
@@ -921,7 +663,7 @@ if (! sqgetGlobalVar('squirrelmail_language',$squirrelmail_language,SQ_COOKIE))
  *  CHARSET   - Encoding used by translation
  *  ALIAS     - used when 'language' is only short name and 'value' should provide long language name
  *  ALTNAME   - Native translation name. Any 8bit symbols must be html encoded.
- *  LOCALE    - Full locale name (in xx_XX.charset format). It can use array with several locale names since 1.4.5 and 1.5.1
+ *  LOCALE    - Full locale name (in xx_XX.charset format). It can use array with more than one locale name since 1.4.5 and 1.5.1
  *  DIR       - Text direction. Used to define Right-to-Left languages. Possible values 'rtl' or 'ltr'. If undefined - defaults to 'ltr'
  *  XTRA_CODE - translation uses special functions. See doc/i18n.txt
  *
@@ -930,286 +672,16 @@ if (! sqgetGlobalVar('squirrelmail_language',$squirrelmail_language,SQ_COOKIE))
  * @name $languages
  * @global array $languages
  */
-$languages['bg_BG']['NAME']    = 'Bulgarian';
-$languages['bg_BG']['ALTNAME'] = '&#1041;&#1098;&#1083;&#1075;&#1072;&#1088;&#1089;&#1082;&#1080;';
-$languages['bg_BG']['CHARSET'] = 'windows-1251';
-$languages['bg_BG']['LOCALE']  = 'bg_BG.CP1251';
-$languages['bg']['ALIAS'] = 'bg_BG';
-
-$languages['bn_IN']['NAME']    = 'Bengali';
-$languages['bn_IN']['CHARSET'] = 'utf-8';
-$languages['bn_IN']['LOCALE']  = 'bn_IN.UTF-8';
-$languages['bn_BD']['ALIAS'] = 'bn_IN';
-$languages['bn']['ALIAS'] = 'bn_IN';
-
-$languages['ca_ES']['NAME']    = 'Catalan';
-$languages['ca_ES']['CHARSET'] = 'iso-8859-1';
-$languages['ca_ES']['LOCALE']  = array('ca_ES.ISO8859-1','ca_ES.ISO-8859-1','ca_ES');
-$languages['ca']['ALIAS'] = 'ca_ES';
-
-$languages['cs_CZ']['NAME']    = 'Czech';
-$languages['cs_CZ']['ALTNAME'] = '&#268;e&scaron;tina';
-$languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
-$languages['cs_CZ']['LOCALE']  = array('cs_CZ.ISO8859-2','cs_CZ.ISO-8859-2','cs_CZ');
-$languages['cs']['ALIAS']      = 'cs_CZ';
-
-$languages['cy_GB']['NAME']    = 'Welsh';
-$languages['cy_GB']['ALTNAME'] = 'Cymraeg';
-$languages['cy_GB']['CHARSET'] = 'iso-8859-1';
-$languages['cy_GB']['LOCALE']  = array('cy_GB.ISO8859-1','cy_GB.ISO-8859-1','cy_GB');
-$languages['cy']['ALIAS'] = 'cy_GB';
-
-// Danish locale is da_DK.
-$languages['da_DK']['NAME']    = 'Danish';
-$languages['da_DK']['ALTNAME'] = 'Dansk';
-$languages['da_DK']['CHARSET'] = 'iso-8859-1';
-$languages['da_DK']['LOCALE']  = array('da_DK.ISO8859-1','da_DK.ISO-8859-1','da_DK');
-$languages['da']['ALIAS'] = 'da_DK';
-
-$languages['de_DE']['NAME']    = 'German';
-$languages['de_DE']['ALTNAME'] = 'Deutsch';
-$languages['de_DE']['CHARSET'] = 'iso-8859-1';
-$languages['de_DE']['LOCALE']  = array('de_DE.ISO8859-1','de_DE.ISO-8859-1','de_DE');
-$languages['de']['ALIAS'] = 'de_DE';
-
-$languages['el_GR']['NAME']    = 'Greek';
-$languages['el_GR']['ALTNAME'] = '&Epsilon;&lambda;&lambda;&eta;&nu;&iota;&kappa;&#940;';
-$languages['el_GR']['CHARSET'] = 'iso-8859-7';
-$languages['el_GR']['LOCALE']  = array('el_GR.ISO8859-7','el_GR.ISO-8859-7','el_GR');
-$languages['el']['ALIAS'] = 'el_GR';
-
-$languages['en_GB']['NAME']    = 'British';
-$languages['en_GB']['CHARSET'] = 'iso-8859-15';
-$languages['en_GB']['LOCALE']  = array('en_GB.ISO8859-15','en_GB.ISO-8859-15','en_GB');
-
 $languages['en_US']['NAME']    = 'English';
 $languages['en_US']['CHARSET'] = 'iso-8859-1';
 $languages['en_US']['LOCALE']  = 'en_US.ISO8859-1';
 $languages['en']['ALIAS'] = 'en_US';
 
-$languages['es_ES']['NAME']    = 'Spanish';
-$languages['es_ES']['ALTNAME'] = 'Espa&ntilde;ol';
-$languages['es_ES']['CHARSET'] = 'iso-8859-1';
-$languages['es_ES']['LOCALE']  = array('es_ES.ISO8859-1','es_ES.ISO-8859-1','es_ES');
-$languages['es']['ALIAS'] = 'es_ES';
-
-$languages['et_EE']['NAME']    = 'Estonian';
-$languages['et_EE']['CHARSET'] = 'iso-8859-15';
-$languages['et_EE']['LOCALE']  = array('et_EE.ISO8859-15','et_EE.ISO-8859-15','et_EE');
-$languages['et']['ALIAS'] = 'et_EE';
-
-$languages['eu_ES']['NAME']    = 'Basque';
-$languages['eu_ES']['CHARSET'] = 'iso-8859-1';
-$languages['eu_ES']['LOCALE']  = array('eu_ES.ISO8859-1','eu_ES.ISO-8859-1','eu_ES');
-$languages['eu']['ALIAS'] = 'eu_ES';
-
-$languages['fo_FO']['NAME']    = 'Faroese';
-$languages['fo_FO']['CHARSET'] = 'iso-8859-1';
-$languages['fo_FO']['LOCALE']  = array('fo_FO.ISO8859-1','fo_FO.ISO-8859-1','fo_FO');
-$languages['fo']['ALIAS'] = 'fo_FO';
-
-$languages['fi_FI']['NAME']    = 'Finnish';
-$languages['fi_FI']['ALTNAME'] = 'Suomi';
-$languages['fi_FI']['CHARSET'] = 'iso-8859-1';
-$languages['fi_FI']['LOCALE']  = array('fi_FI.ISO8859-1','fi_FI.ISO-8859-1','fi_FI');
-$languages['fi']['ALIAS'] = 'fi_FI';
-
-$languages['fr_FR']['NAME']    = 'French';
-$languages['fr_FR']['ALTNAME'] = 'Fran&#231;ais';
-$languages['fr_FR']['CHARSET'] = 'iso-8859-1';
-$languages['fr_FR']['LOCALE']  = array('fr_FR.ISO8859-1','fr_FR.ISO-8859-1','fr_FR');
-$languages['fr']['ALIAS'] = 'fr_FR';
-
-$languages['hr_HR']['NAME']    = 'Croatian';
-$languages['hr_HR']['CHARSET'] = 'iso-8859-2';
-$languages['hr_HR']['LOCALE']  = array('hr_HR.ISO8859-2','hr_HR.ISO-8859-2','hr_HR');
-$languages['hr']['ALIAS'] = 'hr_HR';
-
-$languages['hu_HU']['NAME']    = 'Hungarian';
-$languages['hu_HU']['ALTNAME'] = 'Magyar';
-$languages['hu_HU']['CHARSET'] = 'iso-8859-2';
-$languages['hu_HU']['LOCALE']  = array('hu_HU.ISO8859-2','hu_HU.ISO-8859-2','hu_HU');
-$languages['hu']['ALIAS'] = 'hu_HU';
-
-$languages['id_ID']['NAME']    = 'Indonesian';
-$languages['id_ID']['ALTNAME'] = 'Bahasa Indonesia';
-$languages['id_ID']['CHARSET'] = 'iso-8859-1';
-$languages['id_ID']['LOCALE']  = array('id_ID.ISO8859-1','id_ID.ISO-8859-1','id_ID');
-$languages['id']['ALIAS'] = 'id_ID';
-
-$languages['is_IS']['NAME']    = 'Icelandic';
-$languages['is_IS']['ALTNAME'] = '&Iacute;slenska';
-$languages['is_IS']['CHARSET'] = 'iso-8859-1';
-$languages['is_IS']['LOCALE']  = array('is_IS.ISO8859-1','is_IS.ISO-8859-1','is_IS');
-$languages['is']['ALIAS'] = 'is_IS';
-
-$languages['it_IT']['NAME']    = 'Italian';
-$languages['it_IT']['CHARSET'] = 'iso-8859-1';
-$languages['it_IT']['LOCALE']  = array('it_IT.ISO8859-1','it_IT.ISO-8859-1','it_IT');
-$languages['it']['ALIAS'] = 'it_IT';
-
-$languages['ja_JP']['NAME']    = 'Japanese';
-$languages['ja_JP']['ALTNAME'] = '&#26085;&#26412;&#35486;';
-$languages['ja_JP']['CHARSET'] = 'iso-2022-jp';
-$languages['ja_JP']['LOCALE'] = 'ja_JP.EUC-JP';
-$languages['ja_JP']['XTRA_CODE'] = 'japanese_xtra';
-$languages['ja']['ALIAS'] = 'ja_JP';
-
-$languages['ko_KR']['NAME']    = 'Korean';
-$languages['ko_KR']['CHARSET'] = 'euc-KR';
-$languages['ko_KR']['LOCALE']  = 'ko_KR.EUC-KR';
-$languages['ko_KR']['XTRA_CODE'] = 'korean_xtra';
-$languages['ko']['ALIAS'] = 'ko_KR';
-
-$languages['lt_LT']['NAME']    = 'Lithuanian';
-$languages['lt_LT']['ALTNAME'] = 'Lietuvi&#371;';
-$languages['lt_LT']['CHARSET'] = 'utf-8';
-$languages['lt_LT']['LOCALE'] = 'lt_LT.UTF-8';
-$languages['lt']['ALIAS'] = 'lt_LT';
-
-$languages['nl_NL']['NAME']    = 'Dutch';
-$languages['nl_NL']['ALTNAME'] = 'Nederlands';
-$languages['nl_NL']['CHARSET'] = 'iso-8859-1';
-$languages['nl_NL']['LOCALE']  = array('nl_NL.ISO8859-1','nl_NL.ISO-8859-1','nl_NL');
-$languages['nl']['ALIAS'] = 'nl_NL';
-
-$languages['ms_MY']['NAME']    = 'Malay';
-$languages['ms_MY']['ALTNAME'] = 'Bahasa Melayu';
-$languages['ms_MY']['CHARSET'] = 'iso-8859-1';
-$languages['ms_MY']['LOCALE']  = array('ms_MY.ISO8859-1','ms_MY.ISO-8859-1','ms_MY');
-$languages['my']['ALIAS'] = 'ms_MY';
-
-$languages['nb_NO']['NAME']    = 'Norwegian (Bokm&aring;l)';
-$languages['nb_NO']['ALTNAME'] = 'Norsk (Bokm&aring;l)';
-$languages['nb_NO']['CHARSET'] = 'iso-8859-1';
-$languages['nb_NO']['LOCALE']  = array('nb_NO.ISO8859-1','nb_NO.ISO-8859-1','nb_NO');
-$languages['nb']['ALIAS'] = 'nb_NO';
-
-$languages['nn_NO']['NAME']    = 'Norwegian (Nynorsk)';
-$languages['nn_NO']['ALTNAME'] = 'Norsk (Nynorsk)';
-$languages['nn_NO']['CHARSET'] = 'iso-8859-1';
-$languages['nn_NO']['LOCALE']  = array('nn_NO.ISO8859-1','nn_NO.ISO-8859-1','nn_NO');
-
-$languages['pl_PL']['NAME']    = 'Polish';
-$languages['pl_PL']['ALTNAME'] = 'Polski';
-$languages['pl_PL']['CHARSET'] = 'iso-8859-2';
-$languages['pl_PL']['LOCALE']  = array('pl_PL.ISO8859-2','pl_PL.ISO-8859-2','pl_PL');
-$languages['pl']['ALIAS'] = 'pl_PL';
-
-$languages['pt_PT']['NAME'] = 'Portuguese (Portugal)';
-$languages['pt_PT']['CHARSET'] = 'iso-8859-1';
-$languages['pt_PT']['LOCALE']  = array('pt_PT.ISO8859-1','pt_PT.ISO-8859-1','pt_PT');
-$languages['pt']['ALIAS'] = 'pt_PT';
-
-$languages['pt_BR']['NAME']    = 'Portuguese (Brazil)';
-$languages['pt_BR']['ALTNAME'] = 'Portugu&ecirc;s do Brasil';
-$languages['pt_BR']['CHARSET'] = 'iso-8859-1';
-$languages['pt_BR']['LOCALE']  = array('pt_BR.ISO8859-1','pt_BR.ISO-8859-1','pt_BR');
-
-$languages['ro_RO']['NAME']    = 'Romanian';
-$languages['ro_RO']['ALTNAME'] = 'Rom&acirc;n&#259;';
-$languages['ro_RO']['CHARSET'] = 'iso-8859-2';
-$languages['ro_RO']['LOCALE']  = array('ro_RO.ISO8859-2','ro_RO.ISO-8859-2','ro_RO');
-$languages['ro']['ALIAS'] = 'ro_RO';
-
-$languages['ru_RU']['NAME']    = 'Russian';
-$languages['ru_RU']['ALTNAME'] = '&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;';
-$languages['ru_RU']['CHARSET'] = 'utf-8';
-$languages['ru_RU']['LOCALE']  = 'ru_RU.UTF-8';
-$languages['ru']['ALIAS'] = 'ru_RU';
-
-$languages['sk_SK']['NAME']    = 'Slovak';
-$languages['sk_SK']['CHARSET'] = 'iso-8859-2';
-$languages['sk_SK']['LOCALE']  = array('sk_SK.ISO8859-2','sk_SK.ISO-8859-2','sk_SK');
-$languages['sk']['ALIAS'] = 'sk_SK';
-
-$languages['sl_SI']['NAME']    = 'Slovenian';
-$languages['sl_SI']['ALTNAME'] = 'Sloven&scaron;&#269;ina';
-$languages['sl_SI']['CHARSET'] = 'iso-8859-2';
-$languages['sl_SI']['LOCALE']  = array('sl_SI.ISO8859-2','sl_SI.ISO-8859-2','sl_SI');
-$languages['sl']['ALIAS'] = 'sl_SI';
-
-$languages['sr_YU']['NAME']    = 'Serbian';
-$languages['sr_YU']['ALTNAME'] = 'Srpski';
-$languages['sr_YU']['CHARSET'] = 'iso-8859-2';
-$languages['sr_YU']['LOCALE']  = array('sr_YU.ISO8859-2','sr_YU.ISO-8859-2','sr_YU');
-$languages['sr']['ALIAS'] = 'sr_YU';
-
-$languages['sv_SE']['NAME']    = 'Swedish';
-$languages['sv_SE']['ALTNAME'] = 'Svenska';
-$languages['sv_SE']['CHARSET'] = 'iso-8859-1';
-$languages['sv_SE']['LOCALE']  = array('sv_SE.ISO8859-1','sv_SE.ISO-8859-1','sv_SE');
-$languages['sv']['ALIAS'] = 'sv_SE';
-
-$languages['th_TH']['NAME']    = 'Thai';
-$languages['th_TH']['CHARSET'] = 'tis-620';
-$languages['th_TH']['LOCALE']  = array('th_TH.TIS-620','th_TH');
-$languages['th']['ALIAS'] = 'th_TH';
-
-$languages['tl_PH']['NAME']    = 'Tagalog';
-$languages['tl_PH']['CHARSET'] = 'iso-8859-1';
-$languages['tl_PH']['LOCALE']  = array('tl_PH.ISO8859-1','tl_PH.ISO-8859-1','tl_PH');
-$languages['tl']['ALIAS'] = 'tl_PH';
-
-$languages['tr_TR']['NAME']    = 'Turkish';
-$languages['tr_TR']['CHARSET'] = 'iso-8859-9';
-$languages['tr_TR']['LOCALE']  = array('tr_TR.ISO8859-9','tr_TR.ISO-8859-9','tr_TR');
-$languages['tr']['ALIAS'] = 'tr_TR';
-
-$languages['zh_TW']['NAME']    = 'Chinese Trad';
-$languages['zh_TW']['CHARSET'] = 'big5';
-$languages['zh_TW']['LOCALE']  = array('zh_TW.BIG5','zh_TW');
-$languages['tw']['ALIAS'] = 'zh_TW';
-
-$languages['zh_CN']['NAME']    = 'Chinese Simp';
-$languages['zh_CN']['CHARSET'] = 'gb2312';
-$languages['zh_CN']['LOCALE']  = array('zh_CN.GB2312','zh_CN');
-$languages['cn']['ALIAS'] = 'zh_CN';
-
-$languages['uk_UA']['NAME']    = 'Ukrainian';
-$languages['uk_UA']['CHARSET'] = 'koi8-u';
-$languages['uk_UA']['LOCALE']  = 'uk_UA.KOI8-U';
-$languages['uk']['ALIAS'] = 'uk_UA';
-
-$languages['ru_UA']['NAME']    = 'Russian (Ukrainian)';
-$languages['ru_UA']['CHARSET'] = 'koi8-r';
-$languages['ru_UA']['LOCALE']  = 'ru_UA.KOI8-R';
-
-/*
-$languages['vi_VN']['NAME']    = 'Vietnamese';
-$languages['vi_VN']['CHARSET'] = 'utf-8';
-$languages['vi']['ALIAS'] = 'vi_VN';
-*/
-
-// Right to left languages
-$languages['ar']['NAME']    = 'Arabic';
-$languages['ar']['CHARSET'] = 'windows-1256';
-$languages['ar']['DIR']     = 'rtl';
-
-$languages['fa_IR']['NAME']    = 'Farsi';
-$languages['fa_IR']['CHARSET'] = 'utf-8';
-$languages['fa_IR']['DIR']     = 'rtl';
-$languages['fa_IR']['LOCALE']  = array('fa_IR.UTF-8','fa_IR');
-$languages['fa']['ALIAS']      = 'fa_IR';
-
-$languages['he_IL']['NAME']    = 'Hebrew';
-$languages['he_IL']['CHARSET'] = 'windows-1255';
-$languages['he_IL']['LOCALE']  = array('he_IL.CP1255','he_IL');
-$languages['he_IL']['DIR']     = 'rtl';
-$languages['he']['ALIAS']      = 'he_IL';
-
-$languages['ug']['NAME']    = 'Uighur';
-$languages['ug']['CHARSET'] = 'utf-8';
-$languages['ug']['DIR']     = 'rtl';
-
 /**
  * Automatic translation loading from setup.php files.
  * Solution for bug. 1240889.
  * setup.php file can contain $languages array entries and XTRA_CODE functions.
- * I don't want to enable it, because it allows to keep own translations without
- * submitting them to SquirrelMail.
  */
-/*
 foreach(glob(SM_PATH.'locale/*') as $lang_dir) {
     // remove trailing slash, if present
     if (substr($lang_dir,-1)=='/') {
@@ -1221,7 +693,6 @@ foreach(glob(SM_PATH.'locale/*') as $lang_dir) {
         include_once(SM_PATH.'locale/'.$lang_dir.'/setup.php');
     }
 }
-*/
 
 /* Detect whether gettext is installed. */
 $gettext_flags = 0;