MDL-32578 theme_formal_white: modified two lang strings

theme/formal_white/lang/en/theme_formal_white.php

@@ -24,7 +24,7 @@
  */
 
 $string['blockcolumnwidth'] = 'Blocks column width';
-$string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. <strong>Using widths lower than 200px, the calendar block is not supposed to fit.</strong>';
+$string['blockcolumnwidthdesc'] = 'This sets the blocks column width for the theme. <strong>If width is lower than 200px (blockcolumnwidth-2*blockpadding), the calendar block is not able to fit.</strong>';
 $string['blockcontentbgc'] = 'Blocks content background colour';
 $string['blockcontentbgcdesc'] = 'This sets the blocks content background colour for the theme.';
 $string['blockpadding'] = 'Margin around blocks';
@@ -73,7 +73,7 @@
 $string['footnote'] = 'Footnote';
 $string['footnotedesc'] = 'The content from this textarea will be displayed in the footer of every page.';
 $string['framemargin'] = 'Frame margin';
-$string['framemargindesc'] = 'Room between the frame and the edge of the browser window. (This setting will be ignored whether "Formal white 1.9 look" is requested).';
+$string['framemargindesc'] = 'Room between the frame and the edge of the browser window. (This setting will be ignored if "{$a}" is requested).';
 $string['frontpagelogo'] = 'Custom front page logo';
 $string['frontpagelogodesc'] = 'Change the logo that is displayed on the front page of your site by entering the URL to the image you wish to use (i.e. http://www.yoursite.local/myfrontpagelogo.png). This setting overrides the custom logo setting. As a reference the default logo is 300px wide, 80px high and a transparent png will work best.';
 $string['headerbgc'] = 'Header background colour';
@@ -90,4 +90,4 @@
 $string['rblockcolumnbgc'] = 'Right column background colour';
 $string['rblockcolumnbgcdesc'] = 'This sets the right column background colour for the theme. If you leave this empty the left column background color will be used.';
 $string['region-side-post'] = 'Right';
-$string['region-side-pre'] = 'Left';
+$string['region-side-pre'] = 'Left';

theme/formal_white/settings.php

@@ -27,7 +27,7 @@
     // Frame margin
     $name = 'theme_formal_white/framemargin';
     $title = get_string('framemargin','theme_formal_white');
-    $description = get_string('framemargindesc', 'theme_formal_white');
+    $description = get_string('framemargindesc', 'theme_formal_white', get_string('noframe','theme_formal_white'));
     $default = '15';
     $choices = array(0=>'0px', 5=>'5px', 10=>'10px', 15=>'15px', 20=>'20px', 25=>'25px', 30=>'30px', 35=>'35px', 40=>'40px', 45=>'45px', 50=>'50px');
     $setting = new admin_setting_configselect($name, $title, $description, $default, $choices);
@@ -136,4 +136,4 @@
     $default = '';
     $setting = new admin_setting_configtextarea($name, $title, $description, $default);
     $settings->add($setting);
-}
+}