From c27b9c07226d655e9933ef7a824dc75a174e26e1 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 15 Apr 2011 15:07:35 +0200 Subject: [PATCH] Update translator documentation. i18n/L10n updates. Whitespace updates. --- lib/groupminilist.php | 1 - lib/invitebuttonsection.php | 10 ++++----- lib/peopletageditform.php | 16 +++++++------- lib/peopletaggroupnav.php | 22 ++++++++++---------- lib/peopletaglist.php | 4 ++-- lib/peopletagnav.php | 6 +++--- lib/peopletagsbysubssection.php | 4 ++-- lib/peopletagsection.php | 5 ++--- lib/peopletagsforusersection.php | 3 +-- lib/peopletagsubscriptionssection.php | 2 +- lib/personaltagcloudsection.php | 4 ++-- lib/profileaction.php | 2 +- plugins/OStatus/OStatusPlugin.php | 4 ++-- plugins/OStatus/actions/ostatuspeopletag.php | 1 + 14 files changed, 41 insertions(+), 43 deletions(-) diff --git a/lib/groupminilist.php b/lib/groupminilist.php index 0a50f62b6e..8e3d2a70ce 100644 --- 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 4812e47880..c10817d7a8 100644 --- 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 9fb824bdbc..c9bbd576f8 100644 --- 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 a93499ce76..c247bdb8d8 100644 --- 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 10ebc8cb9e..a776f07d5c 100644 --- 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 cc03b59a35..1be71690b6 100644 --- 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 e1e3251f84..761f88851f 100644 --- 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 a6c587e04e..ccceb71a63 100644 --- 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 9f7879d9e1..8f5edaa51b 100644 --- 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 ab90f7eb75..7fd6bd0bbf 100644 --- 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 a86bb23e8d..c861c4f57f 100644 --- 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 c919cb6bed..6a79f8c07e 100644 --- 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 b0b67569c6..fe1db3b81f 100644 --- 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 1a8495ce21..d4f64553cf 100644 --- 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:'); }