Merge branch 'master' of https://github.com/roundcube/roundcubemail

42 files changed, 577 insertions, 197 deletions

diff --git a/plugins/zipdownload/localization/az_AZ.inc b/plugins/zipdownload/localization/az_AZ.inc
index 215e4591b..e23eaa1f6 100644
--- a/plugins/zipdownload/localization/az_AZ.inc
+++ b/plugins/zipdownload/localization/az_AZ.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Bütün qoşmaları endir';
 $labels['downloadfolder'] = 'Qovluğu endir';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/br.inc b/plugins/zipdownload/localization/br.inc
new file mode 100644
index 000000000..6e6cdb342
--- /dev/null
+++ b/plugins/zipdownload/localization/br.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+
+$labels = array();
+$labels['downloadall'] = 'Pellgargañ an holl stagadennoù';
+$labels['downloadfolder'] = 'Pellgargañ an teuliad';
+
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/bs_BA.inc b/plugins/zipdownload/localization/bs_BA.inc
index cf7c96346..8c727987d 100644
--- a/plugins/zipdownload/localization/bs_BA.inc
+++ b/plugins/zipdownload/localization/bs_BA.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Preuzmi sve priloge';
 $labels['downloadfolder'] = 'Preuzmi folder';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ca_ES.inc b/plugins/zipdownload/localization/ca_ES.inc
index 8ccf0543c..423dae2fd 100644
--- a/plugins/zipdownload/localization/ca_ES.inc
+++ b/plugins/zipdownload/localization/ca_ES.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Drakon */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descarregar tots els adjunts';
 $labels['downloadfolder'] = 'Descarregar carpeta';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/cs_CZ.inc b/plugins/zipdownload/localization/cs_CZ.inc
index 4a1f75177..07f9676ac 100644
--- a/plugins/zipdownload/localization/cs_CZ.inc
+++ b/plugins/zipdownload/localization/cs_CZ.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Tomáš Šafařík */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Stáhnout všechny přílohy';
 $labels['downloadfolder'] = 'Stáhnout složku';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/cy_GB.inc b/plugins/zipdownload/localization/cy_GB.inc
index c3b846de4..412fd2261 100644
--- a/plugins/zipdownload/localization/cy_GB.inc
+++ b/plugins/zipdownload/localization/cy_GB.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Llwytho lawr holl atodiadau';
 $labels['downloadfolder'] = 'Ffolder llwytho lawr';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/da_DK.inc b/plugins/zipdownload/localization/da_DK.inc
index 17c7c0d82..ced645ab2 100644
--- a/plugins/zipdownload/localization/da_DK.inc
+++ b/plugins/zipdownload/localization/da_DK.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: John Loft Christiansen */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Download alle som .zip-fil';
 $labels['downloadfolder'] = 'Download folder som .zip-fil';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/de_CH.inc b/plugins/zipdownload/localization/de_CH.inc
index 68725605b..6106c2c72 100644
--- a/plugins/zipdownload/localization/de_CH.inc
+++ b/plugins/zipdownload/localization/de_CH.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: jedix */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
 $labels['downloadfolder'] = 'Ordner herunterladen';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/de_DE.inc b/plugins/zipdownload/localization/de_DE.inc
index 68725605b..6106c2c72 100644
--- a/plugins/zipdownload/localization/de_DE.inc
+++ b/plugins/zipdownload/localization/de_DE.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: jedix */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
 $labels['downloadfolder'] = 'Ordner herunterladen';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/en_GB.inc b/plugins/zipdownload/localization/en_GB.inc
index 0db6f8f8c..aee8a5e15 100644
--- a/plugins/zipdownload/localization/en_GB.inc
+++ b/plugins/zipdownload/localization/en_GB.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Philip Weir */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Download all attachments';
 $labels['downloadfolder'] = 'Download folder';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/en_US.inc b/plugins/zipdownload/localization/en_US.inc
