Update translator documentation.

i18n/L10n updates.
Whitespace updates.

diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 0a50f62b6e187172625df2e19da63b482dcdaf8b..8e3d2a70ce0bde59327f0b9ae654429c9ebb09ac 100644 (file)
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -44,7 +44,6 @@ define('GROUPS_PER_MINILIST', 8);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class GroupMiniList extends GroupList
 {
     function show()

diff --git a/lib/invitebuttonsection.php b/lib/invitebuttonsection.php
index 4812e47880d82dfe251d32e6cee18e9ce3d07f60..c10817d7a86297605e7fcb02f9e48662281b1be4 100644 (file)
--- a/lib/invitebuttonsection.php
+++ b/lib/invitebuttonsection.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Section for an invite button
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class InviteButtonSection extends Section
 {
     function showTitle()
@@ -54,10 +53,11 @@ class InviteButtonSection extends Section
 
     function showContent()
     {
-        $this->out->element('a', 
+        $this->out->element('a',
                             array('href' => common_local_url('invite'),
                                   'class' => 'invite_button'),
-                            _('Invite more colleagues'));
+                            // TRANS: Button text for inviting more users to the StatusNet instance.
+                            _m('BUTTON','Invite more colleagues'));
         return false;
     }
-}
\ No newline at end of file
+}

diff --git a/lib/peopletageditform.php b/lib/peopletageditform.php
index 9fb824bdbc41e34d020f8b0a1d1b64b7539e135e..c9bbd576f890e39296e3b9442904ea622361c00c 100644 (file)
--- a/lib/peopletageditform.php
+++ b/lib/peopletageditform.php
@@ -105,8 +105,8 @@ class PeopletagEditForm extends Form
      */
     function formLegend()
     {
-        // TRANS: Form legend for people tag edit form.
-        // TRANS: %s is a people tag.
+        // TRANS: Form legend for list edit form.
+        // TRANS: %s is a list.
         $this->out->element('legend', null, sprintf(_('Edit list %s'), $this->peopletag->tag));
     }
 
@@ -137,21 +137,21 @@ class PeopletagEditForm extends Form
         $this->out->elementStart('li');
         $desclimit = Profile_list::maxDescription();
         if ($desclimit == 0) {
-            // TRANS: Field title for description of people tag.
+            // TRANS: Field title for description of list.
             $descinstr = _('Describe the list or topic.');
         } else {
-            // TRANS: Field title for description of people tag.
+            // TRANS: Field title for description of list.
             // TRANS: %d is the maximum number of characters for the description.
             $descinstr = sprintf(_m('Describe the list or topic in %d character.',
                                     'Describe the list or topic in %d characters.',
                                     $desclimit),
                                  $desclimit);
         }
-        // TRANS: Field label for description of people tag.
+        // TRANS: Field label for description of list.
         $this->out->textarea('description', _('Description'),
                              ($this->out->arg('description')) ? $this->out->arg('description') : $description,
                              $descinstr);
-        // TRANS: Checkbox label to mark a people tag private.
+        // TRANS: Checkbox label to mark a list private.
         $this->out->checkbox('private', _('Private'), $private);
         $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
@@ -167,11 +167,11 @@ class PeopletagEditForm extends Form
         // TRANS: Button text to save a people tag.
         $this->out->submit('submit', _('Save'));
         $this->out->submit('form_action-yes',
-                      // TRANS: Button text to delete a people tag.
+                      // TRANS: Button text to delete a list.
                       _m('BUTTON','Delete'),
                       'submit',
                       'delete',
-                      // TRANS: Button title to delete a people tag.
+                      // TRANS: Button title to delete a list.
                       _('Delete this list.'));
     }
 

diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index a93499ce76b291c29ba8a266f0b1db932fd9c237..c247bdb8d843bcdafecf970e6280858f0123f329 100644 (file)
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -103,10 +103,10 @@ class PeopletagGroupNav extends Widget
             // People tag timeline
             $this->out->menuItem(common_local_url('showprofiletag', array('tagger' => $user_profile->nickname,
                                                                           'tag'    => $tag->tag)),
-                             // TRANS: Menu item in people tag navigation panel.
+                             // TRANS: Menu item in list navigation panel.
                              _m('MENU','List'),
-                             // TRANS: Menu item title in people tag navigation panel.
-                             // TRANS: %1$s is a tag, %2$s is a nickname.
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
                              sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'showprofiletag', 'nav_timeline_peopletag');
@@ -114,10 +114,10 @@ class PeopletagGroupNav extends Widget
             // Tagged
             $this->out->menuItem(common_local_url('peopletagged', array('tagger' => $user->nickname,
                                                                         'tag'    => $tag->tag)),
-                             // TRANS: Menu item in people tag navigation panel.
+                             // TRANS: Menu item in list navigation panel.
                              _m('MENU','Listed'),
-                             // TRANS: Menu item title in people tag navigation panel.
-                             // TRANS: %1$s is a tag, %2$s is a nickname.
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
                              sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagged', 'nav_peopletag_tagged');
@@ -125,10 +125,10 @@ class PeopletagGroupNav extends Widget
             // Subscribers
             $this->out->menuItem(common_local_url('peopletagsubscribers', array('tagger' => $user->nickname,
                                                                                 'tag'    => $tag->tag)),
-                             // TRANS: Menu item in people tag navigation panel.
+                             // TRANS: Menu item in list navigation panel.
                              _m('MENU','Subscribers'),
-                             // TRANS: Menu item title in people tag navigation panel.
-                             // TRANS: %1$s is a tag, %2$s is a nickname.
+                             // TRANS: Menu item title in list navigation panel.
+                             // TRANS: %1$s is a list, %2$s is a nickname.
                              sprintf(_('Subscribers to %1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagsubscribers', 'nav_peopletag_subscribers');
@@ -140,8 +140,8 @@ class PeopletagGroupNav extends Widget
                                                                              'tag'    => $tag->tag)),
                                  // TRANS: Menu item in people tag navigation panel.
                                  _m('MENU','Edit'),
-                                 // TRANS: Menu item title in people tag navigation panel.
-                                 // TRANS: %s is a tag.
+                                 // TRANS: Menu item title in list navigation panel.
+                                 // TRANS: %s is a list.
                                  sprintf(_('Edit %s list by you.'), $tag->tag,
                                     (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                                  $action == 'editpeopletag', 'nav_peopletag_edit');

diff --git a/lib/peopletaglist.php b/lib/peopletaglist.php
index 10ebc8cb9e3e44cbbc45718c1d5e23b88d161c52..a776f07d5c501586ef5420e30488627b152ba6ec 100644 (file)
--- a/lib/peopletaglist.php
+++ b/lib/peopletaglist.php
@@ -192,9 +192,9 @@ class PeopletagListItem extends Widget
         $this->out->element('a', array('href' =>
                     common_local_url('editpeopletag', array('tagger' => $this->profile->nickname,
                                                     'tag' => $this->peopletag->tag)),
-                                  // TRANS: Title for link to edit people tag settings.
+                                  // TRANS: Title for link to edit list settings.
                                   'title' => _('Edit list settings.')),
-                       // TRANS: Text for link to edit people tag settings.
+                       // TRANS: Text for link to edit list settings.
                        _('Edit'));
         $this->out->elementEnd('li');
     }

diff --git a/lib/peopletagnav.php b/lib/peopletagnav.php
index cc03b59a3563bf81ebe2bd59468cddcdb3f98844..1be71690b64df015c85d2a3c50deffb9fabc8d68 100644 (file)
--- a/lib/peopletagnav.php
+++ b/lib/peopletagnav.php
@@ -78,7 +78,7 @@ class PeopletagNav extends Menu
                                  _m('MENU','List Subscriptions'),
                                  // TRANS: Tooltip for menu item in the group navigation page.
                                  // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','Lists subscribed to by %s'), $nickname),
+                                 sprintf(_m('TOOLTIP','Lists subscribed to by %s.'), $nickname),
                                  $action_name == 'peopletagsubscriptions',
                                  'nav_list_group');
             $this->out->menuItem(common_local_url('peopletagsforuser', array('nickname' =>
@@ -87,7 +87,7 @@ class PeopletagNav extends Menu
                                  sprintf(_m('MENU','Lists with %s'), $nickname),
                                  // TRANS: Tooltip for menu item in the group navigation page.
                                  // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','Lists with %s'), $nickname),
+                                 sprintf(_m('TOOLTIP','Lists with %s.'), $nickname),
                                  $action_name == 'peopletagsforuser',
                                  'nav_lists_with');
             $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
@@ -96,7 +96,7 @@ class PeopletagNav extends Menu
                                  sprintf(_m('MENU','Lists by %s'), $nickname),
                                  // TRANS: Tooltip for menu item in the group navigation page.
                                  // TRANS: %s is the nickname of the group.
-                                 sprintf(_m('TOOLTIP','Lists by %s'), $nickname),
+                                 sprintf(_m('TOOLTIP','Lists by %s.'), $nickname),
                                  $action_name == 'peopletagsbyuser',
                                  'nav_lists_by');
             Event::handle('EndGroupGroupNav', array($this));

diff --git a/lib/peopletagsbysubssection.php b/lib/peopletagsbysubssection.php
index e1e3251f8417bb3dea4c169f404903d553c522bf..761f88851f8057d302be37a98cee2bd1eac50bc5 100644 (file)
--- a/lib/peopletagsbysubssection.php
+++ b/lib/peopletagsbysubssection.php
@@ -65,8 +65,8 @@ class PeopletagsBySubsSection extends PeopletagSection
 
     function title()
     {
-        // TRANS: Title for section contaning people tags with the most subscribers.
-        return _('Lists with most subscribers');
+        // TRANS: Title for section contaning lists with the most subscribers.
+        return _('Popular lists');
     }
 
     function divId()

diff --git a/lib/peopletagsection.php b/lib/peopletagsection.php
index a6c587e04eb95b782f6bd8aab9713a0acb4139b7..ccceb71a63475d7ced1323eb7c4ab610039bac8e 100644 (file)
--- a/lib/peopletagsection.php
+++ b/lib/peopletagsection.php
@@ -83,7 +83,6 @@ class PeopletagSection extends Section
 
 class PeopletagSectionItem extends PeopletagListItem
 {
-
     function showStart()
     {
     }
@@ -121,8 +120,8 @@ class PeopletagSectionItem extends PeopletagListItem
 
     function showTag()
     {
-        // TRANS: Tag summary. %1$d is the number of users tagged with the tag,
-        // TRANS: %2$d is the number of subscribers to the tag.
+        // TRANS: List summary. %1$d is the number of users in the list,
+        // TRANS: %2$d is the number of subscribers to the list.
         $title = sprintf(_('Listed: %1$d Subscribers: %2$d'),
                          $this->peopletag->taggedCount(),
                          $this->peopletag->subscriberCount());

diff --git a/lib/peopletagsforusersection.php b/lib/peopletagsforusersection.php
index 9f7879d9e1feff9bd26153cef7b56d08bc9ad5a1..8f5edaa51b9b67d0e389a669f6bd19723fee06c5 100644 (file)
--- a/lib/peopletagsforusersection.php
+++ b/lib/peopletagsforusersection.php
@@ -67,8 +67,7 @@ class PeopletagsForUserSection extends PeopletagSection
         if (!empty($user) && $this->profile->id == $user->id) {
             return sprintf(_('Lists with you'));
         }
-        // TRANS: Title for page that displays
-        //        which people tags a user has been tagged with.
+        // TRANS: Title for page that displays which people tags a user has been tagged with.
         // TRANS: %s is a profile name.
         return sprintf(_('Lists with %s'), $this->profile->getBestName());
     }

diff --git a/lib/peopletagsubscriptionssection.php b/lib/peopletagsubscriptionssection.php
index ab90f7eb755aba7938b70cf124687953964a6e05..7fd6bd0bbf7db71837d44fc4393c9476ef40c6fe 100644 (file)
--- a/lib/peopletagsubscriptionssection.php
+++ b/lib/peopletagsubscriptionssection.php
@@ -62,7 +62,7 @@ class PeopletagSubscriptionsSection extends PeopletagSection
 
     function title()
     {
-        // TRANS: Title for page that displays people tags a user has subscribed to.
+        // TRANS: Title for page that displays lists a user has subscribed to.
         return _('List subscriptions');
     }
 

diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index a86bb23e8d8241234977c922df29eaf1e7611b37..c861c4f57f90fb6ceee594b719d2be842cc34acc 100644 (file)
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -52,8 +52,8 @@ class PersonalTagCloudSection extends TagCloudSection
 
     function title()
     {
-        // TRANS: Title for personal tag cloud section. %s is a user nickname.
-        return sprintf(_('Tags'), $this->user->nickname);
+        // TRANS: Title for personal tag cloud section.
+        return _m('TITLE','Tags');
     }
 
     function getTags()

diff --git a/lib/profileaction.php b/lib/profileaction.php
index c919cb6bed65e1c818a610738590aceef502c549..6a79f8c07e698e23fc8506bfd49fae968800f9b2 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -293,9 +293,9 @@ class ProfileAction extends OwnerDesignAction
                                         array('nickname' => $this->profile->nickname));
 
                 $this->elementStart('h2');
-                // TRANS: H2 text for user list membership statistics.
                 $this->element('a',
                                array('href' => $url),
+                               // TRANS: H2 text for user list membership statistics.
                                _('Lists'));
                 $this->text(' ');
                 $this->text($lists->N);

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index b0b67569c62affa46f5ae5809c5f0300fda7a1f8..fe1db3b81f2d5c470346470d36342fd411b815a3 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -854,7 +854,7 @@ class OStatusPlugin extends Plugin
         $oprofile = Ostatus_profile::staticGet('peopletag_id', $peopletag->id);
         if ($oprofile) {
             if (!$oprofile->subscribe()) {
-                // TRANS: Exception thrown when setup of remote people tag subscription fails.
+                // TRANS: Exception thrown when setup of remote list subscription fails.
                 throw new Exception(_m('Could not set up remote list subscription.'));
             }
 
@@ -875,7 +875,7 @@ class OStatusPlugin extends Plugin
             // TRANS: Title for remote follow list.
             $act->title = _m('TITLE','Follow list');
             // TRANS: Success message for remote list follow through OStatus.
-            // TRANS: %1$s is the subscriber name, %2$s the prople tag, %3$s is the tagger's name.
+            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
             $act->content = sprintf(_m("%1$s is now following people listed in %2$s by %3$s."),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),

diff --git a/plugins/OStatus/actions/ostatuspeopletag.php b/plugins/OStatus/actions/ostatuspeopletag.php
index 1a8495ce213aa4c725e0cf7e9fbe8aad96451ebe..d4f64553cffdddfffda6b4f505f546832383688b 100644 (file)
--- a/plugins/OStatus/actions/ostatuspeopletag.php
+++ b/plugins/OStatus/actions/ostatuspeopletag.php
@@ -169,6 +169,7 @@ class OStatusPeopletagAction extends OStatusSubAction
 
     function getInstructions()
     {
+        // TRANS: Instructions for OStatus list subscription form.
         return _m('You can subscribe to lists from other supported sites. Paste the lists\'s URI below:');
     }