Recent changes

[squirrelmail.git] / include / options / folder.php

diff --git a/include/options/folder.php b/include/options/folder.php
index f4b5624a6a7136002462ce749afe0b55e9d322f6..5b3a4a67e5aead700be5fb950ac1e4f0a0a80fa0 100644 (file)
--- a/include/options/folder.php
+++ b/include/options/folder.php
@@ -3,11 +3,10 @@
 /**
  * options_folder.php
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Displays all options relating to folders
  *
+ * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -131,15 +130,12 @@ function load_optpage_data_folder() {
         'posvals' => $left_size_values
     );
 
-    $minute_str = _("Minutes");
     $left_refresh_values = array(SMPREF_NONE => _("Never"));
-    foreach (array(30,60,120,180,300,600) as $lr_val) {
+    foreach (array(30,60,120,180,300,600,1200) as $lr_val) {
         if ($lr_val < 60) {
             $left_refresh_values[$lr_val] = "$lr_val " . _("Seconds");
-        } else if ($lr_val == 60) {
-            $left_refresh_values[$lr_val] = "1 " . _("Minute");
         } else {
-            $left_refresh_values[$lr_val] = ($lr_val/60) . " $minute_str";
+            $left_refresh_values[$lr_val] = sprintf(ngettext("%d Minute","%d Minutes",($lr_val/60)),($lr_val/60));
         }
     }
     $optvals[SMOPT_GRP_FOLDERLIST][] = array(
@@ -215,6 +211,12 @@ function load_optpage_data_folder() {
                             9 => '9')
     );
 
+    $optvals[SMOPT_GRP_FOLDERLIST][] = array(
+        'name'    => 'show_only_subscribed_folders',
+        'caption' => _("Show only subscribed folders"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_FOLDERLIST
+    );
 
     /*** Load the General Options into the array ***/
     $optgrps[SMOPT_GRP_FOLDERSELECT] = _("Folder Selection Options");
@@ -226,9 +228,9 @@ function load_optpage_data_folder() {
         'caption' => _("Selection List Style"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'posvals' => array( 0 => _("Long: ") . '"' . _("Folder") . $delim . _("Subfolder") . '"',
-                            1 => _("Indented: ") .  '"&nbsp;&nbsp;&nbsp;&nbsp;' . _("Subfolder") . '"',
-                            2 => _("Delimited: ") . '".&nbsp;' . _("Subfolder") . '"'),
+        'posvals' => array( 0 => _("Long:") . ' "' . _("Folder") . $delim . _("Subfolder") . '"',
+                            1 => _("Indented:") . ' "&nbsp;&nbsp;&nbsp;&nbsp;' . _("Subfolder") . '"',
+                            2 => _("Delimited:") . ' ".&nbsp;' . _("Subfolder") . '"'),
         'htmlencoded' => true
     );
 
@@ -287,4 +289,4 @@ function save_option_draft_folder($option) {
     save_option($option);
 }
 
-?>
+?>
\ No newline at end of file