index 0db6f8f8c..aee8a5e15 100644
--- a/plugins/zipdownload/localization/en_US.inc
+++ b/plugins/zipdownload/localization/en_US.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Philip Weir */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Download all attachments';
 $labels['downloadfolder'] = 'Download folder';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_AR.inc b/plugins/zipdownload/localization/es_AR.inc
index f3a798c85..6240e3bce 100644
--- a/plugins/zipdownload/localization/es_AR.inc
+++ b/plugins/zipdownload/localization/es_AR.inc
@@ -1,9 +1,23 @@
 <?php
-/* Author: gboksar */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descargar Todo';
-
-$messages = array();
+$labels['downloadfolder'] = 'Descargar carpeta';
 
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_ES.inc b/plugins/zipdownload/localization/es_ES.inc
index 193f7b450..315362f1c 100644
--- a/plugins/zipdownload/localization/es_ES.inc
+++ b/plugins/zipdownload/localization/es_ES.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: David Garabana Barro */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descargar todos los adjuntos';
 $labels['downloadfolder'] = 'Descargar carpeta';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/et_EE.inc b/plugins/zipdownload/localization/et_EE.inc
index f56a59870..6f03e33c0 100644
--- a/plugins/zipdownload/localization/et_EE.inc
+++ b/plugins/zipdownload/localization/et_EE.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Laadi alla kõik manused';
 $labels['downloadfolder'] = 'Allalaadimiste kaust';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fa_IR.inc b/plugins/zipdownload/localization/fa_IR.inc
index 3ad7c2bd2..41585688e 100644
--- a/plugins/zipdownload/localization/fa_IR.inc
+++ b/plugins/zipdownload/localization/fa_IR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'بارگیری همه پیوست‌ها';
 $labels['downloadfolder'] = 'بارگیری پوشه';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fr_FR.inc b/plugins/zipdownload/localization/fr_FR.inc
index b8fc4cdaa..307f0b2f6 100644
--- a/plugins/zipdownload/localization/fr_FR.inc
+++ b/plugins/zipdownload/localization/fr_FR.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Olivier Le Brouster */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Télécharger toutes les pièces jointes';
 $labels['downloadfolder'] = 'Télécharger le répertoire';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/gl_ES.inc b/plugins/zipdownload/localization/gl_ES.inc
index 2c9107949..3925fca5b 100644
--- a/plugins/zipdownload/localization/gl_ES.inc
+++ b/plugins/zipdownload/localization/gl_ES.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: David Garabana Barro */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descargar tódolos adxuntos';
 $labels['downloadfolder'] = 'Descargar o cartafol';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/he_IL.inc b/plugins/zipdownload/localization/he_IL.inc
index 62e82e754..0ba0fcff8 100644
--- a/plugins/zipdownload/localization/he_IL.inc
+++ b/plugins/zipdownload/localization/he_IL.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'להוריד את כל הצרופות';
 $labels['downloadfolder'] = 'תיקיית צרופות';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/hu_HU.inc b/plugins/zipdownload/localization/hu_HU.inc
index 1931cb0f2..7b8ce85dc 100644
--- a/plugins/zipdownload/localization/hu_HU.inc
+++ b/plugins/zipdownload/localization/hu_HU.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Németh János */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Összes csatolmány letöltése';
 $labels['downloadfolder'] = 'Könyvtár letöltése';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/it_IT.inc b/plugins/zipdownload/localization/it_IT.inc
index 63b7b072e..4ea8a543d 100644
--- a/plugins/zipdownload/localization/it_IT.inc
+++ b/plugins/zipdownload/localization/it_IT.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Roberto Puzzanghera */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Scarica tutti gli allegati';
 $labels['downloadfolder'] = 'Scarica cartella';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ja_JP.inc b/plugins/zipdownload/localization/ja_JP.inc
index 97a436f90..c606658b4 100644
--- a/plugins/zipdownload/localization/ja_JP.inc
+++ b/plugins/zipdownload/localization/ja_JP.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'すべての添付ファイルをダウンロード';
 $labels['downloadfolder'] = 'ダウンロード先のフォルダー';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/km_KH.inc b/plugins/zipdownload/localization/km_KH.inc
