Merge branch '0.9.x' into merge

Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php

1 files changed, 24 insertions, 4 deletions

diff --git a/lib/designform.php b/lib/designform.php
index 4163cfc1a..7702b873f 100644
--- a/lib/designform.php
+++ b/lib/designform.php
@@ -127,19 +127,24 @@ class DesignForm extends Form
         $this->out->elementEnd('fieldset');
 
         $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
+        // TRANS: Fieldset legend on profile design page to change profile page colours.
         $this->out->element('legend', null, _('Change colours'));
         $this->colourData();
         $this->out->elementEnd('fieldset');
 
         $this->out->elementStart('fieldset');
 
+        // TRANS: Button text on profile design page to immediately reset all colour settings to default.
         $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
+                           // TRANS: Title for button on profile design page to reset all colour settings to default.
                            'defaults', _('Restore default designs'));
 
         $this->out->element('input', array('id' => 'settings_design_reset',
                                            'type' => 'reset',
-                                           'value' => 'Reset',
+                                           // TRANS: Button text on profile design page to reset all colour settings to default without saving.
+                                           'value' => _m('BUTTON', 'Reset'),
                                            'class' => 'submit form_action-primary',
+                                           // TRANS: Title for button on profile design page to reset all colour settings to default without saving.
                                            'title' => _('Reset back to default')));
     }
 
@@ -148,10 +153,13 @@ class DesignForm extends Form
         $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li');
         $this->out->element('label', array('for' => 'design_background-image_file'),
+                            // TRANS: Label in form on profile design page.
+                            // TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
                             _('Upload file'));
         $this->out->element('input', array('name' => 'design_background-image_file',
                                            'type' => 'file',
                                            'id' => 'design_background-image_file'));
+        // TRANS: Instructions for form on profile design page.
         $this->out->element('p', 'form_guide', _('You can upload your personal ' .
                                                  'background image. The maximum file size is 2Mb.'));
         $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
@@ -182,7 +190,8 @@ class DesignForm extends Form
 
             $this->out->element('label', array('for' => 'design_background-image_on',
                                                'class' => 'radio'),
-                                _('On'));
+                                // TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
+                                _m('RADIO', 'On'));
 
             $attrs = array('name' => 'design_background-image_onoff',
                            'type' => 'radio',
@@ -198,12 +207,16 @@ class DesignForm extends Form
 
             $this->out->element('label', array('for' => 'design_background-image_off',
                                                'class' => 'radio'),
-                                _('Off'));
+                                // TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
+                                _m('RADIO', 'Off'));
+            // TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
+            // TRANS: use of the uploaded profile image.
             $this->out->element('p', 'form_guide', _('Turn background image on or off.'));
             $this->out->elementEnd('li');
 
             $this->out->elementStart('li');
             $this->out->checkbox('design_background-image_repeat',
+                                 // TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
                                  _('Tile background image'),
                                  ($this->design->disposition & BACKGROUND_TILE) ? true : false);
             $this->out->elementEnd('li');
@@ -221,6 +234,7 @@ class DesignForm extends Form
             $bgcolor = new WebColor($this->design->backgroundcolor);
 
             $this->out->elementStart('li');
+            // TRANS: Label on profile design page for setting a profile page background colour.
             $this->out->element('label', array('for' => 'swatch-1'), _('Background'));
             $this->out->element('input', array('name' => 'design_background',
                                                'type' => 'text',
@@ -234,6 +248,7 @@ class DesignForm extends Form
             $ccolor = new WebColor($this->design->contentcolor);
 
             $this->out->elementStart('li');
+            // TRANS: Label on profile design page for setting a profile page content colour.
             $this->out->element('label', array('for' => 'swatch-2'), _('Content'));
             $this->out->element('input', array('name' => 'design_content',
                                                'type' => 'text',
@@ -247,6 +262,7 @@ class DesignForm extends Form
             $sbcolor = new WebColor($this->design->sidebarcolor);
 
             $this->out->elementStart('li');
+            // TRANS: Label on profile design page for setting a profile page sidebar colour.
             $this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
             $this->out->element('input', array('name' => 'design_sidebar',
                                                'type' => 'text',
@@ -260,6 +276,7 @@ class DesignForm extends Form
             $tcolor = new WebColor($this->design->textcolor);
 
             $this->out->elementStart('li');
+            // TRANS: Label on profile design page for setting a profile page text colour.
             $this->out->element('label', array('for' => 'swatch-4'), _('Text'));
             $this->out->element('input', array('name' => 'design_text',
                                                'type' => 'text',
@@ -273,6 +290,7 @@ class DesignForm extends Form
             $lcolor = new WebColor($this->design->linkcolor);
 
             $this->out->elementStart('li');
+            // TRANS: Label on profile design page for setting a profile page links colour.
             $this->out->element('label', array('for' => 'swatch-5'), _('Links'));
             $this->out->element('input', array('name' => 'design_links',
                                                'type' => 'text',
@@ -298,7 +316,9 @@ class DesignForm extends Form
 
     function formActions()
     {
-        $this->out->submit('save', _('Save'), 'submit form_action-secondary',
+        // TRANS: Button text on profile design page to save settings.
+        $this->out->submit('save', _m('BUTTON','Save'), 'submit form_action-secondary',
+                           // TRANS: Title for button on profile design page to save settings.
                            'save', _('Save design'));
     }
 }