Update translator documentation.

i18n/L10n updates.
Whitespace update.

diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index a9cb2315b45e040cb1726914b41dafc10e7e1c86..ccb32b4a49d68a02ef16fe6780a4c35476be25a4 100644 (file)
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -90,6 +90,7 @@ class SubMirrorPlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:SubMirror',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Pull feeds into your timeline!'));
 
         return true;
@@ -102,7 +103,6 @@ class SubMirrorPlugin extends Plugin
      *
      * @return boolean hook return
      */
-
     function onEndSubGroupNav($widget)
     {
         $action = $widget->out;
@@ -183,6 +183,7 @@ class SubMirrorPlugin extends Plugin
             $mirror->subscriber = $profile->id;
             $entry = array(
                 'id' => 'mirrors',
+                // TRANS: Label in profile statistics section, followed by a count.
                 'label' => _m('Mirrored feeds'),
                 'link' => common_local_url('mirrorsettings'),
                 'value' => $mirror->count(),

diff --git a/plugins/SubMirror/actions/addmirror.php b/plugins/SubMirror/actions/addmirror.php
index 31805c166936088e19c8f9306093384c8cfc1d57..0031cf1bf4735b17833c620b743bd52a873f5bae 100644 (file)
--- a/plugins/SubMirror/actions/addmirror.php
+++ b/plugins/SubMirror/actions/addmirror.php
@@ -76,7 +76,8 @@ class AddMirrorAction extends BaseMirrorAction
             $base = 'http://api.twitter.com/1/statuses/user_timeline.atom?screen_name=';
             return $base . urlencode($screenie);
         default:
-            throw new Exception('Internal form error: unrecognized feed provider.');
+            // TRANS: Exception thrown when a feed provider could not be recognised.
+            throw new Exception(_m('Internal form error: Unrecognized feed provider.'));
         }
     }
 
@@ -85,7 +86,8 @@ class AddMirrorAction extends BaseMirrorAction
         if ($this->oprofile->subscribe()) {
             SubMirror::saveMirror($this->user, $this->profile);
         } else {
-            $this->serverError(_m("Could not subscribe to feed."));
+            // TRANS: Exception thrown when a subscribing to a feed fails.
+            $this->serverError(_m('Could not subscribe to feed.'));
         }
     }
 }

diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index 9a01e2ddb727ee9a4a779c0fef164f64079e4b97..e3b67bb1d6a310ef7193721acb892a00f19ba3b4 100644 (file)
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -101,9 +101,10 @@ abstract class BaseMirrorAction extends Action
             $oprofile = Ostatus_profile::ensureFeedURL($url);
         }
         if ($oprofile->isGroup()) {
-            $this->clientError(_m("Cannot mirror a StatusNet group at this time."));
+            // TRANS: Client error displayed when trying to mirror a StatusNet group feed.
+            $this->clientError(_m('Cannot mirror a StatusNet group at this time.'));
         }
-        $this->oprofile = $oprofile; // @fixme ugly side effect :D
+        $this->oprofile = $oprofile; // @todo FIXME: ugly side effect :D
         return $oprofile->localProfile();
     }
 
@@ -115,6 +116,7 @@ abstract class BaseMirrorAction extends Action
     {
         // Only allow POST requests
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            // TRANS: Client error displayed when trying to use another method than POST.
             $this->clientError(_m('This action only accepts POST requests.'));
             return false;
         }
@@ -123,6 +125,7 @@ abstract class BaseMirrorAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_m('There was a problem with your session token.'.
                                  ' Try again, please.'));
             return false;
@@ -157,6 +160,7 @@ abstract class BaseMirrorAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title for subscribed feed mirror.
             $this->element('title', null, _m('Subscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');

diff --git a/plugins/SubMirror/actions/editmirror.php b/plugins/SubMirror/actions/editmirror.php
index 0f8b037325adf2ed1a95769ba7bd0bd3996f3c90..557eb0aba47d3ba123c69830b45a483c9edb9450 100644 (file)
--- a/plugins/SubMirror/actions/editmirror.php
+++ b/plugins/SubMirror/actions/editmirror.php
@@ -47,7 +47,6 @@ if (!defined('STATUSNET')) {
  */
 class EditMirrorAction extends BaseMirrorAction
 {
-
     /**
      * Check pre-requisites and instantiate attributes
      *
@@ -65,7 +64,8 @@ class EditMirrorAction extends BaseMirrorAction
                                                  'subscribed' => $this->profile->id));
 
         if (!$this->mirror) {
-            $this->clientError(_m("Requested invalid profile to edit."));
+            // TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+            $this->clientError(_m('Requested invalid profile to edit.'));
         }
 
         $this->style = $this->validateStyle($this->trimmed('style'));
@@ -83,7 +83,8 @@ class EditMirrorAction extends BaseMirrorAction
         if (in_array($style, $allowed)) {
             return $style;
         } else {
-            $this->clientError(_m("Bad form data."));
+            // TRANS: Client error displayed when providing invalid input when editing a mirror.
+            $this->clientError(_m('Bad form data.'));
         }
     }
 
@@ -92,7 +93,7 @@ class EditMirrorAction extends BaseMirrorAction
         $mirror = SubMirror::getMirror($this->user, $this->profile);
         if (!$mirror) {
             // TRANS: Client error thrown when a mirror request is made and no result is retrieved.
-            $this->clientError(_m('Requested edit of missing mirror.'));
+            $this->clientError(_m('The mirror request failed, because no result was retrieved.'));
         }
 
         if ($this->delete) {

diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index d6e1ed5d1bc8ffa1960f3b7eeb74f3b0f3bcfdf7..2db7504a64d9b890b265a459310a767316e87925 100644 (file)
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -38,7 +38,7 @@ class MirrorSettingsAction extends SettingsAction
      */
     function title()
     {
-        // TRANS: Title.
+        // TRANS: Page title.
         return _m('Feed mirror settings');
     }
 
@@ -50,7 +50,7 @@ class MirrorSettingsAction extends SettingsAction
 
     function getInstructions()
     {
-        // TRANS: Instructions.
+        // TRANS: Page instructions.
         return _m('You can mirror updates from many RSS and Atom feeds ' .
                   'into your StatusNet timeline!');
     }
@@ -129,6 +129,7 @@ class MirrorSettingsAction extends SettingsAction
             header('Content-Type: text/html;charset=utf-8');
             $this->elementStart('html');
             $this->elementStart('head');
+            // TRANS: Title for page with form to add a mirror feed provider on.
             $this->element('title', null, _m('Provider add'));
             $this->elementEnd('head');
             $this->elementStart('body');

diff --git a/plugins/SubMirror/classes/SubMirror.php b/plugins/SubMirror/classes/SubMirror.php
index b39af918d5ddb2e073199c07a373ab190e77de75..5a9d0be5d9ca204bd1829c7c48006462b1ef5666 100644 (file)
--- a/plugins/SubMirror/classes/SubMirror.php
+++ b/plugins/SubMirror/classes/SubMirror.php
@@ -117,7 +117,7 @@ class SubMirror extends Memcached_DataObject
 
     function keyTypes()
     {
-        // @fixme keys
+        // @todo FIXME keys
         // need a sane key for reverse lookup too
         return array('subscriber' => 'K', 'subscribed' => 'K');
     }

diff --git a/plugins/SubMirror/lib/addmirrorform.php b/plugins/SubMirror/lib/addmirrorform.php
index 17edbd5e968c1cf8db34fc7ed1ca41ce5392028a..949b716dea3ffce6a1253677db8e898cc8854298 100644 (file)
--- a/plugins/SubMirror/lib/addmirrorform.php
+++ b/plugins/SubMirror/lib/addmirrorform.php
@@ -57,11 +57,13 @@ class AddMirrorForm extends Form
         $this->li();
         $this->doInput('addmirror-feedurl',
                        'feedurl',
+                       // TRANS: Field label.
                        _m('Web page or feed URL:'),
                        $this->out->trimmed('feedurl'));
         $this->unli();
 
         $this->li();
+        // TRANS: Button text for adding a feed.
         $this->out->submit('addmirror-save', _m('BUTTON','Add feed'));
         $this->unli();
         $this->out->elementEnd('ul');

diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
index 920db0bc9c0319d5ce857a12fea7717fd75e49ad..512b2bfa4add66abde9ab9f1280b40ed3421a3b7 100644 (file)
--- a/plugins/SubMirror/lib/addmirrorwizard.php
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -73,6 +73,7 @@ class AddMirrorWizard extends Widget
             // hopes, is getting timely updates.
             array(
                 'id' => 'twitter',
+                // TRANS: Name for possible feed provider.
                 'name' => _m('Twitter'),
             ),
             /*
@@ -106,6 +107,7 @@ class AddMirrorWizard extends Widget
              */
             array(
                 'id' => 'feed',
+                // TRANS: Name for possible feed provider.
                 'name' => _m('RSS or Atom feed'),
             ),
         );
@@ -116,6 +118,7 @@ class AddMirrorWizard extends Widget
         $out = $this->out;
 
         $out->elementStart('div', 'provider-list');
+        // TRANS: Heading for feed mirroring selection form.
         $out->element('h2', null, _m('Select a feed provider'));
         $out->elementStart('table');
         foreach ($providers as $provider) {

diff --git a/plugins/SubMirror/lib/addtwittermirrorform.php b/plugins/SubMirror/lib/addtwittermirrorform.php
index eb28aa038ffb12d6aa65e7931c20a299d488e835..172d321de2a5ecca73eac33d48e130b1233f9d87 100644 (file)
--- a/plugins/SubMirror/lib/addtwittermirrorform.php
+++ b/plugins/SubMirror/lib/addtwittermirrorform.php
@@ -47,11 +47,13 @@ class AddTwitterMirrorForm extends AddMirrorForm
         $this->li();
         $this->doInput('addmirror-feedurl',
                        'screen_name',
+                       // TRANS: Field label.
                        _m('Twitter username:'),
                        $this->out->trimmed('screen_name'));
         $this->unli();
 
         $this->li();
+        // TRANS: Button text for adding a Twitter feed mirror.
         $this->out->submit('addmirror-save', _m('BUTTON','Add feed'));
         $this->unli();
         $this->out->elementEnd('ul');

diff --git a/plugins/SubMirror/lib/editmirrorform.php b/plugins/SubMirror/lib/editmirrorform.php
index c1f60f9c2c4384b29fb7a0afa216c98a9eb0dd27..c09aa4a7ad70429c95a1945155873a324af2b26f 100644 (file)
--- a/plugins/SubMirror/lib/editmirrorform.php
+++ b/plugins/SubMirror/lib/editmirrorform.php
@@ -80,20 +80,25 @@ class EditMirrorForm extends Form
         $this->out->elementStart('div');
         if ($feed) {
             // XXX: Why the hard coded space?
+            // TRANS: Field label (URL expectected).
             $this->out->text(_m('LABEL', 'Remote feed:') . ' ');
             //$this->out->element('a', array('href' => $feed), $feed);
             $this->out->element('input', array('value' => $feed, 'readonly' => 'readonly', 'style' => 'width: 100%'));
         } else {
+            // TRANS: Field label.
             $this->out->text(_m('LABEL', 'Local user'));
         }
         $this->out->elementEnd('div');
         $this->out->elementEnd('p');
 
         $this->out->elementStart('fieldset', array('style' => 'margin-top: 20px'));
-        $this->out->element('legend', false, _m("Mirroring style"));
+        // TRANS: Fieldset legend for feed mirror setting.
+        $this->out->element('legend', false, _m('Mirroring style'));
 
-        $styles = array('repeat' => _m("Repeat: reference the original user's post (sometimes shows as 'RT @blah')"),
-                        'copy' => _m("Repost the content under my account"));
+        // TRANS: Feed mirror style (radio button option).
+        $styles = array('repeat' => _m('Repeat: reference the original user\'s post (sometimes shows as "RT @blah")'),
+                        // TRANS: Feed mirror style (radio button option).
+                        'copy' => _m('Repost the content under my account'));
         foreach ($styles as $key => $label) {
             $this->out->elementStart('div');
             $attribs = array('type' => 'radio',
@@ -104,7 +109,7 @@ class EditMirrorForm extends Form
                 $attribs['checked'] = 'checked';
             }
             $this->out->element('input', $attribs);
-            $this->out->element('span', false, $label); // @fixme should be label, but the styles muck it up for now
+            $this->out->element('span', false, $label); // @todo FIXME: should be label, but the styles muck it up for now
             $this->out->elementEnd('div');
 
         }
@@ -112,9 +117,11 @@ class EditMirrorForm extends Form
 
 
         $this->out->elementStart('div');
-        $this->out->submit($this->id() . '-save', _m('Save'));
+        // TRANS: Button text to save feed mirror settings.
+        $this->out->submit($this->id() . '-save', _m('BUTTON','Save'));
         $this->out->element('input', array('type' => 'submit',
-                                           'value' => _m('Stop mirroring'),
+                                           // TRANS: Button text to stop mirroring a feed.
+                                           'value' => _m('BUTTON','Stop mirroring'),
                                            'name' => 'delete',
                                            'class' => 'submit'));
         $this->out->elementEnd('div');