* L10n updates: consistent puctuation

* i18n updates: number parameters if more than one are being used

29 files changed, 46 insertions, 46 deletions

diff --git a/actions/all.php b/actions/all.php
index 452803d8a..efa4521e2 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -81,7 +81,7 @@ class AllAction extends ProfileAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
+            return sprintf(_("%1$s and friends, page %2$d"), $this->user->nickname, $this->page);
         } else {
             return sprintf(_("%s and friends"), $this->user->nickname);
         }
@@ -131,7 +131,7 @@ class AllAction extends ProfileAction
             if ($this->user->id === $current_user->id) {
                 $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
             } else {
-                $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
+                $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
         } else {
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index b531d9501..4b718bce6 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -135,7 +135,7 @@ class ApiGroupJoinAction extends ApiAuthAction
             common_log_db_error($member, 'INSERT', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not join user %s to group %s.'),
+                    _('Could not join user %1$s to group %2$s.'),
                     $this->user->nickname,
                     $this->group->nickname
                 )
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 5627bfc14..7321ff5d2 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -121,7 +121,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
             common_log_db_error($member, 'DELETE', __FILE__);
             $this->serverError(
                 sprintf(
-                    _('Could not remove user %s from group %s.'),
+                    _('Could not remove user %1$s from group %2$s.'),
                     $this->user->nickname,
                     $this->group->nickname
                 )
diff --git a/actions/apigrouplist.php b/actions/apigrouplist.php
index 7b05f8a96..4cf657579 100644
--- a/actions/apigrouplist.php
+++ b/actions/apigrouplist.php
@@ -100,7 +100,7 @@ class ApiGroupListAction extends ApiBareAuthAction
             array('nickname' => $this->user->nickname)
         );
         $subtitle   = sprintf(
-            _("Groups %s is a member of on %s."),
+            _("Groups %1$s is a member of on %2$s."),
             $this->user->nickname,
             $sitename
         );
diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 008e04212..700f6e0fd 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -105,7 +105,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(
-            _('%s / Favorites from %s'),
+            _('%1$s / Favorites from %2$s'),
             $sitename,
             $this->user->nickname
         );
@@ -117,7 +117,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             array('nickname' => $this->user->nickname)
         );
         $subtitle   = sprintf(
-            _('%s updates favorited by %s / %s.'),
+            _('%1$s updates favorited by %2$s / %2$s.'),
             $sitename,
             $profile->getBestName(),
             $this->user->nickname
diff --git a/actions/blockedfromgroup.php b/actions/blockedfromgroup.php
index ca4a711cb..934f14ec4 100644
--- a/actions/blockedfromgroup.php
+++ b/actions/blockedfromgroup.php
@@ -90,7 +90,7 @@ class BlockedfromgroupAction extends GroupDesignAction
             return sprintf(_('%s blocked profiles'),
                            $this->group->nickname);
         } else {
-            return sprintf(_('%s blocked profiles, page %d'),
+            return sprintf(_('%1$s blocked profiles, page %2$d'),
                            $this->group->nickname,
                            $this->page);
         }
diff --git a/actions/groupblock.php b/actions/groupblock.php
index faf18c6ad..ec673358e 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -159,7 +159,7 @@ class GroupblockAction extends Action
         $this->hidden('token', common_session_token());
         $this->element('legend', _('Block user'));
         $this->element('p', null,
-                       sprintf(_('Are you sure you want to block user "%s" from the group "%s"? '.
+                       sprintf(_('Are you sure you want to block user "%1$s" from the group "%2$s"? '.
                                  'They will be removed from the group, unable to post, and '.
                                  'unable to subscribe to the group in the future.'),
                                $this->profile->getBestName(),
diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index b326a0df7..5c59594c5 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -93,7 +93,7 @@ class GroupmembersAction extends GroupDesignAction
             return sprintf(_('%s group members'),
                            $this->group->nickname);
         } else {
-            return sprintf(_('%s group members, page %d'),
+            return sprintf(_('%1$s group members, page %2$d'),
                            $this->group->nickname,
                            $this->page);
         }
diff --git a/actions/inbox.php b/actions/inbox.php
index 6cb7f9e15..f605cc9e8 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -56,7 +56,7 @@ class InboxAction extends MailboxAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("Inbox for %s - page %d"), $this->user->nickname,
+            return sprintf(_("Inbox for %1$s - page %2$d"), $this->user->nickname,
                 $this->page);
         } else {
             return sprintf(_("Inbox for %s"), $this->user->nickname);
diff --git a/actions/invite.php b/actions/invite.php
index 3015202e9..d0ed64ec9 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -128,7 +128,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->element('p', null, _('You are already subscribed to these users:'));
             $this->elementStart('ul');
             foreach ($this->already as $other) {
-                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
             }
             $this->elementEnd('ul');
         }
@@ -136,7 +136,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
             $this->elementStart('ul');
             foreach ($this->subbed as $other) {
-                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
             }
             $this->elementEnd('ul');
         }
diff --git a/actions/joingroup.php b/actions/joingroup.php
index bf69b2ad1..5ca34bd9c 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -125,14 +125,14 @@ class JoingroupAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'INSERT', __FILE__);
-            $this->serverError(sprintf(_('Could not join user %s to group %s'),
+            $this->serverError(sprintf(_('Could not join user %1$s to group %2$s'),
                                        $cur->nickname, $this->group->nickname));
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%s joined group %s'),
+            $this->element('title', null, sprintf(_('%1$s joined group %2$s'),
                                                   $cur->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 90c85e1a4..b0f973e1a 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -124,14 +124,14 @@ class LeavegroupAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'DELETE', __FILE__);
-            $this->serverError(sprintf(_('Could not remove user %s from group %s'),
+            $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
                                        $cur->nickname, $this->group->nickname));
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%s left group %s'),
+            $this->element('title', null, sprintf(_('%1$s left group %2$s'),
                                                   $cur->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');
diff --git a/actions/makeadmin.php b/actions/makeadmin.php
index 2dfddebc2..250ade221 100644
--- a/actions/makeadmin.php
+++ b/actions/makeadmin.php
@@ -92,7 +92,7 @@ class MakeadminAction extends Action
             return false;
         }
         if ($this->profile->isAdmin($this->group)) {
-            $this->clientError(sprintf(_('%s is already an admin for group "%s".'),
+            $this->clientError(sprintf(_('%1$s is already an admin for group "%2$s".'),
                                        $this->profile->getBestName(),
                                        $this->group->getBestName()),
                                401);
@@ -129,7 +129,7 @@ class MakeadminAction extends Action
                                               'profile_id' => $this->profile->id));
 
         if (empty($member)) {
-            $this->serverError(_('Can\'t get membership record for %s in group %s'),
+            $this->serverError(_('Can\'t get membership record for %1$s in group %2$s'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
         }
@@ -142,7 +142,7 @@ class MakeadminAction extends Action
 
         if (!$result) {
             common_log_db_error($member, 'UPDATE', __FILE__);
-            $this->serverError(_('Can\'t make %s an admin for group %s'),
+            $this->serverError(_('Can\'t make %1$s an admin for group %2$s'),
                                $this->profile->getBestName(),
                                $this->group->getBestName());
         }
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 76c877ff2..d0673420d 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -88,7 +88,7 @@ class NoticesearchAction extends SearchAction
 
         return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss',
                                                            array('q' => $q)),
-                              sprintf(_('Search results for "%s" on %s'),
+                              sprintf(_('Search results for "%1$s" on %2$s'),
                                       $q, common_config('site', 'name'))));
     }
 
diff --git a/actions/outbox.php b/actions/outbox.php
index 537fad3ef..de30de018 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -55,7 +55,7 @@ class OutboxAction extends MailboxAction
     function title()
     {
         if ($this->page > 1) {
-            return sprintf(_("Outbox for %s - page %d"),
+            return sprintf(_("Outbox for %1$s - page %2$d"),
                 $this->user->nickname, $page);
         } else {
             return sprintf(_("Outbox for %s"), $this->user->nickname);
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 6dbbc9261..4ba1dc0f1 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -141,7 +141,7 @@ class PeopletagAction extends Action
      */
     function title()
     {
-        return sprintf(_('Users self-tagged with %s - page %d'),
+        return sprintf(_('Users self-tagged with %1$s - page %2$d'),
             $this->tag, $this->page);
     }
 
diff --git a/actions/postnotice.php b/actions/postnotice.php
index c2e1c44ca..fb0670376 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -87,8 +87,8 @@ class PostnoticeAction extends Action
         $license      = $_POST['omb_notice_license'];
         $site_license = common_config('license', 'url');
         if ($license && !common_compatible_license($license, $site_license)) {
-            throw new Exception(sprintf(_('Notice license ‘%s’ is not ' .
-                                          'compatible with site license ‘%s’.'),
+            throw new Exception(sprintf(_('Notice license ‘%1$s’ is not ' .
+                                          'compatible with site license ‘%2$s’.'),
                                         $license, $site_license));
         }
     }
diff --git a/actions/register.php b/actions/register.php
index 57f8e7bdf..96015c219 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -534,9 +534,9 @@ class RegisterAction extends Action
                                        array('nickname' => $nickname));
 
         $this->elementStart('div', 'success');
-        $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '.
+        $instr = sprintf(_('Congratulations, %1$s! And welcome to %%%%site.name%%%%. '.
                            'From here, you may want to...'. "\n\n" .
-                           '* Go to [your profile](%s) '.
+                           '* Go to [your profile](%2$s) '.
                            'and post your first message.' .  "\n" .
                            '* Add a [Jabber/GTalk address]'.
                            '(%%%%action.imsettings%%%%) '.
diff --git a/actions/replies.php b/actions/replies.php
index a13b5a227..2e50f1c3c 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -124,7 +124,7 @@ class RepliesAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("Replies to %s"), $this->user->nickname);
         } else {
-            return sprintf(_("Replies to %s, page %d"),
+            return sprintf(_("Replies to %1$s, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }
@@ -195,14 +195,14 @@ class RepliesAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+        $message = sprintf(_('This is the timeline showing replies to %1$s but %2$s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
                 $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
             } else {
-                $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
+                $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
         }
         else {
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index b12fcdd9a..6023f0156 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -76,7 +76,7 @@ class ShowfavoritesAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s's favorite notices"), $this->user->nickname);
         } else {
-            return sprintf(_("%s's favorite notices, page %d"),
+            return sprintf(_("%1$s's favorite notices, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }
diff --git a/actions/showgroup.php b/actions/showgroup.php
index a4af29391..c0de4c653 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -81,7 +81,7 @@ class ShowgroupAction extends GroupDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s group"), $base);
         } else {
-            return sprintf(_("%s group, page %d"),
+            return sprintf(_("%1$s group, page %2$d"),
                            $base,
                            $this->page);
         }
diff --git a/actions/showstream.php b/actions/showstream.php
index 74b46cc95..75e10858d 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -76,7 +76,7 @@ class ShowstreamAction extends ProfileAction
         if ($this->page == 1) {
             return $base;
         } else {
-            return sprintf(_("%s, page %d"),
+            return sprintf(_("%1$s, page %2$d"),
                            $base,
                            $this->page);
         }
@@ -119,7 +119,7 @@ class ShowstreamAction extends ProfileAction
                                   common_local_url('userrss',
                                                    array('nickname' => $this->user->nickname,
                                                          'tag' => $this->tag)),
-                                  sprintf(_('Notice feed for %s tagged %s (RSS 1.0)'),
+                                  sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'),
                                           $this->user->nickname, $this->tag)));
         }
 
@@ -188,14 +188,14 @@ class ShowstreamAction extends ProfileAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('This is the timeline for %s but %s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+        $message = sprintf(_('This is the timeline for %1$s but %2$s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
                 $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)');
             } else {
-                $message .= sprintf(_('You can try to nudge %s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, '@' . $this->user->nickname);
+                $message .= sprintf(_('You can try to nudge %1$s or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname);
             }
         }
         else {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index cc9452820..cd3e2ee5b 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -49,7 +49,7 @@ class SubscribersAction extends GalleryAction
         if ($this->page == 1) {
             return sprintf(_('%s subscribers'), $this->user->nickname);
         } else {
-            return sprintf(_('%s subscribers, page %d'),
+            return sprintf(_('%1$s subscribers, page %2$d'),
                            $this->user->nickname,
                            $this->page);
         }
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 0dc5ee762..0ef31aa9f 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -51,7 +51,7 @@ class SubscriptionsAction extends GalleryAction
         if ($this->page == 1) {
             return sprintf(_('%s subscriptions'), $this->user->nickname);
         } else {
-            return sprintf(_('%s subscriptions, page %d'),
+            return sprintf(_('%1$s subscriptions, page %2$d'),
                            $this->user->nickname,
                            $this->page);
         }
diff --git a/actions/tag.php b/actions/tag.php
index 3a88c1229..12857236e 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -65,7 +65,7 @@ class TagAction extends Action
         if ($this->page == 1) {
             return sprintf(_("Notices tagged with %s"), $this->tag);
         } else {
-            return sprintf(_("Notices tagged with %s, page %d"),
+            return sprintf(_("Notices tagged with %1$s, page %2$d"),
                            $this->tag,
                            $this->page);
         }
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 3cec9523c..e416a6fa9 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -59,8 +59,8 @@ class UpdateprofileAction extends Action
         $license      = $_POST['omb_listenee_license'];
         $site_license = common_config('license', 'url');
         if (!common_compatible_license($license, $site_license)) {
-            $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '.
-                                         'compatible with site license ‘%s’.'),
+            $this->clientError(sprintf(_('Listenee stream license ‘%1$s’ is not '.
+                                         'compatible with site license ‘%2$s’.'),
                                        $license, $site_license));
             return false;
         }
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index dc59e6c94..4321f1302 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -293,7 +293,7 @@ class UserauthorizationAction extends Action
 
         $user = User::staticGet('uri', $listener);
         if (!$user) {
-            throw new Exception(sprintf(_('Listener URI ‘%s’ not found here'),
+            throw new Exception(sprintf(_('Listener URI ‘%s’ not found here.'),
                                         $listener));
         }
 
@@ -327,8 +327,8 @@ class UserauthorizationAction extends Action
         $license      = $_GET['omb_listenee_license'];
         $site_license = common_config('license', 'url');
         if (!common_compatible_license($license, $site_license)) {
-            throw new Exception(sprintf(_('Listenee stream license ‘%s’ is not ' .
-                                          'compatible with site license ‘%s’.'),
+            throw new Exception(sprintf(_('Listenee stream license ‘%1$s’ is not ' .
+                                          'compatible with site license ‘%2$s’.'),
                                         $license, $site_license));
         }
 
diff --git a/actions/usergroups.php b/actions/usergroups.php
index 84e105153..504226143 100644
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -61,7 +61,7 @@ class UsergroupsAction extends OwnerDesignAction
         if ($this->page == 1) {
             return sprintf(_("%s groups"), $this->user->nickname);
         } else {
-            return sprintf(_("%s groups, page %d"),
+            return sprintf(_("%1$s groups, page %2$d"),
                            $this->user->nickname,
                            $this->page);
         }
diff --git a/actions/version.php b/actions/version.php
index 2cf914296..c1f673c45 100644
--- a/actions/version.php
+++ b/actions/version.php
@@ -150,7 +150,7 @@ class VersionAction extends Action
     {
         $this->elementStart('p');
 
-        $this->raw(sprintf(_('This site is powered by %s version %s, '.
+        $this->raw(sprintf(_('This site is powered by %1$s version %2$s, '.
                              'Copyright 2008-2010 StatusNet, Inc. '.
                              'and contributors.'),
                            XMLStringer::estring('a', array('href' => 'http://status.net/'),