index 0fcf8e147..722e0c8ce 100644
--- a/plugins/zipdownload/localization/km_KH.inc
+++ b/plugins/zipdownload/localization/km_KH.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'ទាញយក ឯកសារភ្ជាប់ទាំងអស់';
 $labels['downloadfolder'] = 'ទាញយក ថតឯកសារ';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/lt_LT.inc b/plugins/zipdownload/localization/lt_LT.inc
index 1b74df371..08a5818cd 100644
--- a/plugins/zipdownload/localization/lt_LT.inc
+++ b/plugins/zipdownload/localization/lt_LT.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Linvydas Lapinskas <win0lin1@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Atsisiųsti visus priedus';
 $labels['downloadfolder'] = 'Atsisiųsti aplanką';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nb_NB.inc b/plugins/zipdownload/localization/nb_NB.inc
deleted file mode 100644
index d8f548044..000000000
--- a/plugins/zipdownload/localization/nb_NB.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Martin Bore                                                   |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['downloadall'] = 'Last ned alle vedlegg';
-$labels['downloadfolder'] = 'Nedlastningsmappe';
-
diff --git a/plugins/zipdownload/localization/nb_NO.inc b/plugins/zipdownload/localization/nb_NO.inc
new file mode 100644
index 000000000..637df9063
--- /dev/null
+++ b/plugins/zipdownload/localization/nb_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+
+$labels = array();
+$labels['downloadall'] = 'Last ned alle vedlegg';
+$labels['downloadfolder'] = 'Nedlastningsmappe';
+
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nl_NL.inc b/plugins/zipdownload/localization/nl_NL.inc
index 1cf32ce12..174dd0f8d 100644
--- a/plugins/zipdownload/localization/nl_NL.inc
+++ b/plugins/zipdownload/localization/nl_NL.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Wouter Kevenaar*/
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Alle bijlagen downloaden';
 $labels['downloadfolder'] = 'Map downloaden';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nn_NO.inc b/plugins/zipdownload/localization/nn_NO.inc
new file mode 100644
index 000000000..637df9063
--- /dev/null
+++ b/plugins/zipdownload/localization/nn_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+
+$labels = array();
+$labels['downloadall'] = 'Last ned alle vedlegg';
+$labels['downloadfolder'] = 'Nedlastningsmappe';
+
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pl_PL.inc b/plugins/zipdownload/localization/pl_PL.inc
index c86d87558..b0880c062 100644
--- a/plugins/zipdownload/localization/pl_PL.inc
+++ b/plugins/zipdownload/localization/pl_PL.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: DZIOBAK */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Pobierz wszystkie jako ZIP';
 $labels['downloadfolder'] = 'Pobierz folder';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pt_BR.inc b/plugins/zipdownload/localization/pt_BR.inc
index babf7c0e9..7f80777b4 100644
--- a/plugins/zipdownload/localization/pt_BR.inc
+++ b/plugins/zipdownload/localization/pt_BR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edir Pereira dos Santos <fennder@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Baixar todos os anexos';
 $labels['downloadfolder'] = 'Pasta de baixar arquivos';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pt_PT.inc b/plugins/zipdownload/localization/pt_PT.inc
index fb012bada..8a5afeb06 100644
--- a/plugins/zipdownload/localization/pt_PT.inc
+++ b/plugins/zipdownload/localization/pt_PT.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Guardar todos os anexos';
 $labels['downloadfolder'] = 'Guardar pasta';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ro_RO.inc b/plugins/zipdownload/localization/ro_RO.inc
index 3a2a1ac19..7cba54d32 100644
--- a/plugins/zipdownload/localization/ro_RO.inc
+++ b/plugins/zipdownload/localization/ro_RO.inc
@@ -1,9 +1,23 @@
 <?php
