diff --git a/plugins/AccountManager/AccountManagementControlDocumentAction.php b/plugins/AccountManager/AccountManagementControlDocumentAction.php index 3fcea5af42..955779b4ee 100644 --- a/plugins/AccountManager/AccountManagementControlDocumentAction.php +++ b/plugins/AccountManager/AccountManagementControlDocumentAction.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class AccountManagementControlDocumentAction extends Action { /** @@ -50,7 +49,6 @@ class AccountManagementControlDocumentAction extends Action * * @return void */ - function handle($args) { parent::handle($args); diff --git a/plugins/AccountManager/AccountManagementSessionStatusAction.php b/plugins/AccountManager/AccountManagementSessionStatusAction.php index 48b6034ff6..9eeff72402 100644 --- a/plugins/AccountManager/AccountManagementSessionStatusAction.php +++ b/plugins/AccountManager/AccountManagementSessionStatusAction.php @@ -40,7 +40,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class AccountManagementSessionStatusAction extends Action { /** @@ -50,7 +49,6 @@ class AccountManagementSessionStatusAction extends Action * * @return void */ - function handle($args) { parent::handle($args); diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php index 52dd64a24b..9563252c73 100644 --- a/plugins/AccountManager/AccountManagerPlugin.php +++ b/plugins/AccountManager/AccountManagerPlugin.php @@ -33,7 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { class AccountManagerPlugin extends Plugin { - const AM_REL = 'acct-mgmt'; function __construct() @@ -99,7 +98,6 @@ class AccountManagerPlugin extends Plugin default: return true; } - } function onPluginVersion(&$versions) diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php index fec033331a..fa8afb1807 100644 --- a/plugins/Adsense/AdsensePlugin.php +++ b/plugins/Adsense/AdsensePlugin.php @@ -193,7 +193,7 @@ class AdsensePlugin extends UAPPlugin // TRANS: Menu item title/tooltip $menu_title = _m('AdSense configuration'); // TRANS: Menu item for site administration - $menu->out->menuItem(common_local_url('adsenseadminpanel'), _m('AdSense'), + $menu->out->menuItem(common_local_url('adsenseadminpanel'), _m('MENU','AdSense'), $menu_title, $action_name == 'adsenseadminpanel', 'nav_adsense_admin_panel'); } return true; @@ -206,6 +206,7 @@ class AdsensePlugin extends UAPPlugin 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Adsense', 'rawdescription' => + // TRANS: Plugin description. _m('Plugin to add Google AdSense to StatusNet sites.')); return true; } diff --git a/plugins/Adsense/adsenseadminpanel.php b/plugins/Adsense/adsenseadminpanel.php index 110cc9e2b7..224c82b2fc 100644 --- a/plugins/Adsense/adsenseadminpanel.php +++ b/plugins/Adsense/adsenseadminpanel.php @@ -161,38 +161,50 @@ class AdsenseAdminPanelForm extends AdminForm $this->out->elementStart('ul', 'form_data'); $this->li(); $this->input('client', + // TRANS: Field label in AdSense administration panel. _m('Client ID'), - _m('Google client ID'), + // TRANS: Field title in AdSense administration panel. + _m('Google client ID.'), 'adsense'); $this->unli(); $this->li(); $this->input('adScript', + // TRANS: Field label in AdSense administration panel. _m('Ad script URL'), - _m('Script URL (advanced)'), + // TRANS: Field title in AdSense administration panel. + _m('Script URL (advanced).'), 'adsense'); $this->unli(); $this->li(); $this->input('mediumRectangle', + // TRANS: Field label in AdSense administration panel. _m('Medium rectangle'), - _m('Medium rectangle slot code'), + // TRANS: Field title in AdSense administration panel. + _m('Medium rectangle slot code.'), 'adsense'); $this->unli(); $this->li(); $this->input('rectangle', + // TRANS: Field label in AdSense administration panel. _m('Rectangle'), - _m('Rectangle slot code'), + // TRANS: Field title in AdSense administration panel. + _m('Rectangle slot code.'), 'adsense'); $this->unli(); $this->li(); $this->input('leaderboard', + // TRANS: Field label in AdSense administration panel. _m('Leaderboard'), - _m('Leaderboard slot code'), + // TRANS: Field title in AdSense administration panel. + _m('Leaderboard slot code.'), 'adsense'); $this->unli(); $this->li(); $this->input('wideSkyscraper', + // TRANS: Field label in AdSense administration panel. _m('Skyscraper'), - _m('Wide skyscraper slot code'), + // TRANS: Field title in AdSense administration panel. + _m('Wide skyscraper slot code.'), 'adsense'); $this->unli(); $this->out->elementEnd('ul'); @@ -205,6 +217,9 @@ class AdsenseAdminPanelForm extends AdminForm */ function formActions() { - $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save AdSense settings')); + // TRANS: Button text to save settings in AdSense administration panel. + $this->out->submit('submit', _m('BUTTON','Save'), + // TRANS: Button title to save settings in AdSense administration panel. + 'submit', null, _m('Save AdSense settings.')); } } diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php index 3a1799a2d8..e44505b21c 100644 --- a/plugins/Aim/AimPlugin.php +++ b/plugins/Aim/AimPlugin.php @@ -46,7 +46,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/ext * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class AimPlugin extends ImPlugin { public $user = null; @@ -57,6 +56,7 @@ class AimPlugin extends ImPlugin function getDisplayName() { + // TRANS: Display name. return _m('AIM'); } @@ -116,7 +116,7 @@ class AimPlugin extends ImPlugin function microiduri($screenname) { - return 'aim:' . $screenname; + return 'aim:' . $screenname; } function sendMessage($screenname, $body) @@ -145,10 +145,12 @@ class AimPlugin extends ImPlugin function initialize(){ if(!isset($this->user)){ - throw new Exception("must specify a user"); + // TRANS: Exception thrown in AIM plugin when user has not been specified. + throw new Exception(_m('Must specify a user.')); } if(!isset($this->password)){ - throw new Exception("must specify a password"); + // TRANS: Exception thrown in AIM plugin when password has not been specified. + throw new Exception(_m('Must specify a password.')); } $this->fake_aim = new Fake_Aim($this->user,$this->password,4); @@ -162,8 +164,8 @@ class AimPlugin extends ImPlugin 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:AIM', 'rawdescription' => + // TRANS: Plugin description. _m('The AIM plugin allows users to send and receive notices over the AIM network.')); return true; } } - diff --git a/plugins/Aim/Fake_Aim.php b/plugins/Aim/Fake_Aim.php index 139b68f82b..e24c0f2bfb 100644 --- a/plugins/Aim/Fake_Aim.php +++ b/plugins/Aim/Fake_Aim.php @@ -40,4 +40,3 @@ class Fake_Aim extends Aim $this->would_be_sent = array($sflap_type, $sflap_data, $no_null, $formatted); } } - diff --git a/plugins/Aim/aimmanager.php b/plugins/Aim/aimmanager.php index 8ff7ab7e70..619a9ad0a7 100644 --- a/plugins/Aim/aimmanager.php +++ b/plugins/Aim/aimmanager.php @@ -29,10 +29,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } * In a multi-site queuedaemon.php run, one connection will be instantiated * for each site being handled by the current process that has XMPP enabled. */ - class AimManager extends ImManager { - public $conn = null; /** * Initialize connection to server. @@ -77,6 +75,8 @@ class AimManager extends ImManager $this->conn->registerHandler("IMIn",array($this,"handle_aim_message")); $this->conn->myServer="toc.oscar.aol.com"; $this->conn->signon(); + // @todo i18n FIXME: Update translator documentation, please. + // TRANS: No idea what the use case for this message is. $this->conn->setProfile(_m('Send me a message to post a notice'),false); } return $this->conn; diff --git a/plugins/AnonymousFave/AnonymousFavePlugin.php b/plugins/AnonymousFave/AnonymousFavePlugin.php index 96edf82e12..917f5a7e8c 100644 --- a/plugins/AnonymousFave/AnonymousFavePlugin.php +++ b/plugins/AnonymousFave/AnonymousFavePlugin.php @@ -56,10 +56,8 @@ define('ANONYMOUS_FAVE_PLUGIN_VERSION', '0.1'); * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @link http://status.net/ */ - class AnonymousFavePlugin extends Plugin { - // Array of users who should not have anon faving. The default is // that anonymous faving is allowed for all users. public $restricted = array(); @@ -327,5 +325,4 @@ class AnonymousFavePlugin extends Plugin return true; } - } diff --git a/plugins/AnonymousFave/anonfavorform.php b/plugins/AnonymousFave/anonfavorform.php index 2fbd015e36..a68fdaf2b3 100644 --- a/plugins/AnonymousFave/anonfavorform.php +++ b/plugins/AnonymousFave/anonfavorform.php @@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/form.php'; */ class AnonFavorForm extends FavorForm { - /** * Constructor * @@ -67,5 +66,4 @@ class AnonFavorForm extends FavorForm { return common_local_url('AnonFavor'); } - } diff --git a/plugins/AnonymousFave/scripts/initialize_fave_tallys.php b/plugins/AnonymousFave/scripts/initialize_fave_tallys.php index f7ea6d1ef7..a955620db5 100755 --- a/plugins/AnonymousFave/scripts/initialize_fave_tallys.php +++ b/plugins/AnonymousFave/scripts/initialize_fave_tallys.php @@ -35,4 +35,3 @@ $notice->find(); while ($notice->fetch()) { Fave_tally::ensureTally($notice->id); } -