Update translator documentation.

Break lines in README at or before 80 characters.
i18n fixes.
Whitespace updates.

diff --git a/plugins/Mollom/MollomPlugin.php b/plugins/Mollom/MollomPlugin.php
index d918a6f6b31bcb8c79ce76e725c929085c852ec3..382ce2ee5bb782b2aa327004cd98952a618f0f85 100644 (file)
--- a/plugins/Mollom/MollomPlugin.php
+++ b/plugins/Mollom/MollomPlugin.php
@@ -83,7 +83,8 @@ class MollomPlugin extends Plugin
         );
         $response = $this->mollom('mollom.checkContent', $data);
         if ($response['spam'] == MOLLOM_ANALYSIS_SPAM) {
-          throw new ClientException(_m("Spam Detected."), 400);
+          // TRANS: Client exception thrown when notice content triggers the spam filter.
+          throw new ClientException(_m('Spam Detected.'), 400);
         }
         if ($response['spam'] == MOLLOM_ANALYSIS_UNSURE) {
           //if unsure, let through

diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php
index 187486eedcb687aa4e75a429ef09446a8864d9a1..ccc190334d97f10c98f6a6aaba241b18f0bb0628 100644 (file)
--- a/plugins/Msn/MsnPlugin.php
+++ b/plugins/Msn/MsnPlugin.php
@@ -46,7 +46,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/ext
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0\r
  * @link      http://status.net/\r
  */\r
-\r
 class MsnPlugin extends ImPlugin {\r
     public $user = null;\r
     public $password = null;\r
@@ -59,6 +58,7 @@ class MsnPlugin extends ImPlugin {
      * @return string Name of service\r
      */\r
     public function getDisplayName() {\r
+        // TRANS: Display name of the MSN instant messaging service.\r
         return _m('MSN');\r
     }\r
 \r
@@ -184,13 +184,16 @@ class MsnPlugin extends ImPlugin {
     */\r
     public function initialize() {\r
         if (!isset($this->user)) {\r
-            throw new Exception("Must specify a user");\r
+            // TRANS: Exception thrown when configuration for the MSN plugin is incomplete.\r
+            throw new Exception(_m('Must specify a user.'));\r
         }\r
         if (!isset($this->password)) {\r
-            throw new Exception("Must specify a password");\r
+            // TRANS: Exception thrown when configuration for the MSN plugin is incomplete.\r
+            throw new Exception(_m('Must specify a password.'));\r
         }\r
         if (!isset($this->nickname)) {\r
-            throw new Exception("Must specify a nickname");\r
+            // TRANS: Exception thrown when configuration for the MSN plugin is incomplete.\r
+            throw new Exception(_m('Must specify a nickname.'));\r
         }\r
 \r
         return true;\r
@@ -209,6 +212,7 @@ class MsnPlugin extends ImPlugin {
             'author' => 'Luke Fitzgerald',\r
             'homepage' => 'http://status.net/wiki/Plugin:MSN',\r
             'rawdescription' =>\r
+            // TRANS: Plugin description.\r
             _m('The MSN plugin allows users to send and receive notices over the MSN network.')\r
         );\r
         return true;\r

diff --git a/plugins/Msn/README b/plugins/Msn/README
index fa7bc2fb22ecac84bb9790626dc8ecdcbe2e124c..a56bacd64c23a21df28ce77e4df7bb60f606e8e6 100644 (file)
--- a/plugins/Msn/README
+++ b/plugins/Msn/README
@@ -9,9 +9,10 @@ add "addPlugin('msn',
     array('setting'=>'value', 'setting2'=>'value2', ...);"
 to the bottom of your config.php
 
-scripts/imdaemon.php included with StatusNet must be running. It will be started by
-the plugin along with their other daemons when you run scripts/startdaemons.sh.
-See the StatusNet README for more about queuing and daemons.
+scripts/imdaemon.php included with StatusNet must be running. It will be started
+by the plugin along with their other daemons when you run
+scripts/startdaemons.sh. See the StatusNet README for more about queuing and
+daemons.
 
 Settings
 ========
@@ -29,4 +30,3 @@ addPlugin('msn', array(
     'password' => '...',
     'nickname' => '...'
 ));
-

diff --git a/plugins/Msn/msnmanager.php b/plugins/Msn/msnmanager.php
index a8996ecafadf5eb80d8b45ccfabba0238d4fca6e..82d40d69c92e80eff7d5e42d51b76b159d75ba82 100644 (file)
--- a/plugins/Msn/msnmanager.php
+++ b/plugins/Msn/msnmanager.php
@@ -29,7 +29,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
  * In a multi-site queuedaemon.php run, one connection will be instantiated\r
  * for each site being handled by the current process that has MSN enabled.\r
  */\r
-\r
 class MsnManager extends ImManager {\r
     public $conn = null;\r
     protected $lastPing = null;\r
@@ -109,7 +108,8 @@ class MsnManager extends ImManager {
                     'user' => $this->plugin->user,\r
                     'password' => $this->plugin->password,\r
                     'alias' => $this->plugin->nickname,\r
-                    'psm' => 'Send me a message to post a notice',\r
+                    // TRANS: MSN bot status message.\r
+                    'psm' => _m('Send me a message to post a notice'),\r
                     'debug' => false\r
                 )\r
             );\r
@@ -240,7 +240,8 @@ class MsnManager extends ImManager {
 \r
         if (!$result) {\r
             common_log_db_error($wm, 'INSERT', __FILE__);\r
-            throw new ServerException('DB error inserting queue item');\r
+            // TRANS: Server exception thrown when a message to be sent through MSN cannot be added to the database queue.\r
+            throw new ServerException(_m('Database error inserting queue item.'));\r
         }\r
 \r
         return true;\r