Fix spelling, tweak wording, improve translatability.

diff --git a/agora/lib/Block/forums.php b/agora/lib/Block/forums.php
index 3fee37d..a6480d2 100644 (file)
--- 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") . '</a>';
+        return Horde::applicationUrl('forums.php', true)->link() . _("Forums") . '</a>';
     }
 
     /**

diff --git a/ansel/lib/Config.php b/ansel/lib/Config.php
index efc41aa..cfecdb9 100644 (file)
--- 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 f07bff4..563673c 100644 (file)
--- 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 255cce2..06ba7b2 100644 (file)
--- 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 6194647..c0c8536 100644 (file)
--- 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(), '<?xml') === false) {
-            throw new Horde_Rpc_Exception(_("No valid XML data returned:\n") . $http->getResponseBody());
+            throw new Horde_Rpc_Exception(_("No valid XML data returned:") . "\n" . $http->getResponseBody());
         } else {
             $response = @xmlrpc_decode(substr($http->getResponseBody(), strpos($http->getResponseBody(), '<?xml')));
             if (is_array($response) && isset($response['faultString'])) {

diff --git a/horde/lib/Prefs/Ui.php b/horde/lib/Prefs/Ui.php
index 25b43d2..2c30db6 100644 (file)
--- a/horde/lib/Prefs/Ui.php
+++ b/horde/lib/Prefs/Ui.php
@@ -777,7 +777,7 @@ class Horde_Prefs_Ui
         if ($ui->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 408d268..99efa10 100644 (file)
--- a/horde/templates/prefs/facebook.html
+++ b/horde/templates/prefs/facebook.html
@@ -12,7 +12,7 @@
      </div>
     <else:have_offline>
      <div class="fbbluebox">
-      <tag:app_name /><gettext> can interact with your Facebook account, but you must login to Facebook manually each time.</gettext>
+      <gettext><tag:app_name /> can interact with your Facebook account, but you must login to Facebook manually each time.</gettext>
       <div class="fbaction"><gettext>Authorize an infinite session:</gettext><a class="fbbutton" href="<tag:authUrl />">Facebook</a></div>
      </div>
     </else:have_offline>
@@ -23,7 +23,7 @@
      </div>
     <else:have_publish>
      <div class="fbbluebox">
-      <tag:app_name /> <gettext>cannot set your status messages or publish other content to Facebook.</gettext>
+      <gettext><tag:app_name /> cannot set your status messages or publish other content to Facebook.</gettext>
       <div class="fbaction"><getttext>Authorize Publish:</gettext><a class="fbbutton" href="<tag:publish_url />">Facebook</a></div>
      </div>
     </else:have_publish>
@@ -35,7 +35,7 @@
      </div>
     <else:have_read>
      <div class="fbbluebox">
-      <tag:app_name /> <gettext>cannot read your stream messages.</gettext>
+      <gettext><tag:app_name /> cannot read your stream messages.</gettext>
       <div class="fbaction"><gettext>Authorize Read:</gettext><a class="fbbutton" href="<tag:read_url />">Facebook</a></div>
      </div>
     </else:have_read>
@@ -43,7 +43,7 @@
 <else:have_session>
     <div class="notice">Could not find authorization for <tag:user_name /> to interact with your Facebook account.</div>
     <br />
-    <gettext>Login to Facebook and authorize</gettext> <tag:application_name />
-    <a href="<tag:authUrl />" class="fbbutton"><gettext>Facebook</gettext></a>
+    <gettext>Login to Facebook and authorize <tag:application_name /></gettext>
+    <a href="<tag:authUrl />" class="fbbutton">Facebook</a>
 </else:have_session>
-</if:have_session>
\ No newline at end of file
+</if:have_session>

diff --git a/horde/templates/prefs/twitter.html b/horde/templates/prefs/twitter.html
index fc80496..47f51be 100644 (file)
--- a/horde/templates/prefs/twitter.html
+++ b/horde/templates/prefs/twitter.html
@@ -6,18 +6,18 @@
     </div>
     <div class="clear">&nbsp;</div>
     <div>
-      <tag:appname /> <gettext>can interact with your Twitter account</gettext>.
+      <gettext><tag:appname /> can interact with your Twitter account</gettext>.
       <div><input type="submit" class="button" value="<gettext>Disable</gettext>" onclick="document.prefs.twitteractionID.value='revokeInfinite'; return true" /></div>
     </div>
 <else:haveSession>
     <div class="notice">
-      <gettext>Could not find authorization for</gettext> <tag:appname /> <gettext>to interact with your Twitter account</gettext>
+      <gettext>Could not find authorization for <tag:appname /> to interact with your Twitter account</gettext>
     </div>
     <script type="text/javascript">
       function openTwitterWindow() {
           <tag:popupjs />
       }
     </script>
-    <gettext>Login to Twitter and authorize the</gettext> <tag:appname /> <gettext>application</gettext>: <tag:link />
+    <gettext>Login to Twitter and authorize the <tag:appname /> application</gettext>: <tag:link />
 </else:haveSession>
-</if:haveSession>
\ No newline at end of file
+</if:haveSession>

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index e602ca4..41b4d74 100644 (file)
--- 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 4dcd9c4..b9f34ed 100644 (file)
--- 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 de13122..bbea9f4 100644 (file)
--- 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 409b652..51800f1 100644 (file)
--- a/imp/templates/imp/search/search.html
+++ b/imp/templates/imp/search/search.html
@@ -90,7 +90,7 @@
   <input type="button" id="search_submit" class="button" value="<if:edit_query_vfolder><gettext>Save</gettext><else:edit_query_vfolder><gettext>Submit</gettext></else:edit_query_vfolder></if:edit_query_vfolder>" />
   <input type="button" id="search_reset" class="button" value="<gettext>Reset</gettext>" />
 <if:return_mailbox_text>
-  <input type="button" id="search_dimp_return" class="button" value="<gettext>Return to</gettext> <tag:return_mailbox_text />" />
+  <input type="button" id="search_dimp_return" class="button" value="<gettext>Return to <tag:return_mailbox_text /></gettext>" />
 </if:return_mailbox_text>
  </div>
 </form>

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index a411c5d..a5edc38 100644 (file)
--- 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 5483a10..9f8a421 100644 (file)
--- a/kronolith/templates/chunks/permissions.inc
+++ b/kronolith/templates/chunks/permissions.inc
@@ -10,7 +10,7 @@ if (count($groups) > 1) {
     <div class="kronolithDialogInfo"><?php printf(_("%sStandard sharing.%s You can also set %sadvanced sharing%s options."), '<strong>', '</strong>', '<strong><a href="#" id="kronolithC' .  $type . 'PMore">', '</a></strong>') ?></div>
     <div>
       <input type="radio" id="kronolithC<?php echo $type ?>PNone" name="basic_perms" checked="checked" />
-      <?php printf($type == 'internal' ? _("%sDon't share this calendar%s") : _("%sDon't share this task list%s"), '<label for="kronolithC' . $type . 'PNone">', '</label>') ?><br />
+      <label for="kronolithC<?php echo $type ?>PNone"><?php echo $type == 'internal' ? _("Don't share this calendar") : _("Don't share this task list") ?></label><br />
     </div>
     <div>
       <input type="radio" id="kronolithC<?php echo $type ?>PAll" name="basic_perms" />

diff --git a/nag/quick.php b/nag/quick.php
index 08af7ac..0118416 100644 (file)
--- 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 a53f5d0..ab55991 100644 (file)
--- 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 297fcdf..e4305a8 100644 (file)
--- 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 46d1e11..d00a0af 100644 (file)
--- 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 01b56c2..9db450b 100644 (file)
--- 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;
             }