From 1d1a929718b222308505f16ed4425a89e9679b60 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Fri, 20 May 2011 16:03:29 +0200 Subject: [PATCH] Update translator documentation and L10n. --- .../lib/extendedprofilewidget.php | 20 +++++++++---------- plugins/OStatus/OStatusPlugin.php | 6 ++++-- plugins/OStatus/actions/ostatusgroup.php | 3 ++- plugins/OStatus/actions/ostatussub.php | 9 ++++++--- plugins/OStatus/actions/ostatustag.php | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/plugins/ExtendedProfile/lib/extendedprofilewidget.php b/plugins/ExtendedProfile/lib/extendedprofilewidget.php index 03be420bea..f04dccd0ae 100644 --- a/plugins/ExtendedProfile/lib/extendedprofilewidget.php +++ b/plugins/ExtendedProfile/lib/extendedprofilewidget.php @@ -328,7 +328,7 @@ class ExtendedProfileWidget extends Form if (!empty($field['company'])) { $this->out->element('div', 'field', $field['company']); - // TRANS: Field label in experience area of extended profile (when did one start a position). + // TRANS: Field label in extended profile (when did one start a position or education). $this->out->element('div', 'label', _m('Start')); $this->out->element( 'div', @@ -336,7 +336,7 @@ class ExtendedProfileWidget extends Form date('j M Y', strtotime($field['start']) ) ); - // TRANS: Field label in experience area of extended profile (when did one end a position). + // TRANS: Field label in extended profile (when did one end a position or education). $this->out->element('div', 'label', _m('End')); $this->out->element( 'div', @@ -376,7 +376,7 @@ class ExtendedProfileWidget extends Form isset($field['company']) ? $field['company'] : null ); - // TRANS: Field label in experience edit area of extended profile (when did one start at a company). + // TRANS: Field label in extended profile (when did one start a position or education). $this->out->element('div', 'label', _m('Start')); $this->out->input( $id . '-start', @@ -384,7 +384,7 @@ class ExtendedProfileWidget extends Form isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null ); - // TRANS: Field label in experience edit area of extended profile (when did one terminate at a company). + // TRANS: Field label in extended profile (when did one end a position or education). $this->out->element('div', 'label', _m('End')); $this->out->input( @@ -416,13 +416,13 @@ class ExtendedProfileWidget extends Form $this->out->element('div', 'label', _m('Institution')); if (!empty($field['school'])) { $this->out->element('div', 'field', $field['school']); - // TRANS: Field label in education area of extended profile. + // TRANS: Field label in extended profile for specifying an academic degree. $this->out->element('div', 'label', _m('Degree')); $this->out->element('div', 'field', $field['degree']); // TRANS: Field label in education area of extended profile. $this->out->element('div', 'label', _m('Description')); $this->out->element('div', 'field', $field['description']); - // TRANS: Field label in education area of extended profile (when did one start an education). + // TRANS: Field label in extended profile (when did one start a position or education). $this->out->element('div', 'label', _m('Start')); $this->out->element( 'div', @@ -430,7 +430,7 @@ class ExtendedProfileWidget extends Form date('j M Y', strtotime($field['start']) ) ); - // TRANS: Field label in education area of extended profile (when did one end a education). + // TRANS: Field label in extended profile (when did one end a position or education). $this->out->element('div', 'label', _m('End')); $this->out->element( 'div', @@ -460,7 +460,7 @@ class ExtendedProfileWidget extends Form isset($field['school']) ? $field['school'] : null ); - // TRANS: Field label in education edit area of extended profile. + // TRANS: Field label in extended profile for specifying an academic degree. $this->out->element('div', 'label', _m('Degree')); $this->out->input( $id . '-degree', @@ -477,7 +477,7 @@ class ExtendedProfileWidget extends Form isset($field['description']) ? $field['description'] : null ); - // TRANS: Field label in education edit area of extended profile (when did one start an education). + // TRANS: Field label in extended profile (when did one start a position or education). $this->out->element('div', 'label', _m('Start')); $this->out->input( $id . '-start', @@ -486,7 +486,7 @@ class ExtendedProfileWidget extends Form isset($field['start']) ? date('j M Y', strtotime($field['start'])) : null ); - // TRANS: Field label in education edit area of extended profile (when did one end an education). + // TRANS: Field label in extended profile (when did one end a position or education). $this->out->element('div', 'label', _m('End')); $this->out->input( $id . '-end', diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index af343362fb..1a02cdc8d3 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -327,7 +327,8 @@ class OStatusPlugin extends Plugin return false; } catch (Exception $e) { - // TRANS: Error message in OStatus plugin. + // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com + // TRANS: and example.net, as these are official standard domain names for use in examples. $err = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); } @@ -360,7 +361,8 @@ class OStatusPlugin extends Plugin return $this->filter(array($oprofile->localProfile())); } catch (Exception $e) { - // TRANS: Error message in OStatus plugin. + // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com + // TRANS: and example.net, as these are official standard domain names for use in examples. $this->msg = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); return array(); } diff --git a/plugins/OStatus/actions/ostatusgroup.php b/plugins/OStatus/actions/ostatusgroup.php index f2170c0346..e2c4121c3f 100644 --- a/plugins/OStatus/actions/ostatusgroup.php +++ b/plugins/OStatus/actions/ostatusgroup.php @@ -77,7 +77,8 @@ class OStatusGroupAction extends OStatusSubAction // TRANS: Field label. _m('Join group'), $this->profile_uri, - // TRANS: Tooltip for field label "Join group". + // TRANS: Tooltip for field label "Join group". Do not translate the "example.net" + // TRANS: domain name in the URL, as it is an official standard domain name for examples. _m("OStatus group's address, like http://example.net/group/nickname.")); $this->elementEnd('li'); $this->elementEnd('ul'); diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index c592e8b380..00f9c81faa 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -228,14 +228,16 @@ class OStatusSubAction extends Action } else if (Validate::uri($this->profile_uri)) { $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri); } else { - // TRANS: Error text. + // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com + // TRANS: and example.net, as these are official standard domain names for use in examples. $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); common_debug('Invalid address format.', __FILE__); return false; } return true; } catch (FeedSubBadURLException $e) { - // TRANS: Error text. + // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com + // TRANS: and example.net, as these are official standard domain names for use in examples. $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); common_debug('Invalid URL or could not reach server.', __FILE__); } catch (FeedSubBadResponseException $e) { @@ -260,7 +262,8 @@ class OStatusSubAction extends Action common_debug('Not a recognized feed type.', __FILE__); } catch (Exception $e) { // Any new ones we forgot about - // TRANS: Error text. + // TRANS: Error message in OStatus plugin. Do not translate the domain names example.com + // TRANS: and example.net, as these are official standard domain names for use in examples. $this->error = _m("Sorry, we could not reach that address. Please make sure that the OStatus address is like nickname@example.com or http://example.net/nickname."); common_debug(sprintf('Bad feed URL: %s %s', get_class($e), $e->getMessage()), __FILE__); } diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php index 95f56bbfc4..1df74d9079 100644 --- a/plugins/OStatus/actions/ostatustag.php +++ b/plugins/OStatus/actions/ostatustag.php @@ -74,7 +74,7 @@ class OStatusTagAction extends OStatusInitAction // TRANS: Field label. $this->input('profile', _m('Profile Account'), $this->profile, // TRANS: Field title. - _m('Your account id (i.e. user@identi.ca).')); + _m('Your account id (for example user@identi.ca).')); $this->elementEnd('li'); $this->elementEnd('ul'); $this->submit('submit', $submit);