diff options
Diffstat (limited to 'actions')
-rw-r--r-- | actions/apiaccountupdatedeliverydevice.php | 1 | ||||
-rw-r--r-- | actions/apiaccountupdateprofile.php | 1 | ||||
-rw-r--r-- | actions/apiaccountupdateprofilebackgroundimage.php | 1 | ||||
-rw-r--r-- | actions/apiaccountupdateprofilecolors.php | 1 | ||||
-rw-r--r-- | actions/apiaccountupdateprofileimage.php | 1 | ||||
-rw-r--r-- | actions/apiblockcreate.php | 1 | ||||
-rw-r--r-- | actions/apiblockdestroy.php | 1 | ||||
-rw-r--r-- | actions/apidirectmessagenew.php | 1 | ||||
-rw-r--r-- | actions/apifavoritecreate.php | 1 | ||||
-rw-r--r-- | actions/apifavoritedestroy.php | 1 | ||||
-rw-r--r-- | actions/apifriendshipscreate.php | 1 | ||||
-rw-r--r-- | actions/apifriendshipsdestroy.php | 1 | ||||
-rw-r--r-- | actions/apigroupcreate.php | 1 | ||||
-rw-r--r-- | actions/apigroupjoin.php | 1 | ||||
-rw-r--r-- | actions/apigroupleave.php | 1 | ||||
-rw-r--r-- | actions/apimediaupload.php | 1 | ||||
-rw-r--r-- | actions/apistatusesretweet.php | 1 | ||||
-rw-r--r-- | actions/apistatusesupdate.php | 1 | ||||
-rw-r--r-- | actions/emailsettings.php | 6 | ||||
-rw-r--r-- | actions/groupmembers.php | 22 | ||||
-rw-r--r-- | actions/imsettings.php | 3 |
21 files changed, 46 insertions, 3 deletions
diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php index 295378aa6..2d903cb46 100644 --- a/actions/apiaccountupdatedeliverydevice.php +++ b/actions/apiaccountupdatedeliverydevice.php @@ -83,6 +83,7 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error message. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php index 9b371ea95..92d0f6b77 100644 --- a/actions/apiaccountupdateprofile.php +++ b/actions/apiaccountupdateprofile.php @@ -86,6 +86,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php index 3537b9f97..923fb1d11 100644 --- a/actions/apiaccountupdateprofilebackgroundimage.php +++ b/actions/apiaccountupdateprofilebackgroundimage.php @@ -83,6 +83,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php index c666f9d75..9e07d80de 100644 --- a/actions/apiaccountupdateprofilecolors.php +++ b/actions/apiaccountupdateprofilecolors.php @@ -107,6 +107,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php index 153ef7818..7f868a6eb 100644 --- a/actions/apiaccountupdateprofileimage.php +++ b/actions/apiaccountupdateprofileimage.php @@ -81,6 +81,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php index b355cd1c7..53844cd2f 100644 --- a/actions/apiblockcreate.php +++ b/actions/apiblockcreate.php @@ -86,6 +86,7 @@ class ApiBlockCreateAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php index 7ea201677..871ce66c7 100644 --- a/actions/apiblockdestroy.php +++ b/actions/apiblockdestroy.php @@ -85,6 +85,7 @@ class ApiBlockDestroyAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index 65d065648..44e205ebb 100644 --- a/actions/apidirectmessagenew.php +++ b/actions/apidirectmessagenew.php @@ -106,6 +106,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 0447a92ba..15da01013 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -88,6 +88,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apifavoritedestroy.php b/actions/apifavoritedestroy.php index 9f2efdd00..c2e1ebafc 100644 --- a/actions/apifavoritedestroy.php +++ b/actions/apifavoritedestroy.php @@ -89,6 +89,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apifriendshipscreate.php b/actions/apifriendshipscreate.php index a7ec5b28a..64c857c70 100644 --- a/actions/apifriendshipscreate.php +++ b/actions/apifriendshipscreate.php @@ -88,6 +88,7 @@ class ApiFriendshipsCreateAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apifriendshipsdestroy.php b/actions/apifriendshipsdestroy.php index 551d01682..21da23ef7 100644 --- a/actions/apifriendshipsdestroy.php +++ b/actions/apifriendshipsdestroy.php @@ -88,6 +88,7 @@ class ApiFriendshipsDestroyAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apigroupcreate.php b/actions/apigroupcreate.php index d216c15cd..fa443573d 100644 --- a/actions/apigroupcreate.php +++ b/actions/apigroupcreate.php @@ -102,6 +102,7 @@ class ApiGroupCreateAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php index 5265ec629..a0c069974 100644 --- a/actions/apigroupjoin.php +++ b/actions/apigroupjoin.php @@ -89,6 +89,7 @@ class ApiGroupJoinAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php index 8c100d58a..c838f6c87 100644 --- a/actions/apigroupleave.php +++ b/actions/apigroupleave.php @@ -89,6 +89,7 @@ class ApiGroupLeaveAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/apimediaupload.php b/actions/apimediaupload.php index 7aa88c186..54d7fda68 100644 --- a/actions/apimediaupload.php +++ b/actions/apimediaupload.php @@ -64,6 +64,7 @@ class ApiMediaUploadAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format ); diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index 9aa337485..aae98f637 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -62,6 +62,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction parent::prepare($args); if ($_SERVER['REQUEST_METHOD'] != 'POST') { + // TRANS: Client error. POST is a HTTP command. It should not be translated. $this->clientError(_('This method requires a POST.'), 400, $this->format); return false; diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index fa3f611c0..4715f7002 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -195,6 +195,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction if ($_SERVER['REQUEST_METHOD'] != 'POST') { $this->clientError( + // TRANS: Client error. POST is a HTTP command. It should not be translated. _('This method requires a POST.'), 400, $this->format diff --git a/actions/emailsettings.php b/actions/emailsettings.php index 6138a88f9..9c250fc8a 100644 --- a/actions/emailsettings.php +++ b/actions/emailsettings.php @@ -131,7 +131,11 @@ class EmailsettingsAction extends AccountSettingsAction // TRANS: Field label for e-mail address input in e-mail settings form. $this->input('email', _('Email address'), ($this->arg('email')) ? $this->arg('email') : null, - // TRANS: Instructions for e-mail address input form. + // TRANS: Instructions for e-mail address input form. Do not translate + // TRANS: "example.org". It is one of the domain names reserved for + // TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt. + // TRANS: Any other domain may be owned by a legitimate person or + // TRANS: organization. _('Email address, like "UserName@example.org"')); $this->elementEnd('li'); $this->elementEnd('ul'); diff --git a/actions/groupmembers.php b/actions/groupmembers.php index 54f1d8dcd..038d1db68 100644 --- a/actions/groupmembers.php +++ b/actions/groupmembers.php @@ -97,9 +97,13 @@ class GroupmembersAction extends GroupDesignAction function title() { if ($this->page == 1) { + // TRANS: Title of the page showing group members. + // TRANS: %s is the name of the group. return sprintf(_('%s group members'), $this->group->nickname); } else { + // TRANS: Title of the page showing group members. + // TRANS: %1$s is the name of the group, %2$d is the page number of the members list. return sprintf(_('%1$s group members, page %2$d'), $this->group->nickname, $this->page); @@ -389,7 +393,14 @@ class GroupBlockForm extends Form function formActions() { - $this->out->submit('submit', _('Block'), 'submit', null, _('Block this user')); + $this->out->submit( + 'submit', + // TRANS: Button text for the form that will block a user from a group. + _m('BUTTON','Block'), + 'submit', + null, + // TRANS: Submit button title. + _m('TOOLTIP',_('Block this user')); } } @@ -516,6 +527,13 @@ class MakeAdminForm extends Form function formActions() { - $this->out->submit('submit', _('Make Admin'), 'submit', null, _('Make this user an admin')); + $this->out->submit( + 'submit', + // TRANS: Button text for the form that will make a user administrator. + _m('BUTTON','Make Admin'), + 'submit', + null, + // TRANS: Submit button title. + _m('TOOLTIP','Make this user an admin')); } } diff --git a/actions/imsettings.php b/actions/imsettings.php index 6691c8dad..29cbeb82e 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -137,6 +137,9 @@ class ImsettingsAction extends ConnectSettingsAction ($this->arg('jabber')) ? $this->arg('jabber') : null, // TRANS: IM address input field instructions in IM settings form. // TRANS: %s is the IM address set for the site. + // TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by + // TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate + // TRANS: person or organization. sprintf(_('Jabber or GTalk address, '. 'like "UserName@example.org". '. 'First, make sure to add %s to your '. |