From: Jan Schneider Date: Wed, 18 Aug 2010 14:03:14 +0000 (+0200) Subject: Fix spelling, tweak wording, improve translatability. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=80edd61937efed7d6b77b2116aa1bbae9d15772d;p=horde.git Fix spelling, tweak wording, improve translatability. --- diff --git a/agora/lib/Block/forums.php b/agora/lib/Block/forums.php index 3fee37d53..a6480d227 100644 --- a/agora/lib/Block/forums.php +++ b/agora/lib/Block/forums.php @@ -24,7 +24,7 @@ class Horde_Block_agora_forums extends Horde_Block protected function _title() { - return Horde::applicationUrl('forums.php', true)->link() . _("Formus") . ''; + return Horde::applicationUrl('forums.php', true)->link() . _("Forums") . ''; } /** diff --git a/ansel/lib/Config.php b/ansel/lib/Config.php index efc41aa1f..cfecdb9ad 100644 --- a/ansel/lib/Config.php +++ b/ansel/lib/Config.php @@ -24,7 +24,7 @@ class Ansel_Config public function get($config) { if (!isset($this->_config[$config])) { - throw InvalidArgumentException($config . _(" not found")); + throw InvalidArgumentException($config . ' not found'); } return $this->_config[$config]; } diff --git a/chora/annotate.php b/chora/annotate.php index f07bff4e3..563673c2e 100644 --- a/chora/annotate.php +++ b/chora/annotate.php @@ -22,7 +22,7 @@ try { /* Retrieve the desired revision from the GET variable. */ $rev = Horde_Util::getFormData('rev'); if (!$rev || !$VC->isValidRevision($rev)) { - Chora::fatal(sprintf(_("Revision %s not found"), $rev ? $rev : _("NONE")), '404 Not Found'); + Chora::fatal(sprintf(_("Revision %s not found"), $rev), '404 Not Found'); } switch (Horde_Util::getFormData('actionID')) { diff --git a/framework/Net_SMS/SMS/generic_smtp.php b/framework/Net_SMS/SMS/generic_smtp.php index 255cce210..06ba7b2a6 100644 --- a/framework/Net_SMS/SMS/generic_smtp.php +++ b/framework/Net_SMS/SMS/generic_smtp.php @@ -99,7 +99,7 @@ class Net_SMS_generic_smtp extends Net_SMS { { return array( 'carrier' => array('label' => _("Carrier"), 'type' => 'text'), - 'mailBackend' => array('label' => _("Horde_Mail:: backend"), 'type' => 'text') + 'mailBackend' => array('label' => _("Mail backend"), 'type' => 'text') ); } diff --git a/framework/Rpc/lib/Horde/Rpc/Phpgw.php b/framework/Rpc/lib/Horde/Rpc/Phpgw.php index 61946471f..c0c85360b 100644 --- a/framework/Rpc/lib/Horde/Rpc/Phpgw.php +++ b/framework/Rpc/lib/Horde/Rpc/Phpgw.php @@ -157,7 +157,7 @@ class Horde_Rpc_Phpgw extends Horde_Rpc } elseif ($http->getResponseCode() != 200) { throw new Horde_Rpc_Exception(_("Request couldn't be answered. Returned errorcode: ") . $http->getResponseCode()); } elseif (strpos($http->getResponseBody(), 'getResponseBody()); + throw new Horde_Rpc_Exception(_("No valid XML data returned:") . "\n" . $http->getResponseBody()); } else { $response = @xmlrpc_decode(substr($http->getResponseBody(), strpos($http->getResponseBody(), 'vars->wipeid) { $stateMachine->loadDeviceInfo($ui->vars->wipeid, $GLOBALS['registry']->getAuth()); $stateMachine->setDeviceRWStatus($ui->vars->wipeid, Horde_ActiveSync::RWSTATUS_PENDING); - $GLOBALS['notification']->push(sprintf(_("A Remote Wipe for device id %s has been initiated. The device will be wiped during the next SYNC request."), $ui->vars->wipe)); + $GLOBALS['notification']->push(sprintf(_("A remote wipe for device id %s has been initiated. The device will be wiped during the next synchronisation."), $ui->vars->wipe)); } elseif ($ui->vars->cancelwipe) { $stateMachine->loadDeviceInfo($ui->vars->cancelwipe, $GLOBALS['registry']->getAuth()); $stateMachine->setDeviceRWStatus($ui->vars->cancelwipe, Horde_ActiveSync::RWSTATUS_OK); diff --git a/horde/templates/prefs/facebook.html b/horde/templates/prefs/facebook.html index 408d2681e..99efa1004 100644 --- a/horde/templates/prefs/facebook.html +++ b/horde/templates/prefs/facebook.html @@ -12,7 +12,7 @@
- can interact with your Facebook account, but you must login to Facebook manually each time. + can interact with your Facebook account, but you must login to Facebook manually each time.
Authorize an infinite session:Facebook
 @@ -23,7 +23,7 @@
- cannot set your status messages or publish other content to Facebook. + cannot set your status messages or publish other content to Facebook.
Authorize Publish:Facebook
 @@ -35,7 +35,7 @@
- cannot read your stream messages. + cannot read your stream messages.
Authorize Read:Facebook
 @@ -43,7 +43,7 @@
Could not find authorization for to interact with your Facebook account.

- Login to Facebook and authorize - Facebook + Login to Facebook and authorize + Facebook - \ No newline at end of file + diff --git a/horde/templates/prefs/twitter.html b/horde/templates/prefs/twitter.html index fc8049664..47f51be68 100644 --- a/horde/templates/prefs/twitter.html +++ b/horde/templates/prefs/twitter.html @@ -6,18 +6,18 @@
 
- can interact with your Twitter account. + can interact with your Twitter account.
- Could not find authorization for to interact with your Twitter account + Could not find authorization for to interact with your Twitter account
- Login to Twitter and authorize the application: + Login to Twitter and authorize the application: - \ No newline at end of file + diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist index e602ca4c7..41b4d74d6 100644 --- a/imp/config/prefs.php.dist +++ b/imp/config/prefs.php.dist @@ -888,7 +888,7 @@ $_prefs['delete_spam_after_report'] = array( 1 => _("Delete message"), 2 => _("Move to spam folder") ), - 'desc' => _("What should we do with spam messages after they have been reported as spam?"), + 'desc' => _("What should we do with messages after they have been reported as spam?"), 'help' => 'prefs-delete_spam_after_report' ); @@ -900,7 +900,7 @@ $_prefs['move_ham_after_report'] = array( 0 => _("Nothing"), 1 => _("Move to Inbox") ), - 'desc' => _("What should we do with spam messages after they have been reported as innocent?"), + 'desc' => _("What should we do with messages after they have been reported as innocent?"), 'help' => 'prefs-move_ham_after_report' ); diff --git a/imp/lib/Imap.php b/imp/lib/Imap.php index 4dcd9c496..b9f34ed57 100644 --- a/imp/lib/Imap.php +++ b/imp/lib/Imap.php @@ -415,7 +415,7 @@ class IMP_Imap public function __call($method, $params) { if (!$this->ob || !method_exists($this->ob, $method)) { - throw new IMP_Exception(sprintf(_("%s: Invalid method call '%s'."), __CLASS__, $method)); + throw new IMP_Exception(sprintf('%s: Invalid method call "%s".', __CLASS__, $method)); } return call_user_func_array(array($this->ob, $method), $params); diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php index de1312219..bbea9f4e0 100644 --- a/imp/lib/Prefs/Ui.php +++ b/imp/lib/Prefs/Ui.php @@ -1132,7 +1132,7 @@ class IMP_Prefs_Ui } } elseif (isset($ui->vars->unset_pgp_passphrase)) { $GLOBALS['injector']->getInstance('IMP_Crypt_Pgp')->unsetPassphrase('personal'); - $GLOBALS['notification']->push(_("PHP passphrase successfully unloaded."), 'horde.success'); + $GLOBALS['notification']->push(_("PGP passphrase successfully unloaded."), 'horde.success'); } } diff --git a/imp/templates/imp/search/search.html b/imp/templates/imp/search/search.html index 409b65225..51800f107 100644 --- a/imp/templates/imp/search/search.html +++ b/imp/templates/imp/search/search.html @@ -90,7 +90,7 @@ - + diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index a411c5d98..a5edc38de 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -290,8 +290,8 @@ class Kronolith /* Gettext strings used in core javascript files. */ $code['text'] = array( 'ajax_error' => _("Error when communicating with the server."), - 'ajax_timeout' => _("There has been no contact with the calendar server for several minutes. The server may be temporarily unavailable or network problems may be interrupting your session. You will not see any updates until the connection is restored."), - 'ajax_recover' => _("The connection to the calendar server has been restored."), + 'ajax_timeout' => _("There has been no contact with the server for several minutes. The server may be temporarily unavailable or network problems may be interrupting your session. You will not see any updates until the connection is restored."), + 'ajax_recover' => _("The connection to the server has been restored."), 'alarm' => _("Alarm:"), 'snooze' => sprintf(_("You can snooze it for %s or %s dismiss %s it entirely"), '#{time}', '#{dismiss_start}', '#{dismiss_end}'), 'noalerts' => _("No Notifications"), diff --git a/kronolith/templates/chunks/permissions.inc b/kronolith/templates/chunks/permissions.inc index 5483a1006..9f8a42178 100644 --- a/kronolith/templates/chunks/permissions.inc +++ b/kronolith/templates/chunks/permissions.inc @@ -10,7 +10,7 @@ if (count($groups) > 1) {
', '', '', '') ?>
- ', '') ?>
+
diff --git a/nag/quick.php b/nag/quick.php index 08af7ac3a..0118416fe 100644 --- a/nag/quick.php +++ b/nag/quick.php @@ -8,12 +8,6 @@ if ($quickText = Horde_Util::getPost('quickText')) { if (!$result) { throw new Nag_Exception($result); } - - if (count($result) == 1) { - $notification->push(_("Added one task"), 'horde.success'); - } else { - $notification->push(sprintf(_("Added %s tasks"), count($result)), 'horde.success'); - } - + $notification->push(sprintf(ngettext("Added %d task", "Added %d tasks", count($result)), count($result)), 'horde.success'); Horde::applicationUrl('list.php', true)->redirect(); } diff --git a/turba/addressbooks/delete.php b/turba/addressbooks/delete.php index a53f5d0b2..ab5599153 100644 --- a/turba/addressbooks/delete.php +++ b/turba/addressbooks/delete.php @@ -22,7 +22,7 @@ if (!$GLOBALS['registry']->getAuth() || empty($_SESSION['turba']['has_share'])) $vars = Horde_Variables::getDefaultVariables(); $addressbook_id = $vars->get('a'); if ($addressbook_id == $GLOBALS['registry']->getAuth()) { - $notification->push(_("This addressbook cannot be deleted"), 'horde.warning'); + $notification->push(_("This address book cannot be deleted"), 'horde.warning'); Horde::applicationUrl('addressbooks/', true)->redirect(); } diff --git a/turba/lib/Application.php b/turba/lib/Application.php index 297fcdf52..e4305a890 100644 --- a/turba/lib/Application.php +++ b/turba/lib/Application.php @@ -245,7 +245,7 @@ class Turba_Application extends Horde_Registry_Application return Horde_Core_Prefs_Ui_Widgets::source(array( 'mainlabel' => _("Choose which address books to display, and in what order:"), - 'selectlabel' => _("These addressbooks will display in this order:"), + 'selectlabel' => _("These address books will display in this order:"), 'sources' => array(array( 'selected' => $selected, 'unselected' => $unselected diff --git a/vilma/users/delete.php b/vilma/users/delete.php index 46d1e114b..d00a0af5d 100644 --- a/vilma/users/delete.php +++ b/vilma/users/delete.php @@ -79,7 +79,7 @@ $domain = $vilma->driver->getDomainByName($domain); $vars->set('domain', $domain); $vars->set('mode', 'edit'); -$form = new Horde_Form($vars, _("Delete " . $type)); +$form = new Horde_Form($vars, sprintf(_("Delete %s"), $type)); /* Set up the form. */ $form->setButtons(array(_("Delete"), _("Do not delete"))); //$form->addHidden($user_id, 'user_id', 'text', false); diff --git a/wicked/lib/Page/SyncPages.php b/wicked/lib/Page/SyncPages.php index 01b56c24c..9db450b8d 100644 --- a/wicked/lib/Page/SyncPages.php +++ b/wicked/lib/Page/SyncPages.php @@ -383,7 +383,7 @@ class SyncPages extends Page { if (trim($text) == trim($content)) { return PEAR::raiseError(_("No changes made")); } - $result = $page->updateText($text, _("Downloded from remote server"), true); + $result = $page->updateText($text, _("Downloaded from remote server"), true); if (is_a($result, 'PEAR_Error')) { return $result; }