Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server
2011-04-05 14:40:06 +02:00

View File

@@ -199,8 +199,6 @@ function PMA_langDetect($str, $envType)
*/ */
function PMA_langDetails($lang) { function PMA_langDetails($lang) {
switch ($lang) { switch ($lang) {
case 'en':
return array('en|english', 'en', '');
case 'af': case 'af':
return array('af|afrikaans', 'af', ''); return array('af|afrikaans', 'af', '');
case 'ar': case 'ar':
@@ -208,7 +206,7 @@ function PMA_langDetails($lang) {
case 'az': case 'az':
return array('az|azerbaijani', 'az', 'Azərbaycanca'); return array('az|azerbaijani', 'az', 'Azərbaycanca');
case 'bn': case 'bn':
return array('bn|bangla', 'bn', ''); return array('bn|bangla', 'bn', 'বাংলা');
case 'be': case 'be':
return array('be|belarusian', 'be', 'Беларуская'); return array('be|belarusian', 'be', 'Беларуская');
case 'be@latin': case 'be@latin':
@@ -479,7 +477,7 @@ if (! function_exists('__')) {
$charset = 'utf-8'; $charset = 'utf-8';
/* l10n: Text direction, use either ltr or rtl */ /* l10n: Text direction, use either ltr or rtl */
$text_dir = __('ltr'); $GLOBALS['text_dir'] = __('ltr');
// now, that we have loaded the language strings we can send the errors // now, that we have loaded the language strings we can send the errors
if ($GLOBALS['lang_failed_cfg']) { if ($GLOBALS['lang_failed_cfg']) {