diff options
75 files changed, 695 insertions, 289 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Feature to export only selected contacts from addressbook (by Phil Weir) - Force autocommit mode in mysql database driver (#1488902) RELEASE 0.9-beta @@ -4,7 +4,7 @@ | Roundcube Webmail IMAP Client | | Version 0.9-git | | | - | Copyright (C) 2005-2012, The Roundcube Dev Team | + | Copyright (C) 2005-2013, The Roundcube Dev Team | | | | This program is free software: you can redistribute it and/or modify | | it under the terms of the GNU General Public License (with exceptions | diff --git a/installer/check.php b/installer/check.php index 886200b84..14fc4f06e 100644 --- a/installer/check.php +++ b/installer/check.php @@ -1,3 +1,10 @@ +<?php + +if (!class_exists('rcube_install') || !is_object($RCI)) { + die("Not allowed! Please open installer/index.php instead."); +} + +?> <form action="index.php" method="get"> <?php diff --git a/installer/config.php b/installer/config.php index 6897ffbba..d6846edc7 100644 --- a/installer/config.php +++ b/installer/config.php @@ -1,3 +1,10 @@ +<?php + +if (!class_exists('rcube_install') || !is_object($RCI)) { + die("Not allowed! Please open installer/index.php instead."); +} + +?> <form action="index.php" method="post"> <input type="hidden" name="_step" value="2" /> <?php diff --git a/installer/rcube_install.php b/installer/rcube_install.php index a800dfdbe..33fd4c675 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -260,6 +260,11 @@ class rcube_install } } + // the old default mime_magic reference is obsolete + if ($this->config['mime_magic'] == '/usr/share/misc/magic') { + $out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default"); + } + // iterate over default config foreach ($defaults as $prop => $value) { if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop]))) diff --git a/installer/test.php b/installer/test.php index 2cd9b5374..bd49ac523 100644 --- a/installer/test.php +++ b/installer/test.php @@ -1,3 +1,10 @@ +<?php + +if (!class_exists('rcube_install') || !is_object($RCI)) { + die("Not allowed! Please open installer/index.php instead."); +} + +?> <form action="index.php?_step=3" method="post"> <h3>Check config files</h3> diff --git a/plugins/markasjunk/localization/az_AZ.inc b/plugins/markasjunk/localization/az_AZ.inc index dedc58f1d..77da3f76b 100644 --- a/plugins/markasjunk/localization/az_AZ.inc +++ b/plugins/markasjunk/localization/az_AZ.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/az_AZ/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Spam qovluğuna köçür'; $labels['reportedasjunk'] = 'Spam qovluğuna köçürüldü'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/be_BE.inc b/plugins/markasjunk/localization/be_BE.inc index e415040a1..5553f6475 100644 --- a/plugins/markasjunk/localization/be_BE.inc +++ b/plugins/markasjunk/localization/be_BE.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/be_BE/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Alex Nehaichik <nab@mail.by> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Пазначыць як спам'; $labels['reportedasjunk'] = 'Паспяхова пазначаны як спам'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/br.inc b/plugins/markasjunk/localization/br.inc index b66806cff..6dd835d3e 100644 --- a/plugins/markasjunk/localization/br.inc +++ b/plugins/markasjunk/localization/br.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/br/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Denis | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Lastez'; $labels['buttontitle'] = 'Merkañ evel lastez'; $labels['reportedasjunk'] = 'Danevellet evel lastez gant berzh'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/bs_BA.inc b/plugins/markasjunk/localization/bs_BA.inc index 81c9b1bca..ffcf861e5 100644 --- a/plugins/markasjunk/localization/bs_BA.inc +++ b/plugins/markasjunk/localization/bs_BA.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/bs_BA/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Označi kao spam'; $labels['reportedasjunk'] = 'Uspješno označeno kao spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ca_ES.inc b/plugins/markasjunk/localization/ca_ES.inc index 16a5e3e3c..c798a3adc 100644 --- a/plugins/markasjunk/localization/ca_ES.inc +++ b/plugins/markasjunk/localization/ca_ES.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/ca_ES/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Jordi Sanfeliu <jordi@fibranet.cat> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Correu brossa'; $labels['buttontitle'] = 'Marca com a Spam'; $labels['reportedasjunk'] = 'S\'ha reportat correctament com a Spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/cs_CZ.inc b/plugins/markasjunk/localization/cs_CZ.inc index c353b2e1c..a6aec56be 100644 --- a/plugins/markasjunk/localization/cs_CZ.inc +++ b/plugins/markasjunk/localization/cs_CZ.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/cs_CZ/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Tomáš Kyzlink | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Označit jako Spam'; $labels['reportedasjunk'] = 'Úspěšně nahlášeno jako Spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/cy_GB.inc b/plugins/markasjunk/localization/cy_GB.inc index cc9a07058..8d31383bc 100644 --- a/plugins/markasjunk/localization/cy_GB.inc +++ b/plugins/markasjunk/localization/cy_GB.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/cy_GB/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Sothach'; $labels['buttontitle'] = 'Nodi fel Sbwriel'; $labels['reportedasjunk'] = 'Adroddwyd yn llwyddiannus fel Sbwriel'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/da_DK.inc b/plugins/markasjunk/localization/da_DK.inc index e50016e5f..1e1ca4d66 100644 --- a/plugins/markasjunk/localization/da_DK.inc +++ b/plugins/markasjunk/localization/da_DK.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/da_DK/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Johannes Hessellund <osos@openeyes.dk> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Marker som spam mail'; $labels['reportedasjunk'] = 'Successfuldt rapporteret som spam mail'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/de_DE.inc b/plugins/markasjunk/localization/de_DE.inc index 2455911fa..fe2706bc6 100644 --- a/plugins/markasjunk/localization/de_DE.inc +++ b/plugins/markasjunk/localization/de_DE.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/de_DE/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Thomas | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'als SPAM markieren'; $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/el_GR.inc b/plugins/markasjunk/localization/el_GR.inc index e86d2ec05..044b453ff 100644 --- a/plugins/markasjunk/localization/el_GR.inc +++ b/plugins/markasjunk/localization/el_GR.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/el_GR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Nikos Keramidis <info@torus.gr> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Σήμανση ως Ανεπιθύμητου'; $labels['reportedasjunk'] = 'Αναφέρθηκε ως Ανεπιθήμητο'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/en_GB.inc b/plugins/markasjunk/localization/en_GB.inc index 0ecbf7aec..0cc212f22 100644 --- a/plugins/markasjunk/localization/en_GB.inc +++ b/plugins/markasjunk/localization/en_GB.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/en_GB/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Christian Foellmann <foellmann@foe-services.de> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Mark as Junk'; $labels['reportedasjunk'] = 'Successfully reported as Junk'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/eo.inc b/plugins/markasjunk/localization/eo.inc index 0d90ee87c..0610e00fd 100644 --- a/plugins/markasjunk/localization/eo.inc +++ b/plugins/markasjunk/localization/eo.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/eo/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Michael Moroni <michael.moroni@mailoo.org> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Rubaĵo'; $labels['buttontitle'] = 'Marki kiel rubaĵo'; $labels['reportedasjunk'] = 'Sukcese raportita kiel rubaĵo'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/es_AR.inc b/plugins/markasjunk/localization/es_AR.inc index fd24564e9..9c293f750 100644 --- a/plugins/markasjunk/localization/es_AR.inc +++ b/plugins/markasjunk/localization/es_AR.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/es_AR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Thomas <Unknown> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Correo no deseado'; $labels['buttontitle'] = 'Marcar como SPAM'; $labels['reportedasjunk'] = 'Mensaje reportado como SPAM'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/es_ES.inc b/plugins/markasjunk/localization/es_ES.inc index d018513ce..23eb5e523 100644 --- a/plugins/markasjunk/localization/es_ES.inc +++ b/plugins/markasjunk/localization/es_ES.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/es_ES/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: pompilos <ciordia@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'SPAM'; $labels['buttontitle'] = 'Marcar como SPAM'; $labels['reportedasjunk'] = 'Mensaje informado como SPAM'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/et_EE.inc b/plugins/markasjunk/localization/et_EE.inc index d9b28918d..92c9d53b7 100644 --- a/plugins/markasjunk/localization/et_EE.inc +++ b/plugins/markasjunk/localization/et_EE.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/et_EE/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Rämps'; $labels['buttontitle'] = 'Märgista Rämpsuks'; $labels['reportedasjunk'] = 'Edukalt Rämpsuks märgitud'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/fa_IR.inc b/plugins/markasjunk/localization/fa_IR.inc index 72511e0f9..9d5ee06b2 100644 --- a/plugins/markasjunk/localization/fa_IR.inc +++ b/plugins/markasjunk/localization/fa_IR.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/fa_IR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'بنجل'; $labels['buttontitle'] = 'علامت گذاری به عنوان بنجل'; $labels['reportedasjunk'] = 'با موفقیت به عنوان بنجل گزارش شد'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/fi_FI.inc b/plugins/markasjunk/localization/fi_FI.inc index 622b33915..653c9abbf 100644 --- a/plugins/markasjunk/localization/fi_FI.inc +++ b/plugins/markasjunk/localization/fi_FI.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/fi_FI/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Jiri Grönroos | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); $labels['buttontext'] = 'Roskaposti'; $labels['buttontitle'] = 'Merkitse roskapostiksi'; -$labels['reportedasjunk'] = 'Ilmoitettu onnistuneesti roskapostista'; +$labels['reportedasjunk'] = 'Roskapostista on ilmoitettu onnistuneesti'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/fr_FR.inc b/plugins/markasjunk/localization/fr_FR.inc index e310c541a..0691099c4 100644 --- a/plugins/markasjunk/localization/fr_FR.inc +++ b/plugins/markasjunk/localization/fr_FR.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/fr_FR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Nicolas Delvaux | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Indésirables'; $labels['buttontitle'] = 'Marquer comme indésirable'; $labels['reportedasjunk'] = 'Notification de message indésirable envoyée'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/gl_ES.inc b/plugins/markasjunk/localization/gl_ES.inc index ce70e78e8..2d1c4ac13 100644 --- a/plugins/markasjunk/localization/gl_ES.inc +++ b/plugins/markasjunk/localization/gl_ES.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/gl_ES/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Thomas <Unknown> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Marcar como correo lixo'; $labels['reportedasjunk'] = 'Mensaxe marcada como correo lixo'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/he_IL.inc b/plugins/markasjunk/localization/he_IL.inc index 0dbc31520..a3d503a37 100644 --- a/plugins/markasjunk/localization/he_IL.inc +++ b/plugins/markasjunk/localization/he_IL.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/he_IL/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'זבל'; $labels['buttontitle'] = 'סמן כדואר זבל'; $labels['reportedasjunk'] = 'דואר הזבל דווח בהצלחה'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/hr_HR.inc b/plugins/markasjunk/localization/hr_HR.inc index 8e0a6b27f..e007a6738 100644 --- a/plugins/markasjunk/localization/hr_HR.inc +++ b/plugins/markasjunk/localization/hr_HR.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/hr_HR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Svebor Prstačić <svebor.prstacic@gmail.com> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Označi kao smeće (spam)'; $labels['reportedasjunk'] = 'Uspješno prijavljeno kao smeće (spam)'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/hu_HU.inc b/plugins/markasjunk/localization/hu_HU.inc index a96f88f7a..41af99a0f 100644 --- a/plugins/markasjunk/localization/hu_HU.inc +++ b/plugins/markasjunk/localization/hu_HU.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/hu_HU/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Németh András <narzym@hotmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Levélszemét'; $labels['buttontitle'] = 'Szemétnek jelölés'; $labels['reportedasjunk'] = 'Sikeresen szemétnek jelentve'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/hy_AM.inc b/plugins/markasjunk/localization/hy_AM.inc index b30707ef0..e2b625f11 100644 --- a/plugins/markasjunk/localization/hy_AM.inc +++ b/plugins/markasjunk/localization/hy_AM.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/hy_AM/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Vahan Yerkanian <vahan@yerkanian.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Թափոն'; $labels['buttontitle'] = 'Նշել որպես Թափոն'; $labels['reportedasjunk'] = 'Բարեհաջող հաղորդվեց որպես Թափոն'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/id_ID.inc b/plugins/markasjunk/localization/id_ID.inc index 4389c3354..2f4dc3664 100644 --- a/plugins/markasjunk/localization/id_ID.inc +++ b/plugins/markasjunk/localization/id_ID.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/id_ID/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Putu Arya Sabda Wijaya <Unknown> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Tandai sebagai sampah'; $labels['reportedasjunk'] = 'Berhasil dilaporkan sebagai sampah'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/it_IT.inc b/plugins/markasjunk/localization/it_IT.inc index 3c26a10d0..a7eb367e6 100644 --- a/plugins/markasjunk/localization/it_IT.inc +++ b/plugins/markasjunk/localization/it_IT.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/it_IT/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Andrea Bernini <andrea.bernini@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Marca come Spam'; $labels['reportedasjunk'] = 'Messaggio marcato come Spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ja_JP.inc b/plugins/markasjunk/localization/ja_JP.inc index fa17bd095..c0e1a5050 100644 --- a/plugins/markasjunk/localization/ja_JP.inc +++ b/plugins/markasjunk/localization/ja_JP.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/ja_JP/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = '迷惑メール'; $labels['buttontitle'] = '迷惑メールとして設定'; $labels['reportedasjunk'] = '迷惑メールとして報告しました。'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/km_KH.inc b/plugins/markasjunk/localization/km_KH.inc index 43b54cd9d..5ee7bf59b 100644 --- a/plugins/markasjunk/localization/km_KH.inc +++ b/plugins/markasjunk/localization/km_KH.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/km_KH/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'សំបុត្រមិនល្អ'; $labels['buttontitle'] = 'ចាត់ជា សំបុត្រមិនល្អ'; $labels['reportedasjunk'] = 'រាយការណ៏ថាជា សំបុត្រមិនល្អ បានសំរេច'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ko_KR.inc b/plugins/markasjunk/localization/ko_KR.inc index bfc38d1d5..979ac6aa9 100644 --- a/plugins/markasjunk/localization/ko_KR.inc +++ b/plugins/markasjunk/localization/ko_KR.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/ko_KR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Kim, Woohyun <woohyun.kim@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = '정크메일'; $labels['buttontitle'] = '정크메일로 표시'; $labels['reportedasjunk'] = '성공적으로, 정크메일이라 보고 됨'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ku.inc b/plugins/markasjunk/localization/ku.inc index beb7623c1..f355cc4c1 100644 --- a/plugins/markasjunk/localization/ku.inc +++ b/plugins/markasjunk/localization/ku.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/ku/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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 absalan <absalan@live.com> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'nawnişani bka ba şkaw'; $labels['reportedasjunk'] = 'ba gşti raport kra'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/lt_LT.inc b/plugins/markasjunk/localization/lt_LT.inc index bd2e0e7c8..01030e332 100644 --- a/plugins/markasjunk/localization/lt_LT.inc +++ b/plugins/markasjunk/localization/lt_LT.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/lt_LT/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Rimas Kudelis <rq@akl.lt> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Brukalas'; $labels['buttontitle'] = 'Žymėti kaip brukalą'; $labels['reportedasjunk'] = 'Sėkmingai pranešta, jog laiškas yra brukalas'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/lv_LV.inc b/plugins/markasjunk/localization/lv_LV.inc index 121b48583..46a6cffbf 100644 --- a/plugins/markasjunk/localization/lv_LV.inc +++ b/plugins/markasjunk/localization/lv_LV.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/lv_LV/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Ivars Strazdiņš <Unknown> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Iezīmēt kā mēstuli'; $labels['reportedasjunk'] = 'Sekmīgi iezīmēta kā mēstule'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ml_IN.inc b/plugins/markasjunk/localization/ml_IN.inc index 780a53d7b..d367f97fe 100644 --- a/plugins/markasjunk/localization/ml_IN.inc +++ b/plugins/markasjunk/localization/ml_IN.inc @@ -2,18 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/ml_IN/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Anish A <aneesh.nl@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തുക'; $labels['reportedasjunk'] = 'സ്പാം ആയി അടയാളപ്പെടുത്തി'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/mr_IN.inc b/plugins/markasjunk/localization/mr_IN.inc index 07e62f992..2239fe6ff 100644 --- a/plugins/markasjunk/localization/mr_IN.inc +++ b/plugins/markasjunk/localization/mr_IN.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/mr_IN/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Devendra Buddhikot <devendradb@rediffmail.com> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'नको असलेला अशी खूण करा'; $labels['reportedasjunk'] = 'नको आहे असे यशस्वीरीत्या नक्की केले'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/nb_NO.inc b/plugins/markasjunk/localization/nb_NO.inc index 7dce36cb8..57249e826 100644 --- a/plugins/markasjunk/localization/nb_NO.inc +++ b/plugins/markasjunk/localization/nb_NO.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/nb_NB/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Patrick Kvaksrud <patrick@idrettsforbundet.no> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Useriøs e-post'; $labels['buttontitle'] = 'Marker som useriøs e-post'; $labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykket'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/nl_NL.inc b/plugins/markasjunk/localization/nl_NL.inc index 1f82298ef..702bd03f6 100644 --- a/plugins/markasjunk/localization/nl_NL.inc +++ b/plugins/markasjunk/localization/nl_NL.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/nl_NL/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Geert Wirken | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Markeer als spam'; $labels['reportedasjunk'] = 'Succesvol gemarkeerd als spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/nn_NO.inc b/plugins/markasjunk/localization/nn_NO.inc index c236474ac..05401e48c 100644 --- a/plugins/markasjunk/localization/nn_NO.inc +++ b/plugins/markasjunk/localization/nn_NO.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/nn_NN/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Fredrik Larsen <fredrik.h.larsen@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Useriøs e-post'; $labels['buttontitle'] = 'Marker som useriøs e-post'; $labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykka'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/pl_PL.inc b/plugins/markasjunk/localization/pl_PL.inc index cd3520ec7..d2e644836 100644 --- a/plugins/markasjunk/localization/pl_PL.inc +++ b/plugins/markasjunk/localization/pl_PL.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/pl_PL/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Aleksander Machniak <alec@alec.pl> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Oznacz jako SPAM'; $labels['reportedasjunk'] = 'Pomyślnie oznaczono jako SPAM'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/pt_BR.inc b/plugins/markasjunk/localization/pt_BR.inc index b93bfc20a..49677e379 100644 --- a/plugins/markasjunk/localization/pt_BR.inc +++ b/plugins/markasjunk/localization/pt_BR.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/pt_BR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Victor Benincasa <vbenincasa@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Marcar como Spam'; $labels['reportedasjunk'] = 'Marcado como Spam com sucesso'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/pt_PT.inc b/plugins/markasjunk/localization/pt_PT.inc index 45c9202f8..57be7f2c4 100644 --- a/plugins/markasjunk/localization/pt_PT.inc +++ b/plugins/markasjunk/localization/pt_PT.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/pt_PT/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Lixo'; $labels['buttontitle'] = 'Marcar como Lixo'; $labels['reportedasjunk'] = 'Reportado como Lixo com sucesso'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ro_RO.inc b/plugins/markasjunk/localization/ro_RO.inc index 0fac4fd07..9bd9c4193 100644 --- a/plugins/markasjunk/localization/ro_RO.inc +++ b/plugins/markasjunk/localization/ro_RO.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/ro_RO/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Raduta Alex <raduta.alex@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Vechituri'; $labels['buttontitle'] = 'Marchează ca SPAM'; $labels['reportedasjunk'] = 'Raportat cu succes ca SPAM'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc index acac7e180..2f121ec4c 100644 --- a/plugins/markasjunk/localization/ru_RU.inc +++ b/plugins/markasjunk/localization/ru_RU.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/ru_RU/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Thomas | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'СПАМ'; $labels['buttontitle'] = 'Переместить в "СПАМ'; $labels['reportedasjunk'] = 'Перемещено в "СПАМ'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/si_LK.inc b/plugins/markasjunk/localization/si_LK.inc index 81c33cf88..2e2aa6225 100644 --- a/plugins/markasjunk/localization/si_LK.inc +++ b/plugins/markasjunk/localization/si_LK.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/si_LK/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Mohamed Rizmi <Unknown> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'සුන්බුන් ලෙස සලකුණු කරන්න'; $labels['reportedasjunk'] = 'සුන්බුන් ලෙස වාර්තා කිරීම සාර්ථකයි'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/sk_SK.inc b/plugins/markasjunk/localization/sk_SK.inc index ee208347d..54424e9cf 100644 --- a/plugins/markasjunk/localization/sk_SK.inc +++ b/plugins/markasjunk/localization/sk_SK.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/sk_SK/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: panda | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam'; $labels['buttontitle'] = 'Označiť ako Spam'; $labels['reportedasjunk'] = 'Úspešne nahlásené ako Spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/sl_SI.inc b/plugins/markasjunk/localization/sl_SI.inc index ab7832430..063e85e3f 100644 --- a/plugins/markasjunk/localization/sl_SI.inc +++ b/plugins/markasjunk/localization/sl_SI.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/sl_SI/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Barbara Krasovec <barbarak@arnes.si> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Nezaželena sporočila'; $labels['buttontitle'] = 'Označi kot spam'; $labels['reportedasjunk'] = 'Uspešno označeno kot spam'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/sr_CS.inc b/plugins/markasjunk/localization/sr_CS.inc index aa26dddc7..866466b41 100644 --- a/plugins/markasjunk/localization/sr_CS.inc +++ b/plugins/markasjunk/localization/sr_CS.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/sr_CS/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Saša Zejnilović <zejnils@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Смеће'; $labels['buttontitle'] = 'Означи као cмеће'; $labels['reportedasjunk'] = 'Успешно пријављени као cмеће'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/sv_SE.inc b/plugins/markasjunk/localization/sv_SE.inc index 4ff14bec9..130d6a522 100644 --- a/plugins/markasjunk/localization/sv_SE.inc +++ b/plugins/markasjunk/localization/sv_SE.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/sv_SE/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Skräp'; $labels['buttontitle'] = 'Märk som skräp'; $labels['reportedasjunk'] = 'Framgångsrikt rapporterat som skräp'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/tr_TR.inc b/plugins/markasjunk/localization/tr_TR.inc index 42a0de236..ad97e2a6d 100644 --- a/plugins/markasjunk/localization/tr_TR.inc +++ b/plugins/markasjunk/localization/tr_TR.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/tr_TR/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: ismail yenigul | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'İstenmeyen'; $labels['buttontitle'] = 'Çöp olarak işaretle'; $labels['reportedasjunk'] = 'Spam olarak rapor edildi'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/uk_UA.inc b/plugins/markasjunk/localization/uk_UA.inc index 1e77f2a9c..e853120dd 100644 --- a/plugins/markasjunk/localization/uk_UA.inc +++ b/plugins/markasjunk/localization/uk_UA.inc @@ -2,19 +2,23 @@ /* +-----------------------------------------------------------------------+ - | localization/uk_UA/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Anton Gladky <Unknown> | - +-----------------------------------------------------------------------+ - @version $Id$ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); +$labels['buttontext'] = 'Junk'; $labels['buttontitle'] = 'Перемістити в "Спам'; $labels['reportedasjunk'] = 'Переміщено до "Спаму'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/vi_VN.inc b/plugins/markasjunk/localization/vi_VN.inc index 3d00d923b..6c9fe17d0 100644 --- a/plugins/markasjunk/localization/vi_VN.inc +++ b/plugins/markasjunk/localization/vi_VN.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/vi_VN/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = 'Thư rác'; $labels['buttontitle'] = 'Đánh dấu để được xem là thư rác'; $labels['reportedasjunk'] = 'Đánh dấu để được xem là thư rác thành công'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/zh_CN.inc b/plugins/markasjunk/localization/zh_CN.inc index c5d50362b..6f3ffc195 100644 --- a/plugins/markasjunk/localization/zh_CN.inc +++ b/plugins/markasjunk/localization/zh_CN.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/zh_CN/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Christopher Meng <cickumqt@gmail.com> | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = '垃圾邮件'; $labels['buttontitle'] = '标记为垃圾邮件'; $labels['reportedasjunk'] = '成功报告该邮件为垃圾邮件'; +?>
\ No newline at end of file diff --git a/plugins/markasjunk/localization/zh_TW.inc b/plugins/markasjunk/localization/zh_TW.inc index 372d8d6c5..e627efc44 100644 --- a/plugins/markasjunk/localization/zh_TW.inc +++ b/plugins/markasjunk/localization/zh_TW.inc @@ -2,15 +2,18 @@ /* +-----------------------------------------------------------------------+ - | localization/zh_TW/labels.inc | + | plugins/markasjunk/localization/<lang>.inc | | | - | Language file of the Roundcube Webmail client | + | Localization file of the Roundcube Webmail Mark-As-Junk plugin | | Copyright (C) 2012, The Roundcube Dev Team | - | Licensed under the GNU General Public License | + | | + | 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: Nansen | - +-----------------------------------------------------------------------+ + + For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/ */ $labels = array(); @@ -18,3 +21,4 @@ $labels['buttontext'] = '垃圾郵件'; $labels['buttontitle'] = '標示為垃圾信'; $labels['reportedasjunk'] = '成功回報垃圾信'; +?>
\ No newline at end of file diff --git a/program/include/iniset.php b/program/include/iniset.php index be71fc084..35b5522fc 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -5,7 +5,7 @@ | program/include/iniset.php | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2008-2012, The Roundcube Dev Team | + | Copyright (C) 2008-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 76342c245..d4a1654f1 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -462,6 +462,7 @@ class rcmail_output_html extends rcmail_output if (is_readable($path)) { $this->config->set('skin_path', $skin_path); $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path); // set base_path to core skin directory (not plugin's skin) + $skin_dir = preg_replace('!^plugins/!', '', $skin_path); break; } else { @@ -643,6 +644,7 @@ class rcmail_output_html extends rcmail_output protected function file_callback($matches) { $file = $matches[3]; + $file[0] = preg_replace('!^/this/!', '/', $file[0]); // correct absolute paths if ($file[0] == '/') { diff --git a/program/js/app.js b/program/js/app.js index c627983f4..71976096c 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -509,7 +509,7 @@ function rcube_webmail() return false; // let the browser handle this click (shift/ctrl usually opens the link in a new window/tab) - if ((obj && obj.href && String(obj.href).indexOf(location.href) < 0) && rcube_event.get_modifier(event)) { + if ((obj && obj.href && String(obj.href).indexOf('#') < 0) && rcube_event.get_modifier(event)) { return true; } @@ -820,7 +820,7 @@ function rcube_webmail() var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part; // open attachment in frame if it's of a supported mimetype - if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, $.map(this.env.mimetypes, function(v,k){ return v })) >= 0) { + if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, this.env.mimetypes) >= 0) { if (props.mimetype == 'text/html') qstring += '&_safe=1'; this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment'); @@ -1090,6 +1090,12 @@ function rcube_webmail() } break; + case 'export-selected': + if (this.contact_list.rowcount > 0) { + this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') }); + } + break; + case 'upload-photo': this.upload_contact_photo(props || this.gui_objects.uploadform); break; @@ -3037,7 +3043,7 @@ function rcube_webmail() ac_props; // close compose step in opener - if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') { + if (window.opener && !window.opener.closed && opener.rcmail && opener.rcmail.env.action == 'compose') { setTimeout(function(){ opener.history.back(); }, 100); this.env.opened_extwin = true; } @@ -3707,9 +3713,10 @@ function rcube_webmail() { this.display_message(msg, type); - if (this.env.extwin && window.opener && opener.rcmail) { + if (this.env.extwin) { this.lock_form(this.gui_objects.messageform); - opener.rcmail.display_message(msg, type); + if (window.opener && !window.opener.closed && opener.rcmail) + opener.rcmail.display_message(msg, type); setTimeout(function(){ window.close() }, 1000); } else { @@ -4115,6 +4122,7 @@ function rcube_webmail() // thend we can enable the group-remove-selected command this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0); this.enable_command('compose', this.env.group || list.selection.length > 0); + this.enable_command('export-selected', list.selection.length > 0); this.enable_command('edit', id && writable); this.enable_command('delete', list.selection.length && writable); @@ -4219,12 +4227,10 @@ function rcube_webmail() target = win; this.show_contentframe(true); - // load dummy content - if (!cid) { - // unselect selected row(s) + // load dummy content, unselect selected row(s) + if (!cid) this.contact_list.clear_selection(); - this.enable_command('delete', 'compose', false); - } + this.enable_command('delete', 'compose', 'export-selected', cid); } else if (framed) return false; @@ -6238,6 +6244,7 @@ function rcube_webmail() this.enable_command('compose', (uid && this.contact_list.rows[uid])); this.enable_command('delete', 'edit', writable); this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0)); + this.enable_command('export-selected', false); } case 'moveto': diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 530a7f855..8cea48122 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -3,7 +3,7 @@ /* +-----------------------------------------------------------------------+ | This file is part of the Roundcube PHP suite | - | Copyright (C) 2005-2012, The Roundcube Dev Team | + | Copyright (C) 2005-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php index e8202c6d4..0d3276b84 100644 --- a/program/lib/Roundcube/rcube_csv2vcard.php +++ b/program/lib/Roundcube/rcube_csv2vcard.php @@ -124,6 +124,12 @@ class rcube_csv2vcard //'work_address_2' => '', 'work_country' => 'country:work', 'work_zipcode' => 'zipcode:work', + 'last' => 'surname', + 'first' => 'firstname', + 'work_city' => 'locality:work', + 'work_state' => 'region:work', + 'home_city_short' => 'locality:home', + 'home_state_short' => 'region:home', ); /** diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 51b2242df..b52b79b25 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -322,7 +322,7 @@ class rcube_message // parse headers from message/rfc822 part if (!isset($structure->headers['subject'])) { - list($headers, $dump) = explode("\r\n\r\n", $this->get_part_content($structure->mime_id, null, true, 4096)); + list($headers, $dump) = explode("\r\n\r\n", $this->get_part_content($structure->mime_id, null, true, 8192)); $structure->headers = rcube_mime::parse_headers($headers); } } diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 9deaa6677..a0b6e6a31 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -335,6 +335,8 @@ $labels['composeto'] = 'Compose mail to'; $labels['contactsfromto'] = 'Contacts $from to $to of $count'; $labels['print'] = 'Print'; $labels['export'] = 'Export'; +$labels['exportall'] = 'Export all'; +$labels['exportsel'] = 'Export selected'; $labels['exportvcards'] = 'Export contacts in vCard format'; $labels['newcontactgroup'] = 'Create new contact group'; $labels['grouprename'] = 'Rename group'; diff --git a/program/localization/zh_TW/csv2vcard.inc b/program/localization/zh_TW/csv2vcard.inc new file mode 100644 index 000000000..9fcacc818 --- /dev/null +++ b/program/localization/zh_TW/csv2vcard.inc @@ -0,0 +1,99 @@ +<?php + +/* + +-----------------------------------------------------------------------+ + | localization/zh_TW/csv2vcard.inc | + | | + | Localization file of the Roundcube Webmail client | + | Copyright (C) 2005-2012, 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: Aleksander Machniak <alec@alec.pl> | + +-----------------------------------------------------------------------+ +*/ + +// This is a list of CSV column names specified in CSV file header +// These must be original texts used in Outlook/Thunderbird exported csv files +// Encoding UTF-8 + +$map = array(); + +// MS Outlook 2010 +$map['anniversary'] = "紀念日"; +$map['assistants_name'] = "助理"; +$map['assistants_phone'] = "助理電話"; +$map['birthday'] = "生日"; +$map['business_city'] = "商務 - 市/鎮"; +$map['business_countryregion'] = "商務 - 國家/地區"; +$map['business_fax'] = "商務傳真"; +$map['business_phone'] = "商務電話"; +$map['business_phone_2'] = "商務電話 2"; +$map['business_postal_code'] = "商務 - 郵遞區號"; +$map['business_state'] = "商務 - 縣市"; +$map['business_street'] = "商務 - 街"; +$map['car_phone'] = "汽車電話"; +$map['categories'] = "類別"; +$map['company'] = "公司"; +$map['department'] = "部門"; +$map['email_address'] = "電子郵件地址"; +$map['first_name'] = "名字"; +$map['gender'] = "性別"; +$map['home_city'] = "住家 - 市/鎮"; +$map['home_countryregion'] = "住家 - 國家/地區"; +$map['home_fax'] = "住家傳真"; +$map['home_phone'] = "住家電話"; +$map['home_phone_2'] = "住家電話 2"; +$map['home_postal_code'] = "住家 - 郵遞區號"; +$map['home_state'] = "住家 - 縣/市"; +$map['home_street'] = "住家 - 街"; +$map['job_title'] = "職稱"; +$map['last_name'] = "姓氏"; +$map['managers_name'] = "主管名稱"; +$map['middle_name'] = "中間名"; +$map['mobile_phone'] = "行動電話"; +$map['notes'] = "記事"; +$map['other_city'] = "其他 - 市/鎮"; +$map['other_countryregion'] = "其他 - 國家/地區"; +$map['other_fax'] = "其他傳真"; +$map['other_phone'] = "其他電話"; +$map['other_postal_code'] = "其他 - 郵遞區號"; +$map['other_state'] = "其他 - 縣/市"; +$map['other_street'] = "其他 - 街"; +$map['pager'] = "呼叫器"; +$map['primary_phone'] = "代表電話"; +$map['spouse'] = "配偶"; +$map['suffix'] = "稱謂"; +$map['title'] = "頭銜"; +$map['web_page'] = "網頁"; + +// Thunderbird +$map['last'] = "姓"; +$map['first'] = "名"; +$map['birth_day'] = "生日 (日)"; +$map['birth_month'] = "生日 (月)"; +$map['birth_year'] = "生日 (年)"; +$map['display_name'] = "顯示名稱"; +$map['fax_number'] = "傳真號碼"; +$map['home_address'] = "住家住址"; +$map['home_country'] = "居住國家"; +$map['home_zipcode'] = "住址郵遞區號"; +$map['mobile_number'] = "手機號碼"; +$map['nickname'] = "暱稱"; +$map['organization'] = "Organization"; +$map['pager_number'] = "呼叫器號碼"; +$map['primary_email'] = "主要 Email"; +$map['secondary_email'] = "次要 Email"; +$map['web_page_1'] = "網頁 1"; +$map['web_page_2'] = "網頁 2"; +$map['work_phone'] = "商務電話"; +$map['work_address'] = "商務地址"; +$map['work_country'] = "商務國家"; +$map['work_zipcode'] = "商務郵遞區號"; +$map['work_city'] = "商務市鎮"; +$map['work_state'] = "商務縣市"; +$map['home_city_short'] = "居住市鎮"; +$map['home_state_short'] = "居住縣市"; diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc index 850795c85..bf0657b74 100644 --- a/program/steps/addressbook/export.inc +++ b/program/steps/addressbook/export.inc @@ -56,6 +56,29 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search $result = new rcube_result_set($count); $result->records = array_values($records); } +// selected contacts +else if (!empty($_REQUEST['_cid'])) { + $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name'); + $records = array(); + + $cids = explode(',', get_input_value('_cid', RCUBE_INPUT_GET)); + $CONTACTS = rcmail_contact_source(null, true); + + // Get records from all sources + foreach ($cids as $cid) { + $record = $CONTACTS->get_record($cid, true); + $key = rcmail_contact_key($record, $sort_col); + $records[$key] = $record; + unset($record); + } + + ksort($records, SORT_LOCALE_STRING); + + // create resultset object + $count = count($records); + $result = new rcube_result_set($count); + $result->records = array_values($records); +} // selected directory/group else { $CONTACTS = rcmail_contact_source(null, true); diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 64e628880..3495df9c0 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -79,7 +79,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { } } - $OUTPUT->set_env('mimetypes', $mimetypes); + $OUTPUT->set_env('mimetypes', array_values($mimetypes)); if ($CONFIG['drafts_mbox']) $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']); diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css index a398325b4..1bb1e2c61 100644 --- a/skins/classic/addressbook.css +++ b/skins/classic/addressbook.css @@ -67,6 +67,14 @@ background-position: -128px -32px; } +#abooktoolbar a.exportAll { + background-position: -128px 0; +} + +#abooktoolbar a.exportAllSel { + background-position: -128px -32px; +} + #abooktoolbar span.separator { width: 5px; background-position: -162px 0; diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html index 74673007a..404fb2c11 100644 --- a/skins/classic/templates/addressbook.html +++ b/skins/classic/templates/addressbook.html @@ -27,7 +27,10 @@ <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletecontact" content=" " /> <span class="separator"> </span> <roundcube:button command="import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="importcontacts" content=" " /> +<span class="dropbutton"> <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="exportvcards" content=" " /> +<span id="exportmenulink" onclick="rcmail_ui.show_popup('exportmenu');return false"></span> +</span> <roundcube:button command="advanced-search" type="link" class="buttonPas search" classAct="button search" classSel="button searchSel" title="advsearch" content=" " /> <roundcube:container name="toolbar" id="abooktoolbar" /> </div> @@ -38,6 +41,13 @@ <roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" /> </div> +<div id="exportmenu" class="popupmenu"> + <ul> + <li><roundcube:button command="export" label="exportall" prop="sub" classAct="exportalllink active" class="exportalllink" /></li> + <li><roundcube:button command="export-selected" label="exportsel" prop="sub" classAct="exportsellink active" class="exportsellink" /></li> + </ul> +</div> + <div id="searchmenu" class="popupmenu"> <ul class="toolbarmenu"> <li><label><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="name" /></span></label></li> diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css index 83ea946fa..357ea220f 100644 --- a/skins/larry/iehacks.css +++ b/skins/larry/iehacks.css @@ -65,6 +65,12 @@ input.button:active { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#404040', endColorstr='#060606', GradientType=0); } +#toplogo { + position: absolute; + top: 0px; + left: 10px; +} + .records-table tr.selected td { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', GradientType=0); } diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 34c623391..33e66d10e 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -332,7 +332,7 @@ a.iconbutton.threadmode.selected { position: absolute; right: 256px; width: auto; - top: 7px; + top: 2px; } #searchfilter select { diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 51dc0363c..773ef23d4 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -511,7 +511,7 @@ a.iconlink.upload { /*** basic page layout ***/ #header { - overflow: hidden; /* Chrome bug #1488851 */ + overflow-x: hidden; /* Chrome bug #1488851 */ } #topline { @@ -524,6 +524,7 @@ a.iconlink.upload { } #topnav { + position: relative; height: 46px; margin-bottom: 10px; padding: 0 0 0 10px; @@ -1503,7 +1504,7 @@ ul.proplist li { #quicksearchbar { position: absolute; right: 1px; - top: 0; + top: -5px; width: 240px; } @@ -1679,6 +1680,7 @@ ul.proplist li { } .toolbar a.button.export { + min-width: 74px; background-position: center -1054px; } @@ -1694,7 +1696,6 @@ ul.proplist li { background-position: 0 -1745px; } - a.menuselector { display: inline-block; border: 1px solid #ababab; diff --git a/skins/larry/templates/about.html b/skins/larry/templates/about.html index 2c18e8889..301c301a9 100644 --- a/skins/larry/templates/about.html +++ b/skins/larry/templates/about.html @@ -10,7 +10,7 @@ <roundcube:object name="aboutcontent" /> <h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2> -<p class="copyright">Copyright © 2005-2012, The Roundcube Dev Team</p> +<p class="copyright">Copyright © 2005-2013, The Roundcube Dev Team</p> <p class="license">This program is free software; you can redistribute it and/or modify it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/> diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html index 9a9a2d747..7904f6f3a 100644 --- a/skins/larry/templates/addressbook.html +++ b/skins/larry/templates/addressbook.html @@ -13,7 +13,11 @@ <!-- toolbar --> <div id="addressbooktoolbar" class="toolbar"> <roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" /> - <roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" /> + <span class="dropbutton"> + <roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" /> + <span class="dropbuttontip" id="exportmenulink" onclick="UI.show_popup('exportmenu');return false"></span> + </span> + <span class="spacer"></span> <roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" /> <roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" /> @@ -75,6 +79,12 @@ </div><!-- end mainscreen --> +<div id="exportmenu" class="popupmenu"> + <ul class="toolbarmenu"> + <li><roundcube:button command="export" label="exportall" prop="sub" class="exportalllink" classAct="exportalllink active" /></li> + <li><roundcube:button command="export-selected" label="exportsel" prop="sub" class="exportsellink" classAct="exportsellink active" /></li> + </ul> +</div> <div id="searchmenu" class="popupmenu"> <ul class="toolbarmenu"> diff --git a/tests/Framework/Csv2vcard.php b/tests/Framework/Csv2vcard.php index f460c42af..5d52efc58 100644 --- a/tests/Framework/Csv2vcard.php +++ b/tests/Framework/Csv2vcard.php @@ -31,7 +31,7 @@ class Framework_Csv2vcard extends PHPUnit_Framework_TestCase $vcf_text = trim(str_replace("\r\n", "\n", $vcf_text)); $vcard = trim(str_replace("\r\n", "\n", $vcard)); -echo $vcard; + $this->assertEquals($vcf_text, $vcard); } |