From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

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

diff --git a/program/localization/index.inc b/program/localization/index.inc
index fe0d322..bfb770c 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -18,9 +18,6 @@
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
-
- $Id$
-
 */
 
 // langage codes according to ISO 639-1
@@ -100,6 +97,7 @@
   'uk_UA' => 'Ukrainian (Українська)',
   'vi_VN' => 'Vietnamese (Tiếng Việt)',
   'cy_GB' => 'Welsh (Cymraeg)',
+  'fy_NL' => 'West Frisian (Frysk)',
 );
 
 $rcube_language_aliases = array(
@@ -139,6 +137,8 @@
   'no' => 'nn_NO',
   'ms' => 'ms_MY',
   'mr' => 'mr_IN',
+  'ml' => 'ml_IN',
+  'ml_ML' => 'ml_IN',
   'pl' => 'pl_PL',
   'tw' => 'zh_TW',
   'si' => 'si_LK',

--
Gitblit v1.9.1