Disabled Vietnamese (mix of html codes, Vietnamese and Spanish) and Ukrainian (Russia...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5878 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/AUTHORS b/AUTHORS
index b0de9a69684969af3062adf2ac5b79760618bee4..849a704e0c189b965724e3b8f494131d0e91aa01 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,7 +85,12 @@ THE SQUIRRELMAIL TEAM
    Taiwan        Ching <ching@kiwa.com.tw>
    Thai          Nartpong Ampornaramweth <yongnarak@yahoo.com>  
    Turkish       Volkan Yildirim <volkan@ozzmosis.pleksus.net.tr>
+   Ukrainian    Oleg Baranovsky <oleg@uazone.net>
+    (Ukrainian is not supported unless someone updates translation. 
+     translation is not in Ukrainian)
    Vietnamese    Le Viet Hung <heros@hcm.fpt.vn>
+    (Vietnamese is not supported unless someone updates translation. 
+     translation is not in Vietnamese)
    Welsh        Andrew Rawlins <awr@aber.ac.uk> 
 
  Significant Contributions:

diff --git a/ChangeLog b/ChangeLog
index 6c0a8d8fa54d43bba67202fa467432583c9de93d..516f1adb90101902ac5bac7f66baaf95c797fe3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -99,6 +99,8 @@ Version 1.5.0 -- CVS
     global.php
   - HTML Filter bugfixes and further strengthening in response to some
     findings reported by stardust.
+  - Disabled Vietnamese and Ukrainian translations. They are done in different 
+    language.
 
 
 **************************************

diff --git a/functions/i18n.php b/functions/i18n.php
index a0e9456377db1de2c5998947cee7f694e2103f0f..4600de33d4d3d1a85c7eb9ed5396cdeaac6e1e8a 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -583,22 +583,26 @@ if ( file_exists( SM_PATH . 'locale/bg_BG') ) {
     $languages['bg_BG']['CHARSET'] = 'windows-1251';
     $languages['bg']['ALIAS'] = 'bg_BG';
 }
+/*
 if ( file_exists( SM_PATH . 'locale/uk_UA') ) {
     $languages['uk_UA']['NAME']    = 'Ukrainian';
     $languages['uk_UA']['CHARSET'] = 'koi8-u';
     $languages['uk']['ALIAS'] = 'uk_UA';
 }
+*/
 if ( file_exists( SM_PATH . 'locale/cy_GB') ) {
     $languages['cy_GB']['NAME']    = 'Welsh';
     $languages['cy_GB']['ALTNAME'] = 'Cymraeg';
     $languages['cy_GB']['CHARSET'] = 'iso-8859-1';
     $languages['cy']['ALIAS'] = 'cy_GB';
 }
+/*
 if ( file_exists( SM_PATH . 'locale/vi_VN') ) {
     $languages['vi_VN']['NAME']    = 'Vietnamese';
     $languages['vi_VN']['CHARSET'] = 'utf-8';
     $languages['vi']['ALIAS'] = 'vi_VN';
 }
+*/
 // Right to left languages
 if ( file_exists( SM_PATH . 'locale/ar') ) {
     $languages['ar']['NAME']    = 'Arabic';