From ced34cb15e095836767971aa4d27b141fb1d7ec9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 18 Oct 2014 08:47:54 -0400
Subject: [PATCH] Merge pull request #230 from bytesatwork-xx/master

---
 program/localization/index.inc |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/program/localization/index.inc b/program/localization/index.inc
index 4b848dc..38edb73 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -5,7 +5,7 @@
  | program/localization/index.inc                                        |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -26,7 +26,8 @@
 
 $rcube_languages = array(
   'sq_AL' => 'Albanian (Shqip)',
-  'ar_SA' => 'Arabic (العربية)',
+  'ar'    => 'Arabic (العربية)',
+  'ar_SA' => 'Arabic (Saudi Arabia)',
   'hy_AM' => 'Armenian (Հայերեն)',
   'ast'	  => 'Asturiana (Asturianu)',
   'az_AZ' => 'Azerbaijani (Azərbaycanca)',
@@ -46,10 +47,12 @@
   'de_DE' => 'German (Deutsch)',
   'de_CH' => 'German (Schweiz)',
   'nl_NL' => 'Dutch (Nederlands)',
+  'en_CA' => 'English (Canada)',
   'en_GB' => 'English (GB)',
   'en_US' => 'English (US)',
   'eo'    => 'Esperanto',
   'et_EE' => 'Estonian (Eesti)',
+  'fo_FO' => 'Faroese (Føroyskt)',
   'fi_FI' => 'Finnish (Suomi)',
   'nl_BE' => 'Flemish (Vlaams)',
   'fr_FR' => 'French (Français)',
@@ -66,6 +69,7 @@
   'it_IT' => 'Italian (Italiano)',
   'ja_JP' => 'Japanese (日本語)',
   'km_KH' => 'Khmer (ភាសាខ្មែរ)',
+  'kn_IN' => 'Konkani (कोंकणी)',
   'ko_KR' => 'Korean (한국어)',
   'ku'    => 'Kurdish (Kurmancî)',
   'lv_LV' => 'Latvian (Latviešu)',
@@ -91,11 +95,14 @@
   'sl_SI' => 'Slovenian (Slovenščina)',
   'es_AR' => 'Spanish (Argentina)',
   'es_ES' => 'Spanish (Español)',
+  'es_419' => 'Spanish (Latin America)',
   'sv_SE' => 'Swedish (Svenska)',
   'ta_IN' => 'Tamil (தமிழ்)',
+  'ti'    => 'Tigrinya (ትግርኛ)',
   'th_TH' => 'Thai (ไทย)',
   'tr_TR' => 'Turkish (Türkçe)',
   'uk_UA' => 'Ukrainian (Українська)',
+  'ur_PK' => 'Urdu (اُردو)',
   'vi_VN' => 'Vietnamese (Tiếng Việt)',
   'cy_GB' => 'Welsh (Cymraeg)',
   'fy_NL' => 'West Frisian (Frysk)',
@@ -103,7 +110,6 @@
 
 $rcube_language_aliases = array(
   'am' => 'hy_AM',
-  'ar' => 'ar_SA',
   'az' => 'az_AZ',
   'bg' => 'bg_BG',
   'bs' => 'bs_BA',
@@ -133,6 +139,7 @@
   'kr' => 'ko_KR',
   'kh' => 'km_KH',
   'kh_KH' => 'km_KH',
+  'kn' => 'kn_IN',
   'km' => 'km_KH',
   'lb' => 'lb_LU',
   'ne' => 'ne_NP',

--
Gitblit v1.9.1