diff options
139 files changed, 2232 insertions, 514 deletions
@@ -26,12 +26,27 @@ php_value session.gc_probability 1 <IfModule mod_rewrite.c> RewriteEngine On RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico + # security rules -RewriteRule \.git - [F] -RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ - [F] -RewriteRule ^/?(SQL|bin) - [F] +RewriteRule ^/?(\.git|SQL|bin|config|logs|temp|tests|program\/(include|lib|localization|steps)) - [F] +RewriteRule /?(README(.md)?|composer\.json-dist|composer\.json|package\.xml)$ - [F] </IfModule> +# deny access to all files not containing a "." (dot) +# to block access to different README, Changelog, INSTALL, etc. +# files of various skins and plugins. +<FilesMatch "^[^\.]+$"> + # Apache 2.4 + <IfModule mod_authz_core.c> + Require all denied + </IfModule> + # Apache 2.2 + <IfModule !mod_authz_core.c> + Order Allow,Deny + Deny from all + </IfModule> +</FilesMatch> + <IfModule mod_deflate.c> SetOutputFilter DEFLATE </IfModule> @@ -1,31 +1,30 @@ CHANGELOG Roundcube Webmail =========================== -- Fix default spell-check configuration after Google suspended their spell service -- Fix vulnerability in handling _session argument of utils/save-prefs (#1489382) -- Fix iframe onload for upload errors handling (#1489379) -- Fix address matching in Return-Path header on identity selection (#1489374) +- Fix operations on folders with trailing spaces in name (#1489419) +- Improve identity selection based on From: header (#1489378) +- Fix issue where mails with inline images of the same name contained only the first image multiple times (#1489406) +- Use left/right arrow keys to collapse/expand thread and spacebar to select a row, change Ctrl key behavior (#1489392) +- Fix an issue where using arrow keys to go up a list can result in selected message being under headers (#1489403) +- Fix an issue where Home/End keys don't focus list row properly, don't scrollTo properly (#1489396) +- Add an option to disable smart Reply-List behaviour - reply_all_mode (#1488734) +- Fix an issue where pressing minus key on contacts list was hiding list records (#1489393) +- Fix an issue where shift + arrow-up key wasn't selecting all messages in collapsed thread (#1489397) +- Added icon for priority column in messages list header (#1489234) +- New feature "Canned Responses" to save and recall boilerplate text snippets - Fix HTML part detection when encapsulated inside multipart/signed (#1489372) -- Fix text wrapping issue with long unwrappable lines (#1489371) - Add spellchecker backend for the After the Deadline service - Replace markdown-style [1] link indexes in plain text email bodies -- Fixed issues where HTML comments inside style tag would hang Internet Explorer - Improved mailto: link arguments handling (#1489363) - Use DOMDocument LIBXML_PARSEHUGE and LIBXML_COMPACT options if possible (#1489302) - Support HTTP_HOST, SERVER_NAME and SERVER_ADDR values in include_host_config feature -- Hide Delivery Status Notification option when smtp_server is unset (#1489336) - Make default font size for HTML messages configurable (request #118) -- Display full attachment name using title attribute when name is too long to display (#1489320) - Fix XSS issue in addressbook group name field [CVE-2013-5646] (#1489333) -- Fix attachment icon issue when rare font/language is used (#1489326) - After message is sent refresh messages list of replied message folder (#1489249) - Add option force specified domain in user login - username_domain_forced (#1489264) -- Fix expanded thread root message styling after refreshing messages list (#1489327) -- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319) - Add option to import Vcards with group assignments - Save groups membership in Vcard export (#1488509) - Workaround broken PHP function timezone_name_from_abbr (#1489261) -- Fix error_reporting directive check (#1489323) - Make cached message size limit configurable - messages_cache_threshold (#1489317) - Log also failed logins to userlogins log - Add temp_dir_ttl configuration option (#1489304) @@ -86,6 +85,23 @@ CHANGELOG Roundcube Webmail - Fix export of selected contacts from search result (#1488905) - Feature to export only selected contacts from addressbook (by Phil Weir) +RELEASE 0.9.5 +------------- +- Fix failing vCard import when email address field contains spaces (#1489386) +- Fix default spell-check configuration after Google suspended their spell service +- Fix vulnerability in handling _session argument of utils/save-prefs (#1489382) +- Fix iframe onload for upload errors handling (#1489379) +- Fix address matching in Return-Path header on identity selection (#1489374) +- Fix text wrapping issue with long unwrappable lines (#1489371) +- Fixed issues where HTML comments inside style tag would hang Internet Explorer +- Hide Delivery Status Notification option when smtp_server is unset (#1489336) +- Display full attachment name using title attribute when name is too long to display (#1489320) +- Fix attachment icon issue when rare font/language is used (#1489326) +- Fix expanded thread root message styling after refreshing messages list (#1489327) +- Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319) +- Fix error_reporting directive check (#1489323) +- Fix de_DE localization of "About" label in Help plugin (#1489325) + RELEASE 0.9.4 ------------- - Make identities matching case insensitive (#1485480) diff --git a/bin/transifexpull.sh b/bin/transifexpull.sh index ce25f6fc1..ba26a07f1 100755 --- a/bin/transifexpull.sh +++ b/bin/transifexpull.sh @@ -3,6 +3,9 @@ # In 'translator' mode files will contain empty translated texts # where translation is not available, we'll remove these later +# Note: there's a bug in txclib, so if the command below doesn't +# work see https://github.com/transifex/transifex-client/commit/a80320735973dd608b48520bf3b89ad53e2b088b + tx --debug pull -a --mode translator PWD=`dirname "$0"` diff --git a/config/.htaccess b/config/.htaccess deleted file mode 100644 index 8e6a345dc..000000000 --- a/config/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -Order allow,deny -Deny from all
\ No newline at end of file diff --git a/config/defaults.inc.php b/config/defaults.inc.php index 65c9eaaba..ab0e188bd 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -615,6 +615,12 @@ $config['upload_progress'] = false; // Setting it to 0, disables the feature. $config['undo_timeout'] = 0; +// A static list of canned responses which are immutable for the user +$config['compose_responses_static'] = array( +// array('name' => 'Canned Response 1', 'text' => 'Static Response One'), +// array('name' => 'Canned Response 2', 'text' => 'Static Response Two'), +); + // ---------------------------------- // ADDRESSBOOK SETTINGS // ---------------------------------- @@ -681,6 +687,8 @@ $config['ldap_public']['Verisign'] = array( // DN and password to bind as before searching for bind DN, if anonymous search is not allowed 'search_bind_dn' => '', 'search_bind_pw' => '', + // Optional map of replacement strings => attributes used when binding for an individual address book + 'search_bind_attrib' => array(), // e.g. array('%udc' => 'ou') // Default for %dn variable if search doesn't return DN value 'search_dn_default' => '', // Optional authentication identifier to be used as SASL authorization proxy @@ -762,14 +770,19 @@ $config['ldap_public']['Verisign'] = array( // if the groups base_dn is empty, the contact base_dn is used for the groups as well // -> in this case, assure that groups and contacts are separated due to the concernig filters! 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // Search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // Name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // Attribute to be used as group name - 'member_filter' => '(objectclass=*)', // Optional filter to use when querying for group members - 'vlv' => false, // Use VLV controls to list groups + 'base_dn' => '', + 'scope' => 'sub', // Search mode: sub|base|list + 'filter' => '(objectClass=groupOfNames)', + 'object_classes' => array('top', 'groupOfNames'), // Object classes to be assigned to new groups + 'member_attr' => 'member', // Name of the default member attribute, e.g. uniqueMember + 'name_attr' => 'cn', // Attribute to be used as group name + 'email_attr' => 'mail', // Group email address attribute (e.g. for mailing lists) + 'member_filter' => '(objectclass=*)', // Optional filter to use when querying for group members + 'vlv' => false, // Use VLV controls to list groups + 'class_member_attr' => array( // Mapping of group object class to member attribute used in these objects + 'groupofnames' => 'member', + 'groupofuniquenames' => 'uniquemember' + ), ), // this configuration replaces the regular groups listing in the directory tree with // a hard-coded list of groups, each listing entries with the configured base DN and filter. @@ -1010,3 +1023,8 @@ $config['default_font_size'] = '10pt'; // Enables display of email address with name instead of a name (and address in title) $config['message_show_email'] = false; + +// Default behavior of Reply-All button: +// 0 - Reply-All always +// 1 - Reply-List if mailing list is detected +$config['reply_all_mode'] = 0; @@ -294,7 +294,7 @@ while ($redirects < 5) { } if ($RCMAIL->action == 'refresh') { - $RCMAIL->plugins->exec_hook('refresh', array()); + $RCMAIL->plugins->exec_hook('refresh', array('last' => intval(rcube_utils::get_input_value('_last', rcube_utils::INPUT_GPC)))); } // parse main template (default) diff --git a/logs/.htaccess b/logs/.htaccess deleted file mode 100644 index 8e6a345dc..000000000 --- a/logs/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -Order allow,deny -Deny from all
\ No newline at end of file diff --git a/plugins/acl/localization/lv_LV.inc b/plugins/acl/localization/lv_LV.inc index 83ceec5eb..cadb34ae2 100644 --- a/plugins/acl/localization/lv_LV.inc +++ b/plugins/acl/localization/lv_LV.inc @@ -15,6 +15,7 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/ */ +$labels['sharing'] = 'DalÄ«Å¡anÄs'; $labels['myrights'] = 'Piekļuves tiesÄ«bas'; $labels['username'] = 'LietotÄjs:'; $labels['advanced'] = 'paplaÅ¡inÄtais režīms'; @@ -25,10 +26,15 @@ $labels['anonymous'] = 'Viesi (anonÄ«mie)'; $labels['identifier'] = 'Identifikators'; $labels['acll'] = 'Atrast'; $labels['aclr'] = 'LasÄ«t ziņojumus'; +$labels['acls'] = 'PaturÄ“t "RedzÄ“tÄ" statusu'; +$labels['aclw'] = 'SaglabÄt atzÄ«mes'; +$labels['acli'] = 'Ievietot (IekopÄ“t)'; +$labels['aclp'] = 'NosÅ«tÄ«t'; $labels['aclc'] = 'Izveidot apakÅ¡mapes'; $labels['aclk'] = 'Izveidot apakÅ¡mapes'; $labels['acld'] = 'DzÄ“st ziņojumus'; $labels['aclt'] = 'DzÄ“st ziņojumus'; +$labels['acle'] = 'IzdzÄ“st'; $labels['aclx'] = 'DzÄ“st mapi'; $labels['acla'] = 'PÄrvaldÄ«t'; $labels['aclfull'] = 'Pilna kontrole'; @@ -41,17 +47,29 @@ $labels['shortaclr'] = 'LasÄ«t'; $labels['shortacls'] = 'PaturÄ“t'; $labels['shortaclw'] = 'RakstÄ«t'; $labels['shortacli'] = 'Ievietot'; +$labels['shortaclp'] = 'NosÅ«tÄ«t'; $labels['shortaclc'] = 'Izveidot'; $labels['shortaclk'] = 'Izveidot'; $labels['shortacld'] = 'DzÄ“st'; $labels['shortaclt'] = 'DzÄ“st'; +$labels['shortacle'] = 'IzdzÄ“st'; $labels['shortaclx'] = 'Mapju dzÄ“Å¡ana'; $labels['shortacla'] = 'PÄrvaldÄ«t'; $labels['shortaclother'] = 'Cits'; $labels['shortaclread'] = 'LasÄ«t'; $labels['shortaclwrite'] = 'RakstÄ«t'; $labels['shortacldelete'] = 'DzÄ“st'; +$labels['longacll'] = 'Mape ir redzama kopÄ“jÄ mapju sarakstÄ un var tikt abonÄ“ta'; $labels['longaclr'] = 'Å i mape var tikt atvÄ“rta lasÄ«Å¡anai'; +$labels['longacls'] = 'Ziņojumu "RedzÄ“ts" atzÄ«me var tik mainÄ«ta'; +$labels['longaclw'] = 'Ziņojumu atzÄ«mes, izņemot "RedzÄ“ts" un "DzÄ“sts", un atslÄ“gvÄrdi var tik mainÄ«ti'; +$labels['longacli'] = 'Ziņojumi var tikt ierakstÄ«ti vai pÄrkopÄ“ti uz Å¡o mapi'; +$labels['longaclp'] = 'VÄ“stules var tikt ievietotas Å¡ajÄ mapÄ“'; +$labels['longaclc'] = 'Zem Å¡Ä«s mapes pa tieÅ¡o var tikt izveidotas (vai pÄrsauktas) citas mapes'; +$labels['longaclk'] = 'Zem Å¡Ä«s mapes pa tieÅ¡o var tikt izveidotas (vai pÄrsauktas) citas mapes'; +$labels['longacld'] = 'Ziņojumu "DzÄ“st" atzÄ«me var tikt mainÄ«ta'; +$labels['longaclt'] = 'Ziņojumu "DzÄ“st" atzÄ«me var tikt mainÄ«ta'; +$labels['longacle'] = 'VÄ“stules var tikt izdzÄ“stas'; $labels['longaclx'] = 'Mape var tikt gan dzÄ“sta, gan pÄrdÄ“vÄ“ta'; $labels['longacla'] = 'Mapes pieejas tiesÄ«bas var tikt izmainÄ«tas'; $labels['longaclfull'] = 'Pilna kontrole, iekļaujot arÄ« mapju administrÄ“Å¡anu'; diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js index 3500b9fe4..6ed4f971a 100644 --- a/plugins/archive/archive.js +++ b/plugins/archive/archive.js @@ -1,6 +1,6 @@ /* * Archive plugin script - * @version 2.0 + * @version 2.1 */ function rcmail_archive(prop) @@ -8,29 +8,38 @@ function rcmail_archive(prop) if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length)) return; - if (rcmail.env.mailbox.indexOf(rcmail.env.archive_folder) != 0) { + if (!rcmail_is_archive()) { if (!rcmail.env.archive_type) { // simply move to archive folder (if no partition type is set) rcmail.command('move', rcmail.env.archive_folder); } else { // let the server sort the messages to the according subfolders - var post_data = { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox }; - rcmail.http_post('plugin.move2archive', post_data); + rcmail.http_post('plugin.move2archive', rcmail.selection_post_data()); } } } +function rcmail_is_archive() +{ + // check if current folder is an archive folder or one of its children + if (rcmail.env.mailbox == rcmail.env.archive_folder + || rcmail.env.mailbox.startsWith(rcmail.env.archive_folder + rcmail.env.delimiter) + ) { + return true; + } +} + // callback for app-onload event if (window.rcmail) { rcmail.addEventListener('init', function(evt) { // register command (directly enable in message view mode) - rcmail.register_command('plugin.archive', rcmail_archive, (rcmail.env.uid && rcmail.env.mailbox != rcmail.env.archive_folder)); + rcmail.register_command('plugin.archive', rcmail_archive, rcmail.env.uid && !rcmail_is_archive()); // add event-listener to message list if (rcmail.message_list) rcmail.message_list.addEventListener('select', function(list) { - rcmail.enable_command('plugin.archive', (list.get_selection().length > 0 && rcmail.env.mailbox != rcmail.env.archive_folder)); + rcmail.enable_command('plugin.archive', list.get_selection().length > 0 && !rcmail_is_archive()); }); // set css style for archive folder @@ -41,7 +50,7 @@ if (window.rcmail) { // callback for server response rcmail.addEventListener('plugin.move2archive_response', function(result) { if (result.update) - rcmail.command('checkmail'); // refresh list + rcmail.command('list'); // refresh list }); }) } diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php index 7a81606ab..4a00d5f58 100644 --- a/plugins/archive/archive.php +++ b/plugins/archive/archive.php @@ -6,9 +6,9 @@ * Plugin that adds a new button to the mailbox toolbar * to move messages to a (user selectable) archive folder. * - * @version 2.0 + * @version 2.1 * @license GNU GPLv3+ - * @author Andre Rodier, Thomas Bruederli + * @author Andre Rodier, Thomas Bruederli, Aleksander Machniak */ class archive extends rcube_plugin { @@ -110,19 +110,29 @@ class archive extends rcube_plugin */ function move_messages() { - $rcmail = rcmail::get_instance(); $this->add_texts('localization'); - $storage = $rcmail->get_storage(); + $rcmail = rcmail::get_instance(); + $storage = $rcmail->get_storage(); + $delimiter = $storage->get_hierarchy_delimiter(); + $archive_folder = $rcmail->config->get('archive_mbox'); + $archive_type = $rcmail->config->get('archive_type', ''); + $storage->set_folder(($current_mbox = rcube_utils::get_input_value('_mbox', RCUBE_INPUT_POST))); - $delimiter = $storage->get_hierarchy_delimiter(); - $archive_folder = $rcmail->config->get('archive_mbox'); - $archive_type = $rcmail->config->get('archive_type', ''); + $result = array('reload' => false, 'update' => false, 'errors' => array()); + $folders = array(); + $uids = rcube_utils::get_input_value('_uid', RCUBE_INPUT_POST); + $search_request = get_input_value('_search', RCUBE_INPUT_GPC); - $result = array('reload' => false, 'update' => false, 'errors' => array()); + if ($uids == '*') { + $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order()); + $uids = $index->get(); + } + else { + $uids = explode(',', $uids); + } - $uids = explode(',', rcube_utils::get_input_value('_uid', RCUBE_INPUT_POST)); foreach ($uids as $uid) { if (!$archive_folder || !($message = $rcmail->storage->get_message($uid))) { continue; @@ -164,12 +174,27 @@ class archive extends rcube_plugin } // compose full folder path - $folder = $archive_folder . ($subfolder ? $delimiter . $subfolder : ''); + $folder = $archive_folder . ($subfolder ? $delimiter . $subfolder : ''); // create archive subfolder if it doesn't yet exist - if (!$storage->folder_exists($folder, false)) { - if ($storage->create_folder($folder, true)) - $result['reload'] = true; + // we'll create all folders in the path + if (!in_array($folder, $folders)) { + if (empty($list)) { + $list = $storage->list_folders('', $archive_folder . '*', 'mail', null, true); + } + $path = explode($delimiter, $folder); + + for ($i=0; $i<count($path); $i++) { + $_folder = implode($delimiter, array_slice($path, 0, $i+1)); + if (!in_array($_folder, $list)) { + if ($storage->create_folder($_folder, true)) { + $result['reload'] = true; + $list[] = $_folder; + } + } + } + + $folders[] = $folder; } // move message to target folder @@ -192,7 +217,22 @@ class archive extends rcube_plugin $rcmail->output->show_message($this->gettext('archived'), 'confirmation'); } - $rcmail->output->command('plugin.move2archive_response', $result); + // refresh saved search set after moving some messages + if ($search_request && $rcmail->storage->get_search_set()) { + $_SESSION['search'] = $rcmail->storage->refresh_search(); + } + + if ($_POST['_from'] == 'show' && !empty($result['update'])) { + if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC)) { + $rcmail->output->command('show_message', $next); + } + else { + $rcmail->output->command('command', 'list'); + } + } + else { + $rcmail->output->command('plugin.move2archive_response', $result); + } } /** diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json index 7826545b8..8a585ad09 100644 --- a/plugins/archive/composer.json +++ b/plugins/archive/composer.json @@ -3,12 +3,17 @@ "type": "roundcube-plugin", "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.", "license": "GNU GPLv3+", - "version": "2.0", + "version": "2.1", "authors": [ { "name": "Thomas Bruederli", "email": "roundcube@gmail.com", "role": "Lead" + }, + { + "name": "Aleksander Machniak", + "email": "alec@alec.pl", + "role": "Developer" } ], "repositories": [ diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml index 62a009a99..ec3323e4b 100644 --- a/plugins/archive/package.xml +++ b/plugins/archive/package.xml @@ -13,9 +13,15 @@ <email>roundcube@gmail.com</email> <active>yes</active> </lead> - <date>2013-01-20</date> + <lead> + <name>Aleksander Machniak</name> + <user>alec</user> + <email>alec@alec.pl</email> + <active>yes</active> + </lead> + <date>2013-10-30</date> <version> - <release>2.0</release> + <release>2.1</release> <api>2.0</api> </version> <stability> diff --git a/plugins/attachment_reminder/localization/pt_BR.inc b/plugins/attachment_reminder/localization/pt_BR.inc index b06e8923e..4b61e951c 100644 --- a/plugins/attachment_reminder/localization/pt_BR.inc +++ b/plugins/attachment_reminder/localization/pt_BR.inc @@ -16,5 +16,5 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/ */ $messages['forgotattachment'] = "Você esqueceu-se de anexar um arquivo?"; -$messages['reminderoption'] = "Alertar quando os anexos forem esquecidos"; +$messages['reminderoption'] = "Alertar sobre o possÃvel esquecimento de anexos"; $messages['keywords'] = "anexo,arquivo,anexar,anexado,anexando,incluso,CV,currÃculo"; diff --git a/plugins/attachment_reminder/localization/uk_UA.inc b/plugins/attachment_reminder/localization/uk_UA.inc index c3b4aaa02..122fb2bee 100644 --- a/plugins/attachment_reminder/localization/uk_UA.inc +++ b/plugins/attachment_reminder/localization/uk_UA.inc @@ -15,6 +15,6 @@ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/ */ -$messages['forgotattachment'] = ""; -$messages['reminderoption'] = ""; +$messages['forgotattachment'] = "Ви забули прикріпити файл?"; +$messages['reminderoption'] = "Ðагадати про забуте вкладеннÑ"; $messages['keywords'] = ""; diff --git a/plugins/help/help.php b/plugins/help/help.php index 37fd908a3..df08caf71 100644 --- a/plugins/help/help.php +++ b/plugins/help/help.php @@ -33,6 +33,11 @@ class help extends rcube_plugin $this->register_action('about', array($this, 'action')); $this->register_action('license', array($this, 'action')); + $this->add_hook('startup', array($this, 'startup')); + } + + function startup($args) + { $rcmail = rcmail::get_instance(); // add taskbar button diff --git a/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png b/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png Binary files differindex 1c036f3de..144ecfe77 100644 --- a/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png +++ b/plugins/jqueryui/themes/larry/images/ui-icons-datepicker.png diff --git a/plugins/jqueryui/themes/larry/jquery-ui-1.9.1.custom.css b/plugins/jqueryui/themes/larry/jquery-ui-1.9.1.custom.css index 01afcac0d..3062bbb62 100755 --- a/plugins/jqueryui/themes/larry/jquery-ui-1.9.1.custom.css +++ b/plugins/jqueryui/themes/larry/jquery-ui-1.9.1.custom.css @@ -598,7 +598,34 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } .ui-datepicker select.ui-datepicker-month-year {width: 100%;} .ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker select.ui-datepicker-year { + border: 0; + background: #3a3a3a; + outline: none; + color: #fff; + font-weight: bold; + width: auto; + margin-right: 4px; + padding-right: 4px; +} +.ui-datepicker .ui-datepicker-title select::-ms-expand { display: none; } +.ie10 .ui-datepicker .ui-datepicker-title select, +.webkit .ui-datepicker .ui-datepicker-title select, +.mozilla .ui-datepicker .ui-datepicker-title select { + background-image: url(images/ui-icons-datepicker.png); + background-position: right -18px; + background-repeat: no-repeat; + padding-right: 14px; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} +.mozilla .ui-datepicker .ui-datepicker-title select { + background-position: right -17px; + text-indent: 0.01px; + text-overflow: ''; + padding-right: 0; +} .ui-datepicker table { width: 100%; border-collapse: collapse; margin:0; border-spacing: 0; } .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; color: #666; } .ui-datepicker td { border: 1px solid #bbb; padding: 0; } @@ -611,6 +638,8 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } .ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + + /* with multiple calendars */ .ui-datepicker.ui-datepicker-multi { width:auto; } .ui-datepicker-multi .ui-datepicker-group { float:left; } diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc index a9a77d5df..c9d06d2fd 100644 --- a/plugins/managesieve/localization/bg_BG.inc +++ b/plugins/managesieve/localization/bg_BG.inc @@ -159,22 +159,31 @@ $labels['index'] = 'индекÑ:'; $labels['indexlast'] = 'наобратно'; $messages['filterunknownerror'] = 'ÐеизвеÑтна Ñървърна грешка.'; $messages['filterconnerror'] = 'ÐеуÑпешно Ñвързване Ñ managesieve Ñървъра.'; +$messages['filterdeleteerror'] = 'Ðевъзможно изтриване на филтъра. Възникна Ñървърна грешка.'; $messages['filterdeleted'] = 'Филтърът е изтрит уÑпешно.'; $messages['filtersaved'] = 'Филтърът е запиÑан уÑпешно.'; +$messages['filtersaveerror'] = 'Ðевъзможно запиÑване на филтъра. Възникна Ñървърна грешка.'; $messages['filterdeleteconfirm'] = 'ÐаиÑтина ли желаете да изтриете Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ñ„Ð¸Ð»Ñ‚ÑŠÑ€?'; $messages['ruledeleteconfirm'] = 'Сигурни ли Ñте, че желаете да изтриете избраното уÑловие?'; $messages['actiondeleteconfirm'] = 'Сигурни ли Ñте, че желаете да изтриете избраното дейÑтвие?'; $messages['forbiddenchars'] = 'Забранени Ñимволи в полето.'; $messages['cannotbeempty'] = 'Полето не може да бъде празно.'; $messages['ruleexist'] = 'Вече има филтър Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾Ñ‚Ð¾ име.'; +$messages['setactivateerror'] = 'Ðевъзможно активиране на Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ€ от филтри. Възникна Ñървърна грешка.'; +$messages['setdeactivateerror'] = 'Ðевъзможно деактивиране на Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ€ от филтри. Възникна Ñървърна грешка.'; +$messages['setdeleteerror'] = 'Ðевъзможно изтриване на Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ€ от филтри. Възникна Ñървърна грешка.'; $messages['setactivated'] = 'Ðаборът от филтри е активиран уÑпешно.'; $messages['setdeactivated'] = 'Ðаборът от филтри е деактивиран уÑпешно.'; $messages['setdeleted'] = 'Ðаборът от филтри е изтрит уÑпешно.'; $messages['setdeleteconfirm'] = 'Сигурни ли Ñте, че желаете да изтриете Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð½Ð°Ð±Ð¾Ñ€ от филтри?'; +$messages['setcreateerror'] = 'Ðевъзможно Ñъздаване на набор от филтри. Възникна Ñървърна грешка.'; $messages['setcreated'] = 'Ðаборът от филтри е Ñъздаден уÑпешно.'; +$messages['activateerror'] = 'Ðевъзможно включване на филтъра. Възникна Ñървърна грешка.'; +$messages['deactivateerror'] = 'Ðевъзможно изключване на филтъра. Възникна Ñървърна грешка.'; $messages['deactivated'] = 'Филтърът е изключен уÑпешно.'; $messages['activated'] = 'Филтърът е включен уÑпешно.'; $messages['moved'] = 'Филтърът е премеÑтен уÑпешно.'; +$messages['moveerror'] = 'Ðевъзможно премеÑтване на филтъра. Възникна Ñървърна грешка.'; $messages['nametoolong'] = 'Името е прекалено дълго.'; $messages['namereserved'] = 'Резервирано име.'; $messages['setexist'] = 'Вече има такъв набор филтри.'; diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc index f4b5ebb22..0667db33c 100644 --- a/plugins/managesieve/localization/bs_BA.inc +++ b/plugins/managesieve/localization/bs_BA.inc @@ -159,22 +159,31 @@ $labels['index'] = 'indeks:'; $labels['indexlast'] = 'unazad'; $messages['filterunknownerror'] = 'Nepoznata serverska greÅ¡ka.'; $messages['filterconnerror'] = 'Nije se moguće povezati na server.'; +$messages['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greÅ¡ka.'; $messages['filterdeleted'] = 'Filter je uspjeÅ¡no obrisan.'; $messages['filtersaved'] = 'Filter je uspjeÅ¡no saÄuvan.'; +$messages['filtersaveerror'] = 'Nije moguće saÄuvati filter. Desila se serverska greÅ¡ka.'; $messages['filterdeleteconfirm'] = 'Da li zaista želite obrisati oznaÄeni filter?'; $messages['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati oznaÄeno pravilo?'; $messages['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati oznaÄenu akciju?'; $messages['forbiddenchars'] = 'U polje su uneseni nedozvoljeni znakovi.'; $messages['cannotbeempty'] = 'Polje ne može biti prazno.'; $messages['ruleexist'] = 'Filter s tim imenom već postoji.'; +$messages['setactivateerror'] = 'Nije moguće aktivirati oznaÄeni set filtera. Desila se serverska greÅ¡ka.'; +$messages['setdeactivateerror'] = 'Nije moguće deaktivirati oznaÄeni set filtera. Desila se serverska greÅ¡ka.'; +$messages['setdeleteerror'] = 'Nije moguće obrisati oznaÄeni set filtera. Desila se serverska greÅ¡ka.'; $messages['setactivated'] = 'Set filtera je uspjeÅ¡no aktiviran.'; $messages['setdeactivated'] = 'Set filtera je uspjeÅ¡no deaktiviran.'; $messages['setdeleted'] = 'Set filtera je uspjeÅ¡no obrisan.'; $messages['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati oznaÄeni set filtera?'; +$messages['setcreateerror'] = 'Nije moguće kreirati set filtera. Desila se serverska greÅ¡ka.'; $messages['setcreated'] = 'Set filtera je uspjeÅ¡no kreiran.'; +$messages['activateerror'] = 'Nije moguće omogućiti oznaÄene filtere. Desila se serverska greÅ¡ka.'; +$messages['deactivateerror'] = 'Nije moguće onemogućiti oznaÄene filtere. Desila se serverska greÅ¡ka.'; $messages['deactivated'] = 'Filteri su uspjeÅ¡no omogućeni.'; $messages['activated'] = 'Filteri su uspjeÅ¡no onemogućeni.'; $messages['moved'] = 'Filteri su uspjeÅ¡no premjeÅ¡teni.'; +$messages['moveerror'] = 'Nije moguće premjestiti oznaÄeni filter. Desila se serverska greÅ¡ka.'; $messages['nametoolong'] = 'Ime je predugo.'; $messages['namereserved'] = 'Ime je rezervisano.'; $messages['setexist'] = 'Set već postoji.'; diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc index cf5117f6a..dae49397a 100644 --- a/plugins/managesieve/localization/ca_ES.inc +++ b/plugins/managesieve/localization/ca_ES.inc @@ -39,7 +39,7 @@ $labels['filternotregex'] = 'no coincideix amb l\'expressió regular'; $labels['filterunder'] = 'sota'; $labels['filterover'] = 'sobre'; $labels['addrule'] = 'Afegeix una regla'; -$labels['delrule'] = 'Suprimeix regla'; +$labels['delrule'] = 'Suprimeix una regla'; $labels['messagemoveto'] = 'Mou el missatge a'; $labels['messageredirect'] = 'Redirigeix el missatge cap a'; $labels['messagecopyto'] = 'Copia el missatge a'; @@ -54,8 +54,9 @@ $labels['add'] = 'Afegeix'; $labels['del'] = 'Suprimeix'; $labels['sender'] = 'Remitent'; $labels['recipient'] = 'Destinatari/a'; +$labels['vacationaddr'] = 'Les meves adreces de correu addicionals:'; $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):'; -$labels['vacationinterval'] = 'Amb quina freqüència enviar missatges:'; +$labels['vacationinterval'] = 'Amb quina freqüència s\'han d\'enviar els missatges:'; $labels['days'] = 'dies'; $labels['seconds'] = 'segons'; $labels['vacationreason'] = 'Cos del missatge (raó de les vacances):'; @@ -77,9 +78,9 @@ $labels['fromset'] = 'des del conjunt'; $labels['fromfile'] = 'des del fitxer'; $labels['filterdisabled'] = 'Filtre deshabilitat'; $labels['countisgreaterthan'] = 'el recompte és major que'; -$labels['countisgreaterthanequal'] = 'el recompte és major o igual que'; +$labels['countisgreaterthanequal'] = 'el recompte és major o igual a'; $labels['countislessthan'] = 'el recompte és menor que'; -$labels['countislessthanequal'] = 'el recompte és menor o igual que'; +$labels['countislessthanequal'] = 'el recompte és menor o igual a'; $labels['countequals'] = 'el recompte és igual que'; $labels['countnotequals'] = 'el recompte és diferent de'; $labels['valueisgreaterthan'] = 'el valor és major que'; @@ -102,16 +103,16 @@ $labels['setvarvalue'] = 'Valor de la variable:'; $labels['setvarmodifiers'] = 'Modificadors:'; $labels['varlower'] = 'minúscules'; $labels['varupper'] = 'majúscules'; -$labels['varlowerfirst'] = 'el primer carà cter és minúscul'; -$labels['varupperfirst'] = 'el primer carà cter és majúscul'; +$labels['varlowerfirst'] = 'el primer carà cter en minúscula'; +$labels['varupperfirst'] = 'el primer carà cter en majúscula'; $labels['varquotewildcard'] = 'engloba els carà cters especials amb cometes'; $labels['varlength'] = 'llargada'; $labels['notify'] = 'Envia notificació'; $labels['notifyaddress'] = 'Per a adreça de correu electrònic:'; $labels['notifybody'] = 'Cos de la notificació'; -$labels['notifysubject'] = 'Tema de la notificació:'; +$labels['notifysubject'] = 'Assumpte de la notificació:'; $labels['notifyfrom'] = 'Remitent de la notificació:'; -$labels['notifyimportance'] = 'Importà nica:'; +$labels['notifyimportance'] = 'Importà ncia:'; $labels['notifyimportancelow'] = 'baixa'; $labels['notifyimportancenormal'] = 'normal'; $labels['notifyimportancehigh'] = 'alta'; @@ -133,7 +134,7 @@ $labels['second'] = 'segon'; $labels['time'] = 'hora (hh:mm:ss)'; $labels['iso8601'] = 'data (ISO8601)'; $labels['std11'] = 'data (RFC2822)'; -$labels['zone'] = 'Fus horari'; +$labels['zone'] = 'fus horari'; $labels['weekday'] = 'dia de la setmana (0-6)'; $labels['advancedopts'] = 'Opcions avançades'; $labels['body'] = 'Cos'; @@ -142,7 +143,7 @@ $labels['envelope'] = 'sobre'; $labels['modifier'] = 'modificador:'; $labels['text'] = 'text'; $labels['undecoded'] = 'descodificat (en brut)'; -$labels['contenttype'] = 'tipus de contigut'; +$labels['contenttype'] = 'tipus de contingut'; $labels['modtype'] = 'tipus:'; $labels['allparts'] = 'tots'; $labels['domain'] = 'domini'; @@ -150,7 +151,7 @@ $labels['localpart'] = 'part local'; $labels['user'] = 'usuari/a'; $labels['detail'] = 'detall'; $labels['comparator'] = 'comparador:'; -$labels['default'] = 'per omissió'; +$labels['default'] = 'per defecte'; $labels['octet'] = 'estricte (octet)'; $labels['asciicasemap'] = 'No distingeix entre majúscules i minúscules (ascii-casemap)'; $labels['asciinumeric'] = 'numèric (ascii-numeric)'; @@ -158,22 +159,31 @@ $labels['index'] = 'Ãndex:'; $labels['indexlast'] = 'cap enrere'; $messages['filterunknownerror'] = 'Error desconegut al servidor.'; $messages['filterconnerror'] = 'No s\'ha pogut connectar al servidor.'; +$messages['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.'; $messages['filterdeleted'] = 'El filtre s\'ha suprimit correctament.'; $messages['filtersaved'] = 'Filtre desat correctament.'; +$messages['filtersaveerror'] = 'No s\'ha pogut desar el filtre. Hi ha hagut un error al servidor.'; $messages['filterdeleteconfirm'] = 'Realment voleu suprimit el filtre seleccionat?'; $messages['ruledeleteconfirm'] = 'Esteu segur que voleu suprimir la norma seleccionada?'; $messages['actiondeleteconfirm'] = 'Esteu segur que voleu suprimir l\'acció seleccionada?'; $messages['forbiddenchars'] = 'El camp conté carà cters prohibits.'; $messages['cannotbeempty'] = 'El camp no pot estar buit.'; -$messages['ruleexist'] = 'Ja existeix un filtre amb aquest nom'; +$messages['ruleexist'] = 'Ja existeix un filtre amb aquest nom.'; +$messages['setactivateerror'] = 'No s\'ha pogut activar el conjunt de filtres seleccionat. Hi ha hagut un error al servidor.'; +$messages['setdeactivateerror'] = 'No s\'ha pogut desactivar el conjunt de filtres seleccionat. Hi ha hagut un error al servidor.'; +$messages['setdeleteerror'] = 'No s\'ha pogut suprimir el conjunt de filtres seleccionat. Hi ha hagut un error al servidor.'; $messages['setactivated'] = 'El conjunt de filtres s\'ha activat correctament.'; $messages['setdeactivated'] = 'El conjunt de filtres s\'ha desactivat correctament.'; $messages['setdeleted'] = 'El conjunt de filtres s\'ha suprimit correctament.'; $messages['setdeleteconfirm'] = 'Esteu segurs que voleu suprimir el conjunt de filtres seleccionats?'; +$messages['setcreateerror'] = 'No s\'ha pogut crear el conjunt de filtres. Hi ha hagut un error al servidor.'; $messages['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.'; -$messages['deactivated'] = 'Filtre(s) habilitat(s) correctament.'; -$messages['activated'] = 'Filtre(s) deshabilitat(s) correctament.'; +$messages['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.'; +$messages['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.'; +$messages['deactivated'] = 'Filtre(s) deshabilitat(s) correctament.'; +$messages['activated'] = 'Filtre(s) habilitat(s) correctament.'; $messages['moved'] = 'S\'ha mogut correctament el filtre.'; +$messages['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.'; $messages['nametoolong'] = 'El nom és massa llarg.'; $messages['namereserved'] = 'Nom reservat.'; $messages['setexist'] = 'El conjunt ja existeix.'; diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc index 806a49dde..a10205d09 100644 --- a/plugins/managesieve/localization/cy_GB.inc +++ b/plugins/managesieve/localization/cy_GB.inc @@ -159,22 +159,31 @@ $labels['index'] = 'mynegai:'; $labels['indexlast'] = 'o chwith'; $messages['filterunknownerror'] = 'Gwall gweinydd anhysbys.'; $messages['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.'; +$messages['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.'; $messages['filterdeleted'] = 'Dilëuwyd hidlydd yn llwyddiannus.'; $messages['filtersaved'] = 'Cadwyd hidlydd yn llwyddiannus.'; +$messages['filtersaveerror'] = 'Methwyd cadw hidlydd. Cafwyd gwall gweinydd.'; $messages['filterdeleteconfirm'] = 'Ydych chi wir am ddileu yr hidlydd ddewiswyd?'; $messages['ruledeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r rheol ddewiswyd?'; $messages['actiondeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r weithred ddewiswyd?'; $messages['forbiddenchars'] = 'Llythrennau gwaharddedig yn y maes.'; $messages['cannotbeempty'] = 'Ni all y maes fod yn wag.'; $messages['ruleexist'] = 'Mae hidlydd gyda\'r enw yma yn bodoli\'n barod.'; +$messages['setactivateerror'] = 'Methwyd galluogi y hidlyddion dewiswyd. Cafwyd gwall gweinydd.'; +$messages['setdeactivateerror'] = 'Methwyd analluogi y hidlyddion dewiswyd. Cafwyd gwall gweinydd.'; +$messages['setdeleteerror'] = 'Methwyd dileu y set hidlyddion ddewiswyd. Cafwyd gwall gweinydd.'; $messages['setactivated'] = 'Bywiogwyd y set hidlydd yn llwyddiannus.'; $messages['setdeactivated'] = 'Dadfywiogwyd y set hidlydd yn llwyddiannus.'; $messages['setdeleted'] = 'Dilëuwyd y set hidlydd yn llwyddiannus.'; $messages['setdeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r set hidlydd ddewiswyd?'; +$messages['setcreateerror'] = 'Methwyd creu set hidlydd. Cafwyd gwall gweinydd.'; $messages['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.'; +$messages['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.'; +$messages['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.'; $messages['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.'; $messages['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.'; $messages['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.'; +$messages['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.'; $messages['nametoolong'] = 'Enw yn rhy hir.'; $messages['namereserved'] = 'Enw neilltuedig.'; $messages['setexist'] = 'Mae\'r set yn bodoli\'n barod.'; diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc index 863dc1ecf..f12b20f3a 100644 --- a/plugins/managesieve/localization/da_DK.inc +++ b/plugins/managesieve/localization/da_DK.inc @@ -47,12 +47,14 @@ $labels['messagesendcopy'] = 'Send kopi af besked til'; $labels['messagereply'] = 'Svar med besked'; $labels['messagedelete'] = 'Slet besked'; $labels['messagediscard'] = 'Slet med besked'; +$labels['messagekeep'] = 'Behold besked i Inbox'; $labels['messagesrules'] = 'For indkomne besked:'; $labels['messagesactions'] = '...udfør følgende aktioner:'; $labels['add'] = 'Tilføje'; $labels['del'] = 'Fjern'; $labels['sender'] = 'Afsender'; $labels['recipient'] = 'Modtager'; +$labels['vacationaddr'] = 'Min(e) yderligere email-adresse(r):'; $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):'; $labels['vacationinterval'] = 'Hvor tit skal besked sendes:'; $labels['days'] = 'dage'; @@ -157,6 +159,7 @@ $labels['index'] = 'indeks:'; $labels['indexlast'] = 'baglends'; $messages['filterunknownerror'] = 'Ukendt server fejl.'; $messages['filterconnerror'] = 'Kan ikke forbinde til server.'; +$messages['filterdeleteerror'] = 'Kunne ikke slette filter. Serverfejl opstod.'; $messages['filterdeleted'] = 'Filter slettet.'; $messages['filtersaved'] = 'Filter gemt.'; $messages['filterdeleteconfirm'] = 'Vil du slette det valgte filter?'; diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc index f3559fa89..234f31315 100644 --- a/plugins/managesieve/localization/de_CH.inc +++ b/plugins/managesieve/localization/de_CH.inc @@ -159,22 +159,31 @@ $labels['index'] = 'Index:'; $labels['indexlast'] = 'rückwärts'; $messages['filterunknownerror'] = 'Unbekannter Serverfehler'; $messages['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden'; +$messages['filterdeleteerror'] = 'Serverfehler beim Löschen des Filters.'; $messages['filterdeleted'] = 'Filter erfolgreich gelöscht'; $messages['filtersaved'] = 'Filter gespeichert'; +$messages['filtersaveerror'] = 'Serverfehler beim Speichern des Filters.'; $messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?'; $messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?'; $messages['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?'; $messages['forbiddenchars'] = 'Unerlaubte Zeichen im Feld'; $messages['cannotbeempty'] = 'Feld darf nicht leer sein'; $messages['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.'; +$messages['setactivateerror'] = 'Serverfehler beim Aktivieren des gewählten Filtersatzes.'; +$messages['setdeactivateerror'] = 'Serverfehler beim Deaktivieren des gewählten Filtersatzes.'; +$messages['setdeleteerror'] = 'Serverfehler beim Löschen des gewählten Filtersatzes.'; $messages['setactivated'] = 'Filtersatz erfolgreich aktiviert.'; $messages['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.'; $messages['setdeleted'] = 'Filtersatz erfolgreich gelöscht.'; $messages['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?'; +$messages['setcreateerror'] = 'Serverfehler beim Erstellen des Filtersatzes.'; $messages['setcreated'] = 'Filter erfolgreich erstellt.'; +$messages['activateerror'] = 'Serverfehler beim Aktivieren des/der gewählten Filter(s).'; +$messages['deactivateerror'] = 'Serverfehler beim Deaktivieren des/der gewählten Filter(s).'; $messages['deactivated'] = 'Filter erfolgreich aktiviert.'; $messages['activated'] = 'Filter erfolgreich deaktiviert.'; $messages['moved'] = 'Filter erfolgreich verschoben.'; +$messages['moveerror'] = 'Serverfehler beim Verschieben des gewählten Filters.'; $messages['nametoolong'] = 'Filtersatz kann nicht erstellt werden. Name zu lang.'; $messages['namereserved'] = 'Reservierter Name.'; $messages['setexist'] = 'Filtersatz existiert bereits.'; diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc index 208477a96..91602ee7b 100644 --- a/plugins/managesieve/localization/es_ES.inc +++ b/plugins/managesieve/localization/es_ES.inc @@ -157,25 +157,34 @@ $labels['asciicasemap'] = 'no sensible a mayúsculas (ascii-casemap)'; $labels['asciinumeric'] = 'numerico (ascii-numeric)'; $labels['index'] = 'Ãndice:'; $labels['indexlast'] = 'hacia atrás'; -$messages['filterunknownerror'] = 'Error desconocido de servidor.'; -$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve.'; +$messages['filterunknownerror'] = 'Error desconocido en el servidor.'; +$messages['filterconnerror'] = 'No se ha podido conectar con el servidor managesieve.'; +$messages['filterdeleteerror'] = 'No se ha podido borrar el filtro. Ha ocurrido un error en el servidor.'; $messages['filterdeleted'] = 'Filtro borrado satisfactoriamente.'; $messages['filtersaved'] = 'Filtro guardado satisfactoriamente.'; +$messages['filtersaveerror'] = 'No se ha podido guardar el filtro. Ha ocurrido un error en el servidor.'; $messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?'; $messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?'; $messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?'; $messages['forbiddenchars'] = 'Caracteres prohibidos en el campo.'; $messages['cannotbeempty'] = 'El campo no puede estar vacÃo.'; $messages['ruleexist'] = 'Ya existe un filtro con el nombre especificado.'; +$messages['setactivateerror'] = 'No se ha podido activar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.'; +$messages['setdeactivateerror'] = 'No se ha podido desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.'; +$messages['setdeleteerror'] = 'No se ha podido borrar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.'; $messages['setactivated'] = 'Conjunto de filtros activado satisfactoriamente.'; $messages['setdeactivated'] = 'Conjunto de filtros desactivado satisfactoriamente.'; $messages['setdeleted'] = 'Conjunto de filtros borrado satisfactoriamente.'; $messages['setdeleteconfirm'] = '¿Está seguro de que desea borrar el conjunto de filtros seleccionado?'; +$messages['setcreateerror'] = 'No se ha podido crear el conjunto de filtros. Ha ocurrido un error en el servidor.'; $messages['setcreated'] = 'Conjunto de filtros creado satisfactoriamente.'; +$messages['activateerror'] = 'No se han podido habilitar los filtros seleccionados. Ha ocurrido un error en el servidor.'; +$messages['deactivateerror'] = 'No se han podido deshabilitar los filtros seleccionados. Ha ocurrido un error en el servidor.'; $messages['deactivated'] = 'Filtro(s) deshabilitado(s) correctamente.'; $messages['activated'] = 'Filtro(s) habilitado(s) correctamente.'; $messages['moved'] = 'Filtro movido correctamente.'; -$messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo'; +$messages['moveerror'] = 'No se ha podido mover el filtro seleccionado. Ha ocurrido un error en el servidor.'; +$messages['nametoolong'] = 'Nombre demasiado largo.'; $messages['namereserved'] = 'Nombre reservado.'; $messages['setexist'] = 'El conjunto ya existe.'; $messages['nodata'] = '¡Al menos una posición debe ser seleccionada!'; diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc index 862c32b94..afab3f3a6 100644 --- a/plugins/managesieve/localization/hu_HU.inc +++ b/plugins/managesieve/localization/hu_HU.inc @@ -159,22 +159,31 @@ $labels['index'] = 'index:'; $labels['indexlast'] = 'visszafelé'; $messages['filterunknownerror'] = 'Ismeretlen szerverhiba'; $messages['filterconnerror'] = 'Nem tudok a szűrÅ‘szerverhez kapcsolódni'; +$messages['filterdeleteerror'] = 'A szűrÅ‘t nem lehet törölni. Szerverhiba történt'; $messages['filterdeleted'] = 'A szűrÅ‘ törlése sikeres'; $messages['filtersaved'] = 'A szűrÅ‘ mentése sikeres'; +$messages['filtersaveerror'] = 'A szűrÅ‘ mentése sikertelen. Szerverhiba történt'; $messages['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrÅ‘t?'; $messages['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?'; $messages['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?'; $messages['forbiddenchars'] = 'Érvénytelen karakter a mezÅ‘ben'; $messages['cannotbeempty'] = 'A mezÅ‘ nem lehet üres'; $messages['ruleexist'] = 'Már van ilyen névvel elmentett szűrÅ‘.'; +$messages['setactivateerror'] = 'A kiválasztott szűrÅ‘ készletet nem sikerült engedélyezni. Szerver hiba történt.'; +$messages['setdeactivateerror'] = 'A kiválasztott szűrÅ‘ készletet nem sikerült tiltani. Szerver hiba történt.'; +$messages['setdeleteerror'] = 'Nem sikerült a kiválasztott szűrÅ‘ készletet törölni. Szerver hiba történt.'; $messages['setactivated'] = 'A filter készlet engedélyezése sikeresen végrehajtódott.'; $messages['setdeactivated'] = 'A filter készlet tiltása sikeresen végrehajtódott.'; $messages['setdeleted'] = 'A filter készlet törlése sikeresen végrehajtódott.'; $messages['setdeleteconfirm'] = 'Biztosan törölni szeretnéd a kiválasztott szűrÅ‘ készleteket?'; +$messages['setcreateerror'] = 'Nem sikerült létrehozni a szűrÅ‘ készletet. Szerver hiba történt.'; $messages['setcreated'] = 'A szűrÅ‘ készlet sikeresen létrejött.'; +$messages['activateerror'] = 'Nem sikerült engedélyezni a kiválasztott szűrö(k)et. Szerver hiba történt.'; +$messages['deactivateerror'] = 'Nem sikerült kikapcsolni a kiválasztott szűrÅ‘(ke)t. Szerver hiba történt.'; $messages['deactivated'] = 'SzűrÅ‘(k) sikeresen bekapcsolva.'; $messages['activated'] = 'SzűrÅ‘(k) sikeresen kikapcsolva.'; $messages['moved'] = 'A szűrÅ‘ sikeresen áthelyezve.'; +$messages['moveerror'] = 'Az áthelyezés nem sikerült. Szerver hiba történt.'; $messages['nametoolong'] = 'Túll hosszu név'; $messages['namereserved'] = 'Nem használható (foglalt) név-'; $messages['setexist'] = 'A készlet már létezik.'; diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc index 9de758fa5..b7fc970e5 100644 --- a/plugins/managesieve/localization/it_IT.inc +++ b/plugins/managesieve/localization/it_IT.inc @@ -159,22 +159,31 @@ $labels['index'] = 'indice:'; $labels['indexlast'] = 'indietro'; $messages['filterunknownerror'] = 'Errore sconosciuto del server'; $messages['filterconnerror'] = 'Collegamento al server managesieve fallito'; +$messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server.'; $messages['filterdeleted'] = 'Filtro eliminato con successo'; $messages['filtersaved'] = 'Filtro salvato con successo'; +$messages['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server.'; $messages['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?'; $messages['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?'; $messages['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?'; $messages['forbiddenchars'] = 'Caratteri non consentiti nel campo'; $messages['cannotbeempty'] = 'Il campo non può essere vuoto'; $messages['ruleexist'] = 'Esiste già un filtro con questo nome'; +$messages['setactivateerror'] = 'Impossibile attivare il filtro. Errore del server.'; +$messages['setdeactivateerror'] = 'Impossibile disattivare i filtri selezionati. Errore del server.'; +$messages['setdeleteerror'] = 'Impossibile cancellare i filtri selezionati. Errore del server.'; $messages['setactivated'] = 'Filtro attivato'; $messages['setdeactivated'] = 'Filtro disattivato'; $messages['setdeleted'] = 'Filtro cancellato'; $messages['setdeleteconfirm'] = 'Sei sicuro di voler cancellare il gruppo di filtri'; +$messages['setcreateerror'] = 'Impossibile creare il gruppo di filtri. Errore del server.'; $messages['setcreated'] = 'Gruppo di filtri creato'; +$messages['activateerror'] = 'Impossibile abilitare i filtri selzionati. Errore del server.'; +$messages['deactivateerror'] = 'impossibile disabilitare i filtri selezionati. Errore del server.'; $messages['deactivated'] = 'filtro abilitato'; $messages['activated'] = 'filtro disabilitato'; $messages['moved'] = 'filtro spostato'; +$messages['moveerror'] = 'impossibile spostare il filtro selezionato. Errore del server.'; $messages['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo'; $messages['namereserved'] = 'nome riservato'; $messages['setexist'] = 'Il gruppo esiste già '; diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc index 73aa76573..111f3b4f6 100644 --- a/plugins/managesieve/localization/lv_LV.inc +++ b/plugins/managesieve/localization/lv_LV.inc @@ -47,13 +47,15 @@ $labels['messagesendcopy'] = 'PÄrsÅ«tÄ«t vÄ“stules kopiju uz'; $labels['messagereply'] = 'AtbildÄ“t ar vÄ“stuli'; $labels['messagedelete'] = 'DzÄ“st vÄ“stuli'; $labels['messagediscard'] = 'DzÄ“st vÄ“stuli un atbildÄ“t'; +$labels['messagekeep'] = 'PaturÄ“t ziņu IesÅ«tnÄ“'; $labels['messagesrules'] = 'IenÄkoÅ¡ajÄm vÄ“stulÄ“m:'; $labels['messagesactions'] = '...izpildÄ«t sekojoÅ¡Äs darbÄ«bas:'; $labels['add'] = 'Pievienot'; $labels['del'] = 'DzÄ“st'; $labels['sender'] = 'SÅ«tÄ«tÄjs'; $labels['recipient'] = 'SaņēmÄ“js'; -$labels['vacationdays'] = 'Cik dienu laikÄ vienam un tam paÅ¡am sÅ«tÄ«tÄjam neatbildÄ“t atkÄrtoti (piem., 7):'; +$labels['vacationaddr'] = 'Mana(s) papildus e-pasta adrese(s):'; +$labels['vacationdays'] = 'Cik bieži sÅ«tÄ« ziņojumus (dienÄs):'; $labels['vacationinterval'] = 'Cik bieži sÅ«tÄ«t vÄ“stules:'; $labels['days'] = 'dienas'; $labels['seconds'] = 'sekundes'; @@ -154,25 +156,34 @@ $labels['octet'] = 'precÄ«zs (oktets)'; $labels['asciicasemap'] = 'reÄ£istrnejutÄ«gs (ascii tabula)'; $labels['asciinumeric'] = 'skaitļu (ascii skaitļu)'; $labels['index'] = 'indekss:'; -$labels['indexlast'] = '"backwards"'; +$labels['indexlast'] = 'atpakaļ'; $messages['filterunknownerror'] = 'NezinÄma servera kļūda.'; $messages['filterconnerror'] = 'NeizdevÄs pieslÄ“gties ManageSieve serverim.'; +$messages['filterdeleteerror'] = 'NeizdevÄs izdzÄ“st filtru - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; $messages['filterdeleted'] = 'Filtrs veiksmÄ«gi izdzÄ“sts.'; $messages['filtersaved'] = 'Filtrs veiksmÄ«gi saglabÄts.'; +$messages['filtersaveerror'] = 'NeizdevÄs saglabÄt filtru - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; $messages['filterdeleteconfirm'] = 'Vai JÅ«s tieÅ¡Äm vÄ“laties dzÄ“st atzÄ«mÄ“to filtru?'; $messages['ruledeleteconfirm'] = 'Vai JÅ«s tieÅ¡Äm vÄ“laties dzÄ“st atzÄ«mÄ“to nosacÄ«jumu?'; $messages['actiondeleteconfirm'] = 'Vai JÅ«s tieÅ¡Äm vÄ“laties dzÄ“st atzÄ«mÄ“to darbÄ«bu?'; $messages['forbiddenchars'] = 'Lauks satur aizliegtus simbolus.'; $messages['cannotbeempty'] = 'Lauks nedrÄ«kst bÅ«t tukÅ¡s.'; $messages['ruleexist'] = 'Filtrs ar tÄdu nosaukumu jau pastÄv.'; +$messages['setactivateerror'] = 'NeizdevÄs aktivizÄ“t atzÄ«mÄ“to filtru kopu - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; +$messages['setdeactivateerror'] = 'NeizdevÄs deaktivizÄ“t atzÄ«mÄ“to filtru kopu - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; +$messages['setdeleteerror'] = 'NeizdevÄs izdzÄ“st atzÄ«mÄ“to filtru kopu - atgadÄ«jÄs servera ieksÄ“jÄ kļūda.'; $messages['setactivated'] = 'Filtru kopa veiksmÄ«gi aktivizÄ“ta.'; $messages['setdeactivated'] = 'Filtru kopa veiksmÄ«gi deaktivizÄ“ta.'; $messages['setdeleted'] = 'Filtru kopa veiksmÄ«gi izdzÄ“sta.'; $messages['setdeleteconfirm'] = 'Vai tieÅ¡Äm JÅ«s vÄ“laties dzÄ“st atzÄ«mÄ“to filtru kopu?'; +$messages['setcreateerror'] = 'NeizdevÄs izveidot filtru kopu - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; $messages['setcreated'] = 'Filtru kopa veiksmÄ«gi izveidota.'; +$messages['activateerror'] = 'Nav iespÄ“jams ieslÄ“gt izvÄ“lÄ“to(s) filtru(s) - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; +$messages['deactivateerror'] = 'Nav iespÄ“jams atslÄ“gt izvÄ“lÄ“to(s) filtru(s) - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; $messages['deactivated'] = 'Filtrs(i) veiksmÄ«gi atslÄ“gts(i).'; $messages['activated'] = 'Filtrs(i) veiksmÄ«gi ieslÄ“gts(i).'; $messages['moved'] = 'Filtrs veiksmÄ«gi pÄrvietots.'; +$messages['moveerror'] = 'Nav iespÄ“jams pÄrvietot izvÄ“lÄ“to filtru - atgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda.'; $messages['nametoolong'] = 'NeizdevÄs izveidot filtru kopu. PÄrÄk garÅ¡ kopas nosaukums.'; $messages['namereserved'] = 'RezervÄ“tais nosaukums.'; $messages['setexist'] = 'Kopa jau eksistÄ“.'; diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc index 9b245e7d8..063c60c5f 100644 --- a/plugins/managesieve/localization/pt_BR.inc +++ b/plugins/managesieve/localization/pt_BR.inc @@ -159,22 +159,31 @@ $labels['index'] = 'Ãndice:'; $labels['indexlast'] = 'retroceder'; $messages['filterunknownerror'] = 'Erro desconhecido de servidor'; $messages['filterconnerror'] = 'Não foi possÃvel conectar ao servidor managesieve'; +$messages['filterdeleteerror'] = 'ImpossÃvel excluir o filtro. Ocorreu um erro no servidor.'; $messages['filterdeleted'] = 'Filtro excluÃdo com sucesso'; $messages['filtersaved'] = 'Filtro gravado com sucesso'; +$messages['filtersaveerror'] = 'ImpossÃvel salvar o filtro. Ocorreu um erro no servidor.'; $messages['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?'; $messages['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?'; $messages['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?'; $messages['forbiddenchars'] = 'Caracteres não permitidos no campo'; $messages['cannotbeempty'] = 'Campo não pode ficar em branco'; $messages['ruleexist'] = 'O filtro com o nome especificado já existe.'; +$messages['setactivateerror'] = 'ImpossÃvel ativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.'; +$messages['setdeactivateerror'] = 'ImpossÃvel desativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.'; +$messages['setdeleteerror'] = 'ImpossÃvel excluir o conjunto de filtros selecionados. Ocorreu um erro no servidor.'; $messages['setactivated'] = 'Conjunto de filtros ativados com sucesso.'; $messages['setdeactivated'] = 'Conjunto de filtros desativados com sucesso.'; $messages['setdeleted'] = 'Conjunto de filtros excluÃdos com sucesso.'; $messages['setdeleteconfirm'] = 'Você está certo que deseja excluir o conjunto de filtros selecionados?'; +$messages['setcreateerror'] = 'ImpossÃvel criar o conjunto de filtros. Ocorreu um erro no servidor.'; $messages['setcreated'] = 'Conjunto de filtros criado com sucesso.'; +$messages['activateerror'] = 'ImpossÃvel habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.'; +$messages['deactivateerror'] = 'ImpossÃvel desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.'; $messages['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.'; $messages['activated'] = 'Filtro(s) desabilitado(s) com sucesso.'; $messages['moved'] = 'Filtro movido com sucesso.'; +$messages['moveerror'] = 'ImpossÃvel mover o filtro selecionado. Ocorreu um erro no servidor.'; $messages['nametoolong'] = 'Nome muito longo.'; $messages['namereserved'] = 'Nome reservado.'; $messages['setexist'] = 'Conjunto já existe.'; diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc index 5e7bfb3b5..8a9e01708 100644 --- a/plugins/managesieve/localization/sk_SK.inc +++ b/plugins/managesieve/localization/sk_SK.inc @@ -159,22 +159,31 @@ $labels['index'] = 'index:'; $labels['indexlast'] = 'dozadu'; $messages['filterunknownerror'] = 'Neznáma chyba serveru'; $messages['filterconnerror'] = 'Nepodarilo sa pripojiÅ¥ k managesieve serveru'; +$messages['filterdeleteerror'] = 'Nemožno vymazaÅ¥ filter. Nastala chyba servera.'; $messages['filterdeleted'] = 'Filter bol zmazaný'; $messages['filtersaved'] = 'Filter bol uložený'; +$messages['filtersaveerror'] = 'Nemožno uložiÅ¥ filter. Nastala chyba servera.'; $messages['filterdeleteconfirm'] = 'Naozaj si prajete zmazaÅ¥ tento filter?'; $messages['ruledeleteconfirm'] = 'Naozaj si prajete zamzaÅ¥ toto pravidlo?'; $messages['actiondeleteconfirm'] = 'Naozaj si prajete zmazaÅ¥ túto akciu?'; $messages['forbiddenchars'] = 'Pole obsahuje nepovolené znaky'; $messages['cannotbeempty'] = 'Pole nemôže byÅ¥ prázdne'; $messages['ruleexist'] = 'Filter so zadaným menom už existuje.'; +$messages['setactivateerror'] = 'Nemožno aktivovaÅ¥ vybranú súpravu filtrov. Nastala chyba servera.'; +$messages['setdeactivateerror'] = 'Nemožno deaktivovaÅ¥ vybranú súpravu filtrov. Nastala chyba servera.'; +$messages['setdeleteerror'] = 'Nemožno vymazaÅ¥ vybranú súpravu filtrov. Nastala chyba servera.'; $messages['setactivated'] = 'Sada filtrov bola aktivovaná'; $messages['setdeactivated'] = 'Sada filtrov bola deaktivovaná'; $messages['setdeleted'] = 'Sada filtrov bola zmazaná'; $messages['setdeleteconfirm'] = 'Naozaj si prajete zmazaÅ¥ túto sadu filtrov?'; +$messages['setcreateerror'] = 'Nemožno vytvoriÅ¥ súpravu filtrov. Nastala chyba servera.'; $messages['setcreated'] = 'Sada filtrov bola vytvorená'; +$messages['activateerror'] = 'Nemožno aktivovaÅ¥ vybraný filter (vybrané filtre). Nastala chyba servera.'; +$messages['deactivateerror'] = 'Nemožno deaktivovaÅ¥ vybraný filter (vybrané filtre). Nastala chyba servera.'; $messages['deactivated'] = 'Filter(e) povolený.'; $messages['activated'] = 'Filter(e) úspeÅ¡ne vypnutý.'; $messages['moved'] = 'Filter presunutý.'; +$messages['moveerror'] = 'Nemožno presunúť vybraný filter. Nastala chyba servera.'; $messages['nametoolong'] = 'Názov sady filtrov je prÃliÅ¡ dlhý'; $messages['namereserved'] = 'Rezervovaný názov.'; $messages['setexist'] = 'Množina už existuje.'; diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc index c776a337a..2915684d3 100644 --- a/plugins/managesieve/localization/sl_SI.inc +++ b/plugins/managesieve/localization/sl_SI.inc @@ -54,6 +54,7 @@ $labels['add'] = 'Dodaj'; $labels['del'] = 'IzbriÅ¡i'; $labels['sender'] = 'PoÅ¡iljatelj'; $labels['recipient'] = 'Prejemnik'; +$labels['vacationaddr'] = 'Moji dodatni e-naslovi'; $labels['vacationdays'] = 'Kako pogosto naj bodo sporoÄila poslana (v dnevih):'; $labels['vacationinterval'] = 'SporoÄila poÅ¡lji na:'; $labels['days'] = 'dni'; @@ -158,22 +159,31 @@ $labels['index'] = 'indeks:'; $labels['indexlast'] = 'obraten vrstni red'; $messages['filterunknownerror'] = 'PriÅ¡lo je do neznane napake.'; $messages['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoÄe vzpostaviti'; +$messages['filterdeleteerror'] = 'Pravila ni bilo mogoÄe izbrisati. PriÅ¡lo je do napake.'; $messages['filterdeleted'] = 'Pravilo je bilo uspeÅ¡no izbrisano.'; $messages['filtersaved'] = 'Pravilo je bilo uspeÅ¡no shranjeno'; +$messages['filtersaveerror'] = 'Pravila ni bilo mogoÄe shraniti. PriÅ¡lo je do napake.'; $messages['filterdeleteconfirm'] = 'Ste prepriÄani, da želite izbrisati izbrano pravilo?'; $messages['ruledeleteconfirm'] = 'Ste prepriÄani, da želite izbrisati izbrano pravilo?'; $messages['actiondeleteconfirm'] = 'Ste prepriÄani, da želite izbrisati izbrano dejanje?'; $messages['forbiddenchars'] = 'V polju so neveljavni znaki'; $messages['cannotbeempty'] = 'Polje ne sme biti prazno'; $messages['ruleexist'] = 'Filer s tem imenom že obstaja'; +$messages['setactivateerror'] = 'Izbranih filtrov ni bilo mogoÄe vkljuÄiti. PriÅ¡lo je do napake na strežniku.'; +$messages['setdeactivateerror'] = 'Izbranih filtrov ni bilo mogoÄe izkljuÄiti. PriÅ¡lo je do napake na strežniku.'; +$messages['setdeleteerror'] = 'Izbranih filtrov ni bilo mogoÄe izbrisati. PriÅ¡lo je do napake na strežniku.'; $messages['setactivated'] = 'Filter je bil uspeÅ¡no vkljuÄen.'; $messages['setdeactivated'] = 'Filter je bil uspeÅ¡no onemogoÄen.'; $messages['setdeleted'] = 'Filter je bil uspeÅ¡no izbrisan.'; $messages['setdeleteconfirm'] = 'Ste prepriÄani, da želite izbrisati ta filter?'; +$messages['setcreateerror'] = 'Nabora filtrov ni bilo mogoÄe ustvariti. PriÅ¡lo je do napake na strežniku.'; $messages['setcreated'] = 'Filter je bil uspeÅ¡no ustvarjen.'; +$messages['activateerror'] = 'Izbranega/ih filtra/ov ni bilo mogoÄe vkljuÄiti. PriÅ¡lo je do napake na strežniku.'; +$messages['deactivateerror'] = 'Izbranega/ih fitra/ov ni bilo mogoÄe izkljuÄiti. PriÅ¡lo je do napake na strežniku.'; $messages['deactivated'] = 'Filtri so bili uspeÅ¡no omogoÄeni.'; $messages['activated'] = 'Filtri so bili uspeÅ¡no onemogoÄeni.'; $messages['moved'] = 'Filter je bil uspeÅ¡no premaknjen.'; +$messages['moveerror'] = 'Izbranega filtra ni bilo mogoÄe premakniti. PriÅ¡lo je do napake na strežniku.'; $messages['nametoolong'] = 'Ime je predolgo.'; $messages['namereserved'] = 'Rezervirano ime.'; $messages['setexist'] = 'Nastavitev filtra že obstaja.'; diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc index 5d855bd09..63f88aeba 100644 --- a/plugins/managesieve/localization/sv_SE.inc +++ b/plugins/managesieve/localization/sv_SE.inc @@ -159,22 +159,31 @@ $labels['index'] = 'index:'; $labels['indexlast'] = 'omvänd'; $messages['filterunknownerror'] = 'Okänt serverfel'; $messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades'; +$messages['filterdeleteerror'] = 'Filtret kunde inte tas bort pÃ¥ grund av serverfel'; $messages['filterdeleted'] = 'Filtret är borttaget'; $messages['filtersaved'] = 'Filtret har sparats'; +$messages['filtersaveerror'] = 'Filtret kunde inte sparas pÃ¥ grund av serverfel'; $messages['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?'; $messages['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?'; $messages['actiondeleteconfirm'] = 'Vill du ta bort filterÃ¥tgärden?'; $messages['forbiddenchars'] = 'OtillÃ¥tet tecken i fältet'; $messages['cannotbeempty'] = 'Fältet kan inte lämnas tomt'; $messages['ruleexist'] = 'Ett filter med angivet namn finns redan.'; +$messages['setactivateerror'] = 'Filtergruppen kunde inte aktiveras pÃ¥ grund av serverfel'; +$messages['setdeactivateerror'] = 'Filtergruppen kunde inte deaktiveras pÃ¥ grund av serverfel'; +$messages['setdeleteerror'] = 'Filtergruppen kunde inte tas bort pÃ¥ grund av serverfel'; $messages['setactivated'] = 'Filtergruppen är aktiverad'; $messages['setdeactivated'] = 'Filtergruppen är deaktiverad'; $messages['setdeleted'] = 'Filtergruppen är borttagen'; $messages['setdeleteconfirm'] = 'Vill du ta bort filtergruppen?'; +$messages['setcreateerror'] = 'Filtergruppen kunde inte läggas till pÃ¥ grund av serverfel'; $messages['setcreated'] = 'Filtergruppen har lagts till'; +$messages['activateerror'] = 'Kunde inte aktivera filter pÃ¥ grund av serverfel.'; +$messages['deactivateerror'] = 'Kunde inte deaktivera filter pÃ¥ grund av serverfel.'; $messages['deactivated'] = 'Filter aktiverat.'; $messages['activated'] = 'Filter deaktiverat.'; $messages['moved'] = 'Filter flyttat.'; +$messages['moveerror'] = 'Kunde inte flytta filter pÃ¥ grund av serverfel.'; $messages['nametoolong'] = 'Filtergruppen kan inte läggas till med för lÃ¥ngt namn'; $messages['namereserved'] = 'Reserverat namn.'; $messages['setexist'] = 'Filtergrupp finns redan.'; diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc index 98db751fc..b0b09e18a 100644 --- a/plugins/managesieve/localization/tr_TR.inc +++ b/plugins/managesieve/localization/tr_TR.inc @@ -159,22 +159,31 @@ $labels['index'] = 'indeks:'; $labels['indexlast'] = 'geriye yönelik'; $messages['filterunknownerror'] = 'Bilinmeyen sunucu hatası.'; $messages['filterconnerror'] = 'Sunucuya baÄŸlanamıyor.'; +$messages['filterdeleteerror'] = 'Filtre silinemedi. Sunucuda hata oluÅŸtu.'; $messages['filterdeleted'] = 'Filtre baÅŸarıyla silindi.'; $messages['filtersaved'] = 'Filter baÅŸarıyla kaydedildi.'; +$messages['filtersaveerror'] = 'Filtre kaydedilemedi. Sunucuda hata oluÅŸtu.'; $messages['filterdeleteconfirm'] = 'Seçilen filtreleri gerçekten silmek istiyor musun?'; $messages['ruledeleteconfirm'] = 'Seçili kuralları silmek istediÄŸinizden emin misiniz?'; $messages['actiondeleteconfirm'] = 'Seçili aksiyonları silmek istediÄŸinizden emin misiniz?'; $messages['forbiddenchars'] = 'Alanda izin verilmeyen karakterler var.'; $messages['cannotbeempty'] = 'Alan boÅŸ olmaz'; $messages['ruleexist'] = 'Belirtilen isimde bir filtre zaten var.'; +$messages['setactivateerror'] = 'Seçilen filtreler etkinleÅŸtirilemedi. Sunucuda hata oluÅŸtu.'; +$messages['setdeactivateerror'] = 'Seçilen filtreler pasifleÅŸtirilemedi. Sunucuda hata oluÅŸtu.'; +$messages['setdeleteerror'] = 'Seçilen filtreler silinemedi. Sunucuda hata oluÅŸtu.'; $messages['setactivated'] = 'Filtreler baÅŸarıyla etkinleÅŸtirilemedi.'; $messages['setdeactivated'] = 'Filtreler baÅŸarıyla pasifleÅŸtirildi.'; $messages['setdeleted'] = 'Filtre seti baÅŸarıyla silindi.'; $messages['setdeleteconfirm'] = 'Seçilen filtre setlerini silmek istediÄŸinizden emin misiniz?'; +$messages['setcreateerror'] = 'Filtre setleri oluÅŸturulamadı. Sunucuda hata oluÅŸtu.'; $messages['setcreated'] = 'Filtre setleri baÅŸarıyla oluÅŸturuldu.'; +$messages['activateerror'] = 'Seçilen filtre(ler) etkinleÅŸtirilemedi. Sunucuda hata oluÅŸtu.'; +$messages['deactivateerror'] = 'Seçilen filtre(ler) pasifleÅŸtirilemedi. Sunucuda hata oluÅŸtu.'; $messages['deactivated'] = 'Filtre(ler) baÅŸarıyla etkinleÅŸtirildi.'; $messages['activated'] = 'Filtre(ler) baÅŸarıyla iptal edildi.'; $messages['moved'] = 'Filtre baÅŸarıyla taşındı.'; +$messages['moveerror'] = 'Seçilen filtre taşınamadı. Sunucuda hata oluÅŸtu.'; $messages['nametoolong'] = 'Ä°sim çok uzun.'; $messages['namereserved'] = 'rezerve edilmiÅŸ isim.'; $messages['setexist'] = 'Set zaten var.'; diff --git a/plugins/newmail_notifier/localization/ca_ES.inc b/plugins/newmail_notifier/localization/ca_ES.inc index bb510ae26..1ae40d158 100644 --- a/plugins/newmail_notifier/localization/ca_ES.inc +++ b/plugins/newmail_notifier/localization/ca_ES.inc @@ -24,4 +24,5 @@ $labels['body'] = 'Heu rebut un missatge nou.'; $labels['testbody'] = 'Això és una notificació de prova.'; $labels['desktopdisabled'] = 'Les notificacions d\'escriptori estan deshabilitades al vostre navegador.'; $labels['desktopunsupported'] = 'El vostre navegador no permet les notificacions d\'escriptori.'; +$labels['desktoptimeout'] = 'Tancar notificació de l\'escriptori'; ?> diff --git a/plugins/newmail_notifier/localization/da_DK.inc b/plugins/newmail_notifier/localization/da_DK.inc index 26e4e6a7b..356076f71 100644 --- a/plugins/newmail_notifier/localization/da_DK.inc +++ b/plugins/newmail_notifier/localization/da_DK.inc @@ -24,4 +24,5 @@ $labels['body'] = 'Du har modtaget en ny besked.'; $labels['testbody'] = 'Dette er en test meddelelse.'; $labels['desktopdisabled'] = 'Skrivebordsbeskeder er deaktiveret i din browser.'; $labels['desktopunsupported'] = 'Din browser understøtter ikke skrivebordsbeskeder.'; +$labels['desktoptimeout'] = 'Luk skrivebordsbesked'; ?> diff --git a/plugins/newmail_notifier/localization/fa_IR.inc b/plugins/newmail_notifier/localization/fa_IR.inc index af58aeed2..2c7980640 100644 --- a/plugins/newmail_notifier/localization/fa_IR.inc +++ b/plugins/newmail_notifier/localization/fa_IR.inc @@ -24,4 +24,5 @@ $labels['body'] = 'شما یک پیغام جدید دریاÙت Ú©Ø±Ø¯Ù‡â€ŒØ§ÛŒØ $labels['testbody'] = 'این یک تذکر آزمایشی است.'; $labels['desktopdisabled'] = 'تذکرهای رومیزی در مرورگر شما غیرÙعال شده‌اند.'; $labels['desktopunsupported'] = 'مرورگر شما تذکرهای رومیزی را پشتیبانی نمی‌کند.'; +$labels['desktoptimeout'] = 'بستن تذکر دسکتاپ'; ?> diff --git a/plugins/newmail_notifier/localization/lv_LV.inc b/plugins/newmail_notifier/localization/lv_LV.inc index 60d951e5e..4ca083598 100644 --- a/plugins/newmail_notifier/localization/lv_LV.inc +++ b/plugins/newmail_notifier/localization/lv_LV.inc @@ -24,4 +24,5 @@ $labels['body'] = 'JÅ«s esat saņēmis jaunu vÄ“stuli.'; $labels['testbody'] = 'Å is ir testa paziņojums.'; $labels['desktopdisabled'] = 'Darbavirsmas paziņojumi JÅ«su pÄrlÅ«kprogrammÄ ir atslÄ“gti.'; $labels['desktopunsupported'] = 'JÅ«su pÄrlÅ«kprogramma neatbalsta darbavirsmas paziņojumus.'; +$labels['desktoptimeout'] = 'AizvÄ“rt darbavirsmas paziņojumu'; ?> diff --git a/plugins/newmail_notifier/localization/sl_SI.inc b/plugins/newmail_notifier/localization/sl_SI.inc index 32f36f7d9..a95fde055 100644 --- a/plugins/newmail_notifier/localization/sl_SI.inc +++ b/plugins/newmail_notifier/localization/sl_SI.inc @@ -24,4 +24,5 @@ $labels['body'] = 'Prejeli ste novo sporoÄilo.'; $labels['testbody'] = 'To je testno obvestilo.'; $labels['desktopdisabled'] = 'Obvestila na namizju so v vaÅ¡em brskalniku onemogoÄena.'; $labels['desktopunsupported'] = 'VaÅ¡ brskalnik ne podpira izpis obvestil na namizju.'; +$labels['desktoptimeout'] = 'Zapri obvestila na namizju'; ?> diff --git a/plugins/password/drivers/domainfactory.php b/plugins/password/drivers/domainfactory.php index 7f6b8860e..9128720c9 100644 --- a/plugins/password/drivers/domainfactory.php +++ b/plugins/password/drivers/domainfactory.php @@ -4,9 +4,9 @@ * domainFACTORY Password Driver * * Driver to change passwords with the hosting provider domainFACTORY. - * See: http://www.df.eu/ + * http://www.df.eu/ * - * @version 2.0 + * @version 2.1 * @author Till Krüss <me@tillkruess.com> * @link http://tillkruess.com/projects/roundcube/ * @@ -14,57 +14,76 @@ class rcube_domainfactory_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); + function save($curpass, $passwd) + { + $rcmail = rcmail::get_instance(); - if (is_null($curpass)) { - $curpass = $rcmail->decrypt($_SESSION['password']); - } + if (is_null($curpass)) { + $curpass = $rcmail->decrypt($_SESSION['password']); + } - if ($ch = curl_init()) { - // initial login - curl_setopt_array($ch, array( - CURLOPT_RETURNTRANSFER => true, - CURLOPT_URL => 'https://ssl.df.eu/chmail.php', - CURLOPT_POST => true, - CURLOPT_POSTFIELDS => array( - 'login' => $rcmail->user->get_username(), - 'pwd' => $curpass, - 'action' => 'change' - ) - )); + if ($ch = curl_init()) { - if ($result = curl_exec($ch)) { - // login successful, get token! - $postfields = array( - 'pwd1' => $passwd, - 'pwd2' => $passwd, - 'action[update]' => 'Speichern' - ); + // initial login + curl_setopt_array($ch, array( + CURLOPT_RETURNTRANSFER => true, + CURLOPT_URL => 'https://ssl.df.eu/chmail.php', + CURLOPT_POST => true, + CURLOPT_POSTFIELDS => array( + 'login' => $rcmail->user->get_username(), + 'pwd' => $curpass, + 'action' => 'change' + ) + )); - preg_match_all('~<input name="(.+?)" type="hidden" value="(.+?)">~i', $result, $fields); - foreach ($fields[1] as $field_key => $field_name) { - $postfields[$field_name] = $fields[2][$field_key]; - } + if ($result = curl_exec($ch)) { + // login successful, get token! + $postfields = array( + 'pwd1' => $passwd, + 'pwd2' => $passwd, + 'action[update]' => 'Speichern' + ); - // change password - $ch = curl_copy_handle($ch); - curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields); - if ($result = curl_exec($ch)) { - if (strpos($result, 'Einstellungen erfolgreich') !== false) { - return PASSWORD_SUCCESS; - } - } else { - return PASSWORD_CONNECT_ERROR; - } - } else { - return PASSWORD_CONNECT_ERROR; - } - } else { - return PASSWORD_CONNECT_ERROR; - } + preg_match_all('~<input name="(.+?)" type="hidden" value="(.+?)">~i', $result, $fields); + foreach ($fields[1] as $field_key => $field_name) { + $postfields[$field_name] = $fields[2][$field_key]; + } - return PASSWORD_ERROR; - } + // change password + $ch = curl_copy_handle($ch); + curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields); + if ($result = curl_exec($ch)) { + + // has the password been changed? + if (strpos($result, 'Einstellungen erfolgreich') !== false) { + return PASSWORD_SUCCESS; + } + + // show error message(s) if possible + if (strpos($result, '<div class="d-msg-text">') !== false) { + preg_match_all('#<div class="d-msg-text">(.*?)</div>#s', $result, $errors); + if (isset($errors[1])) { + $error_message = ''; + foreach ( $errors[1] as $error ) { + $error_message .= trim(mb_convert_encoding( $error, 'UTF-8', 'ISO-8859-15' )).' '; + } + return array('code' => PASSWORD_ERROR, 'message' => $error_message); + } + } + + + } else { + return PASSWORD_CONNECT_ERROR; + } + + } else { + return PASSWORD_CONNECT_ERROR; + } + + } else { + return PASSWORD_CONNECT_ERROR; + } + + return PASSWORD_ERROR; + } } diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index cf62debcf..739958ad7 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -146,7 +146,7 @@ class rcube_ldap_password return ''; } - $base = $rcmail->config->get('password_ldap_search_base'); + $base = self::substitute_vars($rcmail->config->get('password_ldap_search_base')); $filter = self::substitute_vars($rcmail->config->get('password_ldap_search_filter')); $options = array ( 'scope' => 'sub', diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php index c5d828fab..47e3b07de 100644 --- a/plugins/password/drivers/ldap_simple.php +++ b/plugins/password/drivers/ldap_simple.php @@ -187,6 +187,8 @@ class rcube_ldap_simple_password $search_base = $rcmail->config->get('password_ldap_search_base'); $search_filter = $rcmail->config->get('password_ldap_search_filter'); + + $search_base = rcube_ldap_password::substitute_vars($search_base); $search_filter = rcube_ldap_password::substitute_vars($search_filter); $this->_debug("C: Search $search_base for $search_filter"); diff --git a/program/.htaccess b/program/.htaccess deleted file mode 100644 index be9e7e25a..000000000 --- a/program/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -<IfModule mod_rewrite.c> -RewriteEngine On -RewriteRule !^(js|resources) - [F] -</IfModule> diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 0483f0e18..4b3f13760 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -346,6 +346,44 @@ class rcmail extends rcube return $list; } + /** + * Getter for compose responses. + * These are stored in local config and user preferences. + * + * @param boolean True to sort the list alphabetically + * @param boolean True if only this user's responses shall be listed + * @return array List of the current user's stored responses + */ + public function get_compose_responses($sorted = false, $user_only = false) + { + $responses = array(); + + if (!$user_only) { + foreach ($this->config->get('compose_responses_static', array()) as $response) { + if (empty($response['key'])) + $response['key'] = substr(md5($response['name']), 0, 16); + $response['static'] = true; + $response['class'] = 'readonly'; + $k = $sorted ? '0000-' . strtolower($response['name']) : $response['key']; + $responses[$k] = $response; + } + } + + foreach ($this->config->get('compose_responses', array()) as $response) { + if (empty($response['key'])) + $response['key'] = substr(md5($response['name']), 0, 16); + $k = $sorted ? strtolower($response['name']) : $response['key']; + $responses[$k] = $response; + } + + // sort list by name + if ($sorted) { + ksort($responses, SORT_LOCALE_STRING); + } + + return array_values($responses); + } + /** * Init output object for GUI and add common scripts. diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index 6651a9461..8a960673d 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -1165,7 +1165,7 @@ class rcmail_output_html extends rcmail_output } else if ($attrib['type'] == 'link') { $btn_content = isset($attrib['content']) ? $attrib['content'] : ($attrib['label'] ? $attrib['label'] : $attrib['command']); - $link_attrib = array('href', 'onclick', 'title', 'id', 'class', 'style', 'tabindex', 'target'); + $link_attrib = array_merge(html::$common_attrib, array('href', 'onclick', 'tabindex', 'target')); if ($attrib['innerclass']) $btn_content = html::span($attrib['innerclass'], $btn_content); } diff --git a/program/js/app.js b/program/js/app.js index ac49b4ed5..f7fd7cea0 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -218,12 +218,8 @@ function rcube_webmail() // load messages this.command('list'); - } - if (this.gui_objects.qsearchbox) { - if (this.env.search_text != null) - this.gui_objects.qsearchbox.value = this.env.search_text; - $(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list && rcmail.message_list.blur(); }); + $(this.gui_objects.qsearchbox).val(this.env.search_text).focusin(function() { rcmail.message_list.blur(); }); } this.set_button_titles(); @@ -256,12 +252,14 @@ function rcube_webmail() } else if (this.env.action == 'compose') { this.env.address_group_stack = []; - this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin']; + this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', + 'toggle-editor', 'list-adresses', 'pushgroup', 'search', 'reset-search', 'extwin', + 'insert-response', 'save-response']; if (this.env.drafts_mailbox) this.env.compose_commands.push('savedraft') - this.enable_command(this.env.compose_commands, 'identities', true); + this.enable_command(this.env.compose_commands, 'identities', 'responses', true); // add more commands (not enabled) $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']); @@ -272,6 +270,23 @@ function rcube_webmail() this.enable_command('spellcheck', true); } + // init canned response functions + if (this.gui_objects.responseslist) { + $('a.insertresponse', this.gui_objects.responseslist) + .attr('unselectable', 'on') + .mousedown(function(e){ return rcube_event.cancel(e); }) + .mouseup(function(e){ + ref.command('insert-response', $(this).attr('rel')); + $(document.body).trigger('mouseup'); // hides the menu + return rcube_event.cancel(e); + }); + + // avoid textarea loosing focus when hitting the save-response button/link + for (var i=0; this.buttons['save-response'] && i < this.buttons['save-response'].length; i++) { + $('#'+this.buttons['save-response'][i].id).mousedown(function(e){ return rcube_event.cancel(e); }) + } + } + document.onmouseup = function(e){ return p.doc_mouse_up(e); }; // init message compose form @@ -332,7 +347,7 @@ function rcube_webmail() this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups); this.enable_command('add', 'import', this.env.writable_source); - this.enable_command('list', 'listgroup', 'pushgroup', 'popgroup', 'listsearch', 'advanced-search', true); + this.enable_command('list', 'listgroup', 'pushgroup', 'popgroup', 'listsearch', 'search', 'reset-search', 'advanced-search', true); if (this.gui_objects.contactslist) { this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, @@ -350,8 +365,8 @@ function rcube_webmail() this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); }; document.onmouseup = function(e){ return p.doc_mouse_up(e); }; - if (this.gui_objects.qsearchbox) - $(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); }); + + $(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); }); this.update_group_commands(); this.command('list'); @@ -375,13 +390,10 @@ function rcube_webmail() this.init_contact_form(); } - if (this.gui_objects.qsearchbox) - this.enable_command('search', 'reset-search', true); - break; case 'settings': - this.enable_command('preferences', 'identities', 'save', 'folders', true); + this.enable_command('preferences', 'identities', 'responses', 'save', 'folders', true); if (this.env.action == 'identities') { this.enable_command('add', this.env.identities_level < 2); @@ -389,9 +401,6 @@ function rcube_webmail() else if (this.env.action == 'edit-identity' || this.env.action == 'add-identity') { this.enable_command('save', 'edit', 'toggle-editor', true); this.enable_command('delete', this.env.identities_level < 2); - - if (this.env.action == 'add-identity') - $("input[type='text']").first().select(); } else if (this.env.action == 'folders') { this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true); @@ -400,7 +409,9 @@ function rcube_webmail() this.enable_command('save', 'folder-size', true); parent.rcmail.env.exists = this.env.messagecount; parent.rcmail.enable_command('purge', this.env.messagecount); - $("input[type='text']").first().select(); + } + else if (this.env.action == 'responses') { + this.enable_command('add', true); } if (this.gui_objects.identitieslist) { @@ -418,8 +429,22 @@ function rcube_webmail() this.sections_list.init(); this.sections_list.focus(); } - else if (this.gui_objects.subscriptionlist) + else if (this.gui_objects.subscriptionlist) { this.init_subscription_list(); + } + else if (this.gui_objects.responseslist) { + this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:false}); + this.responses_list.addEventListener('select', function(list) { + var win, id = list.get_single_selection(); + p.enable_command('delete', !!id && $.inArray(id, p.env.readonly_responses) < 0); + if (id && (win = p.get_frame_window(p.env.contentframe))) { + p.set_busy(true); + p.location_href({ _action:'edit-response', _key:id, _framed:1 }, win); + } + }); + this.responses_list.init(); + this.responses_list.focus(); + } break; @@ -453,6 +478,11 @@ function rcube_webmail() break; } + // select first input field in an edit form + if (this.gui_objects.editform) + $("input,select,textarea", this.gui_objects.editform) + .not(':hidden').not(':disabled').first().select(); + // unset contentframe variable if preview_pane is enabled if (this.env.contentframe && !$('#' + this.env.contentframe).is(':visible')) this.env.contentframe = null; @@ -463,6 +493,7 @@ function rcube_webmail() // flag object as complete this.loaded = true; + this.env.lastrefresh = new Date(); // show message if (this.pending_message) @@ -725,6 +756,13 @@ function rcube_webmail() case 'add': if (this.task == 'addressbook') this.load_contact(0, 'add'); + else if (this.task == 'settings' && this.env.action == 'responses') { + var frame; + if ((frame = this.get_frame_window(this.env.contentframe))) { + this.set_busy(true); + this.location_href({ _action:'add-response', _framed:1 }, frame); + } + } else if (this.task == 'settings') { this.identity_list.clear_selection(); this.load_identity(0, 'add-identity'); @@ -788,7 +826,10 @@ function rcube_webmail() // addressbook task else if (this.task == 'addressbook') this.delete_contacts(); - // user settings task + // settings: canned response + else if (this.task == 'settings' && this.env.action == 'responses') + this.delete_response(); + // settings: user identities else if (this.task == 'settings') this.delete_identity(); break; @@ -815,37 +856,24 @@ function rcube_webmail() break; case 'toggle_status': - if (props && !props._row) - break; - - flag = 'read'; - - if (props._row.uid) { - uid = props._row.uid; + case 'toggle_flag': + flag = command == 'toggle_flag' ? 'flagged' : 'read'; + if (uid = props) { + // toggle flagged/unflagged + if (flag == 'flagged') { + if (this.message_list.rows[uid].flagged) + flag = 'unflagged'; + } // toggle read/unread - if (this.message_list.rows[uid].deleted) + else if (this.message_list.rows[uid].deleted) flag = 'undelete'; else if (!this.message_list.rows[uid].unread) flag = 'unread'; - } - - this.mark_message(flag, uid); - break; - - case 'toggle_flag': - if (props && !props._row) - break; - flag = 'flagged'; - - if (props._row.uid) { - uid = props._row.uid; - // toggle flagged/unflagged - if (this.message_list.rows[uid].flagged) - flag = 'unflagged'; + this.mark_message(flag, uid); } - this.mark_message(flag, uid); + break; case 'always-load': @@ -1031,7 +1059,7 @@ function rcube_webmail() url = {_reply_uid: uid, _mbox: this.env.mailbox}; if (command == 'reply-all') // do reply-list, when list is detected and popup menu wasn't used - url._all = (!props && this.commands['reply-list'] ? 'list' : 'all'); + url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all'); else if (command == 'reply-list') url._all = 'list'; @@ -1173,6 +1201,7 @@ function rcube_webmail() // user settings commands case 'preferences': case 'identities': + case 'responses': case 'folders': this.goto_url('settings/' + command); break; @@ -1439,7 +1468,7 @@ function rcube_webmail() // select the folder if one of its childs is currently selected // don't select if it's virtual (#1488346) - if (this.env.mailbox && this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !node.virtual) + if (this.env.mailbox && this.env.mailbox.startsWith(name + this.env.delimiter) && !node.virtual) this.command('list', name); } else { @@ -1620,8 +1649,8 @@ function rcube_webmail() this.env.coltypes = []; for (i=0; i<cols.length; i++) - if (cols[i].id && cols[i].id.match(/^rcm/)) { - name = cols[i].id.replace(/^rcm/, ''); + if (cols[i].id && cols[i].id.startsWith('rcm')) { + name = cols[i].id.slice(3); this.env.coltypes.push(name); } @@ -1704,7 +1733,7 @@ function rcube_webmail() this.init_message_row = function(row) { - var expando, self = this, uid = row.uid, + var i, fn = {}, self = this, uid = row.uid, status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.uid; if (uid && this.env.messages[uid]) @@ -1712,8 +1741,7 @@ function rcube_webmail() // set eventhandler to status icon if (row.icon = document.getElementById(status_icon)) { - row.icon._row = row.obj; - row.icon.onclick = function(e) { self.command('toggle_status', this); return rcube_event.cancel(e); }; + fn.icon = function(e) { self.command('toggle_status', uid); }; } // save message icon position too @@ -1722,24 +1750,28 @@ function rcube_webmail() else row.msgicon = row.icon; - // set eventhandler to flag icon, if icon found + // set eventhandler to flag icon if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.uid))) { - row.flagicon._row = row.obj; - row.flagicon.onclick = function(e) { self.command('toggle_flag', this); return rcube_event.cancel(e); }; + fn.flagicon = function(e) { self.command('toggle_flag', uid); }; + } + + // set event handler to thread expand/collapse icon + if (!row.depth && row.has_children && (row.expando = document.getElementById('rcmexpando'+row.uid))) { + fn.expando = function(e) { self.expand_message_row(e, uid); }; } - if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) { - row.expando = expando; - expando.onclick = function(e) { return self.expand_message_row(e, uid); }; + // attach events + $.each(fn, function(i, f) { + row[i].onclick = function(e) { f(e); return rcube_event.cancel(e); }; if (bw.touch) { - expando.addEventListener('touchend', function(e) { + row[i].addEventListener('touchend', function(e) { if (e.changedTouches.length == 1) { - self.expand_message_row(e, uid); + f(e); return rcube_event.cancel(e); } }, false); } - } + }); this.triggerEvent('insertrow', { uid:uid, row:row }); }; @@ -2024,12 +2056,14 @@ function rcube_webmail() if (name && (frame = this.get_frame_element(name))) { if (!show && (win = this.get_frame_window(name))) { - if (win.stop) - win.stop(); - else // IE - win.document.execCommand('Stop'); + if (win.location.href.indexOf(this.env.blankpage) < 0) { + if (win.stop) + win.stop(); + else // IE + win.document.execCommand('Stop'); - win.location.href = this.env.blankpage; + win.location.href = this.env.blankpage; + } } else if (!bw.safari && !bw.konq) $(frame)[show ? 'show' : 'hide'](); @@ -2704,9 +2738,6 @@ function rcube_webmail() } } - if (this.env.display_next && this.env.next_uid) - post_data._next_uid = this.env.next_uid; - if (count < 0) post_data._count = (count*-1); // remove threads from the end of the list @@ -2742,6 +2773,9 @@ function rcube_webmail() if (this.env.search_request) data._search = this.env.search_request; + if (this.env.display_next && this.env.next_uid) + data._next_uid = this.env.next_uid; + return data; }; @@ -2992,9 +3026,12 @@ function rcube_webmail() // test if purge command is allowed this.purge_mailbox_test = function() { - return (this.env.exists && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox - || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) - || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter)))); + return (this.env.exists && ( + this.env.mailbox == this.env.trash_mailbox + || this.env.mailbox == this.env.junk_mailbox + || this.env.mailbox.startsWith(this.env.trash_mailbox + this.env.delimiter) + || this.env.mailbox.startsWith(this.env.junk_mailbox + this.env.delimiter) + )); }; @@ -3285,6 +3322,154 @@ function rcube_webmail() return true; }; + this.insert_response = function(key) + { + var insert = this.env.textresponses[key] ? this.env.textresponses[key].text : null; + if (!insert) + return false; + + // insert into tinyMCE editor + if ($("input[name='_is_html']").val() == '1') { + var editor = tinyMCE.get(this.env.composebody); + editor.getWin().focus(); // correct focus in IE & Chrome + editor.selection.setContent(insert, { format:'text' }); + } + // replace selection in compose textarea + else { + var textarea = rcube_find_object(this.env.composebody), + selection = $(textarea).is(':focus') ? this.get_input_selection(textarea) : { start:0, end:0 }, + inp_value = textarea.value; + pre = inp_value.substring(0, selection.start), + end = inp_value.substring(selection.end, inp_value.length); + + // insert response text + textarea.value = pre + insert + end; + + // set caret after inserted text + this.set_caret_pos(textarea, selection.start + insert.length); + textarea.focus(); + } + }; + + /** + * Open the dialog to save a new canned response + */ + this.save_response = function() + { + var sigstart, text = '', strip = false; + + // get selected text from tinyMCE editor + if ($("input[name='_is_html']").val() == '1') { + var editor = tinyMCE.get(this.env.composebody); + editor.getWin().focus(); // correct focus in IE & Chrome + text = editor.selection.getContent({ format:'text' }); + + if (!text) { + text = editor.getContent({ format:'text' }); + strip = true; + } + } + // get selected text from compose textarea + else { + var textarea = rcube_find_object(this.env.composebody), sigstart; + if (textarea && $(textarea).is(':focus')) { + text = this.get_input_selection(textarea).text; + } + + if (!text && textarea) { + text = textarea.value; + strip = true; + } + } + + // strip off signature + if (strip) { + sigstart = text.indexOf('-- \n'); + if (sigstart > 0) { + text = text.substring(0, sigstart); + } + } + + // show dialog to enter a name and to modify the text to be saved + var buttons = {}, + html = '<form class="propform">' + + '<div class="prop block"><label>' + this.get_label('responsename') + '</label>' + + '<input type="text" name="name" id="ffresponsename" size="40" /></div>' + + '<div class="prop block"><label>' + this.get_label('responsetext') + '</label>' + + '<textarea name="text" id="ffresponsetext" cols="40" rows="8"></textarea></div>' + + '</form>'; + + buttons[this.gettext('save')] = function(e) { + var name = $('#ffresponsename').val(), + text = $('#ffresponsetext').val(); + + if (!text) { + $('#ffresponsetext').select(); + return false; + } + if (!name) + name = text.substring(0,40); + + var lock = ref.display_message(ref.get_label('savingresponse'), 'loading'); + ref.http_post('settings/responses', { _insert:1, _name:name, _text:text }, lock); + $(this).dialog('close'); + }; + + buttons[this.gettext('cancel')] = function() { + $(this).dialog('close'); + }; + + this.show_popup_dialog(html, this.gettext('savenewresponse'), buttons); + + $('#ffresponsetext').val(text); + $('#ffresponsename').select(); + }; + + this.add_response_item = function(response) + { + var key = response.key; + this.env.textresponses[key] = response; + + // append to responses list + if (this.gui_objects.responseslist) { + var li = $('<li>').appendTo(this.gui_objects.responseslist); + $('<a>').addClass('insertresponse active') + .attr('href', '#') + .attr('rel', key) + .html(this.quote_html(response.name)) + .appendTo(li) + .mousedown(function(e){ + return rcube_event.cancel(e); + }) + .mouseup(function(e){ + ref.command('insert-response', key); + $(document.body).trigger('mouseup'); // hides the menu + return rcube_event.cancel(e); + }); + } + }; + + this.edit_responses = function() + { + // TODO: implement inline editing of responses + }; + + this.delete_response = function(key) + { + if (!key && this.responses_list) { + var selection = this.responses_list.get_selection(); + key = selection[0]; + } + + // submit delete request + if (key && confirm(this.get_label('deleteresponseconfirm'))) { + this.http_post('settings/delete-response', { _key: key }, false); + return true; + } + + return false; + }; + this.stop_spellchecking = function() { var ed; @@ -3991,7 +4176,7 @@ function rcube_webmail() return; // ...new search value contains old one and previous search was not finished or its result was empty - if (old_value && old_value.length && q.indexOf(old_value) == 0 && (!ac || ac.num <= 0) && this.env.contacts && !this.env.contacts.length) + if (old_value && old_value.length && q.startsWith(old_value) && (!ac || ac.num <= 0) && this.env.contacts && !this.env.contacts.length) return; var i, lock, source, xhr, reqid = new Date().getTime(), @@ -4629,8 +4814,6 @@ function rcube_webmail() $('input.datepicker').datepicker(); } - $("input[type='text']:visible").first().focus(); - // Submit search form on Enter if (this.env.action == 'search') $(this.gui_objects.editform).append($('<input type="submit">').hide()) @@ -5211,6 +5394,35 @@ function rcube_webmail() } }; + this.update_response_row = function(response, oldkey) + { + var list = this.responses_list; + + if (list && oldkey) { + list.update_row(oldkey, [ response.name ], response.key, true); + } + else if (list) { + list.insert_row({ id:'rcmrow'+response.key, cols:[ { className:'name', innerHTML:response.name } ] }); + list.select(response.key); + } + }; + + this.remove_response = function(key) + { + var frame; + + if (this.env.textresponses) { + delete this.env.textresponses[key]; + } + + if (this.responses_list) { + this.responses_list.remove_row(key); + if (this.env.contentframe && (frame = this.get_frame_window(this.env.contentframe))) { + frame.location.href = this.env.blankpage; + } + } + }; + /*********************************************************/ /********* folder manager methods *********/ @@ -5218,7 +5430,10 @@ function rcube_webmail() this.init_subscription_list = function() { - var p = this; + var p = this, delim = RegExp.escape(this.env.delimiter); + + this.last_sub_rx = RegExp('['+delim+']?[^'+delim+']+$'); + this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true}); this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); }); @@ -5229,6 +5444,7 @@ function rcube_webmail() row.obj.onmouseout = function() { p.unfocus_subscription(row.id); }; }; this.subscription_list.init(); + $('#mailboxroot') .mouseover(function(){ p.focus_subscription(this.id); }) .mouseout(function(){ p.unfocus_subscription(this.id); }) @@ -5236,9 +5452,7 @@ function rcube_webmail() this.focus_subscription = function(id) { - var row, folder, - delim = RegExp.escape(this.env.delimiter), - reg = RegExp('['+delim+']?[^'+delim+']+$'); + var row, folder; if (this.drag_active && this.env.mailbox && (row = document.getElementById(id))) if (this.env.subscriptionrows[id] && @@ -5246,8 +5460,8 @@ function rcube_webmail() ) { if (this.check_droptarget(folder) && !this.env.subscriptionrows[this.get_folder_row_id(this.env.mailbox)][2] && - (folder != this.env.mailbox.replace(reg, '')) && - (!folder.match(new RegExp('^'+RegExp.escape(this.env.mailbox+this.env.delimiter)))) + folder != this.env.mailbox.replace(this.last_sub_rx, '') && + !folder.startsWith(this.env.mailbox + this.env.delimiter) ) { this.env.dstfolder = folder; $(row).addClass('droptarget'); @@ -5260,7 +5474,8 @@ function rcube_webmail() var row = $('#'+id); this.env.dstfolder = null; - if (this.env.subscriptionrows[id] && row[0]) + + if (this.env.subscriptionrows[id] && row.length) row.removeClass('droptarget'); else $(this.subscription_list.frame).removeClass('droptarget'); @@ -5286,21 +5501,20 @@ function rcube_webmail() this.subscription_move_folder = function(list) { - var delim = RegExp.escape(this.env.delimiter), - reg = RegExp('['+delim+']?[^'+delim+']+$'); - - if (this.env.mailbox && this.env.dstfolder !== null && (this.env.dstfolder != this.env.mailbox) && - (this.env.dstfolder != this.env.mailbox.replace(reg, '')) + if (this.env.mailbox && this.env.dstfolder !== null && + this.env.dstfolder != this.env.mailbox && + this.env.dstfolder != this.env.mailbox.replace(this.last_sub_rx, '') ) { - reg = new RegExp('[^'+delim+']*['+delim+']', 'g'); - var basename = this.env.mailbox.replace(reg, ''), - newname = this.env.dstfolder === '' ? basename : this.env.dstfolder+this.env.delimiter+basename; + var path = this.env.mailbox.split(this.env.delimiter), + basename = path.pop(), + newname = this.env.dstfolder === '' ? basename : this.env.dstfolder + this.env.delimiter + basename; if (newname != this.env.mailbox) { this.http_post('rename-folder', {_folder_oldname: this.env.mailbox, _folder_newname: newname}, this.set_busy(true, 'foldermoving')); this.subscription_list.draglayer.hide(); } } + this.drag_active = false; this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder)); }; @@ -5373,7 +5587,7 @@ function rcube_webmail() tmp = tmp_name; } // protected folder's child - else if (tmp && folders[n][0].indexOf(tmp) == 0) + else if (tmp && folders[n][0].startsWith(tmp)) slist.push(folders[n][0]); // other else { @@ -5384,7 +5598,7 @@ function rcube_webmail() // check if subfolder of a protected folder for (n=0; n<slist.length; n++) { - if (name.indexOf(slist[n]+this.env.delimiter) == 0) + if (name.startsWith(slist[n] + this.env.delimiter)) rowid = this.get_folder_row_id(slist[n]); } @@ -5422,7 +5636,7 @@ function rcube_webmail() tbody = this.gui_objects.subscriptionlist.tBodies[0], folders = this.env.subscriptionrows, id = this.get_folder_row_id(oldfolder), - regex = new RegExp('^'+RegExp.escape(oldfolder)), + prefix_len = oldfolder.length, subscribed = $('input[name="_subscribed[]"]', $('#'+id)).prop('checked'), // find subfolders of renamed folder list = this.get_subfolders(oldfolder); @@ -5447,7 +5661,7 @@ function rcube_webmail() row.after(tmprow); row = tmprow; // update folder index - name = name.replace(regex, newfolder); + name = newfolder + name.slice(prefix_len); $('input[name="_subscribed[]"]', row).val(name); this.env.subscriptionrows[id][0] = name; // update the name if level is changed @@ -5496,13 +5710,13 @@ function rcube_webmail() this.get_subfolders = function(folder) { var name, list = [], - regex = new RegExp('^'+RegExp.escape(folder)+RegExp.escape(this.env.delimiter)), + prefix = folder + this.env.delimiter, row = $('#'+this.get_folder_row_id(folder)).get(0); while (row = row.nextSibling) { if (row.id) { name = this.env.subscriptionrows[row.id][0]; - if (regex.test(name)) { + if (name && name.startsWith(prefix)) { list.push(row.id); } else @@ -5692,59 +5906,36 @@ function rcube_webmail() // mouse over button this.button_over = function(command, id) { - var n, button, obj, a_buttons = this.buttons[command], - len = a_buttons ? a_buttons.length : 0; - - for (n=0; n<len; n++) { - button = a_buttons[n]; - if (button.id == id && button.status == 'act') { - obj = document.getElementById(button.id); - if (obj && button.over) { - if (button.type == 'image') - obj.src = button.over; - else - obj.className = button.over; - } - } - } + this.button_event(command, id, 'over'); }; // mouse down on button this.button_sel = function(command, id) { - var n, button, obj, a_buttons = this.buttons[command], - len = a_buttons ? a_buttons.length : 0; - - for (n=0; n<len; n++) { - button = a_buttons[n]; - if (button.id == id && button.status == 'act') { - obj = document.getElementById(button.id); - if (obj && button.sel) { - if (button.type == 'image') - obj.src = button.sel; - else - obj.className = button.sel; - } - this.buttons_sel[id] = command; - } - } + this.button_event(command, id, 'sel'); }; // mouse out of button this.button_out = function(command, id) { + this.button_event(command, id, 'act'); + }; + + // event of button + this.button_event = function(command, id, event) + { var n, button, obj, a_buttons = this.buttons[command], len = a_buttons ? a_buttons.length : 0; for (n=0; n<len; n++) { button = a_buttons[n]; if (button.id == id && button.status == 'act') { - obj = document.getElementById(button.id); - if (obj && button.act) { - if (button.type == 'image') - obj.src = button.act; - else - obj.className = button.act; + if (button[event] && (obj = document.getElementById(button.id))) { + obj[button.type == 'image' ? 'src' : 'className'] = button[event]; + } + + if (event == 'sel') { + this.buttons_sel[id] = command; } } } @@ -5899,24 +6090,23 @@ function rcube_webmail() }; // open a jquery UI dialog with the given content - this.show_popup_dialog = function(html, title, buttons) + this.show_popup_dialog = function(html, title, buttons, options) { // forward call to parent window if (this.is_framed()) { - parent.rcmail.show_popup_dialog(html, title, buttons); - return; + return parent.rcmail.show_popup_dialog(html, title, buttons); } var popup = $('<div class="popup">') .html(html) - .dialog({ + .dialog($.extend({ title: title, buttons: buttons, modal: true, resizable: true, width: 500, close: function(event, ui) { $(this).remove() } - }); + }, options || {})); // resize and center popup var win = $(window), w = win.width(), h = win.height(), @@ -5926,13 +6116,15 @@ function rcube_webmail() height: Math.min(h - 40, height + 75 + (buttons ? 50 : 0)), width: Math.min(w - 20, width + 20) }); + + return popup; }; // enable/disable buttons for page shifting this.set_page_buttons = function() { - this.enable_command('nextpage', 'lastpage', (this.env.pagecount > this.env.current_page)); - this.enable_command('previouspage', 'firstpage', (this.env.current_page > 1)); + this.enable_command('nextpage', 'lastpage', this.env.pagecount > this.env.current_page); + this.enable_command('previouspage', 'firstpage', this.env.current_page > 1); }; // mark a mailbox as selected and set environment variable @@ -5942,14 +6134,10 @@ function rcube_webmail() this.treelist.select(name); } else if (this.gui_objects.folderlist) { - var current_li, target_li; - - if ((current_li = $('li.selected', this.gui_objects.folderlist))) { - current_li.removeClass('selected').addClass('unfocused'); - } - if ((target_li = this.get_folder_li(name, prefix, encode))) { - $(target_li).removeClass('unfocused').addClass('selected'); - } + $('li.selected', this.gui_objects.folderlist) + .removeClass('selected').addClass('unfocused'); + $(this.get_folder_li(name, prefix, encode)) + .removeClass('unfocused').addClass('selected'); // trigger event hook this.triggerEvent('selectfolder', { folder:name, prefix:prefix }); @@ -5978,8 +6166,6 @@ function rcube_webmail() name = this.html_identifier(name, encode); return document.getElementById(prefix+name); } - - return null; }; // for reordering column array (Konqueror workaround) @@ -6104,7 +6290,7 @@ function rcube_webmail() div.className.match(/collapsed/)) { // add children's counters for (var k in this.env.unread_counts) - if (k.indexOf(mbox + this.env.delimiter) == 0) + if (k.startsWith(mbox + this.env.delimiter)) childcount += this.env.unread_counts[k]; } @@ -6298,7 +6484,7 @@ function rcube_webmail() if (result === false) return false; else - query = result; + url = this.url(action, result); } url += '&_remote=1'; @@ -6743,6 +6929,9 @@ function rcube_webmail() if (this.task == 'mail' && this.gui_objects.mailboxlist) params = this.check_recent_params(); + params._last = Math.floor(this.env.lastrefresh.getTime() / 1000); + this.env.lastrefresh = new Date(); + // plugins should bind to 'requestrefresh' event to add own params this.http_request('refresh', params, lock); }; @@ -6769,6 +6958,14 @@ function rcube_webmail() /********* helper methods *********/ /********************************************************/ + /** + * Quote html entities + */ + this.quote_html = function(str) + { + return String(str).replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"'); + }; + // get window.opener.rcmail if available this.opener = function() { @@ -6833,6 +7030,57 @@ function rcube_webmail() } }; + // get selected text from an input field + // http://stackoverflow.com/questions/7186586/how-to-get-the-selected-text-in-textarea-using-jquery-in-internet-explorer-7 + this.get_input_selection = function(obj) + { + var start = 0, end = 0, + normalizedValue, range, + textInputRange, len, endRange; + + if (typeof obj.selectionStart == "number" && typeof obj.selectionEnd == "number") { + normalizedValue = obj.value; + start = obj.selectionStart; + end = obj.selectionEnd; + } + else { + range = document.selection.createRange(); + + if (range && range.parentElement() == obj) { + len = obj.value.length; + normalizedValue = obj.value; //.replace(/\r\n/g, "\n"); + + // create a working TextRange that lives only in the input + textInputRange = obj.createTextRange(); + textInputRange.moveToBookmark(range.getBookmark()); + + // Check if the start and end of the selection are at the very end + // of the input, since moveStart/moveEnd doesn't return what we want + // in those cases + endRange = obj.createTextRange(); + endRange.collapse(false); + + if (textInputRange.compareEndPoints("StartToEnd", endRange) > -1) { + start = end = len; + } + else { + start = -textInputRange.moveStart("character", -len); + start += normalizedValue.slice(0, start).split("\n").length - 1; + + if (textInputRange.compareEndPoints("EndToEnd", endRange) > -1) { + end = len; + } + else { + end = -textInputRange.moveEnd("character", -len); + end += normalizedValue.slice(0, end).split("\n").length - 1; + } + } + } + } + + return { start:start, end:end, text:normalizedValue.substr(start, end-start) }; + }; + // disable/enable all fields of a form this.lock_form = function(form, lock) { diff --git a/program/js/common.js b/program/js/common.js index afaf91639..02934f734 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -592,6 +592,14 @@ Date.prototype.getStdTimezoneOffset = function() return tzo; } +// define String's startsWith() method for old browsers +if (!String.prototype.startsWith) { + String.prototype.startsWith = function(search, position) { + position = position || 0; + return this.slice(position, search.length) === search; + }; +} + // Make getElementById() case-sensitive on IE if (bw.ie) { document._getElementById = document.getElementById; diff --git a/program/js/editor.js b/program/js/editor.js index 6d7b9538a..020971d6e 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -161,8 +161,8 @@ function rcmail_editor_images() for (i in files) { att = files[i]; - if (att.complete && att.mimetype.indexOf('image/') == 0) { - list.push([att.name, rcmail.env.comm_path+'&_action=display-attachment&_file='+i+'&_id='+rcmail.env.compose_id]); + if (att.complete && att.mimetype.startsWith('image/')) { + list.push([att.name, rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_file='+i]); } } diff --git a/program/js/list.js b/program/js/list.js index cb69bc462..4ae6c0c66 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -31,6 +31,7 @@ function rcube_list_widget(list, p) this.list = list ? list : null; this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table'; + this.id_regexp = /^rcmrow([a-z0-9\-_=\+\/]+)/i; this.thead; this.tbody; this.fixed_header; @@ -55,7 +56,6 @@ function rcube_list_widget(list, p) this.column_fixed = null; this.last_selected = 0; this.shift_start = 0; - this.in_selection_before = false; this.focused = false; this.drag_mouse_start = null; this.dblclick_time = 500; // default value on MS Windows is 500 @@ -111,7 +111,7 @@ init: function() init_row: function(row) { // make references in internal array and set event handlers - if (row && String(row.id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i)) { + if (row && String(row.id).match(this.id_regexp)) { var self = this, uid = RegExp.$1; row.uid = uid; @@ -405,10 +405,7 @@ drag_column: function(e, col) drag_row: function(e, id) { // don't do anything (another action processed before) - var evtarget = rcube_event.get_target(e), - tagname = evtarget.tagName.toLowerCase(); - - if (evtarget && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && evtarget.onclick))) + if (!this.is_event_target(e)) return true; // accept right-clicks @@ -420,12 +417,13 @@ drag_row: function(e, id) // selects currently unselected row if (!this.in_selection_before) { var mod_key = rcube_event.get_modifier(e); - this.select_row(id, mod_key, false); + this.select_row(id, mod_key, true); } if (this.draggable && this.selection.length && this.in_selection(id)) { this.drag_start = true; this.drag_mouse_start = rcube_event.get_mouse_pos(e); + rcube_event.add_listener({event:'mousemove', object:this, method:'drag_mouse_move'}); rcube_event.add_listener({event:'mouseup', object:this, method:'drag_mouse_up'}); if (bw.touch) { @@ -446,19 +444,16 @@ drag_row: function(e, id) */ click_row: function(e, id) { - var now = new Date().getTime(), - mod_key = rcube_event.get_modifier(e), - evtarget = rcube_event.get_target(e), - tagname = evtarget.tagName.toLowerCase(); - - if ((evtarget && (tagname == 'input' || tagname == 'img'))) + // don't do anything (another action processed before) + if (!this.is_event_target(e)) return true; - var dblclicked = now - this.rows[id].clicked < this.dblclick_time; + var now = new Date().getTime(), + dblclicked = now - this.rows[id].clicked < this.dblclick_time; // unselects currently selected row - if (!this.drag_active && this.in_selection_before == id && !dblclicked) - this.select_row(id, mod_key, false); + if (!this.drag_active && !dblclicked && this.in_selection_before == id) + this.select_row(id, rcube_event.get_modifier(e), true); this.drag_start = false; this.in_selection_before = false; @@ -482,6 +477,18 @@ click_row: function(e, id) }, +/** + * Check target of the current event + */ +is_event_target: function(e) +{ + var target = rcube_event.get_target(e), + tagname = target.tagName.toLowerCase(); + + return !(target && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && target.onclick))); +}, + + /* * Returns thread root ID for specified row ID */ @@ -726,7 +733,7 @@ get_first_row: function() var i, len, rows = this.tbody.childNodes; for (i=0, len=rows.length-1; i<len; i++) - if (rows[i].id && String(rows[i].id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null) + if (rows[i].id && String(rows[i].id).match(this.id_regexp) && this.rows[RegExp.$1] != null) return RegExp.$1; } @@ -739,7 +746,7 @@ get_last_row: function() var i, rows = this.tbody.childNodes; for (i=rows.length-1; i>=0; i--) - if (rows[i].id && String(rows[i].id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null) + if (rows[i].id && String(rows[i].id).match(this.id_regexp) && this.rows[RegExp.$1] != null) return RegExp.$1; } @@ -769,6 +776,7 @@ get_cell: function(row, index) select_row: function(id, mod_key, with_mouse) { var select_before = this.selection.join(','); + if (!this.multiselect) mod_key = 0; @@ -787,8 +795,10 @@ select_row: function(id, mod_key, with_mouse) break; case CONTROL_KEY: - if (!with_mouse) + if (with_mouse) { + this.shift_start = id; this.highlight_row(id, true); + } break; case CONTROL_SHIFT_KEY: @@ -799,6 +809,7 @@ select_row: function(id, mod_key, with_mouse) this.highlight_row(id, false); break; } + this.multi_selecting = true; } @@ -856,14 +867,8 @@ select_first: function(mod_key) { var row = this.get_first_row(); if (row) { - if (mod_key) { - this.shift_select(row, mod_key); - this.triggerEvent('select'); - this.scrollto(row); - } - else { - this.select(row); - } + this.select_row(row, mod_key, false); + this.scrollto(row); } }, @@ -875,14 +880,8 @@ select_last: function(mod_key) { var row = this.get_last_row(); if (row) { - if (mod_key) { - this.shift_select(row, mod_key); - this.triggerEvent('select'); - this.scrollto(row); - } - else { - this.select(row); - } + this.select_row(row, mod_key, false); + this.scrollto(row); } }, @@ -896,7 +895,7 @@ select_children: function(uid) for (i=0; i<len; i++) if (!this.in_selection(children[i])) - this.select_row(children[i], CONTROL_KEY); + this.select_row(children[i], CONTROL_KEY, true); }, @@ -912,7 +911,8 @@ shift_select: function(id, control) from_rowIndex = this._rowIndex(this.rows[this.shift_start].obj), to_rowIndex = this._rowIndex(to_row.obj); - if (!to_row.expanded && to_row.has_children) + // if we're going down the list, and we hit a thread, and it's closed, select the whole thread + if (from_rowIndex < to_rowIndex && !to_row.expanded && to_row.has_children) if (to_row = this.rows[(this.row_children(id)).pop()]) to_rowIndex = this._rowIndex(to_row.obj); @@ -934,6 +934,7 @@ shift_select: function(id, control) } }, + /** * Helper method to emulate the rowIndex property of non-tr elements */ @@ -1134,10 +1135,15 @@ key_press: function(e) // Stop propagation so that the browser doesn't scroll rcube_event.cancel(e); return this.use_arrow_key(keyCode, mod_key); - case 61: - case 107: // Plus sign on a numeric keypad (fc11 + firefox 3.5.2) - case 109: + case 32: + rcube_event.cancel(e); + return this.select_row(this.last_selected, mod_key, true); + + case 37: // Left arrow key + case 39: // Right arrow key + case 107: // Plus sign on a numeric keypad + case 109: // Minus sign on a numeric keypad // Stop propagation rcube_event.cancel(e); var ret = this.use_plusminus_key(keyCode, mod_key); @@ -1146,20 +1152,26 @@ key_press: function(e) this.triggerEvent('keypress'); this.modkey = 0; return ret; + case 36: // Home this.select_first(mod_key); return rcube_event.cancel(e); + case 35: // End this.select_last(mod_key); return rcube_event.cancel(e); + case 27: if (this.drag_active) return this.drag_mouse_up(e); + if (this.col_drag_active) { this.selected_column = null; return this.column_drag_mouse_up(e); } + return rcube_event.cancel(e); + default: this.key_pressed = keyCode; this.modkey = mod_key; @@ -1202,21 +1214,30 @@ use_arrow_key: function(keyCode, mod_key) use_plusminus_key: function(keyCode, mod_key) { var selected_row = this.rows[this.last_selected]; - if (!selected_row) + + if (!selected_row || !selected_row.has_children) return; - if (keyCode == 32) - keyCode = selected_row.expanded ? 109 : 61; - if (keyCode == 61 || keyCode == 107) + // expand + if (keyCode == 39 || keyCode == 107) { + if (selected_row.expanded) + return; + if (mod_key == CONTROL_KEY || this.multiexpand) this.expand_all(selected_row); else - this.expand(selected_row); - else + this.expand(selected_row); + } + // collapse + else { + if (!selected_row.expanded) + return; + if (mod_key == CONTROL_KEY || this.multiexpand) this.collapse_all(selected_row); else this.collapse(selected_row); + } this.update_expando(selected_row.uid, selected_row.expanded); @@ -1231,7 +1252,8 @@ scrollto: function(id) { var row = this.rows[id].obj; if (row && this.frame) { - var scroll_to = Number(row.offsetTop); + var scroll_to = Number(row.offsetTop), + head_offset = 0; // expand thread if target row is hidden (collapsed) if (!scroll_to && this.rows[id].parent_uid) { @@ -1240,8 +1262,14 @@ scrollto: function(id) scroll_to = Number(row.offsetTop); } - if (scroll_to < Number(this.frame.scrollTop)) - this.frame.scrollTop = scroll_to; + if (this.fixed_header) + head_offset = Number(this.thead.offsetHeight); + + // if row is above the frame (or behind header) + if (scroll_to < Number(this.frame.scrollTop) + head_offset) { + // scroll window so that row isn't behind header + this.frame.scrollTop = scroll_to - head_offset; + } else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight)) this.frame.scrollTop = (scroll_to + Number(row.offsetHeight)) - Number(this.frame.offsetHeight); } diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index 4f87d2599..f6f744cb2 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -3,7 +3,7 @@ /* +-----------------------------------------------------------------------+ | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2011, 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. | @@ -32,8 +32,8 @@ class html public static $doctype = 'xhtml'; public static $lc_tags = true; - public static $common_attrib = array('id','class','style','title','align'); - public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script'); + public static $common_attrib = array('id','class','style','title','align','unselectable'); + public static $containers = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script'); /** diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php index f57a30eb9..886f65cb9 100644 --- a/program/lib/Roundcube/rcube_addressbook.php +++ b/program/lib/Roundcube/rcube_addressbook.php @@ -532,8 +532,12 @@ abstract class rcube_addressbook $fn = join(' ', array($contact['surname'], $contact['firstname'], $contact['middlename'])); else if ($compose_mode == 1) $fn = join(' ', array($contact['firstname'], $contact['middlename'], $contact['surname'])); - else + else if ($compose_mode == 0) $fn = !empty($contact['name']) ? $contact['name'] : join(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix'])); + else { + $plugin = rcube::get_instance()->plugins->exec_hook('contact_listname', array('contact' => $contact)); + $fn = $plugin['fn']; + } $fn = trim($fn, ', '); diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php index 00e6d4e20..aa385dce4 100644 --- a/program/lib/Roundcube/rcube_csv2vcard.php +++ b/program/lib/Roundcube/rcube_csv2vcard.php @@ -47,7 +47,7 @@ class rcube_csv2vcard //'business_street_2' => '', //'business_street_3' => '', 'car_phone' => 'phone:car', - 'categories' => 'categories', + 'categories' => 'groups', //'children' => '', 'company' => 'organization', //'company_main_phone' => '', @@ -146,6 +146,9 @@ class rcube_csv2vcard 'work_title' => 'jobtitle', 'work_zip' => 'zipcode:work', 'group' => 'groups', + + // GMail + 'groups' => 'groups', ); /** @@ -427,6 +430,11 @@ class rcube_csv2vcard $contact['birthday'] = $contact['birthday-y'] .'-' .$contact['birthday-m'] . '-' . $contact['birthday-d']; } + // categories/groups separator in vCard is ',' not ';' + if (!empty($contact['groups'])) { + $contact['groups'] = str_replace(';', ',', $contact['groups']); + } + // Empty dates, e.g. "0/0/00", "0000-00-00 00:00:00" foreach (array('birthday', 'anniversary') as $key) { if (!empty($contact[$key])) { diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php index aaba28172..2828f26ee 100644 --- a/program/lib/Roundcube/rcube_db.php +++ b/program/lib/Roundcube/rcube_db.php @@ -392,7 +392,7 @@ class rcube_db */ protected function _query($query, $offset, $numrows, $params) { - $query = trim($query); + $query = ltrim($query); $this->db_connect($this->dsn_select($query), true); @@ -405,27 +405,28 @@ class rcube_db $query = $this->set_limit($query, $numrows, $offset); } - $params = (array) $params; - // Because in Roundcube we mostly use queries that are // executed only once, we will not use prepared queries $pos = 0; $idx = 0; - while ($pos = strpos($query, '?', $pos)) { - if ($query[$pos+1] == '?') { // skip escaped ? - $pos += 2; - } - else { - $val = $this->quote($params[$idx++]); - unset($params[$idx-1]); - $query = substr_replace($query, $val, $pos, 1); - $pos += strlen($val); + if (count($params)) { + while ($pos = strpos($query, '?', $pos)) { + if ($query[$pos+1] == '?') { // skip escaped '?' + $pos += 2; + } + else { + $val = $this->quote($params[$idx++]); + unset($params[$idx-1]); + $query = substr_replace($query, $val, $pos, 1); + $pos += strlen($val); + } } } - // replace escaped ? back to normal - $query = rtrim(strtr($query, array('??' => '?')), ';'); + // replace escaped '?' back to normal, see self::quote() + $query = str_replace('??', '?', $query); + $query = rtrim($query, " \t\n\r\0\x0B;"); $this->debug($query); diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php index 6f79e2f8e..01362e6fb 100644 --- a/program/lib/Roundcube/rcube_html2text.php +++ b/program/lib/Roundcube/rcube_html2text.php @@ -608,7 +608,7 @@ class rcube_html2text $this->width = $p_width; // Add citation markers and create <pre> block - $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_ballback'), trim($body)); + $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_callback'), trim($body)); $body = '<pre>' . htmlspecialchars($body) . '</pre>'; $text = substr_replace($text, $body . "\n", $start, $end + 13 - $start); @@ -624,7 +624,7 @@ class rcube_html2text /** * Callback function to correctly add citation markers for blockquote contents */ - public function blockquote_citation_ballback($m) + public function blockquote_citation_callback($m) { $line = ltrim($m[2]); $space = $line[0] == '>' ? '' : ' '; diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php index 64288f973..b733e2465 100644 --- a/program/lib/Roundcube/rcube_ldap.php +++ b/program/lib/Roundcube/rcube_ldap.php @@ -52,7 +52,7 @@ class rcube_ldap extends rcube_addressbook * * @var array */ - private static $group_types = array( + private $group_types = array( 'group' => 'member', 'groupofnames' => 'member', 'kolabgroupofnames' => 'member', @@ -94,6 +94,9 @@ class rcube_ldap extends rcube_addressbook $this->prop['groups']['name_attr'] = 'cn'; if (empty($this->prop['groups']['scope'])) $this->prop['groups']['scope'] = 'sub'; + // extend group objectclass => member attribute mapping + if (!empty($this->prop['groups']['class_member_attr'])) + $this->group_types = array_merge($this->group_types, $this->prop['groups']['class_member_attr']); // add group name attrib to the list of attributes to be fetched $fetch_attributes[] = $this->prop['groups']['name_attr']; @@ -292,6 +295,14 @@ class rcube_ldap extends rcube_addressbook if ($this->prop['search_base_dn'] && $this->prop['search_filter'] && (strstr($bind_dn, '%dn') || strstr($this->base_dn, '%dn') || strstr($this->groups_base_dn, '%dn')) ) { + $search_attribs = array('uid'); + if ($search_bind_attrib = (array)$this->prop['search_bind_attrib']) { + foreach ($search_bind_attrib as $r => $attr) { + $search_attribs[] = $attr; + $replaces[$r] = ''; + } + } + $search_bind_dn = strtr($this->prop['search_bind_dn'], $replaces); $search_base_dn = strtr($this->prop['search_base_dn'], $replaces); $search_filter = strtr($this->prop['search_filter'], $replaces); @@ -321,10 +332,18 @@ class rcube_ldap extends rcube_addressbook } } - $res = $ldap->search($search_base_dn, $search_filter, 'sub', array('uid')); + $res = $ldap->search($search_base_dn, $search_filter, 'sub', $search_attribs); if ($res) { $res->rewind(); $replaces['%dn'] = $res->get_dn(); + + // add more replacements from 'search_bind_attrib' config + if ($search_bind_attrib) { + $res = $res->current(); + foreach ($search_bind_attrib as $r => $attr) { + $replaces[$r] = $res[$attr][0]; + } + } } if ($ldap != $this->ldap) { @@ -355,6 +374,23 @@ class rcube_ldap extends rcube_addressbook $this->base_dn = strtr($this->base_dn, $replaces); $this->groups_base_dn = strtr($this->groups_base_dn, $replaces); + // replace placeholders in filter settings + if (!empty($this->prop['filter'])) + $this->prop['filter'] = strtr($this->prop['filter'], $replaces); + if (!empty($this->prop['groups']['filter'])) + $this->prop['groups']['filter'] = strtr($this->prop['groups']['filter'], $replaces); + if (!empty($this->prop['groups']['member_filter'])) + $this->prop['groups']['member_filter'] = strtr($this->prop['groups']['member_filter'], $replaces); + + if (!empty($this->prop['group_filters'])) { + foreach ($this->prop['group_filters'] as $i => $gf) { + if (!empty($gf['base_dn'])) + $this->prop['group_filters'][$i]['base_dn'] = strtr($gf['base_dn'], $replaces); + if (!empty($gf['filter'])) + $this->prop['group_filters'][$i]['filter'] = strtr($gf['filter'], $replaces); + } + } + if (empty($bind_user)) { $bind_user = $u; } @@ -559,9 +595,10 @@ class rcube_ldap extends rcube_addressbook /** * Get all members of the given group * - * @param string Group DN - * @param array Group entries (if called recursively) - * @return array Accumulated group members + * @param string Group DN + * @param boolean Count only + * @param array Group entries (if called recursively) + * @return array Accumulated group members */ function list_group_members($dn, $count = false, $entries = null) { @@ -569,7 +606,7 @@ class rcube_ldap extends rcube_addressbook // fetch group object if (empty($entries)) { - $attribs = array('dn','objectClass','member','uniqueMember','memberURL'); + $attribs = array_merge(array('dn','objectClass','memberURL'), array_values($this->group_types)); $entries = $this->ldap->read_entries($dn, '(objectClass=*)', $attribs); if ($entries === false) { return $group_members; @@ -581,17 +618,17 @@ class rcube_ldap extends rcube_addressbook $attrs = array(); foreach ((array)$entry['objectclass'] as $objectclass) { - if (strtolower($objectclass) == 'groupofurls') { - $members = $this->_list_group_memberurl($dn, $entry, $count); - $group_members = array_merge($group_members, $members); - } - else if (($member_attr = $this->get_group_member_attr(array($objectclass), '')) + if (($member_attr = $this->get_group_member_attr(array($objectclass), '')) && ($member_attr = strtolower($member_attr)) && !in_array($member_attr, $attrs) ) { $members = $this->_list_group_members($dn, $entry, $member_attr, $count); $group_members = array_merge($group_members, $members); $attrs[] = $member_attr; } + else if (!empty($entry['memberurl'])) { + $members = $this->_list_group_memberurl($dn, $entry, $count); + $group_members = array_merge($group_members, $members); + } if ($this->prop['sizelimit'] && count($group_members) > $this->prop['sizelimit']) { break 2; @@ -608,6 +645,7 @@ class rcube_ldap extends rcube_addressbook * @param string Group DN * @param array Group entry * @param string Member attribute to use + * @param boolean Count only * @return array Accumulated group members */ private function _list_group_members($dn, $entry, $attr, $count) @@ -621,8 +659,7 @@ class rcube_ldap extends rcube_addressbook // read these attributes for all members $attrib = $count ? array('dn','objectClass') : $this->prop['list_attributes']; - $attrib[] = 'member'; - $attrib[] = 'uniqueMember'; + $attrib = array_merge($attrib, array_values($this->group_types)); $attrib[] = 'memberURL'; $filter = $this->prop['groups']['member_filter'] ? $this->prop['groups']['member_filter'] : '(objectclass=*)'; @@ -669,7 +706,7 @@ class rcube_ldap extends rcube_addressbook if ($result = $this->ldap->search($m[1], $filter, $m[2], $attrs, $this->group_data)) { $entries = $result->entries(); for ($j = 0; $j < $entries['count']; $j++) { - if (self::is_group_entry($entries[$j]) && ($nested_group_members = $this->list_group_members($entries[$j]['dn'], $count))) + if ($this->is_group_entry($entries[$j]) && ($nested_group_members = $this->list_group_members($entries[$j]['dn'], $count))) $group_members = array_merge($group_members, $nested_group_members); else $group_members[] = $entries[$j]; @@ -1354,7 +1391,7 @@ class rcube_ldap extends rcube_addressbook $out[$this->primary_key] = self::dn_encode($rec['dn']); // determine record type - if (self::is_group_entry($rec)) { + if ($this->is_group_entry($rec)) { $out['_type'] = 'group'; $out['readonly'] = true; $fieldmap['name'] = $this->group_data['name_attr'] ? $this->group_data['name_attr'] : $this->prop['groups']['name_attr']; @@ -1479,11 +1516,11 @@ class rcube_ldap extends rcube_addressbook /** * Determines whether the given LDAP entry is a group record */ - private static function is_group_entry($entry) + private function is_group_entry($entry) { $classes = array_map('strtolower', (array)$entry['objectclass']); - return count(array_intersect(array_keys(self::$group_types), $classes)) > 0; + return count(array_intersect(array_keys($this->group_types), $classes)) > 0; } /** @@ -1914,7 +1951,7 @@ class rcube_ldap extends rcube_addressbook if (!empty($object_classes)) { foreach ((array)$object_classes as $oc) { - if ($attr = self::$group_types[strtolower($oc)]) { + if ($attr = $this->group_types[strtolower($oc)]) { return $attr; } } diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 9c2220328..a931c27c1 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -810,7 +810,7 @@ class rcube_mime } $mime_types = $mime_extensions = array(); - $regex = "/([\w\+\-\.\/]+)\t+([\w\s]+)/i"; + $regex = "/([\w\+\-\.\/]+)\s+([\w\s]+)/i"; foreach((array)$lines as $line) { // skip comments or mime types w/o any extensions if ($line[0] == '#' || !preg_match($regex, $line, $matches)) diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php index 67072df41..caca262c6 100644 --- a/program/lib/Roundcube/rcube_session.php +++ b/program/lib/Roundcube/rcube_session.php @@ -34,6 +34,7 @@ class rcube_session private $changed; private $time_diff = 0; private $reloaded = false; + private $appends = array(); private $unsets = array(); private $gc_handlers = array(); private $cookiename = 'roundcube_sessauth'; @@ -441,8 +442,19 @@ class rcube_session $node = &$this->get_node(explode('.', $path), $_SESSION); - if ($key !== null) $node[$key] = $value; - else $node[] = $value; + if ($key !== null) { + $node[$key] = $value; + $path .= '.' . $key; + } + else { + $node[] = $value; + } + + $this->appends[] = $path; + + // when overwriting a previously unset variable + if ($this->unsets[$path]) + unset($this->unsets[$path]); } @@ -491,13 +503,40 @@ class rcube_session */ public function reload() { + // collect updated data from previous appends + $merge_data = array(); + foreach ((array)$this->appends as $var) { + $path = explode('.', $var); + $value = $this->get_node($path, $_SESSION); + $k = array_pop($path); + $node = &$this->get_node($path, $merge_data); + $node[$k] = $value; + } + if ($this->key && $this->memcache) $data = $this->mc_read($this->key); else if ($this->key) $data = $this->db_read($this->key); - if ($data) + if ($data) { session_decode($data); + + // apply appends and unsets to reloaded data + $_SESSION = array_merge_recursive($_SESSION, $merge_data); + + foreach ((array)$this->unsets as $var) { + if (isset($_SESSION[$var])) { + unset($_SESSION[$var]); + } + else { + $path = explode('.', $var); + $k = array_pop($path); + $node = &$this->get_node($path, $_SESSION); + unset($node[$k]); + } + } + } + } /** diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php index d087d2584..3182ff378 100644 --- a/program/lib/Roundcube/rcube_spellchecker.php +++ b/program/lib/Roundcube/rcube_spellchecker.php @@ -104,6 +104,9 @@ class rcube_spellchecker } } + // remove possible duplicates (#1489395) + $languages = array_unique($languages); + asort($languages); return $languages; diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php index 5e9c9af80..57f63361d 100644 --- a/program/lib/Roundcube/rcube_user.php +++ b/program/lib/Roundcube/rcube_user.php @@ -163,8 +163,16 @@ class rcube_user if (!$this->ID) return false; - $config = $this->rc->config; - $old_prefs = (array)$this->get_prefs(); + $plugin = $this->rc->plugins->exec_hook('preferences_update', array( + 'userid' => $this->ID, 'prefs' => $a_user_prefs, 'old' => (array)$this->get_prefs())); + + if (!empty($plugin['abort'])) { + return; + } + + $a_user_prefs = $plugin['prefs']; + $old_prefs = $plugin['old']; + $config = $this->rc->config; // merge (partial) prefs array with existing settings $save_prefs = $a_user_prefs + $old_prefs; diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php index b73bc0812..27a618d83 100644 --- a/program/lib/Roundcube/rcube_utils.php +++ b/program/lib/Roundcube/rcube_utils.php @@ -454,6 +454,9 @@ class rcube_utils // cut out all contents between { and } while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos))) { + $nested = strpos($source, '{', $pos+1); + if ($nested && $nested < $pos2) // when dealing with nested blocks (e.g. @media), take the inner one + $pos = $nested; $length = $pos2 - $pos - 1; $styles = substr($source, $pos+1, $length); @@ -744,40 +747,13 @@ class rcube_utils */ public static function strtotime($date) { - $date = trim($date); - - // check for MS Outlook vCard date format YYYYMMDD - if (preg_match('/^([12][90]\d\d)([01]\d)([0123]\d)$/', $date, $m)) { - return mktime(0,0,0, intval($m[2]), intval($m[3]), intval($m[1])); - } - - // common little-endian formats, e.g. dd/mm/yyyy (not all are supported by strtotime) - if (preg_match('/^(\d{1,2})[.\/-](\d{1,2})[.\/-](\d{4})$/', $date, $m) - && $m[1] > 0 && $m[1] <= 31 && $m[2] > 0 && $m[2] <= 12 && $m[3] >= 1970 - ) { - return mktime(0,0,0, intval($m[2]), intval($m[1]), intval($m[3])); - } + $date = self::clean_datestr($date); // unix timestamp if (is_numeric($date)) { return (int) $date; } - // Clean malformed data - $date = preg_replace( - array( - '/GMT\s*([+-][0-9]+)/', // support non-standard "GMTXXXX" literal - '/[^a-z0-9\x20\x09:+-]/i', // remove any invalid characters - '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i', // remove weekday names - ), - array( - '\\1', - '', - '', - ), $date); - - $date = trim($date); - // if date parsing fails, we have a date in non-rfc format. // remove token from the end and try again while ((($ts = @strtotime($date)) === false) || ($ts < 0)) { @@ -805,8 +781,8 @@ class rcube_utils return $date; } - $dt = false; - $date = trim($date); + $dt = false; + $date = self::clean_datestr($date); // try to parse string with DateTime first if (!empty($date)) { @@ -831,6 +807,52 @@ class rcube_utils return $dt; } + /** + * Clean up date string for strtotime() input + * + * @param string $date Date string + * + * @return string Date string + */ + public static function clean_datestr($date) + { + $date = trim($date); + + // check for MS Outlook vCard date format YYYYMMDD + if (preg_match('/^([12][90]\d\d)([01]\d)([0123]\d)$/', $date, $m)) { + return sprintf('%04d-%02d-%02d 00:00:00', intval($m[1]), intval($m[2]), intval($m[3])); + } + + // Clean malformed data + $date = preg_replace( + array( + '/GMT\s*([+-][0-9]+)/', // support non-standard "GMTXXXX" literal + '/[^a-z0-9\x20\x09:+-\/]/i', // remove any invalid characters + '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i', // remove weekday names + ), + array( + '\\1', + '', + '', + ), $date); + + $date = trim($date); + + // try to fix dd/mm vs. mm/dd discrepancy, we can't do more here + if (preg_match('/^(\d{1,2})[.\/-](\d{1,2})[.\/-](\d{4})$/', $date, $m)) { + $mdy = $m[2] > 12 && $m[1] <= 12; + $day = $mdy ? $m[2] : $m[1]; + $month = $mdy ? $m[1] : $m[2]; + $date = sprintf('%04d-%02d-%02d 00:00:00', intval($m[3]), $month, $day); + } + // I've found that YYYY.MM.DD is recognized wrong, so here's a fix + else if (preg_match('/^(\d{4})\.(\d{1,2})\.(\d{1,2})$/', $date)) { + $date = str_replace('.', '-', $date) . ' 00:00:00'; + } + + return $date; + } + /* * Idn_to_ascii wrapper. * Intl/Idn modules version of this function doesn't work with e-mail address diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php index d54dc56ad..a54ee7e11 100644 --- a/program/lib/Roundcube/rcube_vcard.php +++ b/program/lib/Roundcube/rcube_vcard.php @@ -378,7 +378,7 @@ class rcube_vcard default: if ($field == 'phone' && $this->phonetypemap[$type_uc]) { $type = $this->phonetypemap[$type_uc]; - } + } if (($tag = self::$fieldmap[$field]) && (is_array($value) || strlen($value))) { $index = count($this->raw[$tag]); @@ -518,20 +518,28 @@ class rcube_vcard */ public static function cleanup($vcard) { - // Convert special types (like Skype) to normal type='skype' classes with this simple regex ;) - $vcard = preg_replace( - '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s', - '\2;type=\5\3:\4', - $vcard); - // convert Apple X-ABRELATEDNAMES into X-* fields for better compatibility $vcard = preg_replace_callback( '/item(\d+)\.(X-ABRELATEDNAMES)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s', array('self', 'x_abrelatednames_callback'), $vcard); - // Remove cruft like item1.X-AB*, item1.ADR instead of ADR, and empty lines - $vcard = preg_replace(array('/^item\d*\.X-AB.*$/m', '/^item\d*\./m', "/\n+/"), array('', '', "\n"), $vcard); + // Cleanup + $vcard = preg_replace(array( + // convert special types (like Skype) to normal type='skype' classes with this simple regex ;) + '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s', + '/^item\d*\.X-AB.*$/m', // remove cruft like item1.X-AB* + '/^item\d*\./m', // remove item1.ADR instead of ADR + '/\n+/', // remove empty lines + '/^(N:[^;\R]*)$/m', // if N doesn't have any semicolons, add some + ), + array( + '\2;type=\5\3:\4', + '', + '', + "\n", + '\1;;;;', + ), $vcard); // convert X-WAB-GENDER to X-GENDER if (preg_match('/X-WAB-GENDER:(\d)/', $vcard, $matches)) { @@ -539,9 +547,6 @@ class rcube_vcard $vcard = preg_replace('/X-WAB-GENDER:\d/', 'X-GENDER:' . $value, $vcard); } - // if N doesn't have any semicolons, add some - $vcard = preg_replace('/^(N:[^;\R]*)$/m', '\1;;;;', $vcard); - return $vcard; } @@ -612,8 +617,8 @@ class rcube_vcard $enc = null; foreach($regs2[1] as $attrid => $attr) { + $attr = preg_replace('/[\s\t\n\r\0\x0B]/', '', $attr); if ((list($key, $value) = explode('=', $attr)) && $value) { - $value = trim($value); if ($key == 'ENCODING') { $value = strtoupper($value); // add next line(s) to value string if QP line end detected @@ -792,7 +797,7 @@ class rcube_vcard return $result; } - $s = strtr($s, $rep2); + $s = trim(strtr($s, $rep2)); } // some implementations (GMail) use non-standard backslash before colon (#1489085) diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc index b5a3ed6d8..549c315a6 100644 --- a/program/localization/be_BE/labels.inc +++ b/program/localization/be_BE/labels.inc @@ -29,7 +29,7 @@ $labels['drafts'] = 'Чарнавікі'; $labels['sent'] = 'ДаÑланыÑ'; $labels['trash'] = 'Сметніца'; $labels['junk'] = 'Спам'; -$labels['show_real_foldernames'] = 'Паказваць ÑÐ°Ð¿Ñ€Ð°ÑžÐ´Ð½Ñ‹Ñ Ñ–Ð¼Ñ‘Ð½Ñ‹ Ð´Ð»Ñ Ð°Ð´Ð¼Ñ‹Ñловых папак'; +$labels['show_real_foldernames'] = 'Паказваць ÑÐ°Ð¿Ñ€Ð°ÑžÐ´Ð½Ñ‹Ñ Ð½Ð°Ð·Ð²Ñ‹ Ð´Ð»Ñ Ð°Ð´Ð¼Ñ‹Ñловых папак'; $labels['subject'] = 'ТÑма'; $labels['from'] = 'Ðд каго'; $labels['sender'] = 'Ðдпраўнік'; @@ -44,7 +44,7 @@ $labels['priority'] = 'ПрыÑрытÑÑ‚'; $labels['organization'] = 'УÑтанова'; $labels['readstatus'] = 'Ðе прачытанае'; $labels['listoptions'] = 'Параметры ÑпіÑу...'; -$labels['mailboxlist'] = 'ТÑчкі'; +$labels['mailboxlist'] = 'Папкі'; $labels['messagesfromto'] = 'Паведамленні $from—$to з $count'; $labels['threadsfromto'] = 'Ðбмеркаванні $from—$to з $count'; $labels['messagenrof'] = 'Паведамленне $nr з $count'; @@ -52,11 +52,11 @@ $labels['fromtoshort'] = '$from—$to з $count'; $labels['copy'] = 'Капіраваць'; $labels['move'] = 'ПерамÑÑціць'; $labels['moveto'] = 'ПерамÑÑціць у...'; -$labels['download'] = 'Спампаваць'; -$labels['open'] = 'Ðдчыніць'; +$labels['download'] = 'СцÑгнуць'; +$labels['open'] = 'Ðдкрыць'; $labels['showattachment'] = 'Паказаць'; $labels['showanyway'] = 'УÑÑ‘ адно паказваць'; -$labels['filename'] = 'Ð†Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°'; +$labels['filename'] = 'Ðазва файла'; $labels['filesize'] = 'Памер файла'; $labels['addtoaddressbook'] = 'Дадаць у адраÑную кнігу'; $labels['sun'] = 'нд'; @@ -177,8 +177,8 @@ $labels['msgtext'] = 'УÑÑ‘ паведамленне'; $labels['body'] = 'Цела'; $labels['type'] = 'Тып'; $labels['namex'] = 'ІмÑ'; -$labels['openinextwin'] = 'Ðдчыніць у новым акне'; -$labels['emlsave'] = 'Спампаваць (.eml)'; +$labels['openinextwin'] = 'Ðдкрыць у новым акне'; +$labels['emlsave'] = 'СцÑгнуць (.eml)'; $labels['changeformattext'] = 'Паказаць Ñк проÑÑ‚Ñ‹ Ñ‚ÑкÑÑ‚'; $labels['changeformathtml'] = 'Паказаць Ñк HTML'; $labels['editasnew'] = 'ÐдрÑдагаваць Ñк новае'; @@ -197,11 +197,19 @@ $labels['spellcheck'] = 'ПравапіÑ'; $labels['checkspelling'] = 'Праверыць правапіÑ'; $labels['resumeediting'] = 'ПрацÑгнуць Ñ€Ñдагаванне'; $labels['revertto'] = 'Ðдкаціцца на'; +$labels['responses'] = 'Ðдказы'; +$labels['insertresponse'] = 'УÑтавіць адказ'; +$labels['manageresponses'] = 'Кіраваць адказамі'; +$labels['savenewresponse'] = 'Захаваць новы адказ'; +$labels['editresponses'] = 'Ð Ñдагаваць адказы'; +$labels['editresponse'] = 'Ð Ñдагаваць адказ'; +$labels['responsename'] = 'Ðазва'; +$labels['responsetext'] = 'ТÑкÑÑ‚ адказу'; $labels['attach'] = 'Далучыць'; $labels['attachments'] = 'ДалучÑнні'; -$labels['upload'] = 'Запампаваць'; +$labels['upload'] = 'Ðпублікаваць'; $labels['uploadprogress'] = '$percent ($current з $total)'; -$labels['close'] = 'Зачыніць'; +$labels['close'] = 'Закрыць'; $labels['messageoptions'] = 'Параметры паведамленнÑ...'; $labels['low'] = 'Ðізкі'; $labels['lowest'] = 'Ðайнізшы'; @@ -228,7 +236,7 @@ $labels['mdnrequest'] = 'Ðдпраўнік пажадаў даведацца а $labels['receiptread'] = 'Пацверджанне Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ (прачытаннÑ)'; $labels['yourmessage'] = 'ГÑта пацверджанне аб атрыманні вашага паведамленнÑ'; $labels['receiptnote'] = 'Заўвага: ГÑтае пацверджанне значыць адно, што паведамленне было адлюÑтравана на Ñкране кампутара адраÑата. ÐÑма гарантыі, што атрымальнік прачытаў альбо зразумеў змеÑÑ‚ паведамленнÑ.'; -$labels['name'] = 'Ðкраннае імÑ'; +$labels['name'] = 'ÐÐºÑ€Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ð·Ð²Ð°'; $labels['firstname'] = 'ІмÑ'; $labels['surname'] = 'Прозвішча'; $labels['middlename'] = 'Другое імÑ'; @@ -286,10 +294,10 @@ $labels['edit'] = 'Ð Ñдагаваць'; $labels['cancel'] = 'СкаÑаваць'; $labels['save'] = 'Захаваць'; $labels['delete'] = 'Выдаліць'; -$labels['rename'] = 'Перайменаваць'; +$labels['rename'] = 'Пераназваць'; $labels['addphoto'] = 'Дадаць'; $labels['replacephoto'] = 'ЗамÑніць'; -$labels['uploadphoto'] = 'Запампаваць фота'; +$labels['uploadphoto'] = 'Ðпублікаваць фота'; $labels['newcontact'] = 'Стварыць новую картку кантакта'; $labels['deletecontact'] = 'Выдаліць абраных кантактаў'; $labels['composeto'] = 'СклаÑці ліÑÑ‚ да'; @@ -300,7 +308,7 @@ $labels['exportall'] = 'ÐкÑпартаваць уÑÑ‘'; $labels['exportsel'] = 'ÐкÑпартаваць абранае'; $labels['exportvcards'] = 'ÐкÑпартаваць кантакты Ñž фармаце vCard'; $labels['newcontactgroup'] = 'Стварыць новую групу кантактаў'; -$labels['grouprename'] = 'Перайменаваць групу'; +$labels['grouprename'] = 'Пераназваць групу'; $labels['groupdelete'] = 'Выдаліць групу'; $labels['groupremoveselected'] = 'Выдаліць абраных кантакаў з групы'; $labels['previouspage'] = 'ПапÑÑ€ÑднÑÑ Ñтаронка'; @@ -321,7 +329,7 @@ $labels['importreplace'] = 'ЗамÑніць адраÑную кнігу цалР$labels['importgroups'] = 'Імпартаваць прызначÑнні групы'; $labels['importgroupsall'] = 'УÑе (Ñтварыць групы пры неабходнаÑці)'; $labels['importgroupsexisting'] = 'Толькі Ð´Ð»Ñ Ñ–Ñнуючых груп'; -$labels['importdesc'] = 'Кантакты можна запампаваць з Ñ–Ñнуючай адраÑнай кнігі.<br/>Ðа дадзены момант падтрымліваюцца адраÑÑ‹ Ñž фарматах <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> Ñ– CSV (значÑнні цераз коÑку).'; +$labels['importdesc'] = 'Кантакты можна загрузіць з Ñ–Ñнуючай адраÑнай кнігі.<br/>Ðа дадзены момант падтрымліваюцца адраÑÑ‹ Ñž фарматах <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> Ñ– CSV (значÑнні праз коÑку).'; $labels['done'] = 'Гатова'; $labels['settingsfor'] = 'ÐаÑтаўленні длÑ'; $labels['about'] = 'ÐпіÑанне'; @@ -348,13 +356,13 @@ $labels['timezone'] = 'ЧаÑÐ°Ð²Ð°Ñ Ð·Ð¾Ð½Ð°'; $labels['pagesize'] = 'Радкоў на Ñтаронку'; $labels['signature'] = 'ПодпіÑ'; $labels['dstactive'] = 'Летні/зімовы чаÑ'; -$labels['showinextwin'] = 'ÐдчынÑць паведамленне Ñž новым акне'; +$labels['showinextwin'] = 'Ðдкрываць паведамленні Ñž новым акне'; $labels['composeextwin'] = 'Складаць у новым акне'; $labels['htmleditor'] = 'Складаць паведамленні Ñž HTML'; $labels['htmlonreply'] = 'у адказ на паведамленні Ñž HTML'; $labels['htmlonreplyandforward'] = 'пры пераÑылцы альбо Ñž адказ на паведамленні Ñž HTML'; $labels['htmlsignature'] = 'ÐŸÐ¾Ð´Ð¿Ñ–Ñ Ñƒ HTML'; -$labels['showemail'] = 'Паказваць Ð°Ð´Ñ€Ð°Ñ Ñлектроннай пошты разам з Ñкранным імем'; +$labels['showemail'] = 'Паказваць Ð°Ð´Ñ€Ð°Ñ Ñлектроннай пошты разам з Ñкраннай назвай'; $labels['previewpane'] = 'ПанÑль праглÑду'; $labels['skin'] = 'ТÑма інтÑрфейÑу'; $labels['logoutclear'] = 'Ðчышчаць Сметніцу па выхадзе'; @@ -384,7 +392,7 @@ $labels['never'] = 'ніколі'; $labels['immediately'] = 'імгненна'; $labels['messagesdisplaying'] = 'ÐдлюÑтраванне паведамленнÑÑž'; $labels['messagescomposition'] = 'Складанне паведамленнÑÑž'; -$labels['mimeparamfolding'] = 'Імёны далучÑннÑÑž'; +$labels['mimeparamfolding'] = 'Ðазвы далучÑннÑÑž'; $labels['2231folding'] = 'Поўны RFC 2231 (Thunderbird)'; $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)'; $labels['2047folding'] = 'Поўны RFC 2047 (інш.)'; @@ -429,7 +437,7 @@ $labels['forwardmode'] = 'ПераÑылка паведамленнÑÑž'; $labels['inline'] = 'у Ñ‚ÑкÑце'; $labels['asattachment'] = 'Ñк далучÑнне'; $labels['folder'] = 'Папка'; -$labels['folders'] = 'ТÑчкі'; +$labels['folders'] = 'Папкі'; $labels['foldername'] = 'Ðазва папкі'; $labels['subscribed'] = 'ПадпіÑанаÑ'; $labels['messagecount'] = 'Паведамленні'; diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc index 4b2f07a2f..5833fd8a4 100644 --- a/program/localization/be_BE/messages.inc +++ b/program/localization/be_BE/messages.inc @@ -35,8 +35,8 @@ $messages['loggedout'] = 'СеÑÑ–Ñ ÑкаÑавана. Да пабачÑÐ½Ð½Ñ $messages['mailboxempty'] = 'У Ñкрынцы пуÑта.'; $messages['refreshing'] = 'ÐбнаўлÑецца...'; $messages['loading'] = 'Загружаецца...'; -$messages['uploading'] = 'Файл запампоўваюцца...'; -$messages['uploadingmany'] = 'Файлы запампоўваюцца...'; +$messages['uploading'] = 'Файл зацÑгваецца...'; +$messages['uploadingmany'] = 'Файлы зацÑгваюцца...'; $messages['loadingdata'] = 'Загружаюцца даныÑ...'; $messages['checkingmail'] = 'Праверка новых паведамленнÑÑž...'; $messages['sendingmessage'] = 'Паведамленне адпраўлÑецца...'; @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Паведамленні адпраўлены.'; $messages['savingmessage'] = 'Паведамленне захоўваецца...'; $messages['messagesaved'] = 'Паведамленне захавана Ñž Чарнавікі.'; $messages['successfullysaved'] = 'Захавана.'; +$messages['savingresponse'] = 'ТÑкÑÑ‚ адказу захоўваецца...'; +$messages['deleteresponseconfirm'] = 'Ðапраўду выдаліць Ñ‚ÑкÑÑ‚ адказу?'; $messages['addedsuccessfully'] = 'Кантакт дададзены Ñž адраÑную кнігу.'; $messages['contactexists'] = 'Кантакт з такім Ñамым адраÑам Ñл. пошты ўжо Ñ–Ñнуе.'; $messages['contactnameexists'] = 'Кантакт з такім Ñамым імем ужо Ñ–Ñнуе.'; @@ -82,7 +84,7 @@ $messages['nobodywarning'] = 'Ðдправіць гÑта паведамленн $messages['notsentwarning'] = 'Паведамленне не адпраўлена. Жадаеце ÑкаÑаваць Ñваё паведамленне?'; $messages['noldapserver'] = 'Задайце ldap-Ñервер Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ.'; $messages['nosearchname'] = 'Задайце Ñ–Ð¼Ñ ÐºÐ°Ð½Ñ‚Ð°ÐºÑ‚Ð° альбо Ð°Ð´Ñ€Ð°Ñ Ñлектроннай пошты.'; -$messages['notuploadedwarning'] = 'Ðе ÑžÑе далучÑнні пакуль ÑÑˆÑ‡Ñ Ð·Ð°Ð¿Ð°Ð¼Ð¿Ð°Ð²Ð°Ð½Ñ‹Ñ. Пачакайце альбо ÑкаÑуйце аперацыю.'; +$messages['notuploadedwarning'] = 'Ðе ÑžÑе далучÑнні пакуль ÑÑˆÑ‡Ñ Ð·Ð°Ñ†ÑгнутыÑ. Пачакайце альбо ÑкаÑуйце аперацыю.'; $messages['searchsuccessful'] = 'Знойдзена $nr паведамленнÑÑž.'; $messages['contactsearchsuccessful'] = 'Знойдзена $nr кантактаў.'; $messages['searchnomatch'] = 'Пошук не даў выніку.'; @@ -97,8 +99,8 @@ $messages['folderexpunged'] = 'Папка ÑціÑнута. '; $messages['deletedsuccessfully'] = 'Выдалена.'; $messages['converting'] = 'Фарматаванне выдалÑецца...'; $messages['messageopenerror'] = 'Ðе ўдалоÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ñ–Ñ†ÑŒ паведамленне з Ñервера.'; -$messages['fileuploaderror'] = 'Ðе ўдалоÑÑ Ð·Ð°Ð¿Ð°Ð¼Ð¿Ð°Ð²Ð°Ñ†ÑŒ файл.'; -$messages['filesizeerror'] = 'Запампаваны файл перавышае макÑімальна дазволены памер $size.'; +$messages['fileuploaderror'] = 'Ðе ўдалоÑÑ Ð·Ð°Ñ†Ñгнуць файл.'; +$messages['filesizeerror'] = 'ЗацÑгнуты файл перавышае макÑімальна дазволены памер $size.'; $messages['copysuccess'] = '$nr кантактаў ÑкапіÑвана.'; $messages['movesuccess'] = '$nr кантактаў перамешчана.'; $messages['copyerror'] = 'Ðе ўдалоÑÑ ÑкапіÑваць ніводнага кантакта.'; @@ -118,17 +120,17 @@ $messages['errorsendingreceipt'] = 'Ðе ўдалоÑÑ Ð°Ð´Ð¿Ñ€Ð°Ð²Ñ–Ñ†ÑŒ Ð¿Ð°Ñ $messages['deleteidentityconfirm'] = 'Ðапраўду выдаліць гÑтую тоеÑнаÑць?'; $messages['nodeletelastidentity'] = 'ГÑтую тоеÑнаÑць выдаліць нÑможна, бо апошнÑÑ.'; $messages['forbiddencharacter'] = 'Ðазва папкі змÑшчае забаронены знак.'; -$messages['selectimportfile'] = 'ÐбÑрыце файл на запампоўку.'; +$messages['selectimportfile'] = 'ÐбÑрыце файл да зацÑгваннÑ.'; $messages['addresswriterror'] = 'ÐÐ±Ñ€Ð°Ð½Ð°Ñ Ð°Ð´Ñ€Ð°ÑÐ½Ð°Ñ ÐºÐ½Ñ–Ð³Ð° Ñ‘Ñць толькі-длÑ-чытаннÑ.'; $messages['contactaddedtogroup'] = 'Кантакты дададзены Ñž групу.'; $messages['contactremovedfromgroup'] = 'Кантакты Ð²Ñ‹Ð´Ð°Ð»ÐµÐ½Ñ‹Ñ Ð· групы.'; $messages['nogroupassignmentschanged'] = 'УÑе прызначÑнні групы заÑталіÑÑ Ð±ÐµÐ· зменаў.'; $messages['importwait'] = 'Ідзе імпартаванне. Чакайце...'; -$messages['importformaterror'] = 'Імпартаванне не ўдалоÑÑ! Запампаваны файл не ўтрымоўвае Ñлушных даных на імпарт.'; +$messages['importformaterror'] = 'Імпартаванне не ўдалоÑÑ! Загружаны файл не ўтрымоўвае Ñлушных даных на імпарт.'; $messages['importconfirm'] = '<b>$inserted кантактаў імпартаваныÑ</b>'; $messages['importconfirmskipped'] = '<b>Прапушчана $skipped Ñ–Ñнуючых запіÑаў</b>'; $messages['importmessagesuccess'] = '$nr паведамленнÑÑž імпартавана'; -$messages['importmessageerror'] = 'Ðе ўдалоÑÑ Ñ–Ð¼Ð¿Ð°Ñ€Ñ‚Ð°Ð²Ð°Ñ†ÑŒ! Запампаваны файл не Ñ‘Ñць Ñлушным паведамленнем альбо файлам паштовай Ñкрынкі'; +$messages['importmessageerror'] = 'Ðе ўдалоÑÑ Ñ–Ð¼Ð¿Ð°Ñ€Ñ‚Ð°Ð²Ð°Ñ†ÑŒ! Загружаны файл не Ñ‘Ñць Ñлушным паведамленнем альбо файлам паштовай Ñкрынкі'; $messages['opnotpermitted'] = 'ÐÐ¿ÐµÑ€Ð°Ñ†Ñ‹Ñ Ð½Ðµ дазволенаÑ!'; $messages['nofromaddress'] = 'У абранай тоеÑнаÑці не Ñтае адраÑу Ñл. пошты.'; $messages['editorwarning'] = 'Змена Ñ€Ñдактара прывÑдзе да Ñтраты фарматаваннÑ. ПрацÑгнуць?'; diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc index 29c99e8f4..0394f19b9 100644 --- a/program/localization/bg_BG/labels.inc +++ b/program/localization/bg_BG/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'ПравопиÑ'; $labels['checkspelling'] = 'Проверка на правопиÑа'; $labels['resumeediting'] = 'Продължи черновата'; $labels['revertto'] = 'Върни Ñе към'; +$labels['responses'] = 'Отговори'; +$labels['insertresponse'] = 'Вмъкване на отговори'; +$labels['manageresponses'] = 'ÐаÑтройка на отговори'; +$labels['savenewresponse'] = 'Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° нов отговор'; +$labels['editresponses'] = 'Ð ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð½Ð° отговори'; +$labels['editresponse'] = 'Ð ÐµÐ´Ð°ÐºÑ†Ð¸Ñ Ð½Ð° отговор'; +$labels['responsename'] = 'Име'; +$labels['responsetext'] = 'ТекÑÑ‚ на отговор'; $labels['attach'] = 'Прикачи'; $labels['attachments'] = 'Прикачени файлове'; $labels['upload'] = 'Качи'; diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc index 210eda1b1..48e1fbcc0 100644 --- a/program/localization/bg_BG/messages.inc +++ b/program/localization/bg_BG/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'ПиÑмото е изпратено уÑпешно. $messages['savingmessage'] = 'ЗапиÑване на пиÑмо...'; $messages['messagesaved'] = 'ПиÑмото е запиÑано в Чернови.'; $messages['successfullysaved'] = 'УÑпешен запиÑ.'; +$messages['savingresponse'] = 'ЗапиÑване текÑÑ‚ на отговор...'; +$messages['deleteresponseconfirm'] = 'Желаете ли да изтриете текÑÑ‚ за отговор?'; $messages['addedsuccessfully'] = 'Контактът е добавен в адреÑната книга.'; $messages['contactexists'] = 'Вече ÑъщеÑтвува контакт Ñ Ñ‚Ð¾Ð·Ð¸ e-mail адреÑ.'; $messages['contactnameexists'] = 'Вече ÑъщеÑтвува контакт Ñ Ñ‚Ð¾Ð²Ð° име.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'ТърÑениÑÑ‚ контакт не е нам $messages['contactsearchonly'] = 'Използвайте полето за да Ñ‚ÑŠÑ€Ñите контакти'; $messages['sendingfailed'] = 'ÐеуÑпешно изпращане на пиÑмо.'; $messages['senttooquickly'] = 'ÐœÐ¾Ð»Ñ Ð¸Ð·Ñ‡Ð°ÐºÐ°Ð¹Ñ‚Ðµ $sec Ñекунди преди да изпратите пиÑмото.'; +$messages['errorsavingsent'] = 'Възникна грешка при запиÑване на изпратеното пиÑмо.'; +$messages['errorsaving'] = 'Възникна грешка при запиÑването.'; $messages['errormoving'] = 'ПиÑмото не може да бъде премеÑтено.'; $messages['errorcopying'] = 'ПиÑмото не може да бъде копирано.'; $messages['errordeleting'] = 'ПиÑмото не може да бъде изтрито.'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP грешка: $msg'; $messages['emailformaterror'] = 'Ðевалиден e-mail адреÑ: $email'; $messages['toomanyrecipients'] = 'Прекалено много адреÑи за изпращане (макÑимум: $max).'; $messages['maxgroupmembersreached'] = 'БроÑÑ‚ на членовете на групата е повече от макÑималниÑ: $max.'; +$messages['internalerror'] = 'Възникна вътрешна грешка. ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново.'; $messages['contactdelerror'] = 'Ðевъзможно изтриване на контакти.'; $messages['contactdeleted'] = 'Контактът беше изтрит уÑпешно.'; $messages['contactrestoreerror'] = 'ÐеуÑпешно възÑтановÑване на изтрите контакти.'; diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc index 3424013c5..9e0f083ff 100644 --- a/program/localization/bs_BA/messages.inc +++ b/program/localization/bs_BA/messages.inc @@ -54,6 +54,8 @@ $messages['contactnotfound'] = 'Traženi kontakt nije pronaÄ‘en.'; $messages['contactsearchonly'] = 'Unesite neki pojam za pretragu'; $messages['sendingfailed'] = 'GreÅ¡ka pri slanju poruke.'; $messages['senttooquickly'] = 'Molimo saÄekajte $sec sekundi prije slanja ove poruke.'; +$messages['errorsavingsent'] = 'Desila se greÅ¡ka pri snimanju poslane poruke.'; +$messages['errorsaving'] = 'Desila se greÅ¡ka pri snimanju.'; $messages['errormoving'] = 'Nije moguće premjestiti poruke.'; $messages['errorcopying'] = 'Nije moguće kopirati poruke.'; $messages['errordeleting'] = 'Nije moguće obrisati poruke.'; @@ -140,6 +142,7 @@ $messages['smtperror'] = 'SMTP greÅ¡ka: $msg'; $messages['emailformaterror'] = 'NetaÄna email adresa: $email'; $messages['toomanyrecipients'] = 'PreviÅ¡e primaoca. Smanjite broj primaoca na $max.'; $messages['maxgroupmembersreached'] = 'Broj Älanova grupe prelazi maksimum od $max.'; +$messages['internalerror'] = 'Dogodila se interna greÅ¡ka. Molimo vas da pokuÅ¡ate ponovo.'; $messages['contactdelerror'] = 'Kontakti ne mogu biti obrisani.'; $messages['contactdeleted'] = 'Kontakti su uspjeÅ¡no obrisani.'; $messages['contactrestoreerror'] = 'Nije moguće vratiti obrisane kontakte.'; diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc index 065431fbc..a93b18434 100644 --- a/program/localization/ca_ES/labels.inc +++ b/program/localization/ca_ES/labels.inc @@ -175,14 +175,14 @@ $labels['resetsearch'] = 'Neteja cerca'; $labels['searchmod'] = 'Cerca modificadors'; $labels['msgtext'] = 'Missatge sencer'; $labels['body'] = 'Cos'; -$labels['type'] = 'tipus:'; +$labels['type'] = 'Tipus'; $labels['namex'] = 'Nom'; $labels['openinextwin'] = 'Obre a una nova finestra'; $labels['emlsave'] = 'Descarrega (.eml)'; $labels['changeformattext'] = 'Mostra en format de text net'; $labels['changeformathtml'] = 'Mostra en format HTML'; $labels['editasnew'] = 'Edita com a nou'; -$labels['send'] = 'Enviar'; +$labels['send'] = 'Envia'; $labels['sendmessage'] = 'Envia el missatge'; $labels['savemessage'] = 'Desa aquest esborrany'; $labels['addattachment'] = 'Adjunta un fitxer'; @@ -316,7 +316,11 @@ $labels['searchdelete'] = 'Suprimeix la cerca'; $labels['import'] = 'Importa'; $labels['importcontacts'] = 'Importa contactes'; $labels['importfromfile'] = 'Importa des d\'un fitxer:'; +$labels['importtarget'] = 'Afegeix contactes a'; $labels['importreplace'] = 'Reemplaça la llibreta d\'adreçes sencera'; +$labels['importgroups'] = 'Importa assignacions de grup'; +$labels['importgroupsall'] = 'Tot (crea grups si és necessari)'; +$labels['importgroupsexisting'] = 'Només per a grups existents'; $labels['importdesc'] = 'Podeu carregar contactes des d\'una llibreta de direccions.<br/>Actualment donem suport a la importació d\'adreces des de fitxers de tipus <a href="http://ca.wikipedia.org/wiki/VCard">vCard</a> o CSV (valors separats per comes).'; $labels['done'] = 'Fet'; $labels['settingsfor'] = 'Configuració per a'; @@ -344,8 +348,8 @@ $labels['timezone'] = 'Fus horari'; $labels['pagesize'] = 'Files per pà gina'; $labels['signature'] = 'Signatura'; $labels['dstactive'] = 'Horari d\'estiu'; -$labels['showinextwin'] = 'Obrir el missatge en una nova finestra'; -$labels['composeextwin'] = 'Redactar en una nova finestra'; +$labels['showinextwin'] = 'Obre el missatge en una nova finestra'; +$labels['composeextwin'] = 'Redacta en una nova finestra'; $labels['htmleditor'] = 'Escriu missatges en HTML'; $labels['htmlonreply'] = 'només en resposta a missatges en HTML'; $labels['htmlonreplyandforward'] = 'en reenviament o resposta a missatge HTML'; diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc index 06a72cb50..5f5854de8 100644 --- a/program/localization/ca_ES/messages.inc +++ b/program/localization/ca_ES/messages.inc @@ -54,6 +54,8 @@ $messages['contactnotfound'] = 'No s\'ha trobat el contacte sol·licitat.'; $messages['contactsearchonly'] = 'Introduïu termes de cerca per trobar contactes'; $messages['sendingfailed'] = 'Error enviant el missatge.'; $messages['senttooquickly'] = 'Si us plau, espereu $sec segon(s) abans d\'enviar aquest missatge.'; +$messages['errorsavingsent'] = 'S\'ha produït un error mentre es desava el missatge enviat.'; +$messages['errorsaving'] = 'S\'ha produït un error mentre es desava.'; $messages['errormoving'] = 'No s\'ha pogut moure el(s) missatge(s).'; $messages['errorcopying'] = 'No s\'ha pogut copiar el(s) missatge(s).'; $messages['errordeleting'] = 'No s\'ha pogut suprimir el(s) missatge(s).'; @@ -140,6 +142,7 @@ $messages['smtperror'] = 'Error SMTP: $msg'; $messages['emailformaterror'] = 'Adreça de correu no và lida: $email'; $messages['toomanyrecipients'] = 'Massa destinataris. Reduïu el nombre de destinataris a $max.'; $messages['maxgroupmembersreached'] = 'El nombre de membres del grup excedeix el mà xim de $max.'; +$messages['internalerror'] = 'S\'ha produït un error intern. Si us plau torneu-ho a provar.'; $messages['contactdelerror'] = 'No s\'han pogut suprimir el(s) contacte(s).'; $messages['contactdeleted'] = 'Contacte(s) suprimit(s) correctament.'; $messages['contactrestoreerror'] = 'No s\'ha pogut restaurar el(s) contacte(s) suprimit(s).'; diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc index d887d8d0a..aac514ec5 100644 --- a/program/localization/cs_CZ/labels.inc +++ b/program/localization/cs_CZ/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Pravopis'; $labels['checkspelling'] = 'Zkontrolovat pravopis'; $labels['resumeediting'] = 'PokraÄovat v úpravách'; $labels['revertto'] = 'PÅ™ejÃt na'; +$labels['responses'] = 'OdpovÄ›di'; +$labels['insertresponse'] = 'Vložit odpovÄ›d'; +$labels['manageresponses'] = 'Spravovat odpovÄ›dÃ'; +$labels['savenewresponse'] = 'Uložit novou odpovÄ›Ä'; +$labels['editresponses'] = 'Upravit odpovÄ›di'; +$labels['editresponse'] = 'Upravit odpovÄ›Ä'; +$labels['responsename'] = 'Název'; +$labels['responsetext'] = 'Text odpovÄ›di'; $labels['attach'] = 'PÅ™iložit'; $labels['attachments'] = 'PÅ™Ãlohy'; $labels['upload'] = 'Nahrát'; diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc index 0bd6b0e82..2e3a75c52 100644 --- a/program/localization/cs_CZ/messages.inc +++ b/program/localization/cs_CZ/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Zpráva byla odeslána'; $messages['savingmessage'] = 'Ukládám zprávu...'; $messages['messagesaved'] = 'Zpráva uložena do Rozepsané'; $messages['successfullysaved'] = 'Uloženo'; +$messages['savingresponse'] = 'Ukládám text odpovÄ›di...'; +$messages['deleteresponseconfirm'] = 'Opravdu chcete odstranit tento text odpovÄ›di?'; $messages['addedsuccessfully'] = 'Kontakt byl úspěšnÄ› pÅ™idán do adresáře'; $messages['contactexists'] = 'Kontakt se zadanou e-mailovou adresou již existuje'; $messages['contactnameexists'] = 'Kontakt se stejným jménem již existuje'; diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc index 5dd8230c7..be6c4dac6 100644 --- a/program/localization/cy_GB/messages.inc +++ b/program/localization/cy_GB/messages.inc @@ -54,6 +54,8 @@ $messages['contactnotfound'] = 'Ni gafwyd hyd i\'r cysylltiad gofynnwyd amdano'; $messages['contactsearchonly'] = 'Rhowch dermau chwilio i ganfod cysylltiadau'; $messages['sendingfailed'] = 'Methwyd danfon y neges'; $messages['senttooquickly'] = 'Arhoswch $sec eiliad cyn danfon y neges'; +$messages['errorsavingsent'] = 'Fe gafwyd gwall wrth gadw\'r neges ddanfonwyd.'; +$messages['errorsaving'] = 'Fe gafwyd gwall wrth gadw'; $messages['errormoving'] = 'Methwyd symud y neges'; $messages['errorcopying'] = 'Methwyd copïo\'r neges(euon)'; $messages['errordeleting'] = 'Methwyd dileu y neges'; @@ -140,6 +142,7 @@ $messages['smtperror'] = 'Gwall SMTP: $msg'; $messages['emailformaterror'] = 'Cyfeiriad e-bost anghywir: $email'; $messages['toomanyrecipients'] = 'Gormod o dderbynnwyr. Lleihewch y nifer i $max'; $messages['maxgroupmembersreached'] = 'Mae nifer o aelodau\'r grŵp yn fwy na\'r uchafswm o $max'; +$messages['internalerror'] = 'Fe gafwyd gwall mewnol. Rhowch gynnig arni eto.'; $messages['contactdelerror'] = 'Methwyd dileu cyswllt'; $messages['contactdeleted'] = 'Cyswllt wedi ei ddileu yn llwyddiannus'; $messages['contactrestoreerror'] = 'Methwyd adfer y cyswllt/cysylltiadau a ddilëwyd'; diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc index 52de86d92..53d32090c 100644 --- a/program/localization/da_DK/labels.inc +++ b/program/localization/da_DK/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Stav'; $labels['checkspelling'] = 'Stavekontrol'; $labels['resumeediting'] = 'Genoptag redigering'; $labels['revertto'] = 'Vend tilbage til'; +$labels['responses'] = 'Svar'; +$labels['insertresponse'] = 'Indsæt et svar'; +$labels['manageresponses'] = 'Administrer svar'; +$labels['savenewresponse'] = 'Gem et nyt svar'; +$labels['editresponses'] = 'Rediger svar'; +$labels['editresponse'] = 'Rediger svar'; +$labels['responsename'] = 'Navn'; +$labels['responsetext'] = 'Svartekst'; $labels['attach'] = 'Vedhæft'; $labels['attachments'] = 'Vedhæftninger'; $labels['upload'] = 'Overfør'; @@ -316,7 +324,11 @@ $labels['searchdelete'] = 'Slet søgning'; $labels['import'] = 'Importér'; $labels['importcontacts'] = 'Importér kontakter'; $labels['importfromfile'] = 'Importér fra fil:'; +$labels['importtarget'] = 'Tilføj kontakter til'; $labels['importreplace'] = 'Overskriv hele adressebogen'; +$labels['importgroups'] = 'Importer gruppetildelinger'; +$labels['importgroupsall'] = 'Alle (opret grupper hvis nødvendigt)'; +$labels['importgroupsexisting'] = 'Kun for eksisterende grupper'; $labels['importdesc'] = 'Du kan uploade kontakter fra en eksisterende adressebog. <br/>I øjeblikket supportere vi import af adresser fra <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> og CSV (komma-separeret) data format.'; $labels['done'] = 'Færdig'; $labels['settingsfor'] = 'Indstillinger for'; diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc index c12236eef..1e4635b8d 100644 --- a/program/localization/da_DK/messages.inc +++ b/program/localization/da_DK/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Beskeden blev afsendt succesfuldt.'; $messages['savingmessage'] = 'Gemmer besked...'; $messages['messagesaved'] = 'Beskeden er gemt i kladdemappen.'; $messages['successfullysaved'] = 'Gemt succesfuldt'; +$messages['savingresponse'] = 'Gemmer svartekst...'; +$messages['deleteresponseconfirm'] = 'Er du sikker pÃ¥, at du ønsker at slette svarteksten?'; $messages['addedsuccessfully'] = 'Kontakten blev tilføjet adressebogen.'; $messages['contactexists'] = 'Der er allerede en kontakt med denne e-mailadresse.'; $messages['contactnameexists'] = 'En kontakt med samme navn eksisterer allerede.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'Den søgte kontakt blev ikke fundet.'; $messages['contactsearchonly'] = 'Indtast søgeord for at finde kontakter.'; $messages['sendingfailed'] = 'Beskeden kunne ikke sendes.'; $messages['senttooquickly'] = 'Vent venligst $sec sekunder før du sender denne besked.'; +$messages['errorsavingsent'] = 'Der opstod en fejl ved at gemme den sendte besked.'; +$messages['errorsaving'] = 'Der opstod en fejl ved at gemme.'; $messages['errormoving'] = 'Beskeden kunne ikke flyttes.'; $messages['errorcopying'] = 'Beskeden kunne ikke kopieres.'; $messages['errordeleting'] = 'Beskeden kunne ikke slettes.'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP fejl: $msg'; $messages['emailformaterror'] = 'Ugyldig e-mailadresse: $email'; $messages['toomanyrecipients'] = 'For mange modtagere. Reducer antallet af modtagere til $max.'; $messages['maxgroupmembersreached'] = 'Antallet af gruppemedlemmer overstiger maksimum pÃ¥ $max.'; +$messages['internalerror'] = 'En intern fejl opstod. Prøv venligst igen.'; $messages['contactdelerror'] = 'Kunne ikke slette kontakt(er).'; $messages['contactdeleted'] = 'Kontakt(er) slettet.'; $messages['contactrestoreerror'] = 'Kunne ikke gendanne slettede kontakt(er).'; diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc index e5fe1ec66..b416d0b98 100644 --- a/program/localization/de_CH/labels.inc +++ b/program/localization/de_CH/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Rechtschreibung'; $labels['checkspelling'] = 'Rechtschreibung prüfen'; $labels['resumeediting'] = 'Bearbeitung fortsetzen'; $labels['revertto'] = 'Zurück zu'; +$labels['responses'] = 'Antworten'; +$labels['insertresponse'] = 'Antwort einfügen'; +$labels['manageresponses'] = 'Antworten verwalten'; +$labels['savenewresponse'] = 'Neue Antwort speichern'; +$labels['editresponses'] = 'Antworten bearbeiten'; +$labels['editresponse'] = 'Antwort bearbeiten'; +$labels['responsename'] = 'Name'; +$labels['responsetext'] = 'Antworttext'; $labels['attach'] = 'Anhängen'; $labels['attachments'] = 'Anhänge'; $labels['upload'] = 'Hochladen'; diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc index 4e5ccaa46..2f3257703 100644 --- a/program/localization/de_CH/messages.inc +++ b/program/localization/de_CH/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Nachricht erfolgreich gesendet'; $messages['savingmessage'] = 'Nachricht wird gespeichert...'; $messages['messagesaved'] = 'Nachricht als Entwurf gespeichert'; $messages['successfullysaved'] = 'Erfolgreich gespeichert'; +$messages['savingresponse'] = 'Antwort wird gespeichert...'; +$messages['deleteresponseconfirm'] = 'Wollen Sie diese Antwort wirklich löschen?'; $messages['addedsuccessfully'] = 'Kontakt zum Adressbuch hinzugefügt'; $messages['contactexists'] = 'Es existiert bereits ein Kontakt mit dieser E-Mail-Adresse.'; $messages['contactnameexists'] = 'Es existiert bereits ein Kontakt mit diesem Namen'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'Die gewählte Adresse wurde nicht gefunden'; $messages['contactsearchonly'] = 'Geben Sie einen Suchbegriff ein, um Kontakte zu finden'; $messages['sendingfailed'] = 'Versand der Nachricht fehlgeschlagen'; $messages['senttooquickly'] = 'Bitte warten Sie $sec Sekunde(n) vor dem Senden dieser Nachricht'; +$messages['errorsavingsent'] = 'Beim Speichern der gesendeten Nachricht ist ein Fehler aufgetreten.'; +$messages['errorsaving'] = 'Beim Speichern ist ein Fehler aufgetreten.'; $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.'; $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.'; $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP Fehler: $msg'; $messages['emailformaterror'] = 'Ungültige E-Mail-Adresse: $email'; $messages['toomanyrecipients'] = 'Zuviele Empfänger angegeben. Reduzieren Sie die Empfängeradressen auf $max.'; $messages['maxgroupmembersreached'] = 'Die Anzahl Adressen in dieser Gruppe überschreitet das Maximum von $max.'; +$messages['internalerror'] = 'Ein interner Fehler ist aufgetreten. Bitte versuchen Sie den Vorgang erneut.'; $messages['contactdelerror'] = 'Fehler beim Löschen.'; $messages['contactdeleted'] = 'Kontakt(e) erfolgreich gelöscht.'; $messages['contactrestoreerror'] = 'Die gelöschten Kontakte konnten nicht wiederhergestellt werden.'; diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index 840c9358c..8f221a3a9 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -232,6 +232,15 @@ $labels['checkspelling'] = 'Check spelling'; $labels['resumeediting'] = 'Resume editing'; $labels['revertto'] = 'Revert to'; +$labels['responses'] = 'Responses'; +$labels['insertresponse'] = 'Insert a response'; +$labels['manageresponses'] = 'Manage responses'; +$labels['savenewresponse'] = 'Save new response'; +$labels['editresponses'] = 'Edit responses'; +$labels['editresponse'] = 'Edit response'; +$labels['responsename'] = 'Name'; +$labels['responsetext'] = 'Response Text'; + $labels['attach'] = 'Attach'; $labels['attachments'] = 'Attachments'; $labels['upload'] = 'Upload'; @@ -484,6 +493,9 @@ $labels['standardwindows'] = 'Handle popups as standard windows'; $labels['forwardmode'] = 'Messages forwarding'; $labels['inline'] = 'inline'; $labels['asattachment'] = 'as attachment'; +$labels['replyallmode'] = 'Default action of [Reply all] button'; +$labels['replyalldefault'] = 'reply to all'; +$labels['replyalllist'] = 'reply to mailing list only (if found)'; $labels['folder'] = 'Folder'; $labels['folders'] = 'Folders'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 9733109ad..033c820d1 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -46,6 +46,8 @@ $messages['messagesent'] = 'Message sent successfully.'; $messages['savingmessage'] = 'Saving message...'; $messages['messagesaved'] = 'Message saved to Drafts.'; $messages['successfullysaved'] = 'Successfully saved.'; +$messages['savingresponse'] = 'Saving response text...'; +$messages['deleteresponseconfirm'] = 'Do you really want to delete this response text?'; $messages['addedsuccessfully'] = 'Contact added successfully to address book.'; $messages['contactexists'] = 'A contact with the same e-mail address already exists.'; $messages['contactnameexists'] = 'A contact with the same name already exists.'; diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc index 3a8b5ab31..694544cca 100644 --- a/program/localization/es_ES/messages.inc +++ b/program/localization/es_ES/messages.inc @@ -54,6 +54,8 @@ $messages['contactnotfound'] = 'El contacto solicitado no existe.'; $messages['contactsearchonly'] = 'Ingrese algún criterio para buscar contactos'; $messages['sendingfailed'] = 'Error al enviar mensaje.'; $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje.'; +$messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado.'; +$messages['errorsaving'] = 'Ha ocurrido un error al guardar.'; $messages['errormoving'] = 'No se ha podido mover el/los mensaje(s).'; $messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s).'; $messages['errordeleting'] = 'No se ha podido eliminar el/los mensaje(s).'; @@ -140,6 +142,7 @@ $messages['smtperror'] = 'Error SMTP: $msg'; $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email'; $messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.'; $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.'; +$messages['internalerror'] = 'Ha ocurrido un error interno. Por favor, inténtelo de nuevo.'; $messages['contactdelerror'] = 'No se ha podido eliminar el/los contacto(s).'; $messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente.'; $messages['contactrestoreerror'] = 'No se han podido restaurar los contactos borrados.'; diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc index de23577a0..14f6f8621 100644 --- a/program/localization/fa_IR/labels.inc +++ b/program/localization/fa_IR/labels.inc @@ -18,16 +18,16 @@ $labels['welcome'] = 'به $product خوش آمدید'; $labels['username'] = 'نام کاربری'; $labels['password'] = 'گذرواژه'; -$labels['server'] = 'سرویس‌دهنده'; +$labels['server'] = 'سرور'; $labels['login'] = 'ورود'; -$labels['logout'] = 'برون‌رÙت'; -$labels['mail'] = 'پست'; +$labels['logout'] = 'خروج'; +$labels['mail'] = 'نامه'; $labels['settings'] = 'تنظیمات'; $labels['addressbook'] = 'دÙتر نشانی'; $labels['inbox'] = 'صندوق ورودی'; $labels['drafts'] = 'پیش‌نویس‌ها'; $labels['sent'] = 'Ùرستاده شده'; -$labels['trash'] = 'Øذ٠شده‌ها'; +$labels['trash'] = 'زباله‌دان'; $labels['junk'] = 'بنجل'; $labels['show_real_foldernames'] = 'نمایش نام واقعی برای پوشه‌های ویژه'; $labels['subject'] = 'موضوع'; @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'املاء'; $labels['checkspelling'] = 'بررسی املایی'; $labels['resumeediting'] = 'ادامه‌ی ویرایش'; $labels['revertto'] = 'برگرداندن به'; +$labels['responses'] = 'پاسخ‌ها'; +$labels['insertresponse'] = 'درج پاسخ'; +$labels['manageresponses'] = 'مدیریت پاسخ‌ها'; +$labels['savenewresponse'] = 'ذخیره پاسخ جدید'; +$labels['editresponses'] = 'ویرایش پاسخ‌ها'; +$labels['editresponse'] = 'ویرایش پاسخ'; +$labels['responsename'] = 'نام'; +$labels['responsetext'] = 'متن پاسخ'; $labels['attach'] = 'پیوست کردن'; $labels['attachments'] = 'پیوست‌ها'; $labels['upload'] = 'بارگذاری'; diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc index 43f5a6c2a..502b0445a 100644 --- a/program/localization/fa_IR/messages.inc +++ b/program/localization/fa_IR/messages.inc @@ -54,6 +54,8 @@ $messages['contactnotfound'] = 'مخاطب درخواست شده پیدا نشد $messages['contactsearchonly'] = 'برای یاÙتن مخاطب عبارتی را جستجو کنید'; $messages['sendingfailed'] = 'ارسال پیغام ناموÙÙ‚ بود.'; $messages['senttooquickly'] = 'لطÙا قبل از ارسال این پیغام $sec ثانیه صبر کنید.'; +$messages['errorsavingsent'] = 'خطایی رخ داده است پیام ارسالی ذخیره Ù…ÛŒ گردد.'; +$messages['errorsaving'] = 'خطایی در ذخیره کردن رخ داده است.'; $messages['errormoving'] = 'پیغام(ها) منتقل نشدند.'; $messages['errorcopying'] = 'پیغام(ها) Ú©Ù¾ÛŒ نشدند.'; $messages['errordeleting'] = 'پیغام(ها) Øذ٠نشدند.'; @@ -140,6 +142,7 @@ $messages['smtperror'] = 'خطای SMTP: $msg'; $messages['emailformaterror'] = 'پست الکترونیکی نامعتبر: $email'; $messages['toomanyrecipients'] = 'گیرنده‌های بیش از اندازه: تعداد گیرنده ها را به $max کاهش دهید.'; $messages['maxgroupmembersreached'] = 'تعداد اعضای گروه بیشتر از $max است.'; +$messages['internalerror'] = 'یک خطای داخلی رخ داده است. لطÙا دوباره سعی کنید.'; $messages['contactdelerror'] = 'Øذ٠مخاطب(ها) انجام شد.'; $messages['contactdeleted'] = 'مخاطب(ها) با موÙقیت Øذ٠شدند.'; $messages['contactrestoreerror'] = 'مخاطب(های) Øذ٠شده بازگردانی نخواهند شد.'; diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc index 8a9064028..1e5e26193 100644 --- a/program/localization/fi_FI/labels.inc +++ b/program/localization/fi_FI/labels.inc @@ -196,6 +196,13 @@ $labels['spellcheck'] = 'Oikeinkirjoitus'; $labels['checkspelling'] = 'Tarkista oikeinkirjoitus'; $labels['resumeediting'] = 'Jatka muokkausta'; $labels['revertto'] = 'Muuta takaisin'; +$labels['responses'] = 'Vastaukset'; +$labels['manageresponses'] = 'Hallitse vastauksia'; +$labels['savenewresponse'] = 'Tallenna uusi vastaus'; +$labels['editresponses'] = 'Muokkaa vastauksia'; +$labels['editresponse'] = 'Muokkaa vastausta'; +$labels['responsename'] = 'Nimi'; +$labels['responsetext'] = 'Vastausteksti'; $labels['attach'] = 'Liitä'; $labels['attachments'] = 'Liitetiedostot'; $labels['upload'] = 'Lisää'; @@ -315,6 +322,7 @@ $labels['import'] = 'Tuo'; $labels['importcontacts'] = 'Tuo yhteystiedot'; $labels['importfromfile'] = 'Tuo tiedostosta:'; $labels['importreplace'] = 'Korvaa koko osoitekirja'; +$labels['importgroupsall'] = 'Kaikki (luo ryhmät tarvittaessa)'; $labels['importdesc'] = 'Voit tuoda yhteystietoja olemassa olevasta osoitekirjasta.<br/>Tuettuja muotoja ovat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ja CSV (pilkuin erotetut arvot).'; $labels['done'] = 'Valmis'; $labels['settingsfor'] = 'Asetukset'; diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc index 1b3c3ea49..a94339af1 100644 --- a/program/localization/fi_FI/messages.inc +++ b/program/localization/fi_FI/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Viesti lähetetty'; $messages['savingmessage'] = 'Tallennetaan viestiä...'; $messages['messagesaved'] = 'Viesti tallennettu "Luonnokset"-kansioon'; $messages['successfullysaved'] = 'Tallennus onnistui'; +$messages['savingresponse'] = 'Tallennetaan vastaustekstiä...'; +$messages['deleteresponseconfirm'] = 'Haluatko varmasti poistaa tämän vastaustekstin?'; $messages['addedsuccessfully'] = 'Yhteystieto lisätty osoitekirjaan'; $messages['contactexists'] = 'Samalla sähköpostiosoitteella on jo olemassa yhteystieto'; $messages['contactnameexists'] = 'Yhteystieto samalla nimellä on jo olemassa'; diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc index dd0acf4f1..14d1066f9 100644 --- a/program/localization/fr_FR/labels.inc +++ b/program/localization/fr_FR/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Orthographe'; $labels['checkspelling'] = 'Vérifier l\'orthographe'; $labels['resumeediting'] = 'Retourner à l\'édition'; $labels['revertto'] = 'Revenir à '; +$labels['responses'] = 'Réponses'; +$labels['insertresponse'] = 'Insérer une réponse'; +$labels['manageresponses'] = 'Gérer les réponses'; +$labels['savenewresponse'] = 'Sauvegarder une nouvelle réponse'; +$labels['editresponses'] = 'Editer les réponses'; +$labels['editresponse'] = 'Editer la réponse'; +$labels['responsename'] = 'Nom'; +$labels['responsetext'] = 'Texte de la réponse'; $labels['attach'] = 'Joindre'; $labels['attachments'] = 'Fichiers joints'; $labels['upload'] = 'Transférer'; diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc index 648ac759f..f8d6a1c23 100644 --- a/program/localization/hu_HU/labels.inc +++ b/program/localization/hu_HU/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'HelyesÃrás ellenÅ‘rzés'; $labels['checkspelling'] = 'HelyesÃrás-ellenÅ‘rzés'; $labels['resumeediting'] = 'HelyesÃrás-ellenÅ‘rzés vége'; $labels['revertto'] = 'VisszaállÃtás erre'; +$labels['responses'] = 'Válaszok'; +$labels['insertresponse'] = 'Egy válasz beillesztése'; +$labels['manageresponses'] = 'Válaszok kezelése'; +$labels['savenewresponse'] = 'Új válasz mentése'; +$labels['editresponses'] = 'Válaszok szerkesztése'; +$labels['editresponse'] = 'Válasz szerkesztése'; +$labels['responsename'] = 'Név'; +$labels['responsetext'] = 'Válasz Szöveg'; $labels['attach'] = 'Csatolás'; $labels['attachments'] = 'Csatolmányok'; $labels['upload'] = 'Feltöltés'; diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc index 3ca87a52f..79de6ed2b 100644 --- a/program/localization/hu_HU/messages.inc +++ b/program/localization/hu_HU/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Az üzenet elküldve'; $messages['savingmessage'] = 'Az üzenet mentése...'; $messages['messagesaved'] = 'Az üzenet elmentve a Piszkozatokhoz'; $messages['successfullysaved'] = 'A mentés sikerült'; +$messages['savingresponse'] = 'A válasz szövegének mentése...'; +$messages['deleteresponseconfirm'] = 'Biztosan törli ezt a válasz szöveget?'; $messages['addedsuccessfully'] = 'A kapcsolat hozzáadása a cÃmjegyzékhez megtörtént'; $messages['contactexists'] = 'Ezzel az e-mail cÃmmel már létezik kapcsolat'; $messages['contactnameexists'] = 'Ezzel a névvel már létezik kapcsolat'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'A kiválasztott kapcsolat nem található'; $messages['contactsearchonly'] = 'Adjon meg keresÅ‘kifejezéseket a kapcsolatok közti kereséshez'; $messages['sendingfailed'] = 'Az üzenet elküldése nem sikerült'; $messages['senttooquickly'] = 'Kérem várjon még $sec másodpercet az üzenet elküldése elÅ‘tt'; +$messages['errorsavingsent'] = 'Hiba történt az elküldött üzenet mentése közben'; +$messages['errorsaving'] = 'A mentés során hiba lépett fel'; $messages['errormoving'] = 'Az üzenet(ek)et nem sikerült áthelyezni'; $messages['errorcopying'] = 'Az üzenet(ek)et nem sikerült másolni'; $messages['errordeleting'] = 'Az üzenet(ek)et nem sikerült törölni'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP hiba ($code): $msg'; $messages['emailformaterror'] = 'Helytelen formátumú e-mail cÃm: $email'; $messages['toomanyrecipients'] = 'Túl sok a cÃmzett. Csökkentse a cÃmzettek számát maximum $max cÃmre!'; $messages['maxgroupmembersreached'] = 'A csoport létszáma meghaladja a maximum $max fÅ‘t'; +$messages['internalerror'] = 'BelsÅ‘ hiba történt. Kérjük próbálja újra!'; $messages['contactdelerror'] = 'Hiba a kapcsolat(ok) törlésekor'; $messages['contactdeleted'] = 'Kapcsolat(ok) sikeresen törölve'; $messages['contactrestoreerror'] = 'Nem sikerült a törölt kapcsolat(ok) helyreállÃtása'; diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc index c5a81044e..0fd084f1b 100644 --- a/program/localization/it_IT/messages.inc +++ b/program/localization/it_IT/messages.inc @@ -54,6 +54,8 @@ $messages['contactnotfound'] = 'Il contatto richiesto non è stato trovato'; $messages['contactsearchonly'] = 'Inserisci dei termini per cercare i contatti'; $messages['sendingfailed'] = 'Impossibile inviare il messaggio'; $messages['senttooquickly'] = 'Per favore, attendi $sec secondi prima di inviare questo messaggio'; +$messages['errorsavingsent'] = 'Si è verificato un errore nel savare il messaggio inviato.'; +$messages['errorsaving'] = 'Si è verificato un errore nel salvataggio.'; $messages['errormoving'] = 'Impossibile spostare il messaggio'; $messages['errorcopying'] = 'Impossibile copiare il messaggio'; $messages['errordeleting'] = 'Impossibile eliminare il messaggio'; @@ -140,6 +142,7 @@ $messages['smtperror'] = 'Errore SMTP: $msg'; $messages['emailformaterror'] = 'Indirizzo e-mail non corretto: $email'; $messages['toomanyrecipients'] = 'Numero eccessivo di destinatari, ridurlo a $max'; $messages['maxgroupmembersreached'] = 'Il numero dei membri del gruppo eccede il massimo di $max'; +$messages['internalerror'] = 'Si è verificato un errore interno. Riprovare più tardi.'; $messages['contactdelerror'] = 'Impossibile eliminare il/i contatto/i'; $messages['contactdeleted'] = 'Contatto/i correttamente eliminato/i'; $messages['contactrestoreerror'] = 'Impossibile ripristinare il/i contatto/i cancellato/i'; diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc index aadc8fce0..ef52695bb 100644 --- a/program/localization/ja_JP/labels.inc +++ b/program/localization/ja_JP/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'スペル'; $labels['checkspelling'] = 'スペルãƒã‚§ãƒƒã‚¯'; $labels['resumeediting'] = '編集をå†é–‹'; $labels['revertto'] = 'å…ƒã«æˆ»ã™'; +$labels['responses'] = '回ç”'; +$labels['insertresponse'] = '回ç”を挿入'; +$labels['manageresponses'] = '回ç”を管ç†'; +$labels['savenewresponse'] = 'æ–°ã—ã„回ç”ã‚’ä¿å˜'; +$labels['editresponses'] = '回ç”を編集'; +$labels['editresponse'] = '回ç”を編集'; +$labels['responsename'] = 'åå‰'; +$labels['responsetext'] = '回ç”ã®æ–‡ç« '; $labels['attach'] = '添付'; $labels['attachments'] = '添付ファイル'; $labels['upload'] = 'アップãƒãƒ¼ãƒ‰'; diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc index fb03bc0f8..abe5a6e7a 100644 --- a/program/localization/ja_JP/messages.inc +++ b/program/localization/ja_JP/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'メッセージをé€ä¿¡ã—ã¾ã—ãŸã€‚'; $messages['savingmessage'] = 'メッセージをä¿å˜ä¸...'; $messages['messagesaved'] = 'メッセージを下書ãã«ä¿å˜ã—ã¾ã—ãŸã€‚'; $messages['successfullysaved'] = 'ä¿å˜ã—ã¾ã—ãŸã€‚'; +$messages['savingresponse'] = '回ç”ã®æ–‡ç« ã‚’ä¿å˜ä¸...'; +$messages['deleteresponseconfirm'] = 'ã“ã®å›žç”ã®æ–‡ç« を本当ã«å‰Šé™¤ã—ã¾ã™ã‹?'; $messages['addedsuccessfully'] = '連絡先をアドレス帳ã«è¿½åŠ ã—ã¾ã—ãŸã€‚'; $messages['contactexists'] = 'åŒã˜ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ã®é€£çµ¡å…ˆãŒæ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚'; $messages['contactnameexists'] = 'åŒã˜åå‰ã®é€£çµ¡å…ˆãŒæ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚'; diff --git a/program/localization/lb_LU/labels.inc b/program/localization/lb_LU/labels.inc index d32a263a1..cbd5a12a8 100644 --- a/program/localization/lb_LU/labels.inc +++ b/program/localization/lb_LU/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Orthographie'; $labels['checkspelling'] = 'Orthographie kontrolléieren'; $labels['resumeediting'] = 'Weider editéieren'; $labels['revertto'] = 'Zréck bei'; +$labels['responses'] = 'Äntwerten'; +$labels['insertresponse'] = 'Äntwert afügen'; +$labels['manageresponses'] = 'Äntwerte geréieren'; +$labels['savenewresponse'] = 'Nei Äntwert späicheren'; +$labels['editresponses'] = 'Äntwerten Editéieren'; +$labels['editresponse'] = 'Äntwert editéieren'; +$labels['responsename'] = 'Numm'; +$labels['responsetext'] = 'Äntwert-Text'; $labels['attach'] = 'Drunhänken'; $labels['attachments'] = 'Unhäng'; $labels['upload'] = 'Eroplueden'; @@ -316,7 +324,11 @@ $labels['searchdelete'] = 'Sich läschen'; $labels['import'] = 'Importéieren'; $labels['importcontacts'] = 'Kontakter importéieren'; $labels['importfromfile'] = 'Aus Fichier importéieren:'; +$labels['importtarget'] = 'Kontakter dobäisetze bei'; $labels['importreplace'] = 'Dat ganzt Adressbuch ersetzen'; +$labels['importgroups'] = 'Gruppen-Zouweisung importéieren'; +$labels['importgroupsall'] = 'All (nei Gruppen uleeën falls néideg)'; +$labels['importgroupsexisting'] = 'Just fir Gruppen déi schon existéieren'; $labels['importdesc'] = 'Du kanns Kontakter aus engem existéierenden Adressbuch eroplueden.<br/>Mir ënnerstëtze momentan en Adress-Import vum <a href="http://en.wikipedia.org/wiki/VCard">vCard</a>- oder CSV (mat Komma getrennt)-Date-Format.'; $labels['done'] = 'Erleedegt'; $labels['settingsfor'] = 'Astellunge fir'; diff --git a/program/localization/lb_LU/messages.inc b/program/localization/lb_LU/messages.inc index 8ef0b2f6c..fc053b59e 100644 --- a/program/localization/lb_LU/messages.inc +++ b/program/localization/lb_LU/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Message erfollegräich verschéckt.'; $messages['savingmessage'] = 'Message gëtt gespäichert...'; $messages['messagesaved'] = 'Message als Brouillon gespäichert.'; $messages['successfullysaved'] = 'Erfollegräich gespäichert.'; +$messages['savingresponse'] = 'Äntwert-Text gëtt gespäichert...'; +$messages['deleteresponseconfirm'] = 'Wëlls du dësen Äntwert-Text wierklech läschen?'; $messages['addedsuccessfully'] = 'Kontakt erfollegräich an d\'Adressbuch gesat.'; $messages['contactexists'] = 'Et existéiert schon e Kontakt mat der selweschter E-Mail-Adress.'; $messages['contactnameexists'] = 'Et existéiert schon e Kontakt mam selweschten Numm.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'Den ugefrotene Kontakt gouf net fonnt.'; $messages['contactsearchonly'] = 'Gëff e puer Sichbegrëffer a fir Kontakter ze fannen'; $messages['sendingfailed'] = 'De Message konnt net verschéckt ginn.'; $messages['senttooquickly'] = 'Waart wann ech gelift $sec Sekonn(en) bevir s du de Message verschécks. '; +$messages['errorsavingsent'] = 'Beim Späichere vum geschéckte Message ass e Feeler opgetruden.'; +$messages['errorsaving'] = 'Beim Späicheren ass e Feeler opgetrueden.'; $messages['errormoving'] = 'D\'Messagë konnten net verréckelt ginn.'; $messages['errorcopying'] = 'D\'Messagë konnten net kopéiert ginn.'; $messages['errordeleting'] = 'D\'Messagë konnten net geläscht ginn.'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP-Feeler: $msg'; $messages['emailformaterror'] = 'Ongëlteg E-Mail-Adress: $email'; $messages['toomanyrecipients'] = 'Zevill Empfänger. Reduzéier d\'Zuel vun den Empfänger op $max.'; $messages['maxgroupmembersreached'] = 'D\'Unzuel vu Gruppememberen iwwersteigt de Maximum vun $max.'; +$messages['internalerror'] = 'En interne Feeler ass opgetrueden. Probéier w.e.gl nach eng Kéier.'; $messages['contactdelerror'] = 'Kontakter konnten net geläscht ginn.'; $messages['contactdeleted'] = 'Kontakter erfollegräich geläscht.'; $messages['contactrestoreerror'] = 'Déi geläschte Kontakter konnten net recuperéiert ginn.'; diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc index 95afc4c49..0f80350bb 100644 --- a/program/localization/lv_LV/labels.inc +++ b/program/localization/lv_LV/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'IzrunÄt'; $labels['checkspelling'] = 'PÄrbaudÄ«t pareizrakstÄ«bu'; $labels['resumeediting'] = 'TurpinÄt rediģēšanu'; $labels['revertto'] = 'Atgriezt uz'; +$labels['responses'] = 'Atbildes'; +$labels['insertresponse'] = 'Ievietot atbildi'; +$labels['manageresponses'] = 'PÄrvaldÄ«t atbildes'; +$labels['savenewresponse'] = 'SaglabÄt jauno atbildi'; +$labels['editresponses'] = 'Rediģēt atbildes'; +$labels['editresponse'] = 'Rediģēt atbildi'; +$labels['responsename'] = 'VÄrds'; +$labels['responsetext'] = 'Atbildes teksts'; $labels['attach'] = 'Pievienot'; $labels['attachments'] = 'Pielikumi'; $labels['upload'] = 'AugÅ¡upielÄdÄ“t'; @@ -318,6 +326,7 @@ $labels['importcontacts'] = 'ImportÄ“t kontaktus'; $labels['importfromfile'] = 'ImportÄ“t no faila:'; $labels['importtarget'] = 'Kontaktus pievienot'; $labels['importreplace'] = 'Aizvietot visu adreÅ¡u grÄmatu'; +$labels['importgroups'] = 'ImportÄ“t grupu piesaistes'; $labels['importgroupsall'] = 'Visus (ja nepiecieÅ¡ams, izveidojiet grupas)'; $labels['importgroupsexisting'] = 'Tikai esoÅ¡Äm grupÄm'; $labels['importdesc'] = 'JÅ«s varat ieimportÄ“t kontaktus no jau esoÅ¡as adreÅ¡u grÄmatas.<br/>Uz doto brÄ«di tiek atbalstÄ«ti <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> vai CSV (ar komatu atdalÄ«tie) datu formÄti.'; diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc index f27b01b84..55cff4134 100644 --- a/program/localization/lv_LV/messages.inc +++ b/program/localization/lv_LV/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'VÄ“stule nosÅ«tÄ«ta veiksmÄ«gi'; $messages['savingmessage'] = 'VÄ“stule tiek saglabÄta ...'; $messages['messagesaved'] = 'VÄ“stule saglabÄta Uzmetumos'; $messages['successfullysaved'] = 'VeiksmÄ«gi saglabÄts.'; +$messages['savingresponse'] = 'Tiek saglabÄts atbildes teksts ...'; +$messages['deleteresponseconfirm'] = 'Vai JÅ«s tieÅ¡Äm gribat dzÄ“st Å¡o atbildes tekstu?'; $messages['addedsuccessfully'] = 'Kontakts veiksmÄ«gi pievienots adreÅ¡u grÄmatai'; $messages['contactexists'] = 'Kontakts ar Å¡Ädu e-pasta adresi jau eksistÄ“'; $messages['contactnameexists'] = 'Kontakts ar Å¡Ädu vÄrdu jau eksistÄ“.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'PieprasÄ«tais kontakts nav atrasts'; $messages['contactsearchonly'] = 'Lai atrastu kontaktus, ievadiet meklÄ“Å¡anas kritÄ“rijus'; $messages['sendingfailed'] = 'VÄ“stule netika nosÅ«tÄ«ta'; $messages['senttooquickly'] = 'LÅ«dzu uzgaidiet $sec sekundi(-es) pirms sÅ«tiet Å¡o vÄ“stuli'; +$messages['errorsavingsent'] = 'SaglabÄjot nosÅ«tÄ«to vÄ“stuli notika kļūda - vÄ“stule netika saglabÄta'; +$messages['errorsaving'] = 'SaglabÄjot vÄ“stuli notika kļūda - vÄ“stule netika saglabÄta'; $messages['errormoving'] = 'VÄ“stule(s) netika pÄrvietota(s)'; $messages['errorcopying'] = 'VÄ“stules pÄrkopÄ“t neizdevÄs'; $messages['errordeleting'] = 'VÄ“stules izdzÄ“st neizdevÄs'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP kļūda: $msg'; $messages['emailformaterror'] = 'Nepareiza e-pasta adrese: $email'; $messages['toomanyrecipients'] = 'PÄrÄk daudz saņēmÄ“ju. Samaziniet skaitu lÄ«dz $max.'; $messages['maxgroupmembersreached'] = 'Grupas dalÄ«bnieku skaits pÄrsniedz limitu $max.'; +$messages['internalerror'] = 'AtgadÄ«jÄs servera iekÅ¡Ä“jÄ kļūda. LÅ«dzu mÄ“Ä£iniet vÄ“lreiz.'; $messages['contactdelerror'] = 'Kontaktus izdzÄ“st neizdevÄs.'; $messages['contactdeleted'] = 'Kontakti izdzÄ“sti veiksmÄ«gi.'; $messages['contactrestoreerror'] = 'IzdzÄ“stos kontaktus atjaunot neizdevÄs.'; diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc index f0e4a74b4..b5f273659 100644 --- a/program/localization/nl_NL/labels.inc +++ b/program/localization/nl_NL/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Spelling'; $labels['checkspelling'] = 'Controleer spelling'; $labels['resumeediting'] = 'Doorgaan met opstellen'; $labels['revertto'] = 'Terugwijzigen in'; +$labels['responses'] = 'Reacties'; +$labels['insertresponse'] = 'Reactie invoegen'; +$labels['manageresponses'] = 'Reacties beheren'; +$labels['savenewresponse'] = 'Nieuwe reactie opslaan'; +$labels['editresponses'] = 'Bewerk reactie'; +$labels['editresponse'] = 'Bewerk reactie'; +$labels['responsename'] = 'Naam'; +$labels['responsetext'] = 'Reactie'; $labels['attach'] = 'Bijvoegen'; $labels['attachments'] = 'Bijlagen'; $labels['upload'] = 'Toevoegen'; diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc index 22f9e0f6b..f6081bd8e 100644 --- a/program/localization/nl_NL/messages.inc +++ b/program/localization/nl_NL/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Bericht succesvol verstuurd.'; $messages['savingmessage'] = 'Bericht wordt opgeslagen...'; $messages['messagesaved'] = 'Bericht opgeslagen in Concepten.'; $messages['successfullysaved'] = 'Succesvol opgeslagen.'; +$messages['savingresponse'] = 'Reactie wordt opgeslagen...'; +$messages['deleteresponseconfirm'] = 'Weet u zeker dat u deze reactie wilt verwijderen?'; $messages['addedsuccessfully'] = 'Contactpersoon succesvol toegevoegd aan het adresboek.'; $messages['contactexists'] = 'Er bestaat al een contactpersoon met dit e-mailadres.'; $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.'; diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc index 13db63e99..e42b1ce95 100644 --- a/program/localization/pt_BR/labels.inc +++ b/program/localization/pt_BR/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Revisar'; $labels['checkspelling'] = 'Verificar ortografia'; $labels['resumeediting'] = 'Continuar a edição'; $labels['revertto'] = 'Reverter para'; +$labels['responses'] = 'Respostas'; +$labels['insertresponse'] = 'Inserir uma resposta'; +$labels['manageresponses'] = 'Gerenciar respostas'; +$labels['savenewresponse'] = 'Salvar nova resposta'; +$labels['editresponses'] = 'Editar respostas'; +$labels['editresponse'] = 'Editar resposta'; +$labels['responsename'] = 'Nome'; +$labels['responsetext'] = 'Texto da resposta'; $labels['attach'] = 'Anexar'; $labels['attachments'] = 'Anexos'; $labels['upload'] = 'Enviar arquivo'; diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc index 2f5782373..823dad22e 100644 --- a/program/localization/pt_BR/messages.inc +++ b/program/localization/pt_BR/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Mensagem enviada com sucesso'; $messages['savingmessage'] = 'Salvando Mensagem...'; $messages['messagesaved'] = 'Mensagem salva em Rascunhos'; $messages['successfullysaved'] = 'Salvo com sucesso'; +$messages['savingresponse'] = 'Salvando texto de resposta...'; +$messages['deleteresponseconfirm'] = 'Você realmente deseja apagar este texto de resposta?'; $messages['addedsuccessfully'] = 'Contato incluÃdo com sucesso no catálogo de endereços.'; $messages['contactexists'] = 'Já existe um contato com esse mesmo e-mail.'; $messages['contactnameexists'] = 'Já existe um contato com o mesmo nome.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'O contato solicitado não foi encontrado.'; $messages['contactsearchonly'] = 'Informe os termos de pesquisa para localizar os contatos'; $messages['sendingfailed'] = 'Falha no envio da mensagem.'; $messages['senttooquickly'] = 'Aguarde $sec s para enviar a mensagem.'; +$messages['errorsavingsent'] = 'Ocorreu um erro ao salvar a mensagem enviada.'; +$messages['errorsaving'] = 'Ocorreu um erro ao salvar.'; $messages['errormoving'] = 'Não foi possÃvel mover a(s) mensagem(ns).'; $messages['errorcopying'] = 'Não foi possÃvel copiar a(s) mensagem(ns).'; $messages['errordeleting'] = 'Não foi possÃvel apagar a(s) mensagem(ns).'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'Erro SMTP: $msg'; $messages['emailformaterror'] = 'Endereço de e-mail inválido: $email'; $messages['toomanyrecipients'] = 'Há muitos destinatários. Reduza o número de destinatários para $max.'; $messages['maxgroupmembersreached'] = 'O número de membros do grupo excede o máximo de $max'; +$messages['internalerror'] = 'Ocorreu um erro interno. Por favor tente novamente.'; $messages['contactdelerror'] = 'Não foi possÃvel excluir o(s) contato(s).'; $messages['contactdeleted'] = 'Contato(s) excluÃdo(s) com sucesso.'; $messages['contactrestoreerror'] = 'Não foi possivel recuperar o(s) contato(s) excluÃdo(s).'; diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc index b12830031..b6db8a41e 100644 --- a/program/localization/pt_PT/labels.inc +++ b/program/localization/pt_PT/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Corrector Ortográfico'; $labels['checkspelling'] = 'Verificar ortografia'; $labels['resumeediting'] = 'Continuar a edição'; $labels['revertto'] = 'Reverter para'; +$labels['responses'] = 'Respostas'; +$labels['insertresponse'] = 'Insira uma resposta'; +$labels['manageresponses'] = 'Gerir respostas'; +$labels['savenewresponse'] = 'Gravar nova resposta'; +$labels['editresponses'] = 'Editar respostas'; +$labels['editresponse'] = 'Editar resposta'; +$labels['responsename'] = 'Nome'; +$labels['responsetext'] = 'Texto da resposta'; $labels['attach'] = 'Anexar'; $labels['attachments'] = 'Anexos'; $labels['upload'] = 'Carregar'; diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc index 06e78198d..fed7fa09e 100644 --- a/program/localization/pt_PT/messages.inc +++ b/program/localization/pt_PT/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Mensagem enviada com sucesso'; $messages['savingmessage'] = 'A guardar mensagem...'; $messages['messagesaved'] = 'Mensagem guardada como rascunho'; $messages['successfullysaved'] = 'Guardado com sucesso'; +$messages['savingresponse'] = 'A guardar texto de resposta...'; +$messages['deleteresponseconfirm'] = 'Deseja realmente apagar este texto de resposta?'; $messages['addedsuccessfully'] = 'Contacto adicionado com sucesso'; $messages['contactexists'] = 'Já existe um contacto com este e-mail'; $messages['contactnameexists'] = 'Já existe um contacto com este nome.'; diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc index d8da5ee5c..2509ba49b 100644 --- a/program/localization/ru_RU/messages.inc +++ b/program/localization/ru_RU/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Сообщение отправлено.'; $messages['savingmessage'] = 'Сохранение ÑообщениÑ...'; $messages['messagesaved'] = 'Сохранено в Черновиках.'; $messages['successfullysaved'] = 'Сохранено.'; +$messages['savingresponse'] = 'Сохранение текÑта ответа...'; +$messages['deleteresponseconfirm'] = 'Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот текÑÑ‚ ответа?'; $messages['addedsuccessfully'] = 'Контакт добавлен в адреÑную книгу.'; $messages['contactexists'] = 'Контакт Ñ Ñтим адреÑом e-mail уже ÑущеÑтвует.'; $messages['contactnameexists'] = 'Контакт Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем уже ÑущеÑтвует.'; diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc index 36d9850a0..93bca166f 100644 --- a/program/localization/sk_SK/labels.inc +++ b/program/localization/sk_SK/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Pravopis'; $labels['checkspelling'] = 'SkontrolovaÅ¥ pravopis'; $labels['resumeediting'] = 'PokraÄovaÅ¥ v úpravách'; $labels['revertto'] = 'VrátiÅ¥ sa na'; +$labels['responses'] = 'Odpovede'; +$labels['insertresponse'] = 'VložiÅ¥ odpoveÄ'; +$labels['manageresponses'] = 'SpravovaÅ¥ odpovede'; +$labels['savenewresponse'] = 'UložiÅ¥ novú odpoveÄ'; +$labels['editresponses'] = 'UpraviÅ¥ odpovede'; +$labels['editresponse'] = 'UpraviÅ¥ odpoveÄ'; +$labels['responsename'] = 'Meno'; +$labels['responsetext'] = 'Text odpovede'; $labels['attach'] = 'PriložiÅ¥'; $labels['attachments'] = 'PrÃlohy'; $labels['upload'] = 'NahraÅ¥'; diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc index db830c2a7..71d5d52c1 100644 --- a/program/localization/sk_SK/messages.inc +++ b/program/localization/sk_SK/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Správa bola úspeÅ¡ne odoslaná'; $messages['savingmessage'] = 'Správa sa ukladá...'; $messages['messagesaved'] = 'Správa bola uložená medzi RozpÃsané správy'; $messages['successfullysaved'] = 'ÚspeÅ¡ne uložená'; +$messages['savingresponse'] = 'Ukladanie textu odpovede...'; +$messages['deleteresponseconfirm'] = 'Naozaj chcete vymazaÅ¥ text odpovede?'; $messages['addedsuccessfully'] = 'Kontakt bol pridaný do adresára'; $messages['contactexists'] = 'Kontakt s touto e-mailovou adresou už existuje'; $messages['contactnameexists'] = 'Kontakt s rovnakým menom už existuje.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'Požadovaný kontakt nebol nájdený'; $messages['contactsearchonly'] = 'Zadaj nejaký vyhľadávacà výraz pre hľadanie kontaktov.'; $messages['sendingfailed'] = 'Odosielanie správy zlyhalo'; $messages['senttooquickly'] = 'PoÄkajte $sec sekúnd pred odoslanÃm tejto správy'; +$messages['errorsavingsent'] = 'PoÄas ukladania odoslanej správy nastala chyba.'; +$messages['errorsaving'] = 'PoÄas ukladania nastala chyba.'; $messages['errormoving'] = 'Správa sa nedá presunúť'; $messages['errorcopying'] = 'Správa sa nedá skopÃrovaÅ¥'; $messages['errordeleting'] = 'Správa sa nedá zmazaÅ¥'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'Chyba SMTP: $msg'; $messages['emailformaterror'] = 'Neplatná e-mailová adresa: $email'; $messages['toomanyrecipients'] = 'PrÃliÅ¡ veľa prÃjemcov. ZmenÅ¡ite poÄet prÃjemcov na $max.'; $messages['maxgroupmembersreached'] = 'PoÄet Älenov skupiny dosiahol maxima z $max'; +$messages['internalerror'] = 'DoÅ¡lo k internej chybe systému. ProsÃm skúste to eÅ¡te raz.'; $messages['contactdelerror'] = 'Nemôžem vymazaÅ¥ kontakt(y)'; $messages['contactdeleted'] = 'Kontakt(y) bol vymazaný'; $messages['contactrestoreerror'] = 'Nemôžem obnoviÅ¥ zmazané kontakty'; diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc index f93684d69..f1e9010d4 100644 --- a/program/localization/sl_SI/labels.inc +++ b/program/localization/sl_SI/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'ÄŒrkovanje'; $labels['checkspelling'] = 'Preglej pravopis'; $labels['resumeediting'] = 'Nadaljuj z urejanjem'; $labels['revertto'] = 'Razveljavi'; +$labels['responses'] = 'Odgovori'; +$labels['insertresponse'] = 'Vnesi odgovor'; +$labels['manageresponses'] = 'Uredi odgovore'; +$labels['savenewresponse'] = 'Shrani nove odgovore'; +$labels['editresponses'] = 'Uredi odgovore'; +$labels['editresponse'] = 'Uredi odgovor'; +$labels['responsename'] = 'Ime'; +$labels['responsetext'] = 'Tekst za odgovor'; $labels['attach'] = 'Pripni'; $labels['attachments'] = 'Priponke'; $labels['upload'] = 'Naloži'; @@ -316,7 +324,11 @@ $labels['searchdelete'] = 'IzbriÅ¡i iskanje'; $labels['import'] = 'Uvozi'; $labels['importcontacts'] = 'Uvozi stike'; $labels['importfromfile'] = 'Uvozi iz datoteke:'; +$labels['importtarget'] = 'Dodaj stike v'; $labels['importreplace'] = 'Zamenjaj celoten imenik'; +$labels['importgroups'] = 'Vnesi skupinske zadolžitve'; +$labels['importgroupsall'] = 'Vse (ustvari skupine, Äe je potrebno)'; +$labels['importgroupsexisting'] = 'Samo za obstojeÄe skupine'; $labels['importdesc'] = 'Stike lahko naložite iz obstojeÄega imenika. <br/>Trenutno je podprt uvoz stikov v zapisu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ali v CSV (z vejico loÄene vrednosti) zapisu.'; $labels['done'] = 'DokonÄano'; $labels['settingsfor'] = 'Nastavitve za'; diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc index f1beffc0f..3d1ea677c 100644 --- a/program/localization/sl_SI/messages.inc +++ b/program/localization/sl_SI/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'SporoÄilo je bilo uspeÅ¡no poslano.'; $messages['savingmessage'] = 'Shranjevanje sporoÄila...'; $messages['messagesaved'] = 'SporoÄilo je bilo shranjeno v Osnutke'; $messages['successfullysaved'] = 'UspeÅ¡no shranjeno.'; +$messages['savingresponse'] = 'Shranjevanje odgovora...'; +$messages['deleteresponseconfirm'] = 'Ste prepriÄani, da želite izbrisati ta odgovor?'; $messages['addedsuccessfully'] = 'Stik je bil uspeÅ¡no dodan v imenik.'; $messages['contactexists'] = 'Stik s tem elektronskim naslovom že obstaja.'; $messages['contactnameexists'] = 'Stik s tem imenom že obstaja'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'Iskanega stika ni bilo mogoÄe najti.'; $messages['contactsearchonly'] = 'VpiÅ¡ite iskalni parameter za iskanje stika'; $messages['sendingfailed'] = 'SporoÄila ni bilo mogoÄe poslati.'; $messages['senttooquickly'] = 'PoÄakajte $sec sekund in nato znova poskusite s poÅ¡iljanjem sporoÄila.'; +$messages['errorsavingsent'] = 'Pri shranjevanju poslanega sporoÄila je priÅ¡lo do napake.'; +$messages['errorsaving'] = 'Pri shranjevanju je priÅ¡lo do napake.'; $messages['errormoving'] = 'SporoÄila ni bilo mogoÄe premakniti.'; $messages['errorcopying'] = 'SporoÄila ni bilo mogoÄe kopirati.'; $messages['errordeleting'] = 'SporoÄila ni bilo mogoÄe izbrisati.'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'Napaka pri poÅ¡iljanju:$msg'; $messages['emailformaterror'] = 'Nepravilen elektronski naslov: $email'; $messages['toomanyrecipients'] = 'Navedli ste preveÄ prejemnikov. ZmanjÅ¡ajte Å¡tevilo prejemnikov na $max'; $messages['maxgroupmembersreached'] = 'Å tevilo Älanov skupine presega najveÄje dovoljeno Å¡tevilo $max.'; +$messages['internalerror'] = 'PriÅ¡lo je do napake. Poskusite znova.'; $messages['contactdelerror'] = 'Stika/ov ni bilo mogoÄe izbrisati'; $messages['contactdeleted'] = 'Stik/i so bili uspeÅ¡no izbrisani'; $messages['contactrestoreerror'] = 'Ni bilo mogoÄe obnoviti izbrisanih stikov.'; diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc index 48f71ab57..8116afeff 100644 --- a/program/localization/sv_SE/labels.inc +++ b/program/localization/sv_SE/labels.inc @@ -197,6 +197,14 @@ $labels['spellcheck'] = 'Rättstava'; $labels['checkspelling'] = 'Kontrollera stavning'; $labels['resumeediting'] = 'Ã…teruppta redigering'; $labels['revertto'] = 'Ã…tergÃ¥ till'; +$labels['responses'] = 'Responser'; +$labels['insertresponse'] = 'Infoga respons'; +$labels['manageresponses'] = 'Hantera responser'; +$labels['savenewresponse'] = 'Spara ny respons'; +$labels['editresponses'] = 'Ändra responser'; +$labels['editresponse'] = 'Ändra respons'; +$labels['responsename'] = 'Namn'; +$labels['responsetext'] = 'Responstext'; $labels['attach'] = 'Bifoga'; $labels['attachments'] = 'Bilagor'; $labels['upload'] = 'Bifoga'; diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc index 2773ae4c7..16bbd5a23 100644 --- a/program/localization/sv_SE/messages.inc +++ b/program/localization/sv_SE/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Meddelandet har skickats.'; $messages['savingmessage'] = 'Sparar meddelande...'; $messages['messagesaved'] = 'Meddelandet har sparats i Utkast'; $messages['successfullysaved'] = 'Informationen har sparats.'; +$messages['savingresponse'] = 'Sparar responstext...'; +$messages['deleteresponseconfirm'] = 'Vill du verkligen ta bort denna responstext?'; $messages['addedsuccessfully'] = 'Kontakten har lagts till i adressboken.'; $messages['contactexists'] = 'En kontakt med den här adressen finns redan'; $messages['contactnameexists'] = 'En kontakt med det här namnet finns redan'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'EfterfrÃ¥gad kontakt hittades inte'; $messages['contactsearchonly'] = 'Ange sökord för att hitta kontakter'; $messages['sendingfailed'] = 'Meddelandet kunde inte skickas'; $messages['senttooquickly'] = 'Vänta ytterligare $sec sekunder med att skicka meddelandet'; +$messages['errorsavingsent'] = 'Ett fel inträffade när det skickade meddelandet skulle sparas'; +$messages['errorsaving'] = 'Meddelandet kunde inte sparas'; $messages['errormoving'] = 'Meddelandet kunde inte flyttas'; $messages['errorcopying'] = 'Meddelandet kunde inte kopieras'; $messages['errordeleting'] = 'Meddelandet kunde inte tas bort'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP-fel: $msg'; $messages['emailformaterror'] = 'Felaktig adress: $email'; $messages['toomanyrecipients'] = 'FörmÃ¥nga mottagare. Minska antalet till högst $max'; $messages['maxgroupmembersreached'] = 'Antalet gruppmedlemmar fÃ¥r inte överstiga $max'; +$messages['internalerror'] = 'Ett internt fel uppstod. Försök igen.'; $messages['contactdelerror'] = 'Kontakt kunde inte tas bort'; $messages['contactdeleted'] = 'Kontakt borttagen.'; $messages['contactrestoreerror'] = 'Borttagna kontakter kunde inte Ã¥terskapas'; diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc index 0b2ac1e46..182fc966b 100644 --- a/program/localization/tr_TR/messages.inc +++ b/program/localization/tr_TR/messages.inc @@ -44,6 +44,8 @@ $messages['messagesent'] = 'Posta gönderildi'; $messages['savingmessage'] = 'Posta kaydediliyor...'; $messages['messagesaved'] = 'Posta taslaklara kaydedildi'; $messages['successfullysaved'] = 'Kaydedildi'; +$messages['savingresponse'] = 'Yanıt metni kaydediliyor...'; +$messages['deleteresponseconfirm'] = 'Yanıt metnini gerçekten silmek istiyor musunuz?'; $messages['addedsuccessfully'] = 'KiÅŸi adres defterine eklendi'; $messages['contactexists'] = 'Rehberde bu e-posta adresine sahip biri zaten var'; $messages['contactnameexists'] = 'Rehberde bu ada sahip biri zaten var.'; @@ -54,6 +56,8 @@ $messages['contactnotfound'] = 'Ä°stenen kiÅŸi bulunamadı'; $messages['contactsearchonly'] = 'KiÅŸi aramak için arama terimleri giriniz'; $messages['sendingfailed'] = 'Posta gönderilemedi'; $messages['senttooquickly'] = 'Lütfen bu postayı göndermeden önce $sec saniye bekleyin'; +$messages['errorsavingsent'] = 'Gönderilen postayı kaydederken hata oluÅŸtu.'; +$messages['errorsaving'] = 'Kaydederken bir hata oluÅŸtu.'; $messages['errormoving'] = 'Posta taşınamadı'; $messages['errorcopying'] = 'Posta kopyalanamadı'; $messages['errordeleting'] = 'Posta silinemedi'; @@ -140,6 +144,7 @@ $messages['smtperror'] = 'SMTP Hatası: $msg'; $messages['emailformaterror'] = 'Hatalı e-posta adresi: $email'; $messages['toomanyrecipients'] = 'Çok fazla alıcı. En fazla $max alıcı girebilirsiniz.'; $messages['maxgroupmembersreached'] = 'Grup üyelerinin sayısı $max sınırını aşıyor.'; +$messages['internalerror'] = 'Dahili bir hata oluÅŸtu. Lütfen tekrar deneyin.'; $messages['contactdelerror'] = 'KiÅŸi(ler) silinemedi'; $messages['contactdeleted'] = 'KiÅŸi(ler) silindi'; $messages['contactrestoreerror'] = 'Silinen kiÅŸi(ler) geri getirilemiyor.'; diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc index 669190c2e..620e1520b 100644 --- a/program/localization/uk_UA/messages.inc +++ b/program/localization/uk_UA/messages.inc @@ -53,6 +53,7 @@ $messages['contactnotfound'] = 'Запитаний контакт не знайР$messages['contactsearchonly'] = 'Введіть деÑкі критерії пошуку, щоб знайти контакти'; $messages['sendingfailed'] = 'Ðе вдалоÑÑ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ð¸ лиÑта'; $messages['senttooquickly'] = 'Будь лаÑка, зачекайте $sec Ñекунд Ð´Ð»Ñ Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²ÐºÐ¸ лиÑта'; +$messages['errorsavingsent'] = 'Помилка при збереженні відправленого повідомленнÑ.'; $messages['errormoving'] = 'Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñтити лиÑти'; $messages['errorcopying'] = 'Ðе вдалоÑÑ Ð·ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ñ‚Ð¸ лиÑти'; $messages['errordeleting'] = 'Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ лиÑти'; @@ -96,6 +97,7 @@ $messages['converting'] = 'Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ...'; $messages['messageopenerror'] = 'Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· Ñервера'; $messages['fileuploaderror'] = 'Ðе вдалоÑÑ Ð²ÐºÐ»Ð°Ñти файл'; $messages['filesizeerror'] = 'Розмір вибраного файлу перевищує макÑимально дозволений ($size)'; +$messages['copyerror'] = 'Ðе вдалоÑÑ Ñкопіювати жодного контакту.'; $messages['sourceisreadonly'] = 'Дане джерело Ð°Ð´Ñ€ÐµÑ Ð´Ð¾Ñтупне лише Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ'; $messages['errorsavingcontact'] = 'Ðеможливо зберегти адреÑу контакту'; $messages['movingmessage'] = 'ÐŸÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð»Ð¸Ñта...'; diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index 2adc53bcf..7911802b9 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.inc @@ -80,8 +80,8 @@ foreach ($GLOBALS['CONTACT_COLTYPES'] as $col => $colprop) { // normalize the submitted date strings if ($colprop['type'] == 'date') { - if ($timestamp = rcube_utils::strtotime($a_record[$col])) { - $a_record[$col] = date('Y-m-d', $timestamp); + if ($a_record[$col] && ($dt = rcube_utils::anytodatetime($a_record[$col]))) { + $a_record[$col] = $dt->format('Y-m-d'); } else { unset($a_record[$col]); diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 166a58341..646d2bcd1 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -109,7 +109,8 @@ if (!is_array($COMPOSE)) $OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'cancel', 'nobodywarning', 'notsentwarning', 'notuploadedwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany', - 'fileuploaderror', 'sendmessage'); + 'fileuploaderror', 'sendmessage', 'savenewresponse', 'responsename', 'responsetext', 'save', + 'savingresponse'); $OUTPUT->set_env('compose_id', $COMPOSE['id']); $OUTPUT->set_pagetitle(rcube_label('compose')); @@ -1742,6 +1743,38 @@ function compose_file_drop_area($attrib) } +/** + * + */ +function rcmail_compose_responses_list($attrib) +{ + global $RCMAIL, $OUTPUT; + + $attrib += array('id' => 'rcmresponseslist', 'tagname' => 'ul', 'cols' => 1); + + $jsenv = array(); + $list = new html_table($attrib); + foreach ($RCMAIL->get_compose_responses(true) as $response) { + $key = $response['key']; + $item = html::a(array( + 'href '=> '#'.urlencode($response['name']), + 'class' => rtrim('insertresponse ' . $attrib['itemclass']), + 'unselectable' => 'on', + 'rel' => $key, + ), Q($response['name'])); + + $jsenv[$key] = $response; + $list->add(array(), $item); + } + + // set client env + $OUTPUT->set_env('textresponses', $jsenv); + $OUTPUT->add_gui_object('responseslist', $attrib['id']); + + return $list->show(); +} + + // register UI objects $OUTPUT->add_handlers(array( 'composeheaders' => 'rcmail_compose_headers', @@ -1758,6 +1791,7 @@ $OUTPUT->add_handlers(array( 'storetarget' => 'rcmail_store_target_selection', 'addressbooks' => 'rcmail_addressbook_list', 'addresslist' => 'rcmail_contacts_list', + 'responseslist' => 'rcmail_compose_responses_list', )); $OUTPUT->send('compose'); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 70441e0d7..78a977b82 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -97,6 +97,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { $OUTPUT->set_env('delimiter', $delimiter); $OUTPUT->set_env('threading', $threading); $OUTPUT->set_env('threads', $threading || $RCMAIL->storage->get_capability('THREAD')); + $OUTPUT->set_env('reply_all_mode', (int) $RCMAIL->config->get('reply_all_mode')); $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0)); if ($RCMAIL->storage->get_capability('QUOTA')) { $OUTPUT->set_env('quota', true); @@ -1775,28 +1776,34 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r } } - $from_idx = null; - $found_idx = null; - $default_identity = 0; // default identity is always first on the list + // decode From: address + $from = rcube_mime::decode_address_list($MESSAGE->headers->from, null, true, $MESSAGE->headers->charset); + $from = array_shift($from); + $from['mailto'] = strtolower($from['mailto']); + + $from_idx = null; + $found_idx = array('to' => null, 'from' => null); + $check_from = in_array($compose_mode, array('draft', 'edit', 'reply')); // Select identity foreach ($identities as $idx => $ident) { - // use From header - if (in_array($compose_mode, array('draft', 'edit'))) { - if ($MESSAGE->headers->from == $ident['ident']) { + // use From: header when in edit/draft or reply-to-self + if ($check_from && $from['mailto'] == strtolower($ident['email_ascii'])) { + // remember first matching identity address + if ($found_idx['from'] === null) { + $found_idx['from'] = $idx; + } + // match identity name + if ($from['name'] && $ident['name'] && $from['name'] == $ident['name']) { $from_idx = $idx; break; } } - // reply to yourself - else if ($compose_mode == 'reply' && $MESSAGE->headers->from == $ident['ident']) { - $from_idx = $idx; - break; - } - // use replied message recipients + // use replied/forwarded message recipients else if (($found = array_search(strtolower($ident['email_ascii']), $a_recipients)) !== false) { - if ($found_idx === null) { - $found_idx = $idx; + // remember first matching identity address + if ($found_idx['to'] === null) { + $found_idx['to'] = $idx; } // match identity name if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) { @@ -1806,9 +1813,10 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r } } - // If matching by name+address doesn't found any matches, get first found address (identity) + // If matching by name+address didn't find any matches, + // get first found identity (address) if any if ($from_idx === null) { - $from_idx = $found_idx; + $from_idx = $found_idx['from'] !== null ? $found_idx['from'] : $found_idx['to']; } // Try Return-Path @@ -1839,7 +1847,8 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r $selected = $plugin['selected']; - return $identities[$selected !== null ? $selected : $default_identity]; + // default identity is always first on the list + return $identities[$selected !== null ? $selected : 0]; } // Fixes some content-type names diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index e0c4e2911..ae48307e3 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -84,17 +84,18 @@ else if ($_GET['_thumb']) { // render thumbnail image if not done yet if (!is_file($cache_file)) { - $fp = fopen(($orig_name = $cache_basename . '.orig.' . $ext), 'w'); - $MESSAGE->get_part_content($part->mime_id, $fp); - fclose($fp); - - $image = new rcube_image($orig_name); - if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) { - $mimetype = 'image/' . $imgtype; - unlink($orig_name); - } - else { - rename($orig_name, $cache_file); + if ($fp = fopen(($orig_name = $cache_basename . '.orig.' . $ext), 'w')) { + $MESSAGE->get_part_content($part->mime_id, $fp); + fclose($fp); + + $image = new rcube_image($orig_name); + if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) { + $mimetype = 'image/' . $imgtype; + unlink($orig_name); + } + else { + rename($orig_name, $cache_file); + } } } diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index ccb8978be..52b02ecff 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.inc @@ -615,22 +615,39 @@ else { } // add stored attachments, if any -if (is_array($COMPOSE['attachments'])) -{ +if (is_array($COMPOSE['attachments'])) { foreach ($COMPOSE['attachments'] as $id => $attachment) { // This hook retrieves the attachment contents from the file storage backend $attachment = $RCMAIL->plugins->exec_hook('attachment_get', $attachment); - $dispurl = '/\ssrc\s*=\s*[\'"]*\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\s\'"]*/'; - $message_body = $MAIL_MIME->getHTMLBody(); - if ($isHtml && (preg_match($dispurl, $message_body) > 0)) { - $message_body = preg_replace($dispurl, ' src="'.$attachment['name'].'" ', $message_body); + if ($isHtml) { + $dispurl = '/\ssrc\s*=\s*[\'"]*\S+display-attachment\S+file=rcmfile' . preg_quote($attachment['id']) . '[\s\'"]*/'; + $message_body = $MAIL_MIME->getHTMLBody(); + $is_inline = preg_match($dispurl, $message_body); + } + else { + $is_inline = false; + } + + // inline image + if ($is_inline) { + // Mail_Mime does not support many inline attachments with the same name (#1489406) + // we'll generate cid: urls here to workaround this + $cid = preg_replace('/[^0-9a-zA-Z]/', '', uniqid(time(), true)); + if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $from, $matches)) { + $cid .= $matches[1]; + } else { + $cid .= '@localhost'; + } + + $message_body = preg_replace($dispurl, ' src="cid:' . $cid . '" ', $message_body); + $MAIL_MIME->setHTMLBody($message_body); if ($attachment['data']) - $MAIL_MIME->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false); + $MAIL_MIME->addHTMLImage($attachment['data'], $attachment['mimetype'], $attachment['name'], false, $cid); else - $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name'], true); + $MAIL_MIME->addHTMLImage($attachment['path'], $attachment['mimetype'], $attachment['name'], true, $cid); } else { $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914 diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc index f19e2177b..7f2a10ebc 100644 --- a/program/steps/settings/edit_folder.inc +++ b/program/steps/settings/edit_folder.inc @@ -28,11 +28,11 @@ function rcmail_folder_form($attrib) $storage = $RCMAIL->get_storage(); // edited folder name (empty in create-folder mode) - $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); + $mbox = get_input_value('_mbox', RCUBE_INPUT_GPC, true); $mbox_imap = rcube_charset_convert($mbox, RCMAIL_CHARSET, 'UTF7-IMAP'); // predefined path for new folder - $parent = trim(get_input_value('_path', RCUBE_INPUT_GPC, true)); + $parent = get_input_value('_path', RCUBE_INPUT_GPC, true); $parent_imap = rcube_charset_convert($parent, RCMAIL_CHARSET, 'UTF7-IMAP'); $threading_supported = $storage->get_capability('THREAD'); diff --git a/program/steps/settings/edit_response.inc b/program/steps/settings/edit_response.inc new file mode 100644 index 000000000..49856775a --- /dev/null +++ b/program/steps/settings/edit_response.inc @@ -0,0 +1,107 @@ +<?php + +/* + +-----------------------------------------------------------------------+ + | program/steps/settings/edit_response.inc | + | | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 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. | + | | + | PURPOSE: | + | Show edit form for a canned response record or to add a new one | + | | + +-----------------------------------------------------------------------+ + | Author: Thomas Bruederli <roundcube@gmail.com> | + +-----------------------------------------------------------------------+ +*/ + +$responses = $RCMAIL->get_compose_responses(); + +// edit-response +if (($key = get_input_value('_key', RCUBE_INPUT_GPC))) { + foreach ($responses as $i => $response) { + if ($response['key'] == $key) { + $RESPONSE_RECORD = $response; + $RESPONSE_RECORD['index'] = $i; + break; + } + } +} + +// save response +if ($RCMAIL->action == 'save-response' && isset($_POST['_name']) && !$RESPONSE_RECORD['static']) { + $name = trim(get_input_value('_name', RCUBE_INPUT_POST)); + $text = trim(get_input_value('_text', RCUBE_INPUT_POST)); + + if (!empty($name) && !empty($text)) { + $dupes = 0; + foreach ($responses as $i => $resp) { + if ($RESPONSE_RECORD && $RESPONSE_RECORD['index'] === $i) + continue; + if (strcasecmp($name, preg_replace('/\s\(\d+\)$/', '', $resp['name'])) == 0) + $dupes++; + } + if ($dupes) { // require a unique name + $name .= ' (' . ++$dupes . ')'; + } + + $response = array('name' => $name, 'text' => $text, 'format' => 'text', 'key' => substr(md5($name), 0, 16)); + if ($RESPONSE_RECORD && $responses[$RESPONSE_RECORD['index']]) { + $responses[$RESPONSE_RECORD['index']] = $response; + } + else { + $responses[] = $response; + } + + $responses = array_filter($responses, function($item){ return empty($item['static']); }); + if ($RCMAIL->user->save_prefs(array('compose_responses' => array_values($responses)))) { + $RCMAIL->output->show_message('successfullysaved', 'confirmation'); + $RCMAIL->output->command('parent.update_response_row', $response, $key); + $RCMAIL->overwrite_action('edit-response'); + $RESPONSE_RECORD = $response; + } + } + else { + $RCMAIL->output->show_message('formincomplete', 'error'); + } +} + + +function rcube_response_form($attrib) +{ + global $RCMAIL, $OUTPUT, $RESPONSE_RECORD; + + // Set form tags and hidden fields + $disabled = !empty($RESPONSE_RECORD['static']); + $key = $RESPONSE_RECORD['key']; + list($form_start, $form_end) = get_form_tags($attrib, 'save-response', $key, array('name' => '_key', 'value' => $key)); + unset($attrib['form'], $attrib['id']); + + // return the complete edit form as table + $out = "$form_start\n"; + + $table = new html_table(array('cols' => 2)); + $label = rcube_label('responsename'); + + $table->add('title', html::label('ffname', Q(rcube_label('responsename')))); + $table->add(null, rcube_output::get_edit_field('name', $RESPONSE_RECORD['name'], array('id' => 'ffname', 'size' => $attrib['size'], 'disabled' => $disabled), 'text')); + + $table->add('title', html::label('fftext', Q(rcube_label('responsetext')))); + $table->add(null, rcube_output::get_edit_field('text', $RESPONSE_RECORD['text'], array('id' => 'fftext', 'size' => $attrib['textareacols'], 'rows' => $attrib['textarearows'], 'disabled' => $disabled), 'textarea')); + + $out .= $table->show($attrib); + $out .= $form_end; + + return $out; +} + +$OUTPUT->set_env('readonly', !empty($RESPONSE_RECORD['static'])); +$OUTPUT->add_handler('responseform', 'rcube_response_form'); +$OUTPUT->set_pagetitle(rcube_label(($RCMAIL->action=='add-response' ? 'savenewresponse' : 'editresponse'))); + +$OUTPUT->send('responseedit'); + diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 64af18d62..44482e938 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -109,7 +109,7 @@ else if ($RCMAIL->action == 'delete-folder') else if ($RCMAIL->action == 'rename-folder') { $name_utf8 = trim(get_input_value('_folder_newname', RCUBE_INPUT_POST, true)); - $oldname_utf8 = trim(get_input_value('_folder_oldname', RCUBE_INPUT_POST, true)); + $oldname_utf8 = get_input_value('_folder_oldname', RCUBE_INPUT_POST, true); if (strlen($name_utf8) && strlen($oldname_utf8)) { $name = rcube_charset_convert($name_utf8, RCMAIL_CHARSET, 'UTF7-IMAP'); @@ -167,7 +167,7 @@ else if ($RCMAIL->action == 'purge') // get mailbox size else if ($RCMAIL->action == 'folder-size') { - $name = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true)); + $name = get_input_value('_mbox', RCUBE_INPUT_POST, true); $size = $STORAGE->folder_size($name); diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index af278e5fa..c922aca08 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -869,6 +869,24 @@ function rcmail_user_prefs($current = null) $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1)) ); } + + if (!isset($no_override['reply_all_mode'])) { + if (!$current) { + continue 2; + } + + $field_id = 'rcmfd_reply_all_mode'; + $select = new html_select(array('name' => '_reply_all_mode', 'id' => $field_id)); + + $select->add(rcube_label('replyalldefault'), 0); + $select->add(rcube_label('replyalllist'), 1); + + $blocks['main']['options']['reply_all_mode'] = array( + 'title' => html::label($field_id, Q(rcube_label('replyallmode'))), + 'content' => $select->show(intval($config['reply_all_mode'])), + ); + } + break; // Addressbook config @@ -1260,6 +1278,7 @@ function rcmail_settings_tabs($attrib) array('command' => 'preferences', 'type' => 'link', 'label' => 'preferences', 'title' => 'editpreferences'), array('command' => 'folders', 'type' => 'link', 'label' => 'folders', 'title' => 'managefolders'), array('command' => 'identities', 'type' => 'link', 'label' => 'identities', 'title' => 'manageidentities'), + array('command' => 'responses', 'type' => 'link', 'label' => 'responses', 'title' => 'editresponses'), ); // get all identites from DB and define list of cols to be displayed @@ -1321,4 +1340,7 @@ $RCMAIL->register_action_map(array( 'purge' => 'folders.inc', 'folder-size' => 'folders.inc', 'add-identity' => 'edit_identity.inc', + 'add-response' => 'edit_response.inc', + 'save-response' => 'edit_response.inc', + 'delete-response' => 'responses.inc', )); diff --git a/program/steps/settings/responses.inc b/program/steps/settings/responses.inc new file mode 100644 index 000000000..cfc4148c3 --- /dev/null +++ b/program/steps/settings/responses.inc @@ -0,0 +1,128 @@ +<?php + +/* + +-----------------------------------------------------------------------+ + | program/steps/settings/responses.inc | + | | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 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. | + | | + | PURPOSE: | + | Manage and save canned response texts | + | | + +-----------------------------------------------------------------------+ + | Author: Thomas Bruederli <roundcube@gmail.com> | + +-----------------------------------------------------------------------+ +*/ + + +if (!empty($_POST['_insert'])) { + $name = trim(get_input_value('_name', RCUBE_INPUT_POST)); + $text = trim(get_input_value('_text', RCUBE_INPUT_POST)); + + if (!empty($name) && !empty($text)) { + $dupes = 0; + $responses = $RCMAIL->get_compose_responses(false, true); + foreach ($responses as $resp) { + if (strcasecmp($name, preg_replace('/\s\(\d+\)$/', '', $resp['name'])) == 0) + $dupes++; + } + if ($dupes) { // require a unique name + $name .= ' (' . ++$dupes . ')'; + } + + $response = array('name' => $name, 'text' => $text, 'format' => 'text', 'key' => substr(md5($name), 0, 16)); + $responses[] = $response; + + if ($RCMAIL->user->save_prefs(array('compose_responses' => $responses))) { + $RCMAIL->output->command('add_response_item', $response); + $RCMAIL->output->command('display_message', rcube_label('successfullysaved'), 'confirmation'); + } + else { + $RCMAIL->output->command('display_message', rcube_label('errorsaving'), 'error'); + } + } + + // send response + $RCMAIL->output->send(); +} + + +if ($RCMAIL->action == 'delete-response') { + if ($key = get_input_value('_key', RCUBE_INPUT_GPC)) { + $responses = $RCMAIL->get_compose_responses(false, true); + foreach ($responses as $i => $response) { + if (empty($response['key'])) + $response['key'] = substr(md5($response['name']), 0, 16); + if ($response['key'] == $key) { + unset($responses[$i]); + $deleted = $RCMAIL->user->save_prefs(array('compose_responses' => $responses)); + break; + } + } + } + + if ($deleted) { + $RCMAIL->output->command('display_message', rcube_label('deletedsuccessfully'), 'confirmation'); + $RCMAIL->output->command('remove_response', $key); + } + + if ($RCMAIL->output->ajax_call) { + $RCMAIL->output->send(); + } +} + + +$OUTPUT->set_pagetitle(rcube_label('responses')); +$OUTPUT->include_script('list.js'); + + +/** + * + */ +function rcmail_responses_list($attrib) +{ + global $RCMAIL, $OUTPUT; + + $attrib += array('id' => 'rcmresponseslist', 'tagname' => 'table', 'cols' => 1); + + $plugin = $RCMAIL->plugins->exec_hook('responses_list', array( + 'list' => $RCMAIL->get_compose_responses(true), + 'cols' => array('name') + )); + + $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'key'); + + // set client env + $OUTPUT->add_gui_object('responseslist', $attrib['id']); + $OUTPUT->set_env('readonly_responses', array_values(array_map(function($rec){ return $rec['key']; }, + array_filter($plugin['list'], function($item){ return !empty($item['static']); })))); + + return $out; +} + + +// similar function as /steps/addressbook/func.inc::rcmail_contact_frame() +function rcmail_response_frame($attrib) +{ + global $OUTPUT; + + if (!$attrib['id']) { + $attrib['id'] = 'rcmResponseFrame'; + } + + $OUTPUT->set_env('contentframe', $attrib['id']); + return $OUTPUT->frame($attrib, true); +} + +$OUTPUT->add_handlers(array( + 'responseframe' => 'rcmail_response_frame', + 'responseslist' => 'rcmail_responses_list', +)); +$OUTPUT->add_label('deleteresponseconfirm'); + +$OUTPUT->send('responses'); diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc index 877b0fbbe..efb096d57 100644 --- a/program/steps/settings/save_folder.inc +++ b/program/steps/settings/save_folder.inc @@ -5,7 +5,7 @@ | program/steps/settings/save_folder.inc | | | | This file is part of the Roundcube Webmail client | - | 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. | @@ -26,8 +26,8 @@ $STORAGE = $RCMAIL->get_storage(); $name = trim(get_input_value('_name', RCUBE_INPUT_POST, true)); -$old = trim(get_input_value('_mbox', RCUBE_INPUT_POST, true)); -$path = trim(get_input_value('_parent', RCUBE_INPUT_POST, true)); +$old = get_input_value('_mbox', RCUBE_INPUT_POST, true); +$path = get_input_value('_parent', RCUBE_INPUT_POST, true); $name_imap = rcube_charset_convert($name, RCMAIL_CHARSET, 'UTF7-IMAP'); $old_imap = rcube_charset_convert($old, RCMAIL_CHARSET, 'UTF7-IMAP'); diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 717c7ad8c..bcd05bb85 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -90,6 +90,7 @@ switch ($CURR_SECTION) 'strip_existing_sig' => isset($_POST['_strip_existing_sig']), 'default_font' => get_input_value('_default_font', RCUBE_INPUT_POST), 'default_font_size' => get_input_value('_default_font_size', RCUBE_INPUT_POST), + 'reply_all_mode' => intval($_POST['_reply_all_mode']), 'forward_attachment' => !empty($_POST['_forward_attachment']), ); diff --git a/skins/classic/common.css b/skins/classic/common.css index 919cd2153..186be2485 100644 --- a/skins/classic/common.css +++ b/skins/classic/common.css @@ -484,7 +484,8 @@ body.iframe .boxtitle left: 90px; width: auto; max-height: 70%; - overflow: auto; + overflow: -moz-scrollbars-vertical; + overflow-y: auto; display: none; background-color: #fff; background-color: rgba(255, 255, 255, 0.95); @@ -513,16 +514,25 @@ body.iframe .boxtitle margin: 3px -4px; } -.popupmenu li a +.popupmenu li a, +.popupmenu li label { display: block; color: #a0a0a0; - padding: 2px 10px; + padding: 2px 16px 2px 10px; text-decoration: none; min-height: 14px; background: transparent; } +.popupmenu li label.comment +{ + color: #999; + font-style: italic; + padding-top: 4px; + padding-bottom: 3px; +} + .popupmenu li a.active, .popupmenu li a.active:active, .popupmenu li a.active:visited @@ -706,6 +716,24 @@ ul.treelist li div.expanded outline: none; } +.propform div.prop +{ + margin-bottom: 0.5em; +} + +.propform div.prop.block label +{ + display: block; + margin-bottom: 2px; +} + +.propform div.prop.block input, +.propform div.prop.block textarea +{ + width: 97%; +} + + /***** roundcube webmail pre-defined classes *****/ #rcmversion diff --git a/skins/classic/functions.js b/skins/classic/functions.js index 4ad13136f..8d81c3ad2 100644 --- a/skins/classic/functions.js +++ b/skins/classic/functions.js @@ -625,7 +625,7 @@ prev_sibling: function(elm) enable_command: function(p) { - if (p.command == 'reply-list') { + if (p.command == 'reply-list' && rcmail.env.reply_all_mode == 1) { var label = rcmail.gettext(p.status ? 'replylist' : 'replyall'); $('a.button.replyAll').attr('title', label); } diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png Binary files differindex 4a8431715..3ef003f23 100644 --- a/skins/classic/images/mail_toolbar.png +++ b/skins/classic/images/mail_toolbar.png diff --git a/skins/classic/mail.css b/skins/classic/mail.css index 43367749c..dce49b36f 100644 --- a/skins/classic/mail.css +++ b/skins/classic/mail.css @@ -171,6 +171,10 @@ background-position: -480px -32px; } +#messagetoolbar a.responses { + background-position: -512px 0; +} + #messagetoolbar select.mboxlist { position: relative; @@ -985,6 +989,7 @@ table.messagelist.fixedcopy #listmenu { padding: 6px; + max-height: none; } #listmenu legend diff --git a/skins/classic/settings.css b/skins/classic/settings.css index 2433f5040..acd0b9fd0 100644 --- a/skins/classic/settings.css +++ b/skins/classic/settings.css @@ -34,6 +34,11 @@ height: 18px; } +#identities-table tbody tr.readonly td +{ + font-style: italic; +} + #subscription-table tr.virtual td { color: #666; @@ -81,6 +86,7 @@ } #identity-details table td.title, +#response-details table td.title, #folder-details table td.title { font-weight: bold; @@ -89,6 +95,14 @@ white-space: nowrap; } +#response-details table td.title +{ + text-align: left; + vertical-align: top; + width: 140px; + padding-top: 5px; +} + #bottomboxes { position: absolute; @@ -149,6 +163,12 @@ body.iframe, float: right; } +#formfooter .footerindent +{ + padding: 10px 0; + margin-left: 155px; +} + #quota { position: absolute; diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html index 7d8aa1e43..74d25778b 100644 --- a/skins/classic/templates/compose.html +++ b/skins/classic/templates/compose.html @@ -40,6 +40,7 @@ <span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span> </span> <roundcube:endif /> + <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="rcmail_ui.show_popup('responsesmenu');return false"> </a> <roundcube:container name="toolbar" id="compose-toolbar" /> <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " /> </div> @@ -198,6 +199,16 @@ </table> </div> +<div id="responsesmenu" class="popupmenu"> + <ul id="textresponsesmenu"> + <li><label class="comment"><roundcube:label name="insertresponse" /></label></li> + <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" /> + <li><label class="comment"><roundcube:label name="manageresponses" /></label></li> + <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li> + <li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li> + </ul> +</div> + <div id="spellmenu" class="popupmenu selectable"></div> </form> diff --git a/skins/classic/templates/responseedit.html b/skins/classic/templates/responseedit.html new file mode 100644 index 000000000..67ba35bac --- /dev/null +++ b/skins/classic/templates/responseedit.html @@ -0,0 +1,24 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title><roundcube:object name="pagetitle" /></title> +<roundcube:include file="/includes/links.html" /> +<script type="text/javascript" src="/functions.js"></script> + +</head> +<body class="iframe"> + +<div id="prefs-title" class="boxtitle"><roundcube:object name="steptitle" /></div> + +<div id="response-details" class="boxcontent"> + <roundcube:object name="responseform" class="propform" size="60" textareacols="60" textarearows="18" /> + + <div id="formfooter"> + <div class="footerindent"> + <roundcube:button command="save" type="input" class="button mainaction" label="save" condition="!env:readonly" /> + </div> + </div> +</div> + +</body> +</html> diff --git a/skins/classic/templates/responses.html b/skins/classic/templates/responses.html new file mode 100644 index 000000000..2459827b0 --- /dev/null +++ b/skins/classic/templates/responses.html @@ -0,0 +1,46 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title><roundcube:object name="pagetitle" /></title> +<roundcube:include file="/includes/links.html" /> +<script type="text/javascript" src="/functions.js"></script> +<script type="text/javascript" src="/splitter.js"></script> +<style type="text/css"> +#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; } +#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px; + <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" /> +} +</style> + +</head> +<body> + +<roundcube:include file="/includes/taskbar.html" /> +<roundcube:include file="/includes/header.html" /> +<roundcube:include file="/includes/settingstabs.html" /> + +<div id="mainscreen"> + +<div id="identities-list"> +<div id="identity-title" class="boxtitle"><roundcube:label name="responses" /></div> +<div class="boxlistcontent"> +<roundcube:object name="responsesList" id="identities-table" class="records-table" cellspacing="0" summary="Responses list" noheader="true" editIcon="" /> +</div> +<div class="boxfooter"> +<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="buttonPas delgroup" classAct="button delgroup" content=" " condition="config:identities_level:0<2" /> +</div> +</div> + +<script type="text/javascript"> + var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-box', orientation: 'v', relative: true, start: 300 }); + rcmail.add_onload('identviewsplit.init()'); +</script> + +<div id="identity-box"> + <roundcube:object name="responseframe" id="identity-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" /> +</div> + +</div> + +</body> +</html> diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png Binary files differindex 9f8f44536..8e2560198 100644 --- a/skins/larry/images/buttons.png +++ b/skins/larry/images/buttons.png diff --git a/skins/larry/images/filetypes.png b/skins/larry/images/filetypes.png Binary files differindex 53b2eee9a..09772660b 100644 --- a/skins/larry/images/filetypes.png +++ b/skins/larry/images/filetypes.png diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png Binary files differindex e4ffef660..2527fe10d 100644 --- a/skins/larry/images/listicons.png +++ b/skins/larry/images/listicons.png diff --git a/skins/larry/mail.css b/skins/larry/mail.css index b65b08112..0c6166485 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -621,6 +621,10 @@ table.messagelist.fixedcopy { background-position: -24px -1116px; } +.messagelist thead tr td.priority span.priority { + background-position: -24px -1845px; +} + .messagelist tr td.priority span.prio5 { background-position: 0 -1905px; } @@ -642,7 +646,7 @@ table.messagelist.fixedcopy { } .messagelist thead tr td.flag span.flagged { - background-position: -24px -1036px; + background-position: -22px -1036px; } .messagelist tr td.status span.msgicon:hover { @@ -696,7 +700,7 @@ table.messagelist.fixedcopy { } .messagelist thead tr td.status span.status { - background-position: -24px -1016px; + background-position: -23px -1017px; } .messagelist tr td div.collapsed { @@ -768,6 +772,7 @@ table.messagelist.fixedcopy { width: 100%; bottom: 27px; overflow: auto; + -webkit-overflow-scrolling: touch; } #messageheader, diff --git a/skins/larry/settings.css b/skins/larry/settings.css index 6afa48c40..a769ac412 100644 --- a/skins/larry/settings.css +++ b/skins/larry/settings.css @@ -130,6 +130,14 @@ background-position: 6px -1819px; } +#settings-sections span.responses a { + background-position: 6px -1972px; +} + +#settings-sections span.responses.selected a { + background-position: 6px -1996px; +} + #sections-table #rcmrowgeneral td.section { background-position: 6px -573px; } @@ -206,6 +214,10 @@ text-overflow: ellipsis; } +#identities-table tbody tr.readonly td { + font-style: italic; +} + #folder-details, #identity-details { position: absolute; diff --git a/skins/larry/styles.css b/skins/larry/styles.css index c82e9de93..5fe5a47bc 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -1440,6 +1440,20 @@ body.iframe .footerleft.floating:before, font-size: 12px; } +.propform div.prop { + margin-bottom: 0.5em; +} + +.propform div.prop.block label { + display: block; + margin-bottom: 0.3em; +} + +.propform div.prop.block input, +.propform div.prop.block textarea { + width: 95%; +} + fieldset.floating { float: left; margin-right: 10px; @@ -1817,7 +1831,11 @@ ul.proplist li { } .toolbar a.button.download { - background-position: center -1906px; + background-position: center -1892px; +} + +.toolbar a.button.responses { + background-position: center -1932px; } a.menuselector { @@ -1907,7 +1925,8 @@ select.decorated option { left: 90px; width: auto; max-height: 70%; - overflow: auto; + overflow: -moz-scrollbars-vertical; + overflow-y: auto; background: #444; border: 1px solid #999; z-index: 240; @@ -1924,6 +1943,7 @@ select.decorated option { } ul.toolbarmenu, +ul.toolbarmenu ul, #rcmKSearchpane ul { margin: 0; padding: 0; @@ -1942,13 +1962,13 @@ ul.toolbarmenu li, } .googie_list tr:first-child td, -ul.toolbarmenu li:first-child, +ul.toolbarmenu > li:first-child, select.decorated option:first-child { border-top: 0; } .googie_list tr:last-child td, -ul.toolbarmenu li:last-child, +ul.toolbarmenu > li:last-child, select.decorated option:last-child { border-bottom: 0; } @@ -2002,6 +2022,11 @@ ul.toolbarmenu li label { text-shadow: 0px 1px 1px #333; } +ul.toolbarmenu li.separator label { + color: #bbb; + font-style: italic; +} + ul.toolbarmenu li a.icon { color: #eee; padding: 2px 6px; @@ -2080,6 +2105,15 @@ ul.toolbarmenu li span.conversation { background-position: 0 -1532px; } +#snippetslist { + max-width: 200px; +} + +#snippetslist li a { + overflow: hidden; + text-overflow: ellipsis; +} + #rcmKSearchpane { border-radius: 0 0 4px 4px; border-top: 0; @@ -2289,6 +2323,18 @@ ul.toolbarmenu li span.conversation { background-position: 0 -494px; } +.attachmentslist li.ppt, +.attachmentslist li.pptx, +.attachmentslist li.ppsx, +.attachmentslist li.vnd.mspowerpoint { + background-position: 0 -520px; +} + +.attachmentslist li.odp, +.attachmentslist li.otp { + background-position: 0 -546px; +} + .attachmentslist li a, #compose-attachments ul li { display: block; diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index 15c8e56ff..5a6285c68 100644 --- a/skins/larry/templates/compose.html +++ b/skins/larry/templates/compose.html @@ -30,6 +30,7 @@ <roundcube:endif /> <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attach pressed" label="attach" title="addattachment" onclick="UI.show_uploadform();return false" /> <roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" classSel="button insertsig pressed" label="signature" title="insertsignature" /> + <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.show_popup('responsesmenu');return false"><roundcube:label name="responses" /></a> <roundcube:container name="toolbar" id="compose-toolbar" /> </div> </div> @@ -196,6 +197,16 @@ <div id="spellmenu" class="popupmenu"></div> +<div id="responsesmenu" class="popupmenu"> + <ul class="toolbarmenu" id="textresponsesmenu"> + <li class="separator" id=""><label><roundcube:label name="insertresponse" /></label></li> + <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" /> + <li class="separator"><label><roundcube:label name="manageresponses" /></label></li> + <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li> + <li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li> + </ul> +</div> + <roundcube:include file="/includes/footer.html" /> </body> diff --git a/skins/larry/templates/responseedit.html b/skins/larry/templates/responseedit.html new file mode 100644 index 000000000..8f180fe7f --- /dev/null +++ b/skins/larry/templates/responseedit.html @@ -0,0 +1,22 @@ +<roundcube:object name="doctype" value="html5" /> +<html> +<head> +<title><roundcube:object name="pagetitle" /></title> +<roundcube:include file="/includes/links.html" /> +</head> +<body class="iframe"> + +<h1 class="boxtitle"><roundcube:object name="steptitle" /></h1> + +<div id="preferences-details" class="boxcontent"> +<roundcube:object name="responseform" class="propform" size="60" textareacols="60" textarearows="18" /> +</div> + +<div class="footerleft formbuttons"> + <roundcube:button command="save" type="input" class="button mainaction" label="save" condition="!env:readonly" /> +</div> + +<roundcube:include file="/includes/footer.html" /> + +</body> +</html> diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html new file mode 100644 index 000000000..fb40048c8 --- /dev/null +++ b/skins/larry/templates/responses.html @@ -0,0 +1,41 @@ +<roundcube:object name="doctype" value="html5" /> +<html> +<head> +<title><roundcube:object name="pagetitle" /></title> +<roundcube:include file="/includes/links.html" /> +</head> +<body class="noscroll"> + +<roundcube:include file="/includes/header.html" /> + +<div id="mainscreen" class="offset"> + +<roundcube:include file="/includes/settingstabs.html" /> + +<div id="settings-right"> + +<div id="identitieslist" class="uibox listbox"> +<h2 class="boxtitle"><roundcube:label name="responses" /></h2> +<div class="scroller withfooter"> +<roundcube:object name="responsesList" id="identities-table" class="listing" cellspacing="0" summary="Responses list" noheader="true" /> +</div> +<div class="boxfooter"> +<roundcube:button command="add" type="link" title="savenewresponse" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="-" /> +</div> +</div> + +<div id="identity-details" class="uibox contentbox"> + <div class="iframebox"> + <roundcube:object name="responseframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" /> + </div> + <roundcube:object name="message" id="message" class="statusbar" /> +</div> + +</div> + +</div> + +<roundcube:include file="/includes/footer.html" /> + +</body> +</html> diff --git a/skins/larry/ui.js b/skins/larry/ui.js index d558f16a2..0fd0241f7 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -473,7 +473,7 @@ function rcube_mail_ui() function enable_command(p) { - if (p.command == 'reply-list') { + if (p.command == 'reply-list' && rcmail.env.reply_all_mode == 1) { var label = rcmail.gettext(p.status ? 'replylist' : 'replyall'); if (rcmail.env.action == 'preview') $('a.button.replyall').attr('title', label); diff --git a/temp/.htaccess b/temp/.htaccess deleted file mode 100644 index 8e6a345dc..000000000 --- a/temp/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -Order allow,deny -Deny from all
\ No newline at end of file diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php index 3f7f48c3a..1f1e57b0e 100644 --- a/tests/Framework/Utils.php +++ b/tests/Framework/Utils.php @@ -171,6 +171,12 @@ class Framework_Utils extends PHPUnit_Framework_TestCase $this->assertRegExp('/#rcmbody h1\s\{/', $mod, "Prefix tag styles (single)"); $this->assertRegExp('/#rcmbody h1, #rcmbody h2, #rcmbody h3, #rcmbody textarea\s+\{/', $mod, "Prefix tag styles (multiple)"); $this->assertRegExp('/#rcmbody \.noscript\s+\{/', $mod, "Prefix class styles"); + + $css = file_get_contents(TESTS_DIR . 'src/media.css'); + $mod = rcube_utils::mod_css_styles($css, 'rcmbody'); + + $this->assertContains('#rcmbody table[class=w600]', $mod, 'Replace styles nested in @media block'); + $this->assertContains('#rcmbody {width:600px', $mod, 'Replace body selector nested in @media block'); } /** @@ -288,6 +294,32 @@ class Framework_Utils extends PHPUnit_Framework_TestCase } /** + * rcube:utils::anytodatetime() + */ + function test_anytodatetime() + { + $test = array( + '2013-04-22' => '2013-04-22', + '2013/04/22' => '2013-04-22', + '2013.04.22' => '2013-04-22', + '22-04-2013' => '2013-04-22', + '22/04/2013' => '2013-04-22', + '22.04.2013' => '2013-04-22', + '04/22/2013' => '2013-04-22', + '22.4.2013' => '2013-04-22', + '20130422' => '2013-04-22', + '1900-10-10' => '1900-10-10', + '01-01-1900' => '1900-01-01', + '01/30/1960' => '1960-01-30' + ); + + foreach ($test as $datetime => $ts) { + $result = rcube_utils::anytodatetime($datetime); + $this->assertSame($ts, $result ? $result->format('Y-m-d') : '', "Error parsing date: $datetime"); + } + } + + /** * rcube:utils::normalize _string() */ function test_normalize_string() diff --git a/tests/MailFunc.php b/tests/MailFunc.php index 08cbd4ed0..ab0074ef2 100644 --- a/tests/MailFunc.php +++ b/tests/MailFunc.php @@ -217,4 +217,52 @@ class MailFunc extends PHPUnit_Framework_TestCase $this->assertSame($identities[1], $res); } + + /** + * Test identities selection (#1489378) + */ + function test_rcmail_identity_select2() + { + $identities = array( + array( + 'name' => 'Test 1', + 'email_ascii' => 'addr1@domain.tld', + 'ident' => 'Test 1 <addr1@domain.tld>', + ), + array( + 'name' => 'Test 2', + 'email_ascii' => 'addr2@domain.tld', + 'ident' => 'Test 2 <addr2@domain.tld>', + ), + array( + 'name' => 'Test 3', + 'email_ascii' => 'addr3@domain.tld', + 'ident' => 'Test 3 <addr3@domain.tld>', + ), + array( + 'name' => 'Test 4', + 'email_ascii' => 'addr2@domain.tld', + 'ident' => 'Test 4 <addr2@domain.tld>', + ), + ); + + $message = new stdClass; + $message->headers = new rcube_message_header; + + $message->headers->set('From', '<addr2@domain.tld>'); + $res = rcmail_identity_select($message, $identities); + $this->assertSame($identities[1], $res); + + $message->headers->set('From', 'Test 2 <addr2@domain.tld>'); + $res = rcmail_identity_select($message, $identities); + $this->assertSame($identities[1], $res); + + $message->headers->set('From', 'Other <addr2@domain.tld>'); + $res = rcmail_identity_select($message, $identities); + $this->assertSame($identities[1], $res); + + $message->headers->set('From', 'Test 4 <addr2@domain.tld>'); + $res = rcmail_identity_select($message, $identities); + $this->assertSame($identities[3], $res); + } } diff --git a/tests/src/media.css b/tests/src/media.css new file mode 100644 index 000000000..24eacc8a1 --- /dev/null +++ b/tests/src/media.css @@ -0,0 +1,22 @@ +.ReadMsgBody{width: 100%;} +.ExternalClass{width: 100%;} +div, p, a, li, td { -webkit-text-size-adjust:none; } +@media (max-width: 450px){ + table[class=w600], td[class=w600], table[class=w540], td[class=w540], img[class=w600]{ width:100% !important; } + table[class=w30], td[class=w30]{ width:20px !important; } + .pict img {max-width:260px; height:auto !important;} +} +@media (min-width: 450px) and (max-width: 600px){ + table[class=w600], td[class=w600], table[class=w540], td[class=w540], img[class=w600]{ width:100% !important; } + table[class=w30], td[class=w30]{ width:20px !important; } + .pict img {max-width:410px; height:auto !important;} +} +@media (min-width:600px){ + body {width:600px !important; margin:auto !important;} + .pict img {max-width:540px !important; height:auto !important;} +} +h1{ font-weight:bold; font-size:14px;color:#3c3c3c ;margin:0px; } +h2{ color:#8DB048 ; font-size:14px; font-weight:bold; margin-top:20px; border-bottom:1px solid #d6d6d6; padding-bottom:4px; } +h3{ color:#7e7e7e ; font-size:14px; font-weight:bold; margin:20px 0px 0px 0px; border-bottom:1px solid #d6d6d6; padding-bottom:0px 0px 4px 0px; } +h4{ color:#8DB048 ; font-size:12px; font-weight:bold; margin:0px; padding:0px; } +a:visited{cursor:pointer; color:#8DB048; text-decoration:none; border:none;} |
