From 7e34e4c5b5dac037435d0fc2c6db1f71199006e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 15 Nov 2014 04:03:58 -0500
Subject: [PATCH] Merge branch 'release-1.0' of github.com:roundcube/roundcubemail into release-1.0

---
 plugins/zipdownload/localization/km_KH.inc |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/plugins/zipdownload/localization/km_KH.inc b/plugins/zipdownload/localization/km_KH.inc
index 0ada98d..9bf5721 100644
--- a/plugins/zipdownload/localization/km_KH.inc
+++ b/plugins/zipdownload/localization/km_KH.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2012-2014, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,5 +16,3 @@
  For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 $labels['downloadall'] = 'ទាញយកឯកសារភ្ជាប់ទាំងអស់';
-$labels['downloadfolder'] = 'ទាញយកថតឯកសារ';
-?>
\ No newline at end of file

--
Gitblit v1.9.1