72 files changed, 114 insertions, 362 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 5b8e74cdf..b01e5fd2b 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -186,10 +186,18 @@ class rcmail
     if (!isset($rcube_languages[$lang]) && isset($rcube_language_aliases[$lang])) {
       $lang = $rcube_language_aliases[$lang];
     }
-
+    
     // try the first two chars
-    if (!isset($rcube_languages[$lang]) && strlen($lang)>2) {
-      $lang = $this->language_prop(substr($lang, 0, 2));
+    else if (!isset($rcube_languages[$lang]) && strlen($lang) > 2) {
+      $short = $this->language_prop(substr($lang, 0, 2));
+      
+      // check if we have an alias for the short language code
+      if (!isset($rcube_languages[$short]) && isset($rcube_language_aliases[$short])) {
+        $lang = $rcube_language_aliases[$short];
+      }
+      else {  // expand 'de' to 'de_DE'
+        $lang = $short.'_'.strtoupper($short);
+      }
     }
 
     if (!isset($rcube_languages[$lang]) || !is_dir(INSTALL_PATH . 'program/localization/' . $lang)) {
diff --git a/program/localization/ar/labels.inc b/program/localization/ar_SA/labels.inc
index a4a948ec0..a4a948ec0 100644
--- a/program/localization/ar/labels.inc
+++ b/program/localization/ar_SA/labels.inc
diff --git a/program/localization/ar/messages.inc b/program/localization/ar_SA/messages.inc
index 1165aa894..1165aa894 100644
--- a/program/localization/ar/messages.inc
+++ b/program/localization/ar_SA/messages.inc
diff --git a/program/localization/bg/labels.inc b/program/localization/bg_BG/labels.inc
index 16c8428cf..16c8428cf 100644
--- a/program/localization/bg/labels.inc
+++ b/program/localization/bg_BG/labels.inc
diff --git a/program/localization/bg/messages.inc b/program/localization/bg_BG/messages.inc
index 75d190448..75d190448 100644
--- a/program/localization/bg/messages.inc
+++ b/program/localization/bg_BG/messages.inc
diff --git a/program/localization/ca/labels.inc b/program/localization/ca_ES/labels.inc
index 7c02dc5a3..7c02dc5a3 100644
--- a/program/localization/ca/labels.inc
+++ b/program/localization/ca_ES/labels.inc
diff --git a/program/localization/ca/messages.inc b/program/localization/ca_ES/messages.inc
index 3167a4881..3167a4881 100644
--- a/program/localization/ca/messages.inc
+++ b/program/localization/ca_ES/messages.inc
diff --git a/program/localization/cz/labels.inc b/program/localization/cs_CZ/labels.inc
index 7cad98c68..7cad98c68 100644
--- a/program/localization/cz/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
diff --git a/program/localization/cz/messages.inc b/program/localization/cs_CZ/messages.inc
index b182a5e21..b182a5e21 100644
--- a/program/localization/cz/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
diff --git a/program/localization/da/labels.inc b/program/localization/da_DK/labels.inc
index f515d66b3..f515d66b3 100644
--- a/program/localization/da/labels.inc
+++ b/program/localization/da_DK/labels.inc
diff --git a/program/localization/da/messages.inc b/program/localization/da_DK/messages.inc
index 91098dd7f..91098dd7f 100644
--- a/program/localization/da/messages.inc
+++ b/program/localization/da_DK/messages.inc
diff --git a/program/localization/el/labels.inc b/program/localization/el_GR/labels.inc
index a97ecea73..a97ecea73 100644
--- a/program/localization/el/labels.inc
+++ b/program/localization/el_GR/labels.inc
diff --git a/program/localization/el/messages.inc b/program/localization/el_GR/messages.inc
index 1fa30a524..1fa30a524 100644
--- a/program/localization/el/messages.inc
+++ b/program/localization/el_GR/messages.inc
diff --git a/program/localization/es/labels.inc b/program/localization/es_ES/labels.inc
index e77c9770d..e77c9770d 100644
--- a/program/localization/es/labels.inc
+++ b/program/localization/es_ES/labels.inc
diff --git a/program/localization/es/messages.inc b/program/localization/es_ES/messages.inc
index 8e32bd5f1..8e32bd5f1 100644
--- a/program/localization/es/messages.inc
+++ b/program/localization/es_ES/messages.inc
diff --git a/program/localization/eu/labels.inc b/program/localization/eu_ES/labels.inc
index ca0d3b88c..ca0d3b88c 100644
--- a/program/localization/eu/labels.inc
+++ b/program/localization/eu_ES/labels.inc
diff --git a/program/localization/eu/messages.inc b/program/localization/eu_ES/messages.inc
index ce683d72d..ce683d72d 100644
--- a/program/localization/eu/messages.inc
+++ b/program/localization/eu_ES/messages.inc
diff --git a/program/localization/fi/labels.inc b/program/localization/fi_FI/labels.inc
index f56aa7997..f56aa7997 100644
--- a/program/localization/fi/labels.inc
+++ b/program/localization/fi_FI/labels.inc
diff --git a/program/localization/fi/messages.inc b/program/localization/fi_FI/messages.inc
index 167b4746a..167b4746a 100644
--- a/program/localization/fi/messages.inc
+++ b/program/localization/fi_FI/messages.inc
diff --git a/program/localization/fr/labels.inc b/program/localization/fr_FR/labels.inc
index 01bc6f0bc..01bc6f0bc 100644
--- a/program/localization/fr/labels.inc
+++ b/program/localization/fr_FR/labels.inc
diff --git a/program/localization/fr/messages.inc b/program/localization/fr_FR/messages.inc
index d91e09373..d91e09373 100644
--- a/program/localization/fr/messages.inc
+++ b/program/localization/fr_FR/messages.inc
diff --git a/program/localization/gl/labels.inc b/program/localization/gl_ES/labels.inc
index 4203d2540..4203d2540 100644
--- a/program/localization/gl/labels.inc
+++ b/program/localization/gl_ES/labels.inc
diff --git a/program/localization/gl/messages.inc b/program/localization/gl_ES/messages.inc
index 2ba57d0d7..2ba57d0d7 100644
--- a/program/localization/gl/messages.inc
+++ b/program/localization/gl_ES/messages.inc
diff --git a/program/localization/he/labels.inc b/program/localization/he_IL/labels.inc
index 4d746ab98..4d746ab98 100644
--- a/program/localization/he/labels.inc
+++ b/program/localization/he_IL/labels.inc
diff --git a/program/localization/he/messages.inc b/program/localization/he_IL/messages.inc
index 7689e109f..7689e109f 100644
--- a/program/localization/he/messages.inc
+++ b/program/localization/he_IL/messages.inc
diff --git a/program/localization/hi/labels.inc b/program/localization/hi_IN/labels.inc
index d286659f5..d286659f5 100644
--- a/program/localization/hi/labels.inc
+++ b/program/localization/hi_IN/labels.inc
diff --git a/program/localization/hi/messages.inc b/program/localization/hi_IN/messages.inc
index a32a52404..a32a52404 100644
--- a/program/localization/hi/messages.inc
+++ b/program/localization/hi_IN/messages.inc
diff --git a/program/localization/hu/labels.inc b/program/localization/hu_HU/labels.inc
index d41cc44cf..d41cc44cf 100644
--- a/program/localization/hu/labels.inc
+++ b/program/localization/hu_HU/labels.inc
diff --git a/program/localization/hu/messages.inc b/program/localization/hu_HU/messages.inc
index d1154b85e..d1154b85e 100644
--- a/program/localization/hu/messages.inc
+++ b/program/localization/hu_HU/messages.inc
diff --git a/program/localization/am/labels.inc b/program/localization/hy_AM/labels.inc
index d6b797e5c..d6b797e5c 100644
--- a/program/localization/am/labels.inc
+++ b/program/localization/hy_AM/labels.inc
diff --git a/program/localization/am/messages.inc b/program/localization/hy_AM/messages.inc
index 793ad0f46..793ad0f46 100644
--- a/program/localization/am/messages.inc
+++ b/program/localization/hy_AM/messages.inc
diff --git a/program/localization/index.inc b/program/localization/index.inc
index 91b97db1b..8b06bcb7d 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -9,8 +9,8 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Provide centralized location for keeping track of                   |
- |   available languages                                                 |
+ |   Provide a centralized location table                                |
+ |   for keeping track of available languages                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
@@ -19,84 +19,111 @@
  $Id$
 
 */
- 
- $rcube_languages = array(
-     'sq_AL' => 'Albanian',
-     'ar'    => 'Arabic',
-     'am'    => 'Armenian',
-     'bs_BA' => 'Bosnian (Bosanski)',
-     'bg'    => 'Bulgarian',
-     'ca'    => 'Català',
-     'zh_CN' => 'Chinese (Simplified)',
-     'zh_TW' => 'Chinese (Traditional)',
-     'hr'    => 'Croatian (Hrvatski)',
-     'cz'    => 'Czech',
-     'da'    => 'Dansk',
-     'de_DE' => 'Deutsch (Deutsch)',
-     'de_CH' => 'Deutsch (Schweiz)',
-     'en_GB' => 'English (GB)',
-     'en_US' => 'English (US)',
-     'es'    => 'Español',
-     'eo'    => 'Esperanto',
-     'et_EE' => 'Estonian',
-     'eu'    => 'Euskara',
-     'nl_BE' => 'Flemish',
-     'fr'    => 'Français',
-     'gl'    => 'Galego',
-     'ge'    => 'Georgian',
-     'el'    => 'Greek',
-     'he'    => 'Hebrew',
-     'hi'    => 'Hindi',
-     'hu'    => 'Hungarian',
-     'is'    => 'Icelandic',
-     'id_ID' => 'Indonesian',
-     'ga_IE' => 'Irish',
-     'it'    => 'Italiano',
-     'ja'    => 'Japanese (日本語)',
-     'kr'    => 'Korean',
-     'ku'    => 'Kurdish (Kurmancî)',
-     'lv'    => 'Latvian',
-     'lt'    => 'Lithuanian',
-     'mk'    => 'Macedonian',
-     'ms_MY' => 'Malay',
-     'nl_NL' => 'Nederlands',
-     'ne'    => 'Nepali',
-     'nb_NO' => 'Norsk (bokmål)',
-     'nn_NO' => 'Norsk (nynorsk)',
-     'fa'    => 'Persian',
-     'pl_PL' => 'Polski',
-     'pt_BR' => 'Portuguese (Brazilian)',
-     'pt_PT' => 'Portuguese (Standard)',
-     'ro'    => 'Romanian',
-     'ru'    => 'Russian',
-     'sr_cyrillic'   => 'Serbian Cyrillic',
-     'sr_latin'      => 'Serbian Latin',
-     'si'    => 'Sinhala',
-     'sk'    => 'Slovak',
-     'sl'    => 'Slovenian',
-     'fi'    => 'Suomi',
-     'se'    => 'Svenska',
-     'th_TH' => 'Thai',
-     'tr'    => 'Turkish',
-     'uk'    => 'Ukrainian',
-     'vn'    => 'Vietnamese'
+
+// langage codes according to ISO 639-1
+// country codes according to ISO 3166-1 (Alpha-2)
+
+$rcube_languages = array(
+  'sq_AL' => 'Albanian',
+  'ar_SA' => 'Arabic',
+  'hy_AM' => 'Armenian',
+  'bs_BA' => 'Bosnian (Serbian Latin)',
+  'bg_BG' => 'Bulgarian',
+  'ca_ES' => 'Català',
+  'zh_CN' => 'Chinese (Simplified)',
+  'zh_TW' => 'Chinese (Traditional)',
+  'hr_HR' => 'Croatian (Hrvatski)',
+  'cs_CZ' => 'Czech',
+  'da_DK' => 'Dansk',
+  'de_DE' => 'Deutsch (Deutsch)',
+  'de_CH' => 'Deutsch (Schweiz)',
+  'en_GB' => 'English (GB)',
+  'en_US' => 'English (US)',
+  'es_ES' => 'Español',
+  'eo'    => 'Esperanto',
+  'et_EE' => 'Estonian',
+  'eu_ES' => 'Euskara (Basque)',
+  'fi_FI' => 'Finnish (Suomi)',
+  'nl_BE' => 'Flemish',
+  'fr_FR' => 'Français',
+  'gl_ES' => 'Galego (Galician)',
+  'ka_GE' => 'Georgian (Kartuli)',
+  'el_GR' => 'Greek',
+  'he_IL' => 'Hebrew',
+  'hi_IN' => 'Hindi',
+  'hu_HU' => 'Hungarian',
+  'is_IS' => 'Icelandic',
+  'id_ID' => 'Indonesian',
+  'ga_IE' => 'Irish',
+  'it_IT' => 'Italiano',
+  'ja_JP' => 'Japanese (日本語)',
+  'ko_KR' => 'Korean',
+  'ku'    => 'Kurdish (Kurmancî)',
+  'lv_LV' => 'Latvian',
+  'lt_LT' => 'Lithuanian',
+  'mk_MK' => 'Macedonian',
+  'ms_MY' => 'Malay',
+  'nl_NL' => 'Nederlands',
+  'ne_NP' => 'Nepali',
+  'nb_NO' => 'Norsk (Bokmål)',
+  'nn_NO' => 'Norsk (Nynorsk)',
+  'fa'    => 'Persian (Farsi)',
+  'pl_PL' => 'Polski',
+  'pt_BR' => 'Portuguese (Brazilian)',
+  'pt_PT' => 'Portuguese (Standard)',
+  'ro_RO' => 'Romanian',
+  'ru_RU' => 'Russian',
+  'sr_CS' => 'Serbian (Cyrillic)',
+  'si_LK' => 'Sinhala',
+  'sk_SK' => 'Slovak',
+  'sl_SI' => 'Slovenian',
+  'sv_SE' => 'Swedish (Svenska)',
+  'th_TH' => 'Thai',
+  'tr_TR' => 'Turkish',
+  'uk_UA' => 'Ukrainian',
+  'vi_VN' => 'Vietnamese',
 );
 
 $rcube_language_aliases = array(
-    'ee' => 'et_EE',
-    'bs' => 'bs_BA',
-    'cn' => 'zh_CN',
-    'de' => 'de_DE',
-    'en' => 'en_US',
-    'ga' => 'ga_IE',
-    'nl' => 'nl_NL',
-    'no' => 'nn_NO',
-    'pt' => 'pt_PT',
-    'th' => 'th_TH',
-    'tw' => 'zh_TW',
-    'pl' => 'pl_PL'
+  'ar' => 'ar_SA',
+  'am' => 'hy_AM',
+  'bg' => 'bg_BG',
+  'bs' => 'bs_BA',
+  'ca' => 'ca_ES',
+  'cn' => 'zh_CN',
+  'cs' => 'cs_CZ',
+  'cz' => 'cs_CZ',
+  'da' => 'da_DK',
+  'de' => 'de_DE',
+  'ee' => 'et_EE',
+  'el' => 'el_GR',
+  'en' => 'en_US',
+  'eu' => 'eu_ES',
+  'ga' => 'ga_IE',
+  'ge' => 'ka_GE',
+  'gl' => 'gl_ES',
+  'he' => 'he_IL',
+  'hi' => 'hi_IN',
+  'hr' => 'hr_HR',
+  'ja' => 'ja_JP',
+  'ko' => 'ko_KR',
+  'kr' => 'ko_KR',
+  'ne' => 'ne_NP',
+  'no' => 'nn_NO',
+  'ms' => 'ms_MY',
+  'tw' => 'zh_TW',
+  'si' => 'si_LK',
+  'sl' => 'sl_SI',
+  'sr' => 'sr_CS',
+  'sr_cyrillic' => 'sr_CS',
+  'sr_latin' => 'bs_BA',
+  'se' => 'sv_SE',
+  'sv' => 'sv_SE',
+  'uk' => 'uk_UA',
+  'vn' => 'vi_VN',
+  'vi' => 'vi_VN',
+  'zh' => 'zh_CN',
 );
 
-$rcube_charsets = array();
 
 ?>
diff --git a/program/localization/is/labels.inc b/program/localization/is_IS/labels.inc
index c6b8b0a0d..c6b8b0a0d 100644
--- a/program/localization/is/labels.inc
+++ b/program/localization/is_IS/labels.inc
diff --git a/program/localization/is/messages.inc b/program/localization/is_IS/messages.inc
index fdc1abb7d..fdc1abb7d 100644
--- a/program/localization/is/messages.inc
+++ b/program/localization/is_IS/messages.inc
diff --git a/program/localization/it/labels.inc b/program/localization/it_IT/labels.inc
index 607042427..607042427 100644
--- a/program/localization/it/labels.inc
+++ b/program/localization/it_IT/labels.inc
diff --git a/program/localization/it/messages.inc b/program/localization/it_IT/messages.inc
index 99f97bb98..99f97bb98 100644
--- a/program/localization/it/messages.inc
+++ b/program/localization/it_IT/messages.inc
diff --git a/program/localization/ja/labels.inc b/program/localization/ja_JP/labels.inc
index be570ad24..be570ad24 100644
--- a/program/localization/ja/labels.inc
+++ b/program/localization/ja_JP/labels.inc
diff --git a/program/localization/ja/messages.inc b/program/localization/ja_JP/messages.inc
index 2379cf0cd..2379cf0cd 100644
--- a/program/localization/ja/messages.inc
+++ b/program/localization/ja_JP/messages.inc
diff --git a/program/localization/ge/labels.inc b/program/localization/ka_GE/labels.inc
index 6d3722319..6d3722319 100755
--- a/program/localization/ge/labels.inc
+++ b/program/localization/ka_GE/labels.inc
diff --git a/program/localization/ge/messages.inc b/program/localization/ka_GE/messages.inc
index d2c29ca21..d2c29ca21 100755
--- a/program/localization/ge/messages.inc
+++ b/program/localization/ka_GE/messages.inc
diff --git a/program/localization/kr/labels.inc b/program/localization/ko_KR/labels.inc
index 4df78c645..4df78c645 100644
--- a/program/localization/kr/labels.inc
+++ b/program/localization/ko_KR/labels.inc
diff --git a/program/localization/kr/messages.inc b/program/localization/ko_KR/messages.inc
index 95d591e7b..95d591e7b 100644
--- a/program/localization/kr/messages.inc
+++ b/program/localization/ko_KR/messages.inc
diff --git a/program/localization/lt/labels.inc b/program/localization/lt_LT/labels.inc
index 9a1a7d4e0..9a1a7d4e0 100644
--- a/program/localization/lt/labels.inc
+++ b/program/localization/lt_LT/labels.inc
diff --git a/program/localization/lt/messages.inc b/program/localization/lt_LT/messages.inc
index 02a93c2ff..02a93c2ff 100644
--- a/program/localization/lt/messages.inc
+++ b/program/localization/lt_LT/messages.inc
diff --git a/program/localization/lv/labels.inc b/program/localization/lv_LV/labels.inc
index 2d47aa1f0..2d47aa1f0 100644
--- a/program/localization/lv/labels.inc
+++ b/program/localization/lv_LV/labels.inc
diff --git a/program/localization/lv/messages.inc b/program/localization/lv_LV/messages.inc
index 7ca145608..7ca145608 100644
--- a/program/localization/lv/messages.inc
+++ b/program/localization/lv_LV/messages.inc
diff --git a/program/localization/mk/labels.inc b/program/localization/mk_MK/labels.inc
index 40e2b1a15..40e2b1a15 100755
--- a/program/localization/mk/labels.inc
+++ b/program/localization/mk_MK/labels.inc
diff --git a/program/localization/mk/messages.inc b/program/localization/mk_MK/messages.inc
index 15b664539..15b664539 100755
--- a/program/localization/mk/messages.inc
+++ b/program/localization/mk_MK/messages.inc
diff --git a/program/localization/ne/labels.inc b/program/localization/ne_NP/labels.inc
index 1b1e899a0..1b1e899a0 100644
--- a/program/localization/ne/labels.inc
+++ b/program/localization/ne_NP/labels.inc
diff --git a/program/localization/ne/messages.inc b/program/localization/ne_NP/messages.inc
index bd2819999..bd2819999 100644
--- a/program/localization/ne/messages.inc
+++ b/program/localization/ne_NP/messages.inc
diff --git a/program/localization/ro/labels.inc b/program/localization/ro_RO/labels.inc
index 9ec78f52c..9ec78f52c 100644
--- a/program/localization/ro/labels.inc
+++ b/program/localization/ro_RO/labels.inc
diff --git a/program/localization/ro/messages.inc b/program/localization/ro_RO/messages.inc
index 788886537..788886537 100644
--- a/program/localization/ro/messages.inc
+++ b/program/localization/ro_RO/messages.inc
diff --git a/program/localization/ru/labels.inc b/program/localization/ru_RU/labels.inc
index f4acd15d4..f4acd15d4 100644
--- a/program/localization/ru/labels.inc
+++ b/program/localization/ru_RU/labels.inc
diff --git a/program/localization/ru/messages.inc b/program/localization/ru_RU/messages.inc
index 17e90d4bf..17e90d4bf 100644
--- a/program/localization/ru/messages.inc
+++ b/program/localization/ru_RU/messages.inc
diff --git a/program/localization/si/labels.inc b/program/localization/si_LK/labels.inc
index 4bd63066d..4bd63066d 100644
--- a/program/localization/si/labels.inc
+++ b/program/localization/si_LK/labels.inc
diff --git a/program/localization/si/messages.inc b/program/localization/si_LK/messages.inc
index 3729cbab6..3729cbab6 100644
--- a/program/localization/si/messages.inc
+++ b/program/localization/si_LK/messages.inc
diff --git a/program/localization/sk/labels.inc b/program/localization/sk_SK/labels.inc
index 20b540259..20b540259 100644
--- a/program/localization/sk/labels.inc
+++ b/program/localization/sk_SK/labels.inc
diff --git a/program/localization/sk/messages.inc b/program/localization/sk_SK/messages.inc
index 7ad2d332c..7ad2d332c 100644
--- a/program/localization/sk/messages.inc
+++ b/program/localization/sk_SK/messages.inc
diff --git a/program/localization/sl/labels.inc b/program/localization/sl_SI/labels.inc
index 48e434f27..48e434f27 100644
--- a/program/localization/sl/labels.inc
+++ b/program/localization/sl_SI/labels.inc
diff --git a/program/localization/sl/messages.inc b/program/localization/sl_SI/messages.inc
index 8afe50c6d..8afe50c6d 100644
--- a/program/localization/sl/messages.inc
+++ b/program/localization/sl_SI/messages.inc
diff --git a/program/localization/sr_cyrillic/labels.inc b/program/localization/sr_CS/labels.inc
index 37ae6ecbe..37ae6ecbe 100644
--- a/program/localization/sr_cyrillic/labels.inc
+++ b/program/localization/sr_CS/labels.inc
diff --git a/program/localization/sr_cyrillic/messages.inc b/program/localization/sr_CS/messages.inc
index 1e51f819e..1e51f819e 100644
--- a/program/localization/sr_cyrillic/messages.inc
+++ b/program/localization/sr_CS/messages.inc
diff --git a/program/localization/sr_latin/labels.inc b/program/localization/sr_latin/labels.inc
deleted file mode 100644
index 565ba9c32..000000000
--- a/program/localization/sr_latin/labels.inc
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-/*
-
- +-----------------------------------------------------------------------+
- | language/sr_latin/labels.inc                                          |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Viktor Varga <vile@neobee.net>                                |
- +-----------------------------------------------------------------------+
-
- @version $Id$
-
-*/
-
-$labels = array();
-
-// login page
-$labels['welcome']   = 'Dobrodošli na $product';
-$labels['username']  = 'Korisničko ime';
-$labels['password']  = 'Lozinka';
-$labels['server']    = 'Server';
-$labels['login']     = 'Prijava';
-
-// taskbar
-$labels['logout']   = 'Odjava';
-$labels['mail']     = 'Sanduče';
-$labels['settings'] = 'Podešavanja';
-$labels['addressbook'] = 'Imenik';
-
-// mailbox names
-$labels['inbox']  = 'Inbox';
-$labels['drafts'] = 'Drafts';
-$labels['sent']   = 'Sent';
-$labels['trash']  = 'Trash';
-$labels['junk']   = 'Junk';
-
-// message listing
-$labels['subject'] = 'Naslov';
-$labels['from']    = 'Od';
-$labels['to']      = 'Za';
-$labels['cc']      = 'Cc';
-$labels['bcc']     = 'Bcc';
-$labels['replyto'] = 'Reply-To';
-$labels['date']    = 'Datum';
-$labels['size']    = 'Veličina';
-$labels['priority'] = 'Prioritet';
-$labels['organization'] = 'Organizacija';
-
-// aliases
-$labels['reply-to'] = $labels['replyto'];
-
-$labels['mailboxlist'] = 'Fascikle';
-$labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
-$labels['messagenrof'] = 'Poruka broj $nr od $count';
-
-$labels['moveto']   = 'prebaci u...';
-$labels['download'] = 'preuzmi (download)';
-
-$labels['filename'] = 'Ime datoteke';
-$labels['filesize'] = 'Veličina datoteke';
-
-$labels['preferhtml'] = 'HTML format u prednosti';
-$labels['htmlmessage'] = 'HTML format poruke';
-$labels['prettydate'] = 'Formatiran datum';
-
-$labels['addtoaddressbook'] = 'Dodaj u imenik';
-
-// weekdays short
-$labels['sun'] = 'Ned';
-$labels['mon'] = 'Pon';
-$labels['tue'] = 'Uto';
-$labels['wed'] = 'Sre';
-$labels['thu'] = 'Čet';
-$labels['fri'] = 'Pet';
-$labels['sat'] = 'Sub';
-
-// weekdays long
-$labels['sunday']    = 'Nedelja';
-$labels['monday']    = 'Ponedeljak';
-$labels['tuesday']   = 'Utorak';
-$labels['wednesday'] = 'Sreda';
-$labels['thursday']  = 'Četvrtak';
-$labels['friday']    = 'Petak';
-$labels['saturday']  = 'Subota';
-
-$labels['today'] = 'danas';
-
-// toolbar buttons
-$labels['checkmail']        = 'Provera novih poruka';
-$labels['writenewmessage']  = 'Nova poruka';
-$labels['replytomessage']   = 'Odgovori na poruku';
-$labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primaocima';
-$labels['forwardmessage']   = 'Prosledi poruku';
-$labels['deletemessage']    = 'Prebaci poruku u korpu (Trash)';
-$labels['printmessage']     = 'Odštampaj poruku';
-$labels['previousmessages'] = 'Prikaži prethodni skup poruka';
-$labels['nextmessages']     = 'Prikaži sledeći skup poruka';
-$labels['backtolist']       = 'Povratak na listu poruka';
-$labels['viewsource']       = 'Prikaži poruku u izvornom obliku';
-
-$labels['select'] = 'Obeleži';
-$labels['all'] = 'Sve';
-$labels['none'] = 'Nijednu';
-$labels['unread'] = 'Nepročitane';
-
-$labels['compact'] = 'Kompakcija';
-$labels['empty'] = 'Izprazni';
-$labels['purge'] = 'Očisti';
-
-$labels['quota'] = 'Kvota';
-$labels['unknown']  = 'nepoznato';
-$labels['unlimited']  = 'beskonačna';
-
-$labels['quicksearch']  = 'Brza pretraga';
-$labels['resetsearch']  = 'Prikaži sve poruke';
-
-// message compose
-$labels['compose']  = 'Nova poruka';
-$labels['savemessage']  = 'Sačuvaj u \'Drafts\'';
-$labels['sendmessage']  = 'Pošalji poruku';
-$labels['addattachment']  = 'Priloži datoteku';
-$labels['charset']  = 'Karakter-set';
-$labels['returnreceipt'] = 'Potvrda o prispeću poruke';
-
-$labels['checkspelling'] = 'Provera pravopisa';
-$labels['resumeediting'] = 'Povratak u režim pisanja';
-$labels['revertto'] = 'Revert to';
-
-$labels['attachments'] = 'Prilozi (Attachments)';
-$labels['upload'] = 'Dodaj';
-$labels['close']  = 'Zatvori';
-
-$labels['low']     = 'Nizak';
-$labels['lowest']  = 'Najniži';
-$labels['normal']  = 'Srednji';
-$labels['high']    = 'Visok';
-$labels['highest'] = 'Najviši';
-
-$labels['nosubject']  = '(bez naslova)';
-$labels['showimages'] = 'Prikaži slike';
-
-// address boook
-$labels['name']      = 'Puno ime';
-$labels['firstname'] = 'Ime';
-$labels['surname']   = 'Prezime';
-$labels['email']     = 'E-Mail';
-
-$labels['addcontact'] = 'Dodaj novi kontakt';
-$labels['editcontact'] = 'Izmeni kontakt';
-
-$labels['edit']   = 'Izmeni';
-$labels['cancel'] = 'Otkaži';
-$labels['save']   = 'Sačuvaj';
-$labels['delete'] = 'Obriši';
-
-$labels['newcontact']     = 'Dodaj novi kontakt';
-$labels['deletecontact']  = 'Obriši odabrane kontakte';
-$labels['composeto']      = 'Napiši mail...';
-$labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
-$labels['print']          = 'Štampaj';
-$labels['export']         = 'Izvezi';
-
-$labels['previouspage']   = 'Prikaži predhodni skup';
-$labels['nextpage']       = 'Prikaži sledeći skup';
-
-// LDAP search
-$labels['ldapsearch'] = 'Pretraga LDAP imenika';
-
-$labels['ldappublicsearchname']    = 'Ime kontakta';
-$labels['ldappublicsearchtype'] = 'Potpuna fraza?';
-$labels['ldappublicserverselect'] = 'Odaberi servere';
-$labels['ldappublicsearchfield'] = 'Pretraži na';
-$labels['ldappublicsearchform'] = 'Pretraži kontakte';
-$labels['ldappublicsearch'] = 'Pretraga';
-
-// settings
-$labels['settingsfor']  = 'Podešavanja za';
-
-$labels['preferences']  = 'Podešavanja';
-$labels['userpreferences']  = 'Opšta podešavanja';
-$labels['editpreferences']  = 'Izmena opštih podešavanja';
-
-$labels['identities']  = 'Identiteti';
-$labels['manageidentities']  = 'Podesi identitete za ovaj nalog';
-$labels['newidentity']  = 'Dodaj identitet';
-
-$labels['newitem']  = 'New item';
-$labels['edititem']  = 'Edit item';
-
-$labels['setdefault']  = 'Set default';
-$labels['language']  = 'Jezik';
-$labels['timezone']  = 'Vremenska zona';
-$labels['pagesize']  = 'Redova po stranici';
-$labels['signature'] = 'Potpis';
-$labels['dstactive']  = 'Letnje pomeranje vremena';
-
-$labels['folder']  = 'Fascikla';
-$labels['folders']  = 'Fascikle';
-$labels['foldername']  = 'Ime fascikle';
-$labels['subscribed']  = 'Subscribed';
-$labels['create']  = 'Kreiraj';
-$labels['createfolder']  = 'Kreiraj novu fasciklu';
-$labels['rename'] = 'Preimenuj';
-$labels['renamefolder'] = 'Preimenuj Fasciklu';
-$labels['deletefolder']  = 'Obriši Fasciklu';
-$labels['managefolders']  = 'Podesi Fasciklu';
-
-$labels['sortby'] = 'Sortiraj po';
-$labels['sortasc']  = 'Sortiraj rastućim nizom';
-$labels['sortdesc'] = 'Sortiraj opadajućim nizom';
-
-?>
-\ No newline at end of file
diff --git a/program/localization/sr_latin/messages.inc b/program/localization/sr_latin/messages.inc
deleted file mode 100644
index dfdbcc309..000000000
--- a/program/localization/sr_latin/messages.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
-
- +-----------------------------------------------------------------------+
- | language/sr_latin/messages.inc                                        |
- |                                                                       |
- | Language file of the RoundCube Webmail client                         |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
- | Licensed under the GNU GPL                                            |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Viktor Varga <vile@neobee.net>                                |
- +-----------------------------------------------------------------------+
-
- @version $Id$
-
-*/
-
-$messages = array();
-$messages['loginfailed']  = 'Prijava neuspešna';
-$messages['cookiesdisabled'] = 'Vaš pretraživač ne podržava kolačiće (cookies)';
-$messages['sessionerror'] = 'Sesija je nije validna ili je istekla';
-$messages['imaperror'] = 'Neuspešna konekcija na IMAP server';
-$messages['nomessagesfound'] = 'Nema poruka u sandučetu';
-$messages['loggedout'] = 'Uspešno ste se odjavili.';
-$messages['mailboxempty'] = 'Sanduše je prazno';
-$messages['loading'] = 'Učitavanje...';
-$messages['loadingdata'] = 'Učitavanje podataka...';
-$messages['checkingmail'] = 'Provera novih poruka u toku...';
-$messages['sendingmessage'] = 'Poruka se šalje...';
-$messages['messagesent'] = 'Poruka je uspešno poslana';
-$messages['savingmessage'] = 'Poruka se snima...';
-$messages['messagesaved'] = 'Poruka uspešno sačuvana u \'Drafts\'';
-$messages['successfullysaved'] = 'Snimanje uspešno obavljeno';
-$messages['addedsuccessfully'] = 'Kontakt uspešno dodat u imenik';
-$messages['contactexists'] = 'Kontakt sa ovom e-mail adresom već postoji u imeniku';
-$messages['blockedimages'] = 'Zbog zaštite privatnosti, slike sa udaljenih servera su blokirane.';
-$messages['encryptedmessage'] = 'Ova poruka je šifrovana pa se ne može prikazati';
-$messages['nocontactsfound'] = 'Imenik je prazan';
-$messages['sendingfailed'] = 'Greška pri slanju poruke';
-$messages['errorsaving'] = 'Greška pri snimanju';
-$messages['errormoving'] = 'Greška pri premeštanju poruke';
-$messages['errordeleting'] = 'Greška pri brisanju poruke';
-$messages['deletecontactconfirm']  = 'Da li želite da obrišete izabrane kontakte?';
-$messages['deletefolderconfirm']  = 'Da li zaista želite da obrišete ovu fasciklu?';
-$messages['purgefolderconfirm']  = 'Da li zaista želite da obrišete sve poruke u fascilli?';
-$messages['formincomplete'] = 'Forma nije u celosti popunjena';
-$messages['noemailwarning'] = 'Unesite validnu e-mail adresu';
-$messages['nonamewarning']  = 'Unesite ime';
-$messages['nopagesizewarning'] = 'Unesite veličinu stranice';
-$messages['norecipientwarning'] = 'Unesite primaoca / primaoce (ZA)';
-$messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li da unesete naslov?';
-$messages['nobodywarning'] = 'Da li želite da pošaljete poruku bez teksta?';
-$messages['notsentwarning'] = 'Poruka nije poslana. Da li želite da odbacite ovu poruku?';
-$messages['noldapserver'] = 'Unesite LDAP server za pretragu';
-$messages['nocontactsreturned'] = 'Nije pronađen ni jedan kontakt';
-$messages['nosearchname'] = 'Unesite ime ili e-mail adresu';
-$messages['searchsuccessful'] = 'Broj pronađenih poruka: $nr';
-$messages['searchnomatch'] = 'Tražena fraza nije pronađena ni u jednoj poruci';
-$messages['searching'] = 'Pretraga u toku...';
-$messages['checking'] = 'Provera u toku...';
-$messages['nospellerrors'] = 'Nije pronađena ni jedna pravopisna greška';
-$messages['folderdeleted'] = 'Fascikla uspešno obrisana';
-
-?>
-\ No newline at end of file
diff --git a/program/localization/se/labels.inc b/program/localization/sv_SE/labels.inc
index b8152d659..b8152d659 100644
--- a/program/localization/se/labels.inc
+++ b/program/localization/sv_SE/labels.inc
diff --git a/program/localization/se/messages.inc b/program/localization/sv_SE/messages.inc
index deeaa071a..deeaa071a 100644
--- a/program/localization/se/messages.inc
+++ b/program/localization/sv_SE/messages.inc
diff --git a/program/localization/tr/labels.inc b/program/localization/tr_TR/labels.inc
index 2dddc75b3..2dddc75b3 100644
--- a/program/localization/tr/labels.inc
+++ b/program/localization/tr_TR/labels.inc
diff --git a/program/localization/tr/messages.inc b/program/localization/tr_TR/messages.inc
index 0b2cb3094..0b2cb3094 100644
--- a/program/localization/tr/messages.inc
+++ b/program/localization/tr_TR/messages.inc
diff --git a/program/localization/uk/labels.inc b/program/localization/uk_UA/labels.inc
index 826993489..826993489 100644
--- a/program/localization/uk/labels.inc
+++ b/program/localization/uk_UA/labels.inc
diff --git a/program/localization/uk/messages.inc b/program/localization/uk_UA/messages.inc
index 6abef0458..6abef0458 100644
--- a/program/localization/uk/messages.inc
+++ b/program/localization/uk_UA/messages.inc
diff --git a/program/localization/vn/labels.inc b/program/localization/vi_VN/labels.inc
index e4335ecc2..e4335ecc2 100644
--- a/program/localization/vn/labels.inc
+++ b/program/localization/vi_VN/labels.inc
diff --git a/program/localization/vn/messages.inc b/program/localization/vi_VN/messages.inc
index 9cf2fdb2e..9cf2fdb2e 100644
--- a/program/localization/vn/messages.inc
+++ b/program/localization/vi_VN/messages.inc