diff --git a/actions/invite.php b/actions/invite.php
index 0e3a878f2e..1bfc9f76d3 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -60,7 +60,6 @@ class InviteAction extends CurrentUserDesignAction
     function sendInvitations()
     {
         if (Event::handle('StartSendInvitations', array(&$this))) {
-
             // CSRF protection
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
@@ -162,7 +161,6 @@ class InviteAction extends CurrentUserDesignAction
     function showInvitationSuccess()
     {
         if (Event::handle('StartShowInvitationSuccess', array($this))) {
-
             if ($this->already) {
                 // TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
                 // TRANS: is already subscribed to one or more users with the given e-mail address(es).
diff --git a/lib/inviteform.php b/lib/inviteform.php
index da23d31264..364ca75b9b 100644
--- a/lib/inviteform.php
+++ b/lib/inviteform.php
@@ -41,7 +41,6 @@ require_once INSTALLDIR . '/lib/form.php';
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- *
  */
 class InviteForm extends Form
 {
@@ -95,21 +94,21 @@ class InviteForm extends Form
     {
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li');
-        // TRANS: Field label for a list of e-mail addresses.
         $this->out->textarea(
             'addresses',
+            // TRANS: Field label for a list of e-mail addresses.
             _('Email addresses'),
             $this->out->trimmed('addresses'),
-            // TRANS: Tooltip for field label for a list of e-mail addresses.
+            // TRANS: Field title for a list of e-mail addresses.
             _('Addresses of friends to invite (one per line).')
         );
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
-        // TRANS: Field label for a personal message to send to invitees.
         $this->out->textarea(
+            // TRANS: Field label for a personal message to send to invitees.
             'personal', _('Personal message'),
             $this->out->trimmed('personal'),
-            // TRANS: Tooltip for field label for a personal message to send to invitees.
+            // TRANS: Field title for a personal message to send to invitees.
             _('Optionally add a personal message to the invitation.')
         );
         $this->out->elementEnd('li');
@@ -123,13 +122,13 @@ class InviteForm extends Form
      */
     function formActions()
     {
-        // TRANS: Send button for inviting friends
         $this->out->submit(
             'send',
+            // TRANS: Send button for inviting friends
             _m('BUTTON','Send'), 'submit form_action-primary',
-            // TRANS: Submit button title.
             'send',
-            _('Send')
+            // TRANS: Submit button title.
+            _('Send invitations.')
         );
     }
 }
diff --git a/plugins/DomainWhitelist/DomainWhitelistPlugin.php b/plugins/DomainWhitelist/DomainWhitelistPlugin.php
index cf0d94884d..da49338fe7 100644
--- a/plugins/DomainWhitelist/DomainWhitelistPlugin.php
+++ b/plugins/DomainWhitelist/DomainWhitelistPlugin.php
@@ -118,7 +118,7 @@ class DomainWhitelistPlugin extends Plugin
                 } else {
                     // TRANS: Client exception thrown when a given e-mailaddress is not in the domain whitelist.
                     // TRANS: %s are whitelisted e-mail domains separated by comma's (localisable).
-                    $message = sprintf(_('Email address must be in one of these domains: %s.'),
+                    $message = sprintf(_m('Email address must be in one of these domains: %s.'),
                                        // TRANS: Separator for whitelisted domains.
                                        implode(_m('SEPARATOR',', '), $whitelist));
                 }
@@ -132,7 +132,7 @@ class DomainWhitelistPlugin extends Plugin
     {
         if (!$this->matchesWhitelist($email)) {
             // TRANS: Exception thrown when an e-mail address does not match the site's domain whitelist.
-            throw new Exception(_('That email address is not allowed on this site.'));
+            throw new Exception(_m('That email address is not allowed on this site.'));
         }
 
         return true;
diff --git a/plugins/DomainWhitelist/lib/whitelistinviteform.php b/plugins/DomainWhitelist/lib/whitelistinviteform.php
index 7ff730e6a8..77a48f92fa 100644
--- a/plugins/DomainWhitelist/lib/whitelistinviteform.php
+++ b/plugins/DomainWhitelist/lib/whitelistinviteform.php
@@ -46,7 +46,7 @@ require_once INSTALLDIR . '/lib/form.php';
 class WhitelistInviteForm extends Form
 {
     private $whitelist = null;
-    
+
     /**
      * Constructor
      *
@@ -86,7 +86,7 @@ class WhitelistInviteForm extends Form
     function formLegend()
     {
         // TRANS: Form legend.
-        $this->out->element('legend', null, _('Invite collegues'));
+        $this->out->element('legend', null, _m('Invite collegues'));
     }
 
     /**
@@ -101,17 +101,17 @@ class WhitelistInviteForm extends Form
             $this->showEmailLI();
         }
         $this->out->elementStart('li');
-        // TRANS: Field label for a personal message to send to invitees.
         $this->out->textarea(
-            'personal', _('Personal message'),
+            // TRANS: Field label for a personal message to send to invitees.
+            'personal', _m('Personal message'),
             $this->out->trimmed('personal'),
-            // TRANS: Tooltip for field label for a personal message to send to invitees.
-            _('Optionally add a personal message to the invitation.')
+            // TRANS: Field title for a personal message to send to invitees.
+            _m('Optionally add a personal message to the invitation.')
         );
         $this->out->elementEnd('li');
         $this->out->elementEnd('ul');
     }
-    
+
     function showEmailLI()
     {
         $this->out->elementStart('li');
@@ -119,8 +119,8 @@ class WhitelistInviteForm extends Form
         $this->out->text('@');
         if (count($this->whitelist) == 1) {
             $this->out->element(
-                'span', 
-                array('class' => 'email_invite'), 
+                'span',
+                array('class' => 'email_invite'),
                 $this->whitelist[0]
            );
            $this->out->hidden('domain[]', $this->whitelist[0]);
@@ -154,10 +154,11 @@ class WhitelistInviteForm extends Form
                 'href'  => 'javascript://',
                 'style' => 'display: none;'
             ),
+            // TRANS: Link description to action to add another item to a list.
             _m('Add another item')
         );
     }
-        
+
     /**
      * Action elements
      *
@@ -165,13 +166,13 @@ class WhitelistInviteForm extends Form
      */
     function formActions()
     {
-        // TRANS: Send button for inviting friends
         $this->out->submit(
             'send',
+            // TRANS: Send button for inviting friends.
             _m('BUTTON','Send'), 'submit form_action-primary',
-            // TRANS: Submit button title.
             'send',
-            _('Send')
+            // TRANS: Submit button title.
+            _m('Send invitations.')
         );
     }
 }
diff --git a/plugins/EmailRegistration/scripts/cancelemailregistration.php b/plugins/EmailRegistration/scripts/cancelemailregistration.php
index e6430e850f..d834aade60 100644
--- a/plugins/EmailRegistration/scripts/cancelemailregistration.php
+++ b/plugins/EmailRegistration/scripts/cancelemailregistration.php
@@ -27,7 +27,7 @@ $helptext = <<<END_OF_REGISTEREMAILUSER_HELP
 cancelemailregistration.php [options] <email address>
 
 Options:
--d --dryrun   Don't actually delete the email registration and confirmation code
+-d --dryrun   Do not actually delete the email registration and confirmation code
 
 Cancel an email registration code
 
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/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index 4c87f694bb..796bd3b529 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -312,13 +312,15 @@ class MobileProfilePlugin extends WAP20Plugin
     function onStartShowLocalNavBlock($action)
     {
         if ($this->serveMobile) {
-        $action->element('a', array('href' => '#', 'id' => 'navtoggle'), 'Show Navigation');
+            // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
+            $action->element('a', array('href' => '#', 'id' => 'navtoggle'), 'Show Navigation');
         return true;
         }
     }
 
     function onEndShowScripts($action)
     {
+        // @todo FIXME: "Show Navigation" / "Hide Navigation" needs i18n
         $action->inlineScript('
             $(function() {
                 $("#mobile-toggle-disable").click(function() {
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);