From: Jan Schneider Date: Thu, 9 Sep 2010 18:47:50 +0000 (+0200) Subject: Options/Settings -> Preferences X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6b2c7d5e725f211a601798d707c631ba710748e2;p=horde.git Options/Settings -> Preferences --- diff --git a/agora/config/prefs.php.dist b/agora/config/prefs.php.dist index 28a2c54b1..375048dd9 100644 --- a/agora/config/prefs.php.dist +++ b/agora/config/prefs.php.dist @@ -15,16 +15,16 @@ if ($GLOBALS['conf']['avatar']['allow_avatars']) { } $prefGroups['display_forums'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Forums View"), - 'desc' => _("Set your options for the forums view."), + 'desc' => _("Set your preferences for the forums view."), 'members' => array('forums_sortby', 'forums_sortdir', 'forums_per_page') ); $prefGroups['display_threads'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Threads View"), - 'desc' => _("Set your options for the threads view."), + 'desc' => _("Set your preferences for the threads view."), 'members' => array( 'threads_sortby', 'threads_sortdir', 'threads_hot', 'threads_per_page' @@ -32,9 +32,9 @@ $prefGroups['display_threads'] = array( ); $prefGroups['display_thread'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Single Thread View"), - 'desc' => _("Set your options for the single thread view."), + 'desc' => _("Set your preferences for the single thread view."), 'members' => array( 'thread_sortby', 'thread_sortdir', 'thread_view_bodies', 'thread_per_page' @@ -42,16 +42,16 @@ $prefGroups['display_thread'] = array( ); $prefGroups['display_message'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Message View"), - 'desc' => _("Set your options for the message view."), + 'desc' => _("Set your preferences for the message view."), 'members' => array('message_emoticons') ); $prefGroups['display_comments'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Comments view"), - 'desc' => _("Set your options for the single thread view."), + 'desc' => _("Set your preferences for the single thread view."), 'members' => array( 'comments_sortby', 'comments_sortdir', 'comments_view_bodies', 'comments_per_page' diff --git a/agora/lib/Application.php b/agora/lib/Application.php index f22ea1071..ef0f8f4cd 100644 --- a/agora/lib/Application.php +++ b/agora/lib/Application.php @@ -105,7 +105,7 @@ class Agora_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/ansel/config/conf.xml b/ansel/config/conf.xml index 0e2cf1f7f..b434138b2 100644 --- a/ansel/config/conf.xml +++ b/ansel/config/conf.xml @@ -44,8 +44,8 @@ - - VFS Options + + VFS Settings @@ -68,7 +68,7 @@ - Photo Generation Options + Photo Generation Settings diff --git a/ansel/config/prefs.php.dist b/ansel/config/prefs.php.dist index 28f89da7a..0c63416db 100644 --- a/ansel/config/prefs.php.dist +++ b/ansel/config/prefs.php.dist @@ -3,9 +3,9 @@ * See horde/config/prefs.php for documentation on the structure of this file. */ $prefGroups['display'] = array( - 'column' => _("General Options"), - 'label' => _("Display Options"), - 'desc' => _("Change display options such as which view to display by default, how many photos to display on a page, and the default gallery style to use."), + 'column' => _("General Preferences"), + 'label' => _("Display Preferences"), + 'desc' => _("Change display preferences such as which view to display by default, how many photos to display on a page, and the default gallery style to use."), 'members' => array( 'grouptitle', 'defaultview', 'tilesperrow', 'tilesperpage', 'facesperpage', 'groupby', 'groupsperpage', @@ -14,16 +14,16 @@ $prefGroups['display'] = array( ); $prefGroups['metadata'] = array( - 'column' => _("General Options"), - 'label' => _("Tags and Metadata Options"), - 'desc' => _("Change options dealing with tags and image metadata."), + 'column' => _("General Preferences"), + 'label' => _("Tags and Metadata Preferences"), + 'desc' => _("Change preferences dealing with tags and image metadata."), 'members' => array('showexif', 'exif_tags', 'exif_title') ); $prefGroups['perms'] = array( - 'column' => _("General Options"), - 'label' => _("Permission Options"), - 'desc' => _("Change your user permission options such as who can download original photos, and what permissions newly created galleries should have by default."), + 'column' => _("General Preferences"), + 'label' => _("Permission Preferences"), + 'desc' => _("Change your user permission preferences such as who can download original photos, and what permissions newly created galleries should have by default."), 'members' => array( 'default_download', 'default_permissions', 'group_permissions', 'guest_permissions' @@ -31,9 +31,9 @@ $prefGroups['perms'] = array( ); $prefGroups['watermark'] = array( - 'column' => _("General Options"), - 'label' => _("Watermark Options"), - 'desc' => _("Change your watermark options."), + 'column' => _("General Preferences"), + 'label' => _("Watermark Preferences"), + 'desc' => _("Change your watermark preferences."), 'members' => array( 'watermark_text', 'watermark_vertical', 'watermark_horizontal', 'watermark_font', 'watermark_auto' diff --git a/ansel/lib/Application.php b/ansel/lib/Application.php index 819e11d39..f3c0a397a 100644 --- a/ansel/lib/Application.php +++ b/ansel/lib/Application.php @@ -126,7 +126,7 @@ class Ansel_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/beatnik/config/prefs.php.dist b/beatnik/config/prefs.php.dist index 747e6f812..3d37781e9 100644 --- a/beatnik/config/prefs.php.dist +++ b/beatnik/config/prefs.php.dist @@ -4,14 +4,14 @@ */ $prefGroups['display'] = array( - 'column' => _("Options"), + 'column' => _("Preferences"), 'label' => _("Display Preferences"), 'desc' => _("Set default display parameters."), 'members' => array('domain_groups', 'domains_perpage') ); $prefGroups['defaults'] = array( - 'column' => _("Options"), + 'column' => _("Preferences"), 'label' => _("Record Defaults"), 'desc' => _("Set default record parameters."), 'members' => array('default_ttl') diff --git a/chora/locale/de/help.xml b/chora/locale/de/help.xml index 836382ded..f8ff3fbe5 100644 --- a/chora/locale/de/help.xml +++ b/chora/locale/de/help.xml @@ -20,7 +20,7 @@ - + Menü: Einstellungen Über das Einstellungen-Symbol gelangt man zu den persönlichen diff --git a/chora/locale/en/help.xml b/chora/locale/en/help.xml index 5afbc4319..ab38524d2 100644 --- a/chora/locale/en/help.xml +++ b/chora/locale/en/help.xml @@ -19,10 +19,10 @@ - - Menu Buttons: Options + + Menu Buttons: Preferences - The Options button lets you set some personal preferences to control the + The Preferences button lets you set some personal preferences to control the way Chora behaves. diff --git a/chora/locale/es/help.xml b/chora/locale/es/help.xml index 4fae3abd0..3e0e3aa4a 100644 --- a/chora/locale/es/help.xml +++ b/chora/locale/es/help.xml @@ -10,7 +10,7 @@ El botón Examinar le devuelve a la visualización principal de archivos de Chora del depósito por omisión. - + Botones del menú: Opciones El botón Opciones le permite configurar varias preferencias personales para controlar el comportamiento de Chora. diff --git a/chora/locale/fi/help.xml b/chora/locale/fi/help.xml index 136556f09..da61fbe11 100644 --- a/chora/locale/fi/help.xml +++ b/chora/locale/fi/help.xml @@ -12,7 +12,7 @@ Selaa painike palauttaa sinut takaisin Chora oletusvaraston tiedostojen päänäkymään. - + Valikkopainikkeet: Asetukset Napauttamalla Asetukset painiketta pääset muuttamaan asetuksiasi. diff --git a/fima/config/prefs.php.dist b/fima/config/prefs.php.dist index 57caf4dab..8a06772d3 100644 --- a/fima/config/prefs.php.dist +++ b/fima/config/prefs.php.dist @@ -4,7 +4,7 @@ */ $prefGroups['share'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Active Configuration"), 'desc' => _("Choose your active Ledger and Posting Type."), 'members' => array( @@ -13,9 +13,9 @@ $prefGroups['share'] = array( ); $prefGroups['display'] = array( - 'column' => _("General Options"), - 'label' => _("Interface Options"), - 'desc' => _("Change the display and input options."), + 'column' => _("General Preferences"), + 'label' => _("Interface Preferences"), + 'desc' => _("Change the display and input preferences."), 'members' => array( 'max_postings', 'startpage', 'sortby', 'altsortby', 'sortdir', 'wildcard_format', 'amount_format', 'expenses_sign', 'delete_opt', diff --git a/fima/lib/Application.php b/fima/lib/Application.php index de4ee4846..d969fce92 100644 --- a/fima/lib/Application.php +++ b/fima/lib/Application.php @@ -25,7 +25,7 @@ class Fima_Application extends Horde_Regsitry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/fima/locale/de/help.xml b/fima/locale/de/help.xml index 90239b08d..2c38e480e 100644 --- a/fima/locale/de/help.xml +++ b/fima/locale/de/help.xml @@ -15,7 +15,7 @@ * grafische Auswertungsdiagramme - + Fima: Einstellungen Aktive Konfiguration * Ihr aktives Buch: wählen Sie Ihr aktives Buch @@ -145,7 +145,7 @@ Für die vereinfachte Eingabe wird bei neuen Buchungen das Datum und Vermögenskonto vom darüberliegenden Eintrag kopiert, kann aber nachträglich geändert werden. - Ausgaben haben üblicherweise negative Beträge, können jedoch aus Komfort ohne negatives Vorzeichen eingegeben werden (siehe Oberflächen-Einstellungen: Ausgaben mit negativem Vorzeichen eingeben?). Bei Vermögensumlagen (Transfer von einem Vermögenskonto auf ein anderes) betrifft der eingegebene Betrag stets das gewählte Verm*genskonto (zB. -10 bedeutet eine Verminderung des gewählten Vermögenskontos um 10 und folglich eine Erhöhung um 10 des als Bewegungskonto ausgewählten Vermögenskontos). + Ausgaben haben üblicherweise negative Beträge, können jedoch aus Komfort ohne negatives Vorzeichen eingegeben werden (siehe Oberflächen-Einstellungen: Ausgaben mit negativem Vorzeichen eingeben?). Bei Vermögensumlagen (Transfer von einem Vermögenskonto auf ein anderes) betrifft der eingegebene Betrag stets das gewählte Verm*genskonto (zB. -10 bedeutet eine Verminderung des gewählten Vermögenskontos um 10 und folglich eine Erhöhung um 10 des als Bewegungskonto ausgewählten Vermögenskontos). Tipp: Bei der Eingabe neuer Buchungen können Konten auch ausgewählt werden, indem man einfach die Kontonummer auf der Tastatur eingibt anstatt die Listenfelder zu durchsuchen. Sie werden rasch die am häufigsten verwendeten Kontonummer kennen und sich so eine Menege Zeit bei der Eingabe neuer Buchungen sparen. @@ -197,7 +197,7 @@ * Enddatum: Ende des zu filternden Zeitraums * Vermögenskonten: es werden Buchungen mit dem/den ausgewählten Konten als Vermögens- oder Bewegungskonto (bei Vermögensumlagen) gefiltert * Bewegungskonten: es werden Buchungen mit dem/den ausgewählten Konten als Bewegungskonto gefiltert - * Anmerkung: Sie können Platzhalter beim Durchsuchen der Anmerkung verwenden (siehe Oberflächen-Einstellungen: Wählen Sie das Format für Platzhalter in der Textsuche). + * Anmerkung: Sie können Platzhalter beim Durchsuchen der Anmerkung verwenden (siehe Oberflächen-Einstellungen: Wählen Sie das Format für Platzhalter in der Textsuche). * Anfangsbetrag: minimaler Betrag * Endbetrag: maximaler Betrag * a.o. Buchungen: alle oder keine a.o. Buchungen filtern; leer lassen um alle Buchungen zu erhalten @@ -344,7 +344,7 @@ Tipp: Die vierte Buchung ist eine Vermögensumlage, Person B hebt 1.000,00 vom Girokonto ab. Es wäre auch möglich gewesen die Transaktion aus Sicht des Girokontos zu tätigen, indem man Vermögens- und Bewegungskonto vertauscht und einen negativen Betrag eingibt. - Tipp: Aus Komfort ist es möglich Ausgaben ohne negativem Vorzeichen einzugeben (siehe Oberflächen-Einstellungen: Ausgaben mit negativem Vorzeichen eingeben?). Jedenfalls betrifft der eingegeben Betrag bei der vierten Transaktion (Vermögensumlage) stets das ausgewählte Vermögenskonto. + Tipp: Aus Komfort ist es möglich Ausgaben ohne negativem Vorzeichen einzugeben (siehe Oberflächen-Einstellungen: Ausgaben mit negativem Vorzeichen eingeben?). Jedenfalls betrifft der eingegeben Betrag bei der vierten Transaktion (Vermögensumlage) stets das ausgewählte Vermögenskonto. Tipp: Kontrollieren Sie die Endbeträge der Vermögenskonten mit der Auswertung Vermögensübersicht (mit kumulierten Werten). diff --git a/fima/locale/en/help.xml b/fima/locale/en/help.xml index 98bdab075..dbcfa21f9 100644 --- a/fima/locale/en/help.xml +++ b/fima/locale/en/help.xml @@ -15,13 +15,13 @@ * graphical report charts - - Fima: Options + + Fima: Preferences Active Configuration * Your active ledger: select your current ledger * Your active posting type: select the current posting type * Closed by period: select the end of the period until which adding and editing postings will be locked; select "None" to keep all postings changeable - Interface Options + Interface Preferences * Postings per page in the list view: enter the number of postings to display per page * When displaying the posting, which page do you want to start on: first or last page * Sort postings by: select the column which to sort postings by @@ -145,7 +145,7 @@ When adding new postings the date and asset account will be copied from the entry above for convenience, but may be changed later on. - Expenses usually are negative amounts, but may be entered without negative sign for convenience (see Interface Options: Enter expenses with negative sign?). However, when shifting assets (transfer from one asset account to another one) the entered value always applies to the selected asset account (eg. -10 means a decrease of the selected asset account by 10 and subsequently an increase by 10 of the asset account selected as posting account). + Expenses usually are negative amounts, but may be entered without negative sign for convenience (see Interface Preferences: Enter expenses with negative sign?). However, when shifting assets (transfer from one asset account to another one) the entered value always applies to the selected asset account (eg. -10 means a decrease of the selected asset account by 10 and subsequently an increase by 10 of the asset account selected as posting account). Tip: When entering new postings, it is possible to select accounts by simply typing the account number on the keyboard instead of browsing through the drop down field. In a short time you will know the most used account numbers and it will save you a lot of time entering new postings. @@ -154,7 +154,7 @@ Tip: When entering new postings, it is possible to execute mathematical operations in the amount field. Simply type the mathematical expression (eg. 3+2*5) and the result will automatically be calculated. - Tip: In order to prevent adding or editing postings with a date in the past unintentionally, enter a closing period (see Options: Active Configuration: Closed by period). + Tip: In order to prevent adding or editing postings with a date in the past unintentionally, enter a closing period (see Preferences: Active Configuration: Closed by period). Tip: When entering new postings for budget or forecast, it is possible to automatically create a set of similar postings for each month of a specific year. In the first row enter any date in the desired year, choose an asset and posting account and enter a description (optionally) and amount. Then press the button "Autofill" to copy the entered values down for alle months. @@ -200,7 +200,7 @@ * Date End: end of filter period * Asset Accounts: postings with the selected account(s) as asset or posting account (when shifting assets) will be filtered * Posting Accounts: postings with the selected account(s) as posting account will be filtered - * Description: you may use wildcards when search the description (see Interface Options: Select the format for wildcards for text search). + * Description: you may use wildcards when search the description (see Interface Preferences: Select the format for wildcards for text search). * Amount Start: minimum amount * Amount End: maximum amount * e.o. Postings: filter all or none e.o. postings; leave empty to get all postings @@ -347,7 +347,7 @@ Tip: The fourth posting is a transaction for shifting assets, person B withdraws 1,000.00 from the giro account. It would have also been possible to look on the transaction from the perspective of the giro account by switching asset and posting account and enter a negative amount. - Tip: It is possible to enter expenses without negative sign for convenience (see Interface Options: Enter expenses with negative sign?). However, with the fourth transaction (shifting assets) the entered value always applies to the selected asset account. + Tip: It is possible to enter expenses without negative sign for convenience (see Interface Preferences: Enter expenses with negative sign?). However, with the fourth transaction (shifting assets) the entered value always applies to the selected asset account. Tip: Control the final amounts of asset accounts by using the report Asset Overview (with cumulated values). diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index 0dcea8695..21b101019 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -456,7 +456,7 @@ HTML; * 'prefsapi * 'problem' * 'sidebar' - * 'options' + * 'prefs' * * @param string $app The name of the current Horde application. * @@ -504,10 +504,10 @@ HTML; case 'logout': return $GLOBALS['registry']->getLogoutUrl(array('reason' => Horde_Auth::REASON_LOGOUT)); - case 'options': + case 'prefs': case 'prefsapi': if (!in_array($GLOBALS['conf']['prefs']['driver'], array('', 'none'))) { - $url = self::url(($type == 'options') ? 'services/prefs.php' : 'services/prefs/', false, $opts); + $url = self::url(($type == 'prefs') ? 'services/prefs.php' : 'services/prefs/', false, $opts); if (!is_null($app)) { $url->add('app', $app); } @@ -1402,7 +1402,7 @@ HTML; /** * Determines the location of the system temporary directory. If a specific - * setting cannot be found, it defaults to /tmp. + * configuration cannot be found, it defaults to /tmp. * * @return string A directory name that can be used for temp files. * Returns false if one could not be found. diff --git a/framework/Core/lib/Horde/Core/Factory/Prefs.php b/framework/Core/lib/Horde/Core/Factory/Prefs.php index 00658a061..ce43e4e2b 100644 --- a/framework/Core/lib/Horde/Core/Factory/Prefs.php +++ b/framework/Core/lib/Horde/Core/Factory/Prefs.php @@ -117,7 +117,7 @@ class Horde_Core_Factory_Prefs if (empty($_SESSION['prefs_cache']['unavailable'])) { $_SESSION['prefs_cache']['unavailable'] = true; if (isset($GLOBALS['notification'])) { - $GLOBALS['notification']->push(_("The preferences backend is currently unavailable and your preferences have not been loaded. You may continue to use the system with default settings.")); + $GLOBALS['notification']->push(_("The preferences backend is currently unavailable and your preferences have not been loaded. You may continue to use the system with default preferences.")); } } $this->_instances[$sig] = Horde_Prefs::factory('Session', $scope); diff --git a/framework/Core/lib/Horde/Core/Prefs/Ui.php b/framework/Core/lib/Horde/Core/Prefs/Ui.php index 0d48d7c7d..01a59667f 100644 --- a/framework/Core/lib/Horde/Core/Prefs/Ui.php +++ b/framework/Core/lib/Horde/Core/Prefs/Ui.php @@ -302,9 +302,9 @@ class Horde_Core_Prefs_Ui } if ($prefs instanceof Horde_Prefs_Session) { - $notification->push(_("Your options have been updated for the duration of this session."), 'horde.success'); + $notification->push(_("Your preferences have been updated for the duration of this session."), 'horde.success'); } else { - $notification->push(_("Your options have been updated."), 'horde.success'); + $notification->push(_("Your preferences have been updated."), 'horde.success'); } $this->_loadPrefs($this->app); @@ -324,7 +324,7 @@ class Horde_Core_Prefs_Ui */ public function selfUrl($options = array()) { - $url = Horde::getServiceLink('options', $this->app); + $url = Horde::getServiceLink('prefs', $this->app); if ($this->group) { $url->add('group', $this->group); } @@ -372,11 +372,11 @@ class Horde_Core_Prefs_Ui } if (empty($columns) && empty($pref_list)) { - $notification->push(_("There are no options available."), 'horde.message'); + $notification->push(_("There are no preferences available."), 'horde.message'); $this->nobuttons = true; } - $options_link = Horde::getServiceLink('options'); + $options_link = Horde::getServiceLink('prefs'); $h_templates = $registry->get('templates', 'horde'); $base = $GLOBALS['injector']->createInstance('Horde_Template'); @@ -525,7 +525,7 @@ class Horde_Core_Prefs_Ui $content = Horde::endBuffer(); - $title = _("User Options"); + $title = _("User Preferences"); /* Get the menu output before we start to output the page. * Again, this will catch any javascript inserted into the page. */ @@ -578,7 +578,7 @@ class Horde_Core_Prefs_Ui ); } $t->set('apps', $tmp); - $t->set('header', htmlspecialchars(($this->app == 'horde') ? _("Global Options") : sprintf(_("Options for %s"), $registry->get('name', $this->app)))); + $t->set('header', htmlspecialchars(($this->app == 'horde') ? _("Global Preferences") : sprintf(_("Preferences for %s"), $registry->get('name', $this->app)))); if (empty($_SESSION['horde_prefs']['advanced'])) { $t->set('advanced', $this->selfUrl()->add('show_advanced', 1)); diff --git a/framework/Core/lib/Horde/Core/Sidebar.php b/framework/Core/lib/Horde/Core/Sidebar.php index 11a626121..97cf7e4dd 100644 --- a/framework/Core/lib/Horde/Core/Sidebar.php +++ b/framework/Core/lib/Horde/Core/Sidebar.php @@ -72,11 +72,11 @@ class Horde_Core_Sidebar } catch (Horde_Exception $e) {} } - if (Horde_Menu::showService('options') && + if (Horde_Menu::showService('prefs') && !($injector->getInstance('Horde_Prefs')->getPrefs() instanceof Horde_Prefs_Session)) { - $menu['options'] = array( + $menu['prefs'] = array( 'icon' => Horde_Themes::img('prefs.png'), - 'name' => _("Options"), + 'name' => _("Preferences"), 'status' => 'active' ); @@ -84,24 +84,24 @@ class Horde_Core_Sidebar $prefs_apps = $registry->listApps(array('active', 'admin'), true, Horde_Perms::READ); if (!empty($prefs_apps['horde'])) { - $menu['options_' . 'horde'] = array( + $menu['prefs_' . 'horde'] = array( 'icon' => $registry->get('icon', 'horde'), - 'menu_parent' => 'options', - 'name' => _("Global Options"), + 'menu_parent' => 'prefs', + 'name' => _("Global Preferences"), 'status' => 'active', - 'url' => Horde::getServiceLink('options', 'horde') + 'url' => Horde::getServiceLink('prefs', 'horde') ); unset($prefs_apps['horde']); } asort($prefs_apps); foreach ($prefs_apps as $app => $params) { - $menu['options_' . $app] = array( + $menu['prefs_' . $app] = array( 'icon' => $registry->get('icon', $app), - 'menu_parent' => 'options', + 'menu_parent' => 'prefs', 'name' => $params['name'], 'status' => 'active', - 'url' => Horde::getServiceLink('options', $app) + 'url' => Horde::getServiceLink('prefs', $app) ); } } diff --git a/framework/Core/lib/Horde/Menu.php b/framework/Core/lib/Horde/Menu.php index 627def7ff..66277a9b6 100644 --- a/framework/Core/lib/Horde/Menu.php +++ b/framework/Core/lib/Horde/Menu.php @@ -159,11 +159,11 @@ class Horde_Menu $this->addAppLinks(); } - /* Add settings link. */ + /* Add preferences link. */ if (($this->_mask & self::MASK_PREFS) && - $this->showService('options') && - ($url = Horde::getServiceLink('options', $app))) { - $this->add($url, _("_Options"), 'prefs.png'); + $this->showService('prefs') && + ($url = Horde::getServiceLink('prefs', $app))) { + $this->add($url, _("_Preferences"), 'prefs.png'); } /* Add problem link. */ @@ -338,9 +338,8 @@ class Horde_Menu * 
      * The following must be defined in Horde's menu config, or else they
      * won't be displayed in the menu:
-     * 'help', 'problem', 'logout', 'login', 'options'
+     * 'help', 'problem', 'logout', 'login', 'prefs'
      *
- * @param boolean $override Override Horde settings? * * @return boolean True if the link is to be shown. */ @@ -348,7 +347,7 @@ class Horde_Menu { global $conf; - if (!in_array($type, array('help', 'problem', 'logout', 'login', 'options'))) { + if (!in_array($type, array('help', 'problem', 'logout', 'login', 'prefs'))) { return true; } diff --git a/framework/Core/lib/Horde/Registry/Application.php b/framework/Core/lib/Horde/Registry/Application.php index 94a331964..73162a92c 100644 --- a/framework/Core/lib/Horde/Registry/Application.php +++ b/framework/Core/lib/Horde/Registry/Application.php @@ -238,7 +238,7 @@ class Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the preferences page. */ // public function prefsSpecial($ui, $item) {} diff --git a/framework/Prefs/lib/Horde/Prefs/CategoryManager.php b/framework/Prefs/lib/Horde/Prefs/CategoryManager.php index a6a7b6078..ba0603351 100644 --- a/framework/Prefs/lib/Horde/Prefs/CategoryManager.php +++ b/framework/Prefs/lib/Horde/Prefs/CategoryManager.php @@ -154,7 +154,7 @@ JAVASCRIPT; unset($categories[$key]); $GLOBALS['prefs']->setValue('categories', implode('|', $categories)); - // Remove any color settings for $category. + // Remove any color preferences for $category. $colors = self::colors(); unset($colors[$category]); self::setColors($colors); diff --git a/framework/admintools/horde-remove-pref.php b/framework/admintools/horde-remove-pref.php index bd5ddd47b..8dcd17dfa 100755 --- a/framework/admintools/horde-remove-pref.php +++ b/framework/admintools/horde-remove-pref.php @@ -3,9 +3,9 @@ /** * Copyright 2007-2010 The Horde Project (http://www.horde.org/) * - * This script removes a pref from users' settings. Helps when a setting is - * to be moved from locked = false, to locked = true and there have already - * been prefs set by the users. + * This script removes a preference from users' preferences. Helps when a + * preference is to be moved from locked = false, to locked = true and there + * have already been preferences set by the users. * * @package admintools */ diff --git a/gollem/config/prefs.php.dist b/gollem/config/prefs.php.dist index 90d786a0c..961a34f8d 100644 --- a/gollem/config/prefs.php.dist +++ b/gollem/config/prefs.php.dist @@ -10,7 +10,7 @@ $prefGroups['display'] = array( 'column' => _("User Interface"), 'label' => _("File Display"), - 'desc' => _("File display options."), + 'desc' => _("File display preferences."), 'members' => array( 'show_dotfiles', 'sortdirsfirst', 'columnselect', 'sortby', 'sortdir', 'perpage' diff --git a/gollem/lib/Application.php b/gollem/lib/Application.php index 8f6240886..b1c6483b2 100644 --- a/gollem/lib/Application.php +++ b/gollem/lib/Application.php @@ -118,7 +118,7 @@ class Gollem_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/gollem/locale/en/help.xml b/gollem/locale/en/help.xml index 952bcab71..69d2f0b9f 100644 --- a/gollem/locale/en/help.xml +++ b/gollem/locale/en/help.xml @@ -20,8 +20,8 @@ By default, you can only delete directories that are empty, however you can enable the deletion of non-empty directories (recursive delete). If you try to delete a non-empty directory without enabling this feature, deletion will fail with - an error. To enable the deleting non-empty directories, click on Options, Settings and choose Yes from the drop down box - for the Delete Folders Recursively option. This will enable the recursive delete option. + an error. To enable the deleting non-empty directories, click on Preferences, File Actions and choose Yes from the drop down box + for the Delete Folders Recursively preference. This will enable the recursive delete preference. In order to delete, cut or copy a directory or directories, you need to select at least one directory. After you select one or more directories using the checkboxes to the left of the item, select either Cut Items, Copy Items diff --git a/hermes/config/prefs.php.dist b/hermes/config/prefs.php.dist index a08533934..51a579316 100644 --- a/hermes/config/prefs.php.dist +++ b/hermes/config/prefs.php.dist @@ -4,8 +4,8 @@ */ $prefGroups['timer'] = array( - 'column' => _("General Options"), - 'label' => _("Timer Options"), + 'column' => _("General Preferences"), + 'label' => _("Timer Preferences"), 'desc' => _("Set preferences on the stop watch timer."), 'members' => array('add_description') ); diff --git a/horde/config/conf.xml b/horde/config/conf.xml index 5c1364260..2c8119ce9 100644 --- a/horde/config/conf.xml +++ b/horde/config/conf.xml @@ -1510,7 +1510,7 @@ never - authenticated diff --git a/horde/config/prefs.php.dist b/horde/config/prefs.php.dist index 0ca76c182..bf75c4366 100644 --- a/horde/config/prefs.php.dist +++ b/horde/config/prefs.php.dist @@ -11,7 +11,7 @@ * * $prefGroups * =========== - * $prefGroups defines the options page in which a preference value will + * $prefGroups defines the preferences page in which a preference value will * appear in. * * Format: @@ -28,8 +28,8 @@ * Additionally, applications can define additional * identity information in their prefs.php file that * will be displayed after the Horde-wide settings. - * Empty - The default options screen. - * DEFAULT: The default options screen. + * Empty - The default preferences screen. + * DEFAULT: The default preferences screen. * * $_prefs * ======= @@ -40,13 +40,13 @@ * The following are OPTIONAL values for each entry: * * advanced - (boolean) Mark pref as advanced - will only be displayed if user - * switches to advanced options mode. + * switches to advanced preferences mode. * VALUES: - * true: Advanced preference; hidden in basic options mode. - * false: Basic preference; shown regardless of options mode. + * true: Advanced preference; hidden in basic preferences mode. + * false: Basic preference; shown regardless of preferences mode. * DEFAULT: false * - * locked - (boolean) Allow preference to be changed from the options screen? + * locked - (boolean) Allow preference to be changed from the preferences screen? * VALUES: * true: Do not show this preference in the UI and don't allow * changing by any mechanism. @@ -67,7 +67,7 @@ * DEFAULT: No help icon is displayed * * The UI display for a preference is controlled by the 'type' key. This key - * controls how the preference is displayed on the options screen. If this + * controls how the preference is displayed on the preferences screen. If this * key is not present, the preference is treated as type 'implict'. The * following is the list of types, with a description of further keys used * for each type. @@ -77,7 +77,7 @@ * Provides a checkbox (yes/no) entry. * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'value' - (integer) 0 (or false) for unchecked, 1 (or true) for checked. * DEFAULT: 0 * @@ -86,7 +86,7 @@ * Provides an enumeration (a/k/a selection) list in the UI. * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'escaped' - (boolean) If true, values in 'enum' are already escaped. * DEFAULT: false * 'enum' - (array) The enumeration list. Keys will be used as the @@ -126,7 +126,7 @@ * to be selected. * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'escaped' - (boolean) If true, values in 'enum' are already escaped. * DEFAULT: false * 'enum' - (array) The enumeration list. Keys will be used as the @@ -141,7 +141,7 @@ * preference are automatically converted to a number value. * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'value' - (number) The preference value. * * 'password' @@ -150,7 +150,7 @@ * displayed to the screen). * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'value' - (string) The preference value. * * 'prefslink' @@ -191,7 +191,7 @@ * Provides a single-line textbox. * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'value' - (string) The preference value. * * 'textarea' @@ -199,7 +199,7 @@ * Provides a multi-line textbox. * * ADDITIONAL KEYS: - * 'desc' - (string) The description text to use on the options page. + * 'desc' - (string) The description text to use on the preferences page. * 'value' - (string) The preference value. Lines should be separated * with the "\n" character. * @@ -274,7 +274,7 @@ $_prefs['confirm_email'] = array( $prefGroups['forgotpass'] = array( 'column' => _("Your Information"), 'label' => _("Account Password"), - 'desc' => _("Set options to allow you to reset your password if you ever forget it."), + 'desc' => _("Set preferences to allow you to reset your password if you ever forget it."), 'members' => array( 'security_question', 'security_answer', 'alternate_email' ) @@ -311,7 +311,7 @@ $_prefs['alternate_email'] = array( $prefGroups['language'] = array( 'column' => _("Your Information"), 'label' => _("Locale and Time"), - 'desc' => _("Set your preferred language, timezone and date options."), + 'desc' => _("Set your preferred language, timezone and date preferences."), 'members' => array( 'language', 'timezone', 'twentyFour', 'date_format', 'first_week_day' ) @@ -418,12 +418,12 @@ $_prefs['category_colors'] = array( -// *** Display Options Preferences *** +// *** Display Preferences *** $prefGroups['display'] = array( 'column' => _("Other Information"), - 'label' => _("Display Options"), - 'desc' => _("Set your startup application, color scheme, page refreshing, and other display options."), + 'label' => _("Display Preferences"), + 'desc' => _("Set your startup application, color scheme, page refreshing, and other display preferences."), 'members' => array( 'initial_application', 'show_last_login', 'theme', 'summary_refresh_time', 'show_sidebar', 'sidebar_width', diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES index 0a84562d1..a233a7246 100644 --- a/horde/docs/CHANGES +++ b/horde/docs/CHANGES @@ -13,12 +13,12 @@ v4.0-cvs [mms] Remove reliance on PEAR Mail library. [jan] Send alarm emails again if the alarm has changed (Bug #8717). [mms] Add advanced preferences options screen. -[mms] Complete rewrite of options UI display. +[mms] Complete rewrite of preferences UI display. [mjr] Horde_Image can now act as an Iterator for multi-page images. [mms] Remove Horde_Cipher library. [mms] Add 'cssfiles' hook to add custom CSS files to a page. -[jan] Add option to not automatically show all available shares. -[jan] Add option to disallow world permissions for user shares. +[jan] Add configuration to not automatically show all available shares. +[jan] Add configuration to disallow world permissions for user shares. [jan] Store alarm dates in UTC (Bug #8381). [mms] Add abstracted AJAX interface (Request #4561). [mms] Update scriptaculous to v1.8.3. diff --git a/horde/lib/Block/fb_stream.php b/horde/lib/Block/fb_stream.php index 7a04ac4eb..63f96b0ad 100644 --- a/horde/lib/Block/fb_stream.php +++ b/horde/lib/Block/fb_stream.php @@ -121,7 +121,7 @@ class Horde_Block_Horde_fb_stream extends Horde_Block $facebook = $this->_facebook; $fbp = $this->_fbp; if (empty($fbp['sid'])) { - return sprintf(_("You have not properly connected your Facebook account with Horde. You should check your Facebook settings in your %s."), Horde::getServiceLink('options', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); + return sprintf(_("You have not properly connected your Facebook account with Horde. You should check your Facebook settings in your %s."), Horde::getServiceLink('prefs', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); } /* Add the client javascript / initialize it */ @@ -156,7 +156,7 @@ EOT; $status = $facebook->fql->run($fql); } catch (Horde_Service_Facebook_Exception $e) { $html = sprintf(_("There was an error making the request: %s"), $e->getMessage()); - $html .= sprintf(_("You can also check your Facebook settings in your %s."), Horde::getServiceLink('options', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); + $html .= sprintf(_("You can also check your Facebook settings in your %s."), Horde::getServiceLink('prefs', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); return $html; } diff --git a/horde/lib/Block/twitter_timeline.php b/horde/lib/Block/twitter_timeline.php index c730a313d..9d360d7ce 100644 --- a/horde/lib/Block/twitter_timeline.php +++ b/horde/lib/Block/twitter_timeline.php @@ -179,7 +179,7 @@ EOT; { $token = unserialize($GLOBALS['prefs']->getValue('twitter')); if (empty($token['key']) && empty($token['secret'])) { - $pref_link = Horde::getServiceLink('options', 'horde')->add('group', 'twitter')->link(); + $pref_link = Horde::getServiceLink('prefs', 'horde')->add('group', 'twitter')->link(); throw new Horde_Exception(sprintf(_("You have not properly connected your Twitter account with Horde. You should check your Twitter settings in your %s."), $pref_link . _("preferences") . '')); } diff --git a/horde/services/confirm.php b/horde/services/confirm.php index 3cb75a7ad..827b1caf2 100644 --- a/horde/services/confirm.php +++ b/horde/services/confirm.php @@ -16,4 +16,4 @@ Horde_Registry::appInit('horde', array('nologintasks' => true)); $identity = $injector->getInstance('Horde_Prefs_Identity')->getIdentity()->confirmIdentity(Horde_Util::getFormData('h')); -Horde::getServiceLink('options')->add('group', 'identities')->redirect(); +Horde::getServiceLink('prefs')->add('group', 'identities')->redirect(); diff --git a/horde/services/facebook.php b/horde/services/facebook.php index ff60cb9ef..fee2b5058 100644 --- a/horde/services/facebook.php +++ b/horde/services/facebook.php @@ -52,7 +52,7 @@ if ($token = Horde_Util::getFormData('auth_token')) { $stream = $facebook->streams->get('', array(), Horde_Util::getPost('oldest'), Horde_Util::getPost('newest'), $count, $filter); } catch (Horde_Service_Facebook_Exception $e) { $html = sprintf(_("There was an error making the request: %s"), $e->getMessage()); - $html .= sprintf(_("You can also check your Facebook settings in your %s."), Horde::getServiceLink('options', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); + $html .= sprintf(_("You can also check your Facebook settings in your %s."), Horde::getServiceLink('prefs', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); return $html; } @@ -69,7 +69,7 @@ if ($token = Horde_Util::getFormData('auth_token')) { . ' ' . _("Event Invites:") . ' ' . count($notifications['event_invites']); } catch (Horde_Service_Facebook_Exception $e) { $html = sprintf(_("There was an error making the request: %s"), $e->getMessage()); - $html .= sprintf(_("You can also check your Facebook settings in your %s."), Horde::getServiceLink('options', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); + $html .= sprintf(_("You can also check your Facebook settings in your %s."), Horde::getServiceLink('prefs', 'horde')->add('group', 'facebook')->link() . _("preferences") . ''); return $html; } diff --git a/horde/services/prefs.php b/horde/services/prefs.php index 967e6af7c..fd209d87e 100644 --- a/horde/services/prefs.php +++ b/horde/services/prefs.php @@ -1,6 +1,6 @@ + - +

diff --git a/hylax/config/prefs.php.dist b/hylax/config/prefs.php.dist index 9f452ecd1..708b10f6e 100644 --- a/hylax/config/prefs.php.dist +++ b/hylax/config/prefs.php.dist @@ -6,9 +6,9 @@ */ $prefGroups['display'] = array( - 'column' => _("Other Options"), - 'label' => _("Display Options"), - 'desc' => _("Change display options such as how search results are sorted."), + 'column' => _("Other Preferences"), + 'label' => _("Display Preferences"), + 'desc' => _("Change display preferences such as how search results are sorted."), 'members' => array('hylax_default_view') ); diff --git a/imp/config/hooks.php.dist b/imp/config/hooks.php.dist index 337ae4ff9..7728c4795 100644 --- a/imp/config/hooks.php.dist +++ b/imp/config/hooks.php.dist @@ -347,7 +347,7 @@ class IMP_Hooks // return Horde::url('', false, array('app' => 'turba')); // // case 'prefs': -// return Horde::getServiceLink('options', 'horde'); +// return Horde::getServiceLink('prefs', 'horde'); // // default: // return ''; diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist index 2e588500d..82af9c485 100644 --- a/imp/config/prefs.php.dist +++ b/imp/config/prefs.php.dist @@ -8,7 +8,7 @@ // *** Personal Information Preferences *** $prefGroups['identities'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Personal Information"), 'desc' => _("Change the name, address, and signature that people see when they read and reply to your email."), 'members' => array( @@ -109,7 +109,7 @@ $_prefs['sentmailselect'] = array( // *** Server and Folder Preferences *** $prefGroups['server'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Server and Folder Information"), 'desc' => _("Change mail server and folder settings."), 'members' => array( @@ -198,7 +198,7 @@ $_prefs['vfolder'] = array( // *** ACL Preferences *** $prefGroups['acl'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Share Folders"), 'desc' => _("Share your mail folders with other users."), 'members' => array('aclmanagement') @@ -209,7 +209,7 @@ $_prefs['aclmanagement'] = array( 'type' => 'special' ); -// folder sharing options +// folder sharing preferences $_prefs['acl'] = array( // set 'locked' => true to disable folder sharing 'value' => '' @@ -220,7 +220,7 @@ $_prefs['acl'] = array( // *** Login Tasks Preferences *** $prefGroups['logintasks'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Login Tasks"), 'desc' => sprintf(_("Configure tasks to run upon logon to %s."), $GLOBALS['registry']->get('name')), 'members' => array( @@ -364,7 +364,7 @@ $_prefs['purge_spam_keep'] = array( // *** Additional Accounts Preferences *** $prefGroups['accounts'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Additional Accounts"), 'desc' => _("Configure additional mail accounts to display."), 'members' => array('accountsmanagement') @@ -386,7 +386,7 @@ $_prefs['accounts'] = array( // *** Compose Preferences *** $prefGroups['compose'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Message Composition"), 'desc' => _("Configure how you send mail."), 'members' => array( @@ -568,7 +568,7 @@ $_prefs['ckeditor_buttons'] = array( // *** Stationery Preferences *** $prefGroups['stationery'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Stationery"), 'desc' => _("Edit stationery and form responses."), 'members' => array('stationerymanagement') @@ -590,7 +590,7 @@ $_prefs['stationery'] = array( // *** Compose Reply Preferences *** $prefGroups['reply'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Message Replies"), 'desc' => _("Configure how you reply to mail."), 'members' => array( @@ -635,7 +635,7 @@ $_prefs['attrib_text'] = array( // *** Compose Forward Preferences *** $prefGroups['forward'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Message Forwards"), 'desc' => _("Configure how you forward mail."), 'members' => array('forward_default', 'forward_format') @@ -671,7 +671,7 @@ $_prefs['forward_format'] = array( // *** Message Drafts Preferences *** $prefGroups['drafts'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Message Drafts"), 'desc' => _("Configure how to deal with message drafts."), 'members' => array( @@ -719,7 +719,7 @@ $_prefs['auto_delete_drafts'] = array( // *** Message Viewing Preferences *** $prefGroups['viewing'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Message Viewing"), 'desc' => _("Configure how messages are displayed."), 'members' => array( @@ -851,7 +851,7 @@ $_prefs['disposition_send_mdn'] = array( 'enum' => array( 0 => _("Never send read receipt"), 1 => _("Always prompt"), -// This option is not given to the user by default - it makes it too easy for +// This preference is not given to the user by default - it makes it too easy for // spam messages to determine valid e-mail addresses. // 2 => _("Prompt only if necessary; otherwise automatically send") ), @@ -864,7 +864,7 @@ $_prefs['disposition_send_mdn'] = array( // *** Delete/Move Messages Preferences *** $prefGroups['delmove'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Deleting and Moving Messages"), 'desc' => _("Set preferences for what happens when you move and delete messages."), 'members' => array( @@ -956,7 +956,7 @@ $_prefs['delhide'] = array( // *** New Mail Notification Preferences *** $prefGroups['newmail'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("New Mail"), 'desc' => _("Control when new mail will be checked for, and whether or not to notify you when it arrives."), 'members' => array( @@ -1001,7 +1001,7 @@ $_prefs['soundselect'] = array( // *** IMAP Flag Preferences *** $prefGroups['flags'] = array( - 'column' => _("Message Options"), + 'column' => _("Message Preferences"), 'label' => _("Message Flags"), 'desc' => _("Configure flag highlighting."), 'members' => array('flagmanagement', 'show_all_flags') @@ -1170,9 +1170,9 @@ $_prefs['show_all_flags'] = array( // *** Mailbox Display Preferences *** $prefGroups['mboxdisplay'] = array( - 'column' => _("Other Options"), - 'label' => _("Mailbox Display Options"), - 'desc' => _("Change display options such as how many messages you see on each page and how messages are sorted."), + 'column' => _("Other Preferences"), + 'label' => _("Mailbox Display Preferences"), + 'desc' => _("Change display preferences such as how many messages you see on each page and how messages are sorted."), 'members' => array( 'mailbox_start', 'sortby', 'sortdir', 'sortdate', 'max_msgs', 'from_link', 'time_format', 'atc_flag' @@ -1294,9 +1294,9 @@ $_prefs['atc_flag'] = array( // *** Folder Display Preferences *** $prefGroups['folderdisplay'] = array( - 'column' => _("Other Options"), - 'label' => _("Folder Display Options"), - 'desc' => _("Change folder navigation display options."), + 'column' => _("Other Preferences"), + 'label' => _("Folder Display Preferences"), + 'desc' => _("Change folder navigation display preferences."), 'members' => array( 'nav_expanded', 'tree_view', 'nav_poll_all' ) @@ -1348,7 +1348,7 @@ $_prefs['nav_poll'] = array( // *** Filter Preferences *** $prefGroups['filters'] = array( - 'column' => _("Other Options"), + 'column' => _("Other Preferences"), 'label' => _("Filters"), 'desc' => _("Create filtering rules to organize your incoming mail, sort it into folders, and delete spam."), 'members' => array( @@ -1419,7 +1419,7 @@ $_prefs['filter_menuitem'] = array( // *** Addressbook Preferences *** $prefGroups['addressbooks'] = array( - 'column' => _("Other Options"), + 'column' => _("Other Preferences"), 'label' => _("Address Books"), 'desc' => _("Select address book sources for adding and searching for addresses."), 'members' => array( @@ -1437,7 +1437,7 @@ $_prefs['save_recipients'] = array( // By default, display all contacts in the address book when loading // the contacts screen. If your default address book is large and -// slow to display, you may want to disable and lock this option. +// slow to display, you may want to disable and lock this preference. $_prefs['display_contact'] = array( 'value' => 1, 'shared' => true, @@ -1491,7 +1491,7 @@ $_prefs['add_source'] = array( // *** Event Request Preferences *** $prefGroups['events'] = array( - 'column' => _("Other Options"), + 'column' => _("Other Preferences"), 'label' => _("Event Requests"), 'desc' => _("Configure how event or meeting requests should be handled."), 'members' => array('conflict_interval') @@ -1509,8 +1509,8 @@ $_prefs['conflict_interval'] = array( // *** PGP Preferences *** $prefGroups['pgp'] = array( - 'column' => _("Other Options"), - 'label' => _("PGP Options"), + 'column' => _("Other Preferences"), + 'label' => _("PGP Preferences"), 'desc' => sprintf(_("Control PGP support for %s."), $GLOBALS['registry']->get('name')), 'members' => array( 'use_pgp', 'use_pgp_text', 'pgp_attach_pubkey', 'pgp_scan_body', @@ -1581,8 +1581,8 @@ $_prefs['pgp_private_key'] = array( // *** S/MIME Preferences *** $prefGroups['smime'] = array( - 'column' => _("Other Options"), - 'label' => _("S/MIME Options"), + 'column' => _("Other Preferences"), + 'label' => _("S/MIME Preferences"), 'desc' => sprintf(_("Control S/MIME support for %s."), $GLOBALS['registry']->get('name')), 'members' => array( 'use_smime', 'use_smime_text', 'smime_verify', 'smimepublickey', @@ -1637,9 +1637,9 @@ $_prefs['smime_additional_cert'] = array( // *** Mobile View (MIMP) Preferences *** $prefGroups['mimp'] = array( - 'column' => _("Other Options"), - 'label' => _("Mobile View Options"), - 'desc' => _("Configure options for the mobile view."), + 'column' => _("Other Preferences"), + 'label' => _("Mobile View Preferences"), + 'desc' => _("Configure preferences for the mobile view."), 'members' => array( 'mimp_preview_msg', 'mimp_download_confirm', 'mimp_inline_all' ) @@ -1671,9 +1671,9 @@ $_prefs['mimp_inline_all'] = array( // *** Standard View (IMP) Preferences *** $prefGroups['standard'] = array( - 'column' => _("Other Options"), - 'label' => _("Standard View Options"), - 'desc' => _("Configure options for the standard view."), + 'column' => _("Other Preferences"), + 'label' => _("Standard View Preferences"), + 'desc' => _("Configure preferences for the standard view."), 'members' => array( 'preview_enabled', 'preview_maxlen', 'preview_strip_nl', 'preview_show_unread', 'preview_show_tooltip' @@ -1729,9 +1729,9 @@ $_prefs['preview_show_tooltip'] = array( // *** Dynamic View (DIMP) Preferences *** $prefGroups['dimp'] = array( - 'column' => _("Other Options"), - 'label' => _("Dynamic View Options"), - 'desc' => _("Configure options for the dynamic view."), + 'column' => _("Other Preferences"), + 'label' => _("Dynamic View Preferences"), + 'desc' => _("Configure preferences for the dynamic view."), 'members' => array('dynamic_view', 'dimp_login_view') ); diff --git a/imp/lib/Prefs/Identity.php b/imp/lib/Prefs/Identity.php index 0e45d8038..1b7a2211a 100644 --- a/imp/lib/Prefs/Identity.php +++ b/imp/lib/Prefs/Identity.php @@ -129,7 +129,7 @@ class Imp_Prefs_Identity extends Horde_Core_Prefs_Identity try { $ob = Horde_Mime_Address::parseAddressList($address, array('defserver' => $_SESSION['imp']['maildomain'])); } catch (Horde_Mime_Exception $e) { - throw new Horde_Exception (_("Your From address is not a valid email address. This can be fixed in your Personal Information options page.")); + throw new Horde_Exception (_("Your From address is not a valid email address. This can be fixed in your Personal Information preferences page.")); } if (empty($name)) { diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php index 7d3a44f5f..d9428fe0d 100644 --- a/imp/lib/Prefs/Ui.php +++ b/imp/lib/Prefs/Ui.php @@ -363,7 +363,7 @@ class IMP_Prefs_Ui * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/imp/locale/en/help.xml b/imp/locale/en/help.xml index 76af97642..ce8c19c59 100644 --- a/imp/locale/en/help.xml +++ b/imp/locale/en/help.xml @@ -42,7 +42,7 @@ Message Composition: Identity Identity - Choose the identity to send email as from a drop-down list of identities that you entered under Options->Personal Information. + Choose the identity to send email as from a drop-down list of identities that you entered under Preferences->Personal Information. @@ -335,7 +335,7 @@ PGP: Attach Public Key Attach Public Key - If selected then a copy of your PGP public key, if it exists, will be attached to the outgoing message. You can set the default behavior via the PGP Options screen. + If selected then a copy of your PGP public key, if it exists, will be attached to the outgoing message. You can set the default behavior via the PGP Preferences screen. @@ -637,14 +637,14 @@ Preferences: Maintenance: Rename Sent-mail Folder Monthly - Turn this option on if you would like to rename your sent-mail folder at the beginning of every month. The folder will be renamed (to a name that contains the month and year) and a new sent-mail folder will be created. + Turn this preference on if you would like to rename your sent-mail folder at the beginning of every month. The folder will be renamed (to a name that contains the month and year) and a new sent-mail folder will be created. Preferences: Maintenance: Delete Sent-mail Folder Monthly - Turn this option on if you would like to delete old sent-mail folders at the beginning of every month. This may be useful if you have a quota, for example. + Turn this preference on if you would like to delete old sent-mail folders at the beginning of every month. This may be useful if you have a quota, for example. @@ -679,7 +679,7 @@ Preferences: Maintenance: Delete Linked Attachments Monthly - Turn this option on if you would like to delete old linked attachments at the beginning of every month. This may be useful if you have a quota, for example. + Turn this preference on if you would like to delete old linked attachments at the beginning of every month. This may be useful if you have a quota, for example. diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc index bcb25be02..4f75305f2 100644 --- a/imp/templates/dimp/index.inc +++ b/imp/templates/dimp/index.inc @@ -73,7 +73,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false) get('status', 'horde') != 'hidden') && ($registry->get('status', 'horde') != 'notoolbar')): ?> - + diff --git a/imp/templates/dimp/javascript_defs_dimp.php b/imp/templates/dimp/javascript_defs_dimp.php index c699a129c..1477a97b0 100644 --- a/imp/templates/dimp/javascript_defs_dimp.php +++ b/imp/templates/dimp/javascript_defs_dimp.php @@ -45,7 +45,7 @@ $code['conf'] = array_filter(array( 'URI_DIMP' => strval(Horde::url('index-dimp.php')), 'URI_MESSAGE' => strval(Horde::url('message-dimp.php')->setRaw(true)->add('ajaxui', 1)), 'URI_PREFS' => strval(Horde::getServiceLink('prefsapi', 'imp')), - 'URI_PREFS_IMP' => strval(Horde::getServiceLink('options', 'imp')->setRaw(true)->add('ajaxui', 1)), + 'URI_PREFS_IMP' => strval(Horde::getServiceLink('prefs', 'imp')->setRaw(true)->add('ajaxui', 1)), 'URI_SEARCH' => strval(Horde::url('search.php')), 'URI_VIEW' => strval(Horde::url('view.php')), diff --git a/ingo/config/prefs.php.dist b/ingo/config/prefs.php.dist index cbbb7a402..e96446c82 100644 --- a/ingo/config/prefs.php.dist +++ b/ingo/config/prefs.php.dist @@ -10,9 +10,9 @@ if (!isset($_SESSION['ingo']['script_generate']) || $_SESSION['ingo']['script_generate']) { $prefGroups['script'] = array( - 'column' => _("Other Options"), + 'column' => _("Other Preferences"), 'label' => _("Script Updating"), - 'desc' => _("Options about script updating."), + 'desc' => _("Preferences about script updating."), 'members' => array('auto_update')); } diff --git a/jeta/config/prefs.php.dist b/jeta/config/prefs.php.dist index 81cc0fafe..acbd459f2 100644 --- a/jeta/config/prefs.php.dist +++ b/jeta/config/prefs.php.dist @@ -6,16 +6,16 @@ */ $prefGroups['base'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Base Settings"), 'desc' => _("Change your base settings."), 'members' => array('host', 'port', 'sshdriver') ); $prefGroups['sshtools'] = array( - 'column' => _("Applet Options"), - 'label' => _("SSHTools Options"), - 'desc' => _("Options that control the behavior of the SSHTools applet."), + 'column' => _("Applet Preferences"), + 'label' => _("SSHTools Preferences"), + 'desc' => _("Preferences that control the behavior of the SSHTools applet."), 'members' => array('sshtools_auth', 'sshtools_connect_immediately', 'sshtools_connect_dialog', 'sshtools_disable_hostkey_verify', @@ -25,9 +25,9 @@ $prefGroups['sshtools'] = array( ); $prefGroups['jta'] = array( - 'column' => _("Applet Options"), - 'label' => _("JTA Options"), - 'desc' => _("Options that control the behavior of the JTA applet."), + 'column' => _("Applet Preferences"), + 'label' => _("JTA Preferences"), + 'desc' => _("Preferences that control the behavior of the JTA applet."), 'members' => array('jta_detach', 'jta_detach_fullscreen', 'jta_detach_title', 'jta_detach_immediately', 'jta_detach_start', 'jta_detach_stop', diff --git a/koward/www/horde/config/prefs.php.dist b/koward/www/horde/config/prefs.php.dist index 86799f786..5f9980e7d 100644 --- a/koward/www/horde/config/prefs.php.dist +++ b/koward/www/horde/config/prefs.php.dist @@ -10,8 +10,8 @@ * * prefGroups array * ---------------- - * $prefGroups are for display purposes when you press the options button. - * The options choice will appear when you set your preferences driver + * $prefGroups are for display purposes when you press the preferences button. + * The preferences choice will appear when you set your preferences driver * in the horde/config/conf.php file. * * $prefGroups array definition: @@ -94,7 +94,7 @@ try { $prefGroups['forgotpass'] = array( 'column' => _("Your Information"), 'label' => _("Account Password"), - 'desc' => _("Set options to allow you to reset your password if you ever forget it."), + 'desc' => _("Set preferences to allow you to reset your password if you ever forget it."), 'members' => array('security_question', 'security_answer', 'alternate_email') ); } @@ -103,7 +103,7 @@ try { $prefGroups['language'] = array( 'column' => _("Your Information"), 'label' => _("Locale and Time"), - 'desc' => _("Set your preferred language, timezone and date options."), + 'desc' => _("Set your preferred language, timezone and date preferences."), 'members' => array('language', 'timezone', 'twentyFour', 'date_format', 'first_week_day') ); @@ -116,8 +116,8 @@ $prefGroups['categories'] = array( $prefGroups['display'] = array( 'column' => _("Other Information"), - 'label' => _("Display Options"), - 'desc' => _("Set your startup application, color scheme, page refreshing, and other display options."), + 'label' => _("Display Preferences"), + 'desc' => _("Set your startup application, color scheme, page refreshing, and other display preferences."), 'members' => array('initial_application', 'show_last_login', 'theme', 'summary_refresh_time', 'show_sidebar', 'sidebar_width', 'moz_sidebar', 'menu_view', 'menu_refresh_time', @@ -160,7 +160,7 @@ if (!empty($GLOBALS['conf']['imsp']['enabled'])) { // Determine functionality of richtext editor $prefGroups['richtext'] = array( 'column' => _("Other Information"), - 'label' => _("Rich Text Editor Options"), + 'label' => _("Rich Text Editor Preferences"), 'desc' => _("Which plugins to enable for the Rich Text editor."), 'members' => array('editor_plugins'), ); @@ -248,7 +248,7 @@ $_prefs['from_addr'] = array( 'desc' => _("Your From: address:") ); -// Authentication Options +// Authentication Preferences // credentials $_prefs['credentials'] = array( diff --git a/kronolith/config/prefs.php.dist b/kronolith/config/prefs.php.dist index e7797a070..e36015b96 100644 --- a/kronolith/config/prefs.php.dist +++ b/kronolith/config/prefs.php.dist @@ -6,9 +6,9 @@ */ $prefGroups['view'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("User Interface"), - 'desc' => _("Select confirmation options, how to display the different views and choose default view."), + 'desc' => _("Select confirmation preferences, how to display the different views and choose default view."), 'members' => array( 'dynamic_view', 'confirm_delete', 'defaultview', 'max_events', 'time_between_days', 'week_start_monday', 'day_hour_start', @@ -54,12 +54,12 @@ $prefGroups['notification'] = array( $prefGroups['freebusy'] = array( 'column' => _("Calendars"), 'label' => _("Free/Busy Information"), - 'desc' => _("Set your Free/Busy calendars and your own and other users' Free/Busy options."), + 'desc' => _("Set your Free/Busy calendars and your own and other users' Free/Busy preferences."), 'members' => array('fb_url', 'fb_cals', 'freebusy_days'), ); $prefGroups['addressbooks'] = array( - 'column' => _("Other Options"), + 'column' => _("Other Preferences"), 'label' => _("Address Books"), 'desc' => _("Select address book sources for adding and searching for addresses."), 'members' => array('display_contact', 'sourceselect'), @@ -305,7 +305,7 @@ $_prefs['freebusy_days'] = array( // By default, display all contacts in the address book when loading // the contacts screen. If your default address book is large and -// slow to display, you may want to disable and lock this option. +// slow to display, you may want to disable and lock this preference. $_prefs['display_contact'] = array( 'value' => 1, 'shared' => true, diff --git a/kronolith/index.php b/kronolith/index.php index 48287b14a..cf2d52fe4 100644 --- a/kronolith/index.php +++ b/kronolith/index.php @@ -26,7 +26,7 @@ if ($help_link) { } $today = new Horde_Date($_SERVER['REQUEST_TIME']); -/* Suppress menus in options screen and indicate that notifications should use +/* Suppress menus in prefs screen and indicate that notifications should use * the ajax mode. */ $_SESSION['horde_notification']['override'] = array( KRONOLITH_BASE . '/lib/Notification/Listener/AjaxStatus.php', diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index 81b9cb234..956e675d8 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -27,7 +27,7 @@ KronolithCore = { viewLoading: [], fbLoading: 0, redBoxLoading: false, - inOptions: false, + inPrefs: false, date: Date.today(), tasktype: 'incomplete', growls: 0, @@ -289,7 +289,7 @@ KronolithCore = { var locParts = fullloc.split(':'); var loc = locParts.shift(); - if (this.inOptions && loc != 'options') { + if (this.inPrefs && loc != 'prefs') { this.redirect(window.location.href.sub(window.location.hash, '#' + fullloc), true); return; } @@ -530,13 +530,13 @@ KronolithCore = { this.loadNextView(); break; - case 'options': + case 'prefs': var url = Kronolith.conf.prefs_url; if (data) { url += (url.include('?') ? '&' : '?') + $H(data).toQueryString(); } this.addHistory(loc); - this.inOptions = true; + this.inPrefs = true; this.closeView('iframe'); this.iframeContent(url); this.setTitle(Kronolith.text.prefs); @@ -3973,14 +3973,14 @@ KronolithCore = { case 'kronolithEventAlarmPrefs': this.closeRedBox(); this.go(this.lastLocation); - this.go('options', { app: 'kronolith', group: 'notification' }); + this.go('prefs', { app: 'kronolith', group: 'notification' }); e.stop(); break; case 'kronolithTaskAlarmPrefs': this.closeRedBox(); this.go(this.lastLocation); - this.go('options', { app: 'nag', group: 'notification' }); + this.go('prefs', { app: 'nag', group: 'notification' }); e.stop(); break; @@ -4156,8 +4156,8 @@ KronolithCore = { e.stop(); return; - case 'kronolithOptions': - this.go('options'); + case 'kronolithPrefs': + this.go('prefs'); e.stop(); return; diff --git a/kronolith/lib/Application.php b/kronolith/lib/Application.php index f96b76ab5..4ef7dbfd1 100644 --- a/kronolith/lib/Application.php +++ b/kronolith/lib/Application.php @@ -208,7 +208,7 @@ class Kronolith_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 79a069476..ce2919e64 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -140,7 +140,7 @@ class Kronolith 'exception' => (string)Horde_Themes::img('exception-fff.png'), ), 'user' => $GLOBALS['registry']->convertUsername($GLOBALS['registry']->getAuth(), false), - 'prefs_url' => (string)Horde::getServiceLink('options', 'kronolith')->setRaw(true)->add('ajaxui', 1), + 'prefs_url' => (string)Horde::getServiceLink('prefs', 'kronolith')->setRaw(true)->add('ajaxui', 1), 'app_urls' => $app_urls, 'name' => $registry->get('name'), 'has_tasks' => $has_tasks, @@ -302,7 +302,7 @@ class Kronolith 'searching' => sprintf(_("Events matching \"%s\""), '#{term}'), 'allday' => _("All day"), 'more' => _("more..."), - 'prefs' => _("Options"), + 'prefs' => _("Preferences"), 'shared' => _("Shared"), 'no_url' => _("You must specify a URL."), 'no_calendar_title' => _("The calendar title must not be empty."), @@ -2245,7 +2245,7 @@ class Kronolith $ident = $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($event->creator); if (!$ident->getValue('from_addr')) { - $notification->push(sprintf(_("You do not have an email address configured in your Personal Information Options. You must set one %shere%s before event notifications can be sent."), Horde::getServiceLink('options', 'kronolith')->add(array('app' => 'horde', 'group' => 'identities'))->link(), ''), 'horde.error', array('content.raw')); + $notification->push(sprintf(_("You do not have an email address configured in your Personal Information Preferences. You must set one %shere%s before event notifications can be sent."), Horde::getServiceLink('prefs', 'kronolith')->add(array('app' => 'horde', 'group' => 'identities'))->link(), ''), 'horde.error', array('content.raw')); return; } diff --git a/kronolith/locale/ca/help.xml b/kronolith/locale/ca/help.xml index dc712a01b..bdd812a66 100644 --- a/kronolith/locale/ca/help.xml +++ b/kronolith/locale/ca/help.xml @@ -56,7 +56,7 @@ Kronolith és una aplicació d'agenda basada en web. A més de les funcions habi L'element Afegir del menú li permetrà afegir un esdeveniment a l'agenda. - + Menú: Opcions Opcions diff --git a/kronolith/locale/de/help.xml b/kronolith/locale/de/help.xml index e28a696cb..20bbe8f58 100644 --- a/kronolith/locale/de/help.xml +++ b/kronolith/locale/de/help.xml @@ -74,7 +74,7 @@ - + Menü: Einstellungen Über den Einstellungen-Menüeintrag können Sie die Einstellungen diff --git a/kronolith/locale/en/help.xml b/kronolith/locale/en/help.xml index c526d831c..85d6a7b24 100644 --- a/kronolith/locale/en/help.xml +++ b/kronolith/locale/en/help.xml @@ -19,7 +19,7 @@ Menu: Today The Today menu item will display your default view (month, week, - day, etc. as set in Options) for the current date. + day, etc. as set in Preferences) for the current date. @@ -72,13 +72,12 @@ - - Menu: Options + + Menu: Preferences - The Options menu item allows you to set Options (or - preferences) that control the look and feel of Kronolith, Kronolith's - interaction with Horde and other Horde applications, and manage multiple - and shared calendars. + The Preferences menu item allows you to set Preferences that + control the look and feel of Kronolith, Kronolith's interaction with Horde + and other Horde applications, and manage multiple and shared calendars. diff --git a/kronolith/locale/es/help.xml b/kronolith/locale/es/help.xml index 1d6dac53e..a01122e5f 100644 --- a/kronolith/locale/es/help.xml +++ b/kronolith/locale/es/help.xml @@ -56,7 +56,7 @@ El elemento Añadir del menú le permitirá añadir un acontecimiento a la agenda. - + Menú: Opciones Opciones diff --git a/kronolith/locale/eu/help.xml b/kronolith/locale/eu/help.xml index 85f331a61..43116fa3c 100644 --- a/kronolith/locale/eu/help.xml +++ b/kronolith/locale/eu/help.xml @@ -33,7 +33,7 @@ Menua: Gertaera berria Gertaera berria menu-elementuaren bidez, gertaera berri bat jar dezakezu egutegian. - + Menua: Aukerak Aukerak menu-elementuaren bidez, Kronolith-en itxura eta izaera kontrolatzen duten Aukerak (edo hobespenak) ezar ditzakezu. Kronolith-ek interakzioa duenez Horde-rekin eta bestelako Horde aplikazioekin, hainbat egutegi eta egutegi partekatuak erabili ahal izango dituzu. diff --git a/kronolith/locale/fi/help.xml b/kronolith/locale/fi/help.xml index ab2cb7ff0..629d9c718 100644 --- a/kronolith/locale/fi/help.xml +++ b/kronolith/locale/fi/help.xml @@ -63,7 +63,7 @@ uuden tapahtuman. - + Valikko: Asetukset Asetukset valikkotoiminnolla voit muokata ohjelman diff --git a/kronolith/locale/fr/help.xml b/kronolith/locale/fr/help.xml index ef6bbc4aa..8ef1a5d95 100644 --- a/kronolith/locale/fr/help.xml +++ b/kronolith/locale/fr/help.xml @@ -56,7 +56,7 @@ Kronolith est une application internet de calendrier. En plus des fonctions hab Le menu Nouvel événement vous permet de créer un événement à ajouter dans le calendrier. - + Menu: Options Options diff --git a/kronolith/locale/hr/help.xml b/kronolith/locale/hr/help.xml index 7ec975223..024846b4a 100644 --- a/kronolith/locale/hr/help.xml +++ b/kronolith/locale/hr/help.xml @@ -74,7 +74,7 @@ - + Izbornik: Opcije Stavka Opcije u glavnom izborniku aplikacije služi za postavljanje diff --git a/kronolith/locale/hu/help.xml b/kronolith/locale/hu/help.xml index 10fbd0ae9..658e7ee62 100644 --- a/kronolith/locale/hu/help.xml +++ b/kronolith/locale/hu/help.xml @@ -69,7 +69,7 @@ jeleníti meg. a naptárban. - + Menü: Opciók Opciók diff --git a/kronolith/locale/pt_BR/help.xml b/kronolith/locale/pt_BR/help.xml index 639f5ec97..6fc2f8971 100644 --- a/kronolith/locale/pt_BR/help.xml +++ b/kronolith/locale/pt_BR/help.xml @@ -56,7 +56,7 @@ Kronolith é um calendário de interface Web. Em adição as funções necessár O item de menu Novo Evento permite você criar um novo evento para ser adicionado ao calendário. - + Menu: Opções Opções diff --git a/kronolith/locale/tr/help.xml b/kronolith/locale/tr/help.xml index 597b09d6f..98adb8f48 100644 --- a/kronolith/locale/tr/help.xml +++ b/kronolith/locale/tr/help.xml @@ -49,7 +49,7 @@ Ay sekmesi,şu anki geçerli seçilmiş günden başlayarak tüm ay'ı görünt Yeni olay menüsü seçenekleri takvimde yeni olaylar oluşturmamıza izin verir. - + Menu:seçenekler Seçenekler menüsü seçenekleri çoklu ve paylaşılan takvimleri yönetir ve Horde ve diğer Horde uygulamalarıyla etkileşim içindedir ve bize Kronolithin bakışını ve yorumlayışını kontrol etmemize izin verir. diff --git a/luxor/docs/CHANGES b/luxor/docs/CHANGES index 3b7be9ae1..b69c2379f 100644 --- a/luxor/docs/CHANGES +++ b/luxor/docs/CHANGES @@ -18,7 +18,7 @@ v0.1 [jan] Add German translation. [cjh] Add symbol search functionality. [cjh] Fix spacing of source code. -[cjh] Add options to filter out certain directories and filenames. +[cjh] Add settings to filter out certain directories and filenames. [jan] Add Romanian translation (Eugen Hoanca ). [jan] Implement indexing and referencing. [jan] Initial port from LXR. diff --git a/mnemo/config/prefs.php.dist b/mnemo/config/prefs.php.dist index ba11e8d25..7c99e9b53 100644 --- a/mnemo/config/prefs.php.dist +++ b/mnemo/config/prefs.php.dist @@ -6,21 +6,21 @@ */ $prefGroups['display'] = array( - 'column' => _("General Options"), - 'label' => _("Display Options"), - 'desc' => _("Change your note sorting and display options."), + 'column' => _("General Preferences"), + 'label' => _("Display Preferences"), + 'desc' => _("Change your note sorting and display preferences."), 'members' => array('show_notepad', 'sortby', 'sortdir') ); $prefGroups['share'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Default Notepad"), 'desc' => _("Choose your default Notepad."), 'members' => array('default_notepad') ); $prefGroups['deletion'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Delete Confirmation"), 'desc' => _("Delete button behaviour"), 'members' => array('delete_opt') diff --git a/nag/config/prefs.php.dist b/nag/config/prefs.php.dist index 037e5b9b1..bc6148724 100644 --- a/nag/config/prefs.php.dist +++ b/nag/config/prefs.php.dist @@ -6,42 +6,42 @@ */ $prefGroups['display'] = array( - 'column' => _("General Options"), - 'label' => _("Display Options"), - 'desc' => _("Change your task sorting and display options."), + 'column' => _("General Preferences"), + 'label' => _("Display Preferences"), + 'desc' => _("Change your task sorting and display preferences."), 'members' => array('tasklist_columns', 'sortby', 'altsortby', 'sortdir'), ); $prefGroups['deletion'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Delete Confirmation"), 'desc' => _("Delete button behaviour"), 'members' => array('delete_opt'), ); $prefGroups['tasks'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Task Defaults"), 'desc' => _("Defaults for new tasks"), 'members' => array('default_due', 'default_due_days', 'default_due_time'), ); $prefGroups['share'] = array( - 'column' => _("Task List and Share Options"), + 'column' => _("Task List and Share Preferences"), 'label' => _("Default Task List"), 'desc' => _("Choose your default task list."), 'members' => array('default_tasklist'), ); $prefGroups['notification'] = array( - 'column' => _("Task List and Share Options"), + 'column' => _("Task List and Share Preferences"), 'label' => _("Notifications"), 'desc' => _("Choose if you want to be notified of task changes and task alarms."), 'members' => array('task_notification', 'task_notification_exclude_self', 'task_alarms_select'), ); $prefGroups['external'] = array( - 'column' => _("Task List and Share Options"), + 'column' => _("Task List and Share Preferences"), 'label' => _("External Data"), 'desc' => _("Show data from other applications or sources."), 'members' => array('show_external'), diff --git a/nag/lib/Application.php b/nag/lib/Application.php index b10c242b2..c8bf53dd0 100644 --- a/nag/lib/Application.php +++ b/nag/lib/Application.php @@ -177,7 +177,7 @@ class Nag_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/nag/templates/list/task_headers.inc b/nag/templates/list/task_headers.inc index d3bcd131b..ec4e42a62 100644 --- a/nag/templates/list/task_headers.inc +++ b/nag/templates/list/task_headers.inc @@ -70,7 +70,7 @@ function doPrefsUpdate(column, sortDown) if ($GLOBALS['registry']->getAuth() && (!$GLOBALS['prefs']->isLocked('categories') || !$GLOBALS['prefs']->isLocked('category_colors'))) { - $categoryUrl = Horde_Util::addParameter(Horde::getServiceLink('options', 'horde'), array('group' => 'categories')); + $categoryUrl = Horde_Util::addParameter(Horde::getServiceLink('prefs', 'horde'), array('group' => 'categories')); echo ' ' . Horde::link($categoryUrl, _("Edit categories and colors"), '', '_blank', 'Horde.popup({url:this.href}); return false;') . Horde::img('colorpicker.png', _("Edit categories and colors")) . ''; } ?> diff --git a/news/add.php b/news/add.php index c477d8bc9..1fa187e51 100644 --- a/news/add.php +++ b/news/add.php @@ -216,7 +216,7 @@ if ($conf['attributes']['attachments']) { if ($registry->isAdmin(array('permission' => 'news:admin'))) { $form->setSection('admin', _("Admin"), '', true); - $form->addVariable(_("News administrator options"), 'content', 'header', false); + $form->addVariable(_("News administrator settings"), 'content', 'header', false); if ($conf['attributes']['sponsored']) { $form->addVariable(_("Sponsored"), 'sponsored', 'boolean', false); diff --git a/news/admin/sources/index.php b/news/admin/sources/index.php index f6be8513c..11ff22395 100644 --- a/news/admin/sources/index.php +++ b/news/admin/sources/index.php @@ -1,6 +1,6 @@ * diff --git a/operator/config/prefs.php.dist b/operator/config/prefs.php.dist index 18bd1682e..f34e5e0d5 100644 --- a/operator/config/prefs.php.dist +++ b/operator/config/prefs.php.dist @@ -6,7 +6,7 @@ */ $prefGroups['display'] = array( - 'column' => _("Options"), + 'column' => _("General Preferences"), 'label' => _("Display Preferences"), 'desc' => _("Set default display parameters."), 'members' => array('rowsperpage', 'resultlimit', 'columns') diff --git a/skoli/config/prefs.php.dist b/skoli/config/prefs.php.dist index 8d0621fa2..bf88f6376 100644 --- a/skoli/config/prefs.php.dist +++ b/skoli/config/prefs.php.dist @@ -4,21 +4,21 @@ */ $prefGroups['display'] = array( - 'column' => _("General Options"), - 'label' => _("Display Options"), - 'desc' => _("Change your sorting and display options."), + 'column' => _("General Preferences"), + 'label' => _("Display Preferences"), + 'desc' => _("Change your sorting and display preferences."), 'members' => array('initial_page', 'class_columns', 'sortby_class', 'sortdir_class', 'student_columns', 'sortby_student', 'sortdir_student', 'entry_details_wrap'), ); $prefGroups['contactlists'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Contact Lists"), 'desc' => _("Change your settings for automatically create contact lists."), 'members' => $GLOBALS['conf']['addresses']['contact_list'] == 'user' ? array('contact_list', 'contact_list_name') : array(), ); $prefGroups['marks'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Marks"), 'desc' => _("Define a format for marks"), 'members' => array('marks_roundby') diff --git a/skoli/templates/list/headers.inc b/skoli/templates/list/headers.inc index 3aeb7033e..f2ce0a8e7 100644 --- a/skoli/templates/list/headers.inc +++ b/skoli/templates/list/headers.inc @@ -85,7 +85,7 @@ function doPrefsUpdate(column, sortDown) getAuth() && (!$GLOBALS['prefs']->isLocked('categories') || !$GLOBALS['prefs']->isLocked('category_colors'))) { - $categoryUrl = Horde_Util::addParameter(Horde::getServiceLink('options', 'horde'), array('group' => 'categories')); + $categoryUrl = Horde_Util::addParameter(Horde::getServiceLink('prefs', 'horde'), array('group' => 'categories')); echo ' ' . Horde::link($categoryUrl, _("Edit categories and colors"), '', '_blank', Horde::popupJs($categoryUrl, array('urlencode' => true)) . 'return false;') . Horde::img('colorpicker.png', _("Edit categories and colors")) . ''; } ?> diff --git a/trean/config/prefs.php.dist b/trean/config/prefs.php.dist index 686e493c0..9ad50eb75 100644 --- a/trean/config/prefs.php.dist +++ b/trean/config/prefs.php.dist @@ -6,8 +6,8 @@ */ $prefGroups['display'] = array( - 'column' => _("Other Options"), - 'label' => _("Display Options"), + 'column' => _("Other Preferences"), + 'label' => _("Display Preferences"), 'desc' => _("Set how to display bookmark listings and how to open links."), 'members' => array('sortby', 'sortdir', 'show_folder_actions', 'show_in_new_window', 'expand_tree') ); diff --git a/turba/config/prefs.php.dist b/turba/config/prefs.php.dist index aa0e11131..bdf5d7326 100644 --- a/turba/config/prefs.php.dist +++ b/turba/config/prefs.php.dist @@ -6,28 +6,28 @@ */ $prefGroups['addressbooks'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Address Books"), 'desc' => _("Choose which address books to use."), 'members' => array('default_dir', 'addressbookselect', 'sync_books'), ); $prefGroups['columns'] = array( - 'column' => _("Display Options"), - 'label' => _("Column Options"), + 'column' => _("Display Preferences"), + 'label' => _("Column Preferences"), 'desc' => _("Select which fields to display in the address lists."), 'members' => array('columnselect'), ); $prefGroups['display'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Display"), - 'desc' => _("Select view to display by default and paging options."), + 'desc' => _("Select view to display by default and paging preferences."), 'members' => array('initial_page', 'maxpage', 'perpage'), ); $prefGroups['format'] = array( - 'column' => _("Display Options"), + 'column' => _("Display Preferences"), 'label' => _("Name Format"), 'desc' => _("Select which format to display names."), 'members' => array('name_format', 'name_sort'), diff --git a/turba/lib/Application.php b/turba/lib/Application.php index 0b1201b53..1b4d9ed83 100644 --- a/turba/lib/Application.php +++ b/turba/lib/Application.php @@ -229,7 +229,7 @@ class Turba_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) { diff --git a/whups/config/prefs.php.dist b/whups/config/prefs.php.dist index cf057f1a5..99d9eebe0 100644 --- a/whups/config/prefs.php.dist +++ b/whups/config/prefs.php.dist @@ -6,9 +6,9 @@ */ $prefGroups['display'] = array( - 'column' => _("General Options"), - 'label' => _("Display Options"), - 'desc' => _("Change display options such as how search results are sorted."), + 'column' => _("General Preferences"), + 'label' => _("Display Preferences"), + 'desc' => _("Change display preferences such as how search results are sorted."), 'members' => array( 'sortby', 'sortdir', 'comment_sort_dir', 'whups_default_view', 'summary_show_requested', 'summary_show_ticket_numbers', @@ -17,13 +17,13 @@ $prefGroups['display'] = array( ); $prefGroups['notification'] = array( - 'column' => _("General Options"), - 'label' => _("Notification Options"), - 'desc' => _("Change options for email notifications of ticket activity."), + 'column' => _("General Preferences"), + 'label' => _("Notification Preferences"), + 'desc' => _("Change preferences for email notifications of ticket activity."), 'members' => array('email_others_only', 'email_comments_only')); $prefGroups['addressbooks'] = array( - 'column' => _("General Options"), + 'column' => _("General Preferences"), 'label' => _("Address Books"), 'desc' => _("Select address book sources for adding and searching for addresses."), 'members' => array('sourceselect'), diff --git a/whups/lib/Application.php b/whups/lib/Application.php index d1a9bdff5..b71ea34e8 100644 --- a/whups/lib/Application.php +++ b/whups/lib/Application.php @@ -132,7 +132,7 @@ class Whups_Application extends Horde_Registry_Application * @param Horde_Core_Prefs_Ui $ui The UI object. * @param string $item The preference name. * - * @return string The HTML code to display on the options page. + * @return string The HTML code to display on the prefs page. */ public function prefsSpecial($ui, $item) {