-/* Author: Ovidiu Bica */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descarca toate atasamentele.';
-
-$messages = array();
+$labels['downloadfolder'] = 'Dosar de descărcare';
 
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ru_RU.inc b/plugins/zipdownload/localization/ru_RU.inc
index ac11327a0..014b2001e 100644
--- a/plugins/zipdownload/localization/ru_RU.inc
+++ b/plugins/zipdownload/localization/ru_RU.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Peter Zotov */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Загрузить все вложения';
 $labels['downloadfolder'] = 'Загрузить каталог';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sk_SK.inc b/plugins/zipdownload/localization/sk_SK.inc
index b12318c54..b26059cb9 100644
--- a/plugins/zipdownload/localization/sk_SK.inc
+++ b/plugins/zipdownload/localization/sk_SK.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Stiahnuť všetky prílohy';
 $labels['downloadfolder'] = 'Priečinok na sťahovanie';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sr_CS.inc b/plugins/zipdownload/localization/sr_CS.inc
new file mode 100644
index 000000000..b8d63b3f5
--- /dev/null
+++ b/plugins/zipdownload/localization/sr_CS.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
+
+$labels = array();
+$labels['downloadall'] = 'Преузми све прилоге';
+$labels['downloadfolder'] = 'Фасцикла за преузимање';
+
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sv_SE.inc b/plugins/zipdownload/localization/sv_SE.inc
index 020daeed6..db8a1a368 100644
--- a/plugins/zipdownload/localization/sv_SE.inc
+++ b/plugins/zipdownload/localization/sv_SE.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Hämta alla bifogade filer';
 $labels['downloadfolder'] = 'Hämta katalog';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/tr_TR.inc b/plugins/zipdownload/localization/tr_TR.inc
index dc7489da1..bfdf98a6c 100644
--- a/plugins/zipdownload/localization/tr_TR.inc
+++ b/plugins/zipdownload/localization/tr_TR.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Mustafa Icer */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Tüm ek dosyaları indir';
 $labels['downloadfolder'] = 'klasörü indir';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/vi_VN.inc b/plugins/zipdownload/localization/vi_VN.inc
index 919c40396..a91b32010 100644
--- a/plugins/zipdownload/localization/vi_VN.inc
+++ b/plugins/zipdownload/localization/vi_VN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Tải tất cả đính kèm về';
 $labels['downloadfolder'] = 'Tải giữ liệu về';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/zh_CN.inc b/plugins/zipdownload/localization/zh_CN.inc
deleted file mode 100644
index a4c9a2ce2..000000000
--- a/plugins/zipdownload/localization/zh_CN.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: FULL NAME <EMAIL@ADDRESS>                                     |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-
diff --git a/plugins/zipdownload/localization/zh_TW.inc b/plugins/zipdownload/localization/zh_TW.inc
index 8f5ae363a..cc8d673a1 100644
--- a/plugins/zipdownload/localization/zh_TW.inc
+++ b/plugins/zipdownload/localization/zh_TW.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = '下載所有附件';
 $labels['downloadfolder'] = '下載資料夾';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/skins/larry/zipdownload.css b/plugins/zipdownload/skins/larry/zipdownload.css
index d719ac677..bb92631b1 100644
--- a/plugins/zipdownload/skins/larry/zipdownload.css
+++ b/plugins/zipdownload/skins/larry/zipdownload.css
@@ -2,6 +2,6 @@
 
 a.zipdownload {
 	display: inline-block;
-	margin-top: 1.5em;
+	margin-top: .5em;
 	padding: 3px 5px 4px 5px;
-}
\ No newline at end of file
+}
diff --git a/plugins/zipdownload/tests/Zipdownload.php b/plugins/zipdownload/tests/Zipdownload.php
new file mode 100644
index 000000000..f3b4e1b35
--- /dev/null
+++ b/plugins/zipdownload/tests/Zipdownload.php
@@ -0,0 +1,23 @@
+<?php
+
+class Zipdownload_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../zipdownload.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new zipdownload($rcube->api);
+
+        $this->assertInstanceOf('zipdownload', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 8bad9b341..7e132bfbb 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/plugins/zipdownload/zipdownload.php
@@ -30,9 +30,9 @@ class zipdownload extends rcube_plugin
 		}
 
 		$rcmail = rcmail::get_instance();
-		$this->charset = $rcmail->config->get('zipdownload_charset', RCMAIL_CHARSET);
 
 		$this->load_config();
+		$this->charset = $rcmail->config->get('zipdownload_charset', RCUBE_CHARSET);
 		$this->add_texts('localization');
 
 		if ($rcmail->config->get('zipdownload_attachments', 1) > -1 && ($rcmail->action == 'show' || $rcmail->action == 'preview'))
@@ -62,11 +62,14 @@ class zipdownload extends rcube_plugin
 
 		// only show the link if there is more than the configured number of attachments
 		if (substr_count($p['content'], '<li') > $rcmail->config->get('zipdownload_attachments', 1)) {
-			$link = html::a(array(
-				'href' => rcmail_url('plugin.zipdownload.zip_attachments', array('_mbox' => $rcmail->output->env['mailbox'], '_uid' => $rcmail->output->env['uid'])),
-				'class' => 'button zipdownload',
-				),
-				Q($this->gettext('downloadall'))
+		    $href = $rcmail->url(array(
+		        '_action' => 'plugin.zipdownload.zip_attachments',
+		        '_mbox'   => $rcmail->output->env['mailbox'],
+		        '_uid'    => $rcmail->output->env['uid'],
+		    ));
+
+			$link = html::a(array('href' => $href, 'class' => 'button zipdownload'),
+				rcube::Q($this->gettext('downloadall'))
 			);
 
 			// append link to attachments list, slightly different in some skins
@@ -96,7 +99,7 @@ class zipdownload extends rcube_plugin
 		$temp_dir = $rcmail->config->get('temp_dir');
 		$tmpfname = tempnam($temp_dir, 'zipdownload');
 		$tempfiles = array($tmpfname);
-		$message = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
+		$message = new rcube_message(rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET));
 
 		// open zip file
 		$zip = new ZipArchive();
@@ -140,7 +143,7 @@ class zipdownload extends rcube_plugin
 	public function download_selection()
 	{
 		if (isset($_REQUEST['_uid'])) {
-			$uids = explode(",", get_input_value('_uid', RCUBE_INPUT_GPC));
+			$uids = explode(",", rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC));
 
 			if (sizeof($uids) > 0)
 				$this->_download_messages($uids);
@@ -157,7 +160,7 @@ class zipdownload extends rcube_plugin
 
 		// initialize searching result if search_filter is used
 		if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
-			$imap->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET);
+			$imap->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET);
 		}
 
 		// fetch message headers for all pages
@@ -208,7 +211,7 @@ class zipdownload extends rcube_plugin
 				$disp_name = "message_rfc822.eml";
 
 			$disp_name = $uid . "_" . $disp_name;
-			
+
 			$tmpfn = tempnam($temp_dir, 'zipmessage');
 			$tmpfp = fopen($tmpfn, 'w');
 			$imap->get_raw_body($uid, $tmpfp);
@@ -234,7 +237,9 @@ class zipdownload extends rcube_plugin
 	private function _deliver_zipfile($tmpfname, $filename)
 	{
 		$browser = new rcube_browser;
-		send_nocacheing_headers();
+		$rcmail  = rcmail::get_instance();
+
+		$rcmail->output->nocacheing_headers();
 
 		if ($browser->ie && $browser->ver < 7)
 			$filename = rawurlencode(abbreviate_string($filename, 55));
@@ -258,10 +263,10 @@ class zipdownload extends rcube_plugin
 	/**
 	 * Helper function to convert filenames to the configured charset
 	 */
-	private function _convert_filename($str, $from = RCMAIL_CHARSET)
+	private function _convert_filename($str, $from = RCUBE_CHARSET)
 	{
-		return strtr(rcube_charset_convert($str, $from, $this->charset), array(':'=>'', '/'=>'-'));
+        $str = rcube_charset::convert($str, $from == '' ? RCUBE_CHARSET : $from, $this->charset);
+
+		return strtr($str, array(':'=>'', '/'=>'-'));
 	}
 }
-
-?>
\ No newline at end of file