diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/all.php | 2 | ||||
| -rw-r--r-- | actions/apioauthauthorize.php | 4 | ||||
| -rw-r--r-- | actions/apitimelinefriends.php | 1 | ||||
| -rw-r--r-- | actions/confirmaddress.php | 2 | ||||
| -rw-r--r-- | actions/editapplication.php | 2 | ||||
| -rw-r--r-- | actions/newapplication.php | 2 | ||||
| -rw-r--r-- | actions/oauthconnectionssettings.php | 2 | ||||
| -rw-r--r-- | actions/othersettings.php | 2 | ||||
| -rw-r--r-- | actions/showapplication.php | 3 | ||||
| -rw-r--r-- | actions/version.php | 3 |
10 files changed, 11 insertions, 12 deletions
diff --git a/actions/all.php b/actions/all.php index efa4521e2..3eb185214 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(_("%1$s and friends, page %2$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); } diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index fa074c4e7..19128bdce 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -303,8 +303,8 @@ class ApiOauthAuthorizeAction extends ApiOauthAction $access = ($this->app->access_type & Oauth_application::$writeAccess) ? 'access and update' : 'access'; - $msg = _("The application <strong>%s</strong> by <strong>%s</strong> would like " . - "the ability to <strong>%s</strong> your account data."); + $msg = _("The application <strong>%1$s</strong> by <strong>%2$s</strong> would like " . + "the ability to <strong>%3$s</strong> your account data."); $this->raw(sprintf($msg, $this->app->name, diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php index ef58b103c..4e3827bae 100644 --- a/actions/apitimelinefriends.php +++ b/actions/apitimelinefriends.php @@ -72,7 +72,6 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction function prepare($args) { parent::prepare($args); - common_debug("api friends_timeline"); $this->user = $this->getTargetUser($this->arg('id')); if (empty($this->user)) { diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index 6fd74f3ff..cc8351d8d 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -141,7 +141,7 @@ class ConfirmaddressAction extends Action function title() { - return _('Confirm Address'); + return _('Confirm address'); } /** diff --git a/actions/editapplication.php b/actions/editapplication.php index 9cc3e3cea..3b120259a 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -51,7 +51,7 @@ class EditApplicationAction extends OwnerDesignAction function title() { - return _('Edit Application'); + return _('Edit application'); } /** diff --git a/actions/newapplication.php b/actions/newapplication.php index c499fe7c7..bc5b4edaf 100644 --- a/actions/newapplication.php +++ b/actions/newapplication.php @@ -49,7 +49,7 @@ class NewApplicationAction extends OwnerDesignAction function title() { - return _('New Application'); + return _('New application'); } /** diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index b17729b82..c2e8d441b 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -68,7 +68,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction function title() { - return _('Connected Applications'); + return _('Connected applications'); } function isReadOnly($args) diff --git a/actions/othersettings.php b/actions/othersettings.php index 0de7cd908..10e9873b3 100644 --- a/actions/othersettings.php +++ b/actions/othersettings.php @@ -57,7 +57,7 @@ class OthersettingsAction extends AccountSettingsAction function title() { - return _('Other Settings'); + return _('Other settings'); } /** diff --git a/actions/showapplication.php b/actions/showapplication.php index 049206375..a6ff425c7 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -265,7 +265,7 @@ class ShowApplicationAction extends OwnerDesignAction $this->elementEnd('dl'); $this->element('p', 'note', - _('Note: We support hmac-sha1 signatures. We do not support the plaintext signature method.')); + _('Note: We support HMAC-SHA1 signatures. We do not support the plaintext signature method.')); $this->elementEnd('div'); $this->elementStart('p', array('id' => 'application_action')); @@ -325,4 +325,3 @@ class ShowApplicationAction extends OwnerDesignAction } } - diff --git a/actions/version.php b/actions/version.php index c1f673c45..b6593e5ed 100644 --- a/actions/version.php +++ b/actions/version.php @@ -266,5 +266,6 @@ class VersionAction extends Action 'Craig Andrews', 'mEDI', 'Brett Taylor', - 'Brigitte Schuster'); + 'Brigitte Schuster', + 'Brion Vibber'); } |