Correct minor lang string fixes (Bug #1492663)

incl. in a couple of places simply changing the
lang string ID so that it shows up for the
translators.

behatnotneeded

Change-Id: Ifbee0345d00078ffe99367f2f3e2bae4ecab2b69
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

htdocs/admin/site/cookieconsent2.php

@@ -153,7 +153,7 @@ $data = array(
     'social' => array(
         'title' => get_string('cookietypessocial', 'cookieconsent'),
         'item1' => get_string('instructiontext1', 'cookieconsent', get_string('cookietypessocial','cookieconsent'), get_string('example1social','cookieconsent')),
-        'item2' => get_string('instructiontext2', 'cookieconsent'),
+        'item2' => get_string('instructiontext2-1', 'cookieconsent'),
         'item3' => get_string('instructiontext3', 'cookieconsent', 'cc-onconsent-social'),
         'code1' => $examplesocialbefore,
         'code2' => $examplesocialafter,

htdocs/admin/users/uploadcsv.php

@@ -630,7 +630,7 @@ foreach ($ALLOWEDKEYS as $type) {
 }
 $fields .= "<div class=cl></div></ul>\n";
 
-$uploadcsvpagedescription = get_string('uploadcsvpagedescription5', 'admin', $fields);
+$uploadcsvpagedescription = get_string('uploadcsvpagedescription6', 'admin', $fields);
 
 $form = pieform($form);
 

htdocs/artefact/blog/lang/en.utf8/artefact.blog.php

@@ -121,9 +121,9 @@ $string['viewblog'] = 'View journal';
 $string['viewbloggroup'] = 'View "%s" journal';
 $string['youarenottheownerofthisblog'] = 'You are not the owner of this journal.';
 $string['youarenottheownerofthisblogpost'] = 'You are not the owner of this journal entry.';
-$string['youarenotanadminof'] = 'You are not an admin of the "%s" institution.';
+$string['youarenotanadminof'] = 'You are not an administrator of the "%s" institution.';
 $string['youarenotamemberof'] = 'You are not a member of the "%s" group.';
-$string['youarenotaneditingmemberof'] = 'You do not have the editing permissions for the journals in the group "%s".';
+$string['youarenotaneditingmemberof'] = 'You do not have editing permissions for the journals in the group "%s".';
 $string['cannotdeleteblogpost'] = 'An error occurred removing this journal entry.';
 
 $string['baseline'] = 'Baseline';

htdocs/artefact/file/blocktype/gallery/lang/en.utf8/blocktype.gallery.php

@@ -16,7 +16,7 @@ $string['title'] = 'Image gallery';
 $string['description1'] = 'A collection of images from your files area or an external gallery';
 
 $string['select'] = 'Image selection';
-$string['selectfolder'] = 'Display all images from a folder (includes images uploaded later)';
+$string['selectfolder'] = 'Display all images from a folder including images uploaded later';
 $string['selectimages'] = 'Choose individual images to display';
 $string['selectexternal'] = 'Display images from external gallery';
 $string['externalgalleryurl'] = 'Gallery URL or RSS';

htdocs/auth/webservice/lang/en.utf8/auth.webservice.php

@@ -291,7 +291,7 @@ $string['wsdocumentation'] = 'Web service documentation';
 $string['wspassword'] = 'Web service password';
 $string['wsusername'] = 'Web service username';
 $string['webservicesenabled'] = 'Web services enabled';
-$string['webservicesnotenabled'] = 'You need to enable at least one Protocol';
+$string['webservicesnotenabled'] = 'You need to enable at least one protocol';
 
 // Web Service functions errors
 $string['nooauth'] = 'Not enabled for OAuth';

htdocs/lang/en.utf8/activity.php

@@ -42,8 +42,8 @@ $string['selectalldelete'] = 'All notifications for deletion';
 $string['recurseall'] = 'Recurse all';
 $string['alltypes'] = 'All types';
 $string['nodelete'] = 'No notifications to delete';
-$string['youroutboxisempty'] = 'Your outbox is empty!';
-$string['yourinboxisempty'] = 'Your inbox is empty!';
+$string['youroutboxisempty'] = 'Your outbox is empty.';
+$string['yourinboxisempty'] = 'Your inbox is empty.';
 
 $string['markedasread'] = 'Marked your notifications as read';
 $string['failedtomarkasread'] = 'Failed to mark your notifications as read';

htdocs/lang/en.utf8/admin.php

@@ -225,7 +225,7 @@ $string['filemissingdesc'] = 'File %s%s is missing from server';
 $string['Field'] = 'Field';
 $string['Value'] = 'Value';
 $string['datathatwillbesent'] = 'Data that will be sent';
-$string['datathathavebeensent'] = 'Data that have been sent';
+$string['datathathavebeensent'] = 'Data that has been sent';
 $string['sendweeklyupdates'] = 'Send weekly updates?';
 $string['sendweeklyupdatesdescription1'] = 'If set to "On", your site will send weekly updates to mahara.org with some statistics about your site.';
 $string['Register'] = 'Register';
@@ -466,7 +466,7 @@ $string['watchlistdelaytitle'] = 'Watchlist notification delay';
 $string['defaultmultipleblogs'] = 'Multiple journals';
 $string['defaultmultipleblogsdescription1'] = 'Allow users to have multiple journals by default. Users can override this in their account settings page.';
 $string['mathjax'] = 'Enable MathJax';
-$string['mathjaxdescription'] = 'MathJax renders LaTeX markup into properly formatted math and science equations, on portfolio pages.';
+$string['mathjaxdescription'] = 'MathJax renders LaTeX markup into properly formatted math and science equations on portfolio pages.';
 $string['mathjaxconfig'] = 'MathJax configuration';
 
 // Site content
@@ -613,22 +613,24 @@ $string['uploadcsverrorduplicateremoteuser'] = 'Line %s of the file specifies a
 $string['uploadcsverrorremoteusertaken'] = 'Line %s of the file specifies a remote username "%s" that is already taken by the user "%s".';
 $string['uploadcsverrorusernotininstitution'] = 'Error on line %s: The user "%s" is not a member of the institution %s.';
 $string['uploadcsverroruserinaninstitution'] = 'Error on line %s: The user "%s" is a member of the following institutions: %s. You cannot update this user\'s authentication method to "No Institution".';
-$string['uploadcsvpagedescription5'] = '<p>Here you can upload new users via a <acronym title="Comma Separated Values">CSV</acronym> file.</p>
+$string['uploadcsvpagedescription6'] = '<p>Here you can upload new users via a <acronym title="Comma Separated Values">CSV</acronym> file.</p>
 
 <p>The first row of your CSV file should specify the format of your CSV data. For example, it should look like this:</p>
 
 <pre>username,password,email,firstname,lastname,studentid</pre>
 
-<p>This row must include the following fields:</p>
+<p>This row must include the following fields when you create <i>new</i> users:</p>
 <ul class="fieldslist">
 <li>username</li>
-<li>password</li>
-<li>email</li>
 <li>firstname</li>
 <li>lastname</li>
+<li>email</li>
+<li>password</li>
 </ul>
 
-<p>Your CSV file may include any other profile fields as you require. The list of optional fields is:</p>
+<p>You can leave out the "password" field when you update existing users.</p>
+
+<p>Your CSV file may include any other profile fields that you want to pre-fill. The optional fields are:</p>
 
 %s';
 $string['uploadcsverrortoomanyusers'] = 'You have too many lines in your CSV file. Your file should not contain more than %s.';
@@ -800,7 +802,7 @@ $string['probationreportcolumn'] = 'Probation';
 $string['addusertoinstitution'] = 'Add user to institution';
 $string['removeuserfrominstitution'] = 'Remove user from this institution';
 $string['confirmremoveuserfrominstitution'] = 'Are you sure you want to remove the user from this institution?';
-$string['usereditdescription'] = 'Here you can view and set details for this user account. Below, you can also suspend or delete this account or change settings for this user in the institutions they are in.';
+$string['usereditdescription1'] = 'Here you can manage this user account, including changing details, suspending or deleting it or changing its membership in institutions.';
 $string['usereditwarning'] = 'NOTE: Saving the account changes will cause the user to be logged out (if currently logged in).';
 $string['suspenduserdescription'] = 'A suspended user is unable to log in until the account is unsuspended.';
 $string['deleteusernote'] = 'Please note that this operation <strong>cannot be undone</strong>.';
@@ -1160,7 +1162,7 @@ $string['usershaveloggedinsince'] = 'Users have logged in since';
 $string['usershavenotloggedinsince'] = 'Users have not logged in since';
 
 // Admin user search duplicate email filter
-$string['duplicateemailfilter'] = 'Duplicate email addresses';
+$string['duplicateemailfilter1'] = 'Duplicate email addresses';
 
 $string['noemailfound'] = 'No email address found';
 
@@ -1208,15 +1210,15 @@ $string['committingchanges'] = 'Saving changes...';
 // Password reset script
 $string['cli_pwreset_authupdated'] = 'Auth method updated to "internal".';
 $string['cli_pwreset_failure'] = 'ERROR: Unable to successfully reset the password for "%s".';
-$string['cli_pwreset_forcepasswordchange'] = 'Force password change on next login. (Default "true" if you use the "--password" option; "false" otherwise.)';
+$string['cli_pwreset_forcepasswordchange'] = 'Force password change on next login (Default "true" if you use the "--password" option; "false" otherwise).';
 $string['cli_pwreset_info'] = 'This command-line PHP script allows you to reset a user\'s password. This will only work for users whose auth method allows password resets (e.g. "internal").' ;
-$string['cli_pwreset_makeinternal'] = 'Change the user\'s auth method to "internal". (Default "false")';
+$string['cli_pwreset_makeinternal'] = 'Change the user\'s auth method to "internal" (Default "false").';
 $string['cli_pwreset_nointernalauth'] = 'ERROR: Couldn\'t find default "internal" auth method.';
 $string['cli_pwreset_nosuchuser'] = 'ERROR: There is no user with username "%s" in the database.';
 $string['cli_pwreset_notsupported'] = 'ERROR: User "%s" has an auth method that doesn\'t support password resets. Use the "-i=true" option if you want to change them to "internal" auth.';
-$string['cli_pwreset_password'] = 'The new password. (If this parameter is not supplied, the script will prompt you for a password.)';
+$string['cli_pwreset_password'] = 'The new password. If this parameter is not supplied, the script will prompt you for a password.';
 $string['cli_pwreset_prompt1'] = 'Enter new password';
 $string['cli_pwreset_prompt2'] = 'Retype new password';
 $string['cli_pwreset_success'] = 'Successfully reset password for user "%s".';
 $string['cli_pwreset_success_forcepasswordchange'] = 'The user will be forced to reset their password at their next login.';
-$string['cli_pwreset_typo'] = 'Sorry, passwords do not match';
+$string['cli_pwreset_typo'] = 'Sorry, passwords do not match.';

htdocs/lang/en.utf8/cookieconsent.php

@@ -69,8 +69,8 @@ $string['cookieconsentdisabled'] = 'Cookie Consent disabled';
 $string['cookieconsent2'] = 'Additional site modifications';
 $string['additionalmodifications'] = 'If you want Cookie Control to take full effect, you will have to modify or update your theme header files or the <tt>$cfg->additionalhtmlhead</tt> config setting.';
 $string['instructiontext1'] = 'Find any Javascript elements that set %s cookies. Examples might include %s.';
-$string['instructiontext2'] = 'Modify the <tt>&lt;script&gt;</tt> tag so that the type attribute is "text/plain" rather than "application/javascript"';
-$string['instructiontext3'] = 'Add a class of "%s" to the <tt>&lt;script&gt;</tt> tag';
+$string['instructiontext2-1'] = 'Modify the <tt>&lt;script&gt;</tt> tag so that the type attribute is "text/plain" rather than "application/javascript".';
+$string['instructiontext3'] = 'Add a class of "%s" to the <tt>&lt;script&gt;</tt> tag.';
 $string['example1social'] = 'Facebook buttons and Twitter widgets';
 $string['example1analytics'] = 'Google Analytics and StatCounter';
 $string['example1advertising'] = 'Google AdSense and other targeted advertising plugins';

htdocs/lang/en.utf8/error.php

@@ -87,7 +87,7 @@ $string['notfound'] = 'Not found';
 $string['notfoundexception'] = 'The page you are looking for could not be found.';
 
 $string['accessdenied'] = 'Access denied';
-$string['accessdeniedobjection'] = 'Access denied - The objection has already been resolved by another administrator.';
+$string['accessdeniedobjection'] = 'Access denied. The objection has already been resolved by another administrator.';
 $string['accessdeniedexception'] =  'You do not have access to view this page.';
 
 $string['viewnotfoundexceptiontitle'] = 'Page not found';

htdocs/lang/en.utf8/group.php

@@ -388,4 +388,4 @@ $string['extcommenters'] = "Non-members involved";
 $string['groupparticipationreports'] = "Participation report";
 $string['groupparticipationreportsdesc1'] = "Group administrators can access a report displaying all group and shared pages and who has commented on them.";
 
-$string['returntogrouppages'] = "Rreturn to group pages";
\ No newline at end of file
+$string['returntogrouppages'] = "Return to group pages";

htdocs/lang/en.utf8/help/forms/adduser.addremovecolumns.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Show controls to add and remove columns when editing a page</h3>
-<p>You can choose to display a row with  buttons
+<p>You can choose to display a row with the buttons
     <span class="btn btn-success btn-xs text-left" title="Add column">
         <span class="mrs icon-long-arrow-down icon-rotate-45 icon icon-sm"></span>
         <span class="icon-plus icon icon-sm"></span>

htdocs/lang/en.utf8/help/forms/siteoptions.mathjax.html

 <!-- @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later -->
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
-<h3>MathJax</h3> 
+<h3>MathJax</h3>
 MathJax is a JavaScript display engine for TeX, LaTeX, AsciiMath and MathMl notation which allows mathematics and science equations to be displayed in Mahara pages.
 <p>MathJax allows the display of equations throughout your Mahara installation.</p>
 <h4>MathJax URL</h4>
-<p>The default configuration uses the latest stable version on the MathJax Content Distribution Network (CDN). http and https protocols may be used, as appopriate.</p>
-<p>Alternatively, $cfg->mathjaxpath may use a local server installation of MathJax. See <a href="http://docs.mathjax.org/en/latest/installation.html">http://docs.mathjax.org/en/latest/installation.html</a></p>
-<p>The default includes a commonly used configuration allowing input of MathML, AsciiMath, TeX or LaTeX and processing to MathML or HTML-CSS</p>
-<h4>MathJax additional configuration</h4>
+<p>The default configuration uses the latest stable version on the MathJax Content Distribution Network (CDN). http and https protocols may be used as appopriate.</p>
+<p>Alternatively, $cfg->mathjaxpath may use a local server installation of MathJax. See <a href="http://docs.mathjax.org/en/latest/installation.html">the documentation</a> for more information.</p>
+<p>The default includes a commonly used configuration allowing input of MathML, AsciiMath, TeX or LaTeX and processing to MathML or HTML-CSS.</p>
+<h4>Additional configuration of MathJax</h4>
 <p>Additional MathJax configuration can be added to $cfg->mathjaxconfig. The default MathJax configuration should be appropriate for most users, but MathJax is highly configurable and any of the standard MathJax configuration options can be added here.</p>
-<p>By default, includes the mhchem extension which adds the \ce macro for chemical formulae. See <a href="http://docs.mathjax.org/en/latest/tex.html#tex-and-latex-extensions">http://docs.mathjax.org/en/latest/tex.html#tex-and-latex-extensions</a>.</p>
+<p>By default, the mhchem extension which adds the \ce macro for chemical formulae is included. See <a href="http://docs.mathjax.org/en/latest/tex.html#tex-and-latex-extensions">the documentation</a> for more information.</p>

htdocs/lang/en.utf8/view.php

@@ -232,7 +232,7 @@ $string['groupviewurltaken'] = 'A page with this URL already exists.';
 $string['editblockspagedescription'] = '<p>Drag and drop content blocks from the tabs below to create your page.</p>';
 $string['displayview'] = 'Display page';
 $string['editthisview'] = 'Edit this page';
-$string['expandcontract'] = 'Expand/Contract list of block types';
+$string['expandcontract'] = 'Expand /   Contract list of block types';
 
 $string['success.addblocktype'] = 'Added block successfully';
 $string['err.addblocktype'] = 'Could not add the block to your page';

htdocs/module/multirecipientnotification/lang/en.utf8/help/pages/inbox.html

@@ -6,4 +6,5 @@
 <ul>
 <li>Page access notifications</li>
 <li>Watchlist notifications</li>
-<li>Institution messages</li>
\ No newline at end of file
+<li>Institution messages</li>
+</ul>

htdocs/module/multirecipientnotification/lang/en.utf8/help/pages/outbox.html

@@ -2,4 +2,4 @@
 <!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
 <h3>Sent</h3>
 <p>This is a list of system activities or notifications that originated from you. Once you have read a notification you can mark it for removal from your list.</p>
-<p><strong>Note:</strong> Internal notifications can't be deleted from the "Sent" area.</p>
+<p><strong>Note:</strong> You can't delete internal notifications from the "Sent" area.</p>

htdocs/theme/default/templates/admin/users/edit.tpl

@@ -13,9 +13,9 @@
 {/if}
 
 <div class="row">
-	<div class="col-md-9">
+    <div class="col-md-9">
         <h2>{str tag="siteaccountsettings" section="admin"}</h2>
-        
+
         <div id="profileicon" class="profile-icon pull-left pseudolabel">
             <a class="user-icon" href="{profile_url($user)}"><img src="{profile_icon_url user=$user maxheight=100 maxwidth=100}" alt="{str tag=profileimagetext arg1=$user|display_default_name}"></a>
             <div id="profilename"><a href="{profile_url($user)}">{$user|display_name}</a></div>
@@ -23,13 +23,13 @@
                <div id="loginas"><a class="btn btn-default" href="{$WWWROOT}admin/users/changeuser.php?id={$user->id}">{str tag=loginas section=admin}</a></div>
             {/if}
         </div>
-        
-        <p>{str tag="usereditdescription" section="admin"}</p>
+
+        <p>{str tag="usereditdescription1" section="admin"}</p>
         <p class="errmsg">{str tag="usereditwarning" section="admin"}</p>
-        
+
         <div class="clearfix form-group"></div>
         {$siteform|safe}
-        
+
          {if ($institutions)}
         <div id="institutions" class="panel panel-default">
             <div class="panel-heading">
@@ -41,11 +41,11 @@
             </div>
         </div>
         {/if}
-        
+
     </div>
-    
-	<div class="col-md-3">
-       
+
+    <div class="col-md-3">
+
         {if $suspendable}
         <div id="suspenddelete">
             <div id="suspend" class="panel panel-warning">
@@ -70,8 +70,8 @@
             {/if}
         </div>
         {/if}
-	</div>
+    </div>
 </div>
-        
+
 
 {include file="footer.tpl"}

htdocs/theme/raw/templates/admin/users/edit.tpl

 {include file="header.tpl"}
-<p class="lead">{str tag="usereditdescription" section="admin"}</p>
+<p class="lead">{str tag="usereditdescription1" section="admin"}</p>
 
 {if $suspended}
     <div class="suspendederror admin-warning alert alert-warning">

htdocs/theme/raw/templates/admin/users/search.tpl

@@ -108,7 +108,7 @@
                     <div class="duplicateemail-filter mtm checkbox form-group">
                        <input class="checkbox pull-left" type="checkbox" name="duplicateemail" id="duplicateemail" value="1"{if $search->duplicateemail} checked{/if}>
                         <label class="input-inline pls" for="duplicateemail">
-                            {str tag="duplicateemailfilter" section="admin"}
+                            {str tag="duplicateemailfilter1" section="admin"}
                         </label>
 
                     </div>