Document messages for which clarification was requested.

diff --git a/actions/allrss.php b/actions/allrss.php
index 01e737ad7bb65300df8b166dd39eb6351b2deada..7df0b1ef7c67c0ee2dc7389f9bede96d7373cdda 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -112,10 +112,12 @@ class AllrssAction extends Rss10Action
         $c    = array('url' => common_local_url('allrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link title. %s is a user nickname.
                    'title' => sprintf(_('%s and friends'), $user->nickname),
                    'link' => common_local_url('all',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
                    'description' => sprintf(_('Updates from %1$s and friends on %2$s!'),
                                             $user->nickname, common_config('site', 'name')));
         return $c;

diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php
index f7677970f8e387442c49569c57e07c1ddbd318a2..bd05fa3ea880712a1c1061af5d7039d0730bbbd4 100644 (file)
--- a/actions/apigrouplistall.php
+++ b/actions/apigrouplistall.php
@@ -87,6 +87,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
         parent::handle($args);
 
         $sitename   = common_config('site', 'name');
+        // TRANS: Message is used as a title. %s is a site name.
         $title      = sprintf(_("%s groups"), $sitename);
         $taguribase = TagURI::base();
         $id         = "tag:$taguribase:Groups";

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index ac350ab1b7a25acf8c5ee77dba5cd6269089670c..7f80f252e74caa4a3797c64ff578a4f9da26bf50 100644 (file)
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -116,6 +116,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         $id         = "tag:$taguribase:FriendsTimeline:" . $this->user->id;
 
         $subtitle = sprintf(
+            // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
             _('Updates from %1$s and friends on %2$s!'),
             $this->user->nickname,
             $sitename

diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 1618c9923c8be7eb79b4c8bd2221afb982bca4b8..43a13dcda9ca09aa1b9786251bb3a9cb25fd4de7 100644 (file)
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -117,6 +117,7 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
         $id         = "tag:$taguribase:HomeTimeline:" . $this->user->id;
 
         $subtitle   = sprintf(
+            // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
             _('Updates from %1$s and friends on %2$s!'),
             $this->user->nickname, $sitename
         );

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index dc17499f551161b6f1f936daa862d7f158cd3ba5..8bf8c8c4d4d7a75de8c27ba5029421d88b3c0aac 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -87,10 +87,12 @@ class ConfirmaddressAction extends Action
         }
         $type = $confirm->address_type;
         if (!in_array($type, array('email', 'jabber', 'sms'))) {
+            // TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
             $this->serverError(sprintf(_('Unrecognized address type %s.'), $type));
             return;
         }
         if ($cur->$type == $confirm->address) {
+            // TRANS: Client error for an already confirmed email/jabbel/sms address.
             $this->clientError(_('That address has already been confirmed.'));
             return;
         }

diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 41d917e3ca2a961256d648244d089fdcc82bca52..8c08581b5d1243af59bbb4ce9a2707396ccb6b41 100644 (file)
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -59,6 +59,7 @@ class DesignadminpanelAction extends AdminPanelAction
 
     function title()
     {
+        // TRANS: Message used as title for design settings for the site.
         return _('Design');
     }
 
@@ -454,6 +455,7 @@ class DesignAdminPanelForm extends AdminForm
 
             $this->out->element('label', array('for' => 'design_background-image_on',
                                           'class' => 'radio'),
+                                          // TRANS: Used as radio button label to add a background image.
                                           _('On'));
 
             $attrs = array('name' => 'design_background-image_onoff',
@@ -470,6 +472,7 @@ class DesignAdminPanelForm extends AdminForm
 
             $this->out->element('label', array('for' => 'design_background-image_off',
                                           'class' => 'radio'),
+                                          // TRANS: Used as radio button label to not add a background image.
                                           _('Off'));
             $this->out->element('p', 'form_guide', _('Turn background image on or off.'));
             $this->unli();

diff --git a/actions/grouprss.php b/actions/grouprss.php
index 490f6f945cac57b509f968b3f771aea5b3f3c5c5..98fdea38defe9e9a1747a2b72f0334bf02cb55a3 100644 (file)
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -135,8 +135,10 @@ class groupRssAction extends Rss10Action
         $c = array('url' => common_local_url('grouprss',
                                              array('nickname' =>
                                                    $group->nickname)),
+                   // TRANS: Message is used as link title. %s is a user nickname.
                    'title' => sprintf(_('%s timeline'), $group->nickname),
                    'link' => common_local_url('showgroup', array('nickname' => $group->nickname)),
+                   // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
                    'description' => sprintf(_('Updates from members of %1$s on %2$s!'),
                                             $group->nickname, common_config('site', 'name')));
         return $c;

diff --git a/actions/usergroups.php b/actions/usergroups.php
index 29bda0a765c289dc107316bd1f1a4a5135346472..6606e76cdb907c641bf8594dbf4fb34c66111e17 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -59,8 +59,10 @@ class UsergroupsAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Message is used as a page title. %s is a nick name.
             return sprintf(_('%s groups'), $this->user->nickname);
         } else {
+            // TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
             return sprintf(_('%1$s groups, page %2$d'),
                            $this->user->nickname,
                            $this->page);

diff --git a/actions/userrss.php b/actions/userrss.php
index c6103b2f8a7875645c2504348126cfab92de5afb..b7078fcaf886a2967a11cc3d2b058b89cf6f37c2 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -90,8 +90,10 @@ class UserrssAction extends Rss10Action
         $c = array('url' => common_local_url('userrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: Message is used as link title. %s is a user nickname.
                    'title' => sprintf(_('%s timeline'), $user->nickname),
                    'link' => $profile->profileurl,
+                   // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
                    'description' => sprintf(_('Updates from %1$s on %2$s!'),
                                             $user->nickname, common_config('site', 'name')));
         return $c;

diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 08c1c707c578091a0d5eb7d67b0795d776b9f013..08c28a48be6de8a7777e9ebb7e004e0d3fb56fa8 100644 (file)
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -63,6 +63,7 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
 
         $sitename   = common_config('site', 'name');
         $subtitle   = sprintf(
+            // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
             _('Updates from %1$s on %2$s!'),
             $group->nickname,
             $sitename

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 428cc2de2f01192f46a212e97e398f97ba7afd5b..a534cbee6b42acb5ae9037ccd1ed190a2203e1fc 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -69,6 +69,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
 
         $sitename   = common_config('site', 'name');
         $subtitle   = sprintf(
+            // TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
             _('Updates from %1$s on %2$s!'),
             $user->nickname, $sitename
         );