Commit ba10ffdc authored by Kristina Hoeppner's avatar Kristina Hoeppner
Browse files

Fix language strings (Bug 892959)



Some language strings need fixing that were beyond the
minor language string updates. Except for the strings in
install.php they all needed new strings to be picked up
by the translators.

Change-Id: I9cc6fe169a2b7b287a63df0bac1c52ea2c56c633
Signed-off-by: Kristina Hoeppner's avatarKristina D.C. Hoeppner <kristina@catalyst.net.nz>
parent b5cb415b
......@@ -266,7 +266,7 @@ $siteoptionform = array(
'institutionexpirynotification' => array(
'type' => 'expiry',
'title' => get_string('institutionexpirynotification', 'admin'),
'description' => get_string('institutionexpirynotificationdescription', 'admin'),
'description' => get_string('institutionexpirynotificationdescriptioninfo', 'admin'),
'defaultvalue' => get_config('institutionexpirynotification'),
'help' => true,
'disabled' => in_array('institutionexpirynotification', $OVERRIDDEN),
......@@ -514,14 +514,14 @@ $siteoptionform = array(
'showselfsearchsideblock' => array(
'type' => 'checkbox',
'title' => get_string('showselfsearchsideblock', 'admin'),
'description' => get_string('showselfsearchsideblockdescription', 'admin'),
'description' => get_string('showselfsearchsideblockdescription1', 'admin'),
'defaultvalue' => get_config('showselfsearchsideblock'),
'disabled' => in_array('showselfsearchsideblock', $OVERRIDDEN),
),
'showtagssideblock' => array(
'type' => 'checkbox',
'title' => get_string('showtagssideblock', 'admin'),
'description' => get_string('showtagssideblockdescription', 'admin'),
'description' => get_string('showtagssideblockdescription1', 'admin'),
'defaultvalue' => get_config('showtagssideblock'),
'disabled' => in_array('showtagssideblock', $OVERRIDDEN),
),
......@@ -544,7 +544,7 @@ $siteoptionform = array(
'showonlineuserssideblock' => array(
'type' => 'checkbox',
'title' => get_string('showonlineuserssideblock', 'admin'),
'description' => get_string('showonlineuserssideblockdescription', 'admin'),
'description' => get_string('showonlineuserssideblockdescriptionmessage', 'admin'),
'defaultvalue' => get_config('showonlineuserssideblock'),
'disabled' => in_array('showonlineuserssideblock', $OVERRIDDEN),
),
......
......@@ -327,7 +327,7 @@ if ($institution || $add) {
$elements['registerallowed'] = array(
'type' => 'checkbox',
'title' => get_string('registrationallowed', 'admin'),
'description' => get_string('registrationalloweddescription2', 'admin'),
'description' => get_string('registrationalloweddescription3', 'admin'),
'defaultvalue' => $data->registerallowed,
'help' => true,
);
......@@ -399,7 +399,7 @@ if ($institution || $add) {
$elements['showonlineusers'] = array(
'type' => 'select',
'title' => get_string('showonlineusers', 'admin'),
'description' => get_string('showonlineusersdesc','admin'),
'description' => get_string('showonlineusersdescription','admin'),
'defaultvalue' => $data->showonlineusers,
'collapseifoneoption' => true,
'options' => $showonlineusersoptions,
......
......@@ -32,4 +32,4 @@ $string['description'] = 'A single image from your files area';
$string['showdescription'] = 'Show description';
$string['width'] = 'Width';
$string['widthdescription'] = 'Specify the width for your image (in pixels). The image will be scaled to this width. Leave it blank to use the original size of the image.';
$string['widthdescription1'] = 'Specify the width for your image (in pixels). The image will be scaled to this width. Leave it blank to use the original size of the image. If the original size is too big, it will be scaled to the width of the block.';
......@@ -93,7 +93,7 @@ class PluginBlocktypeImage extends PluginBlocktype {
'type' => 'text',
'title' => get_string('width', 'blocktype.file/image'),
'size' => 3,
'description' => get_string('widthdescription', 'blocktype.file/image'),
'description' => get_string('widthdescription1', 'blocktype.file/image'),
'rules' => array(
'minvalue' => 16,
'maxvalue' => get_config('imagemaxwidth'),
......
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$string['title'] = 'Latest pages';
$string['description'] = 'List the most recently updated pages on the site';
$string['description1'] = 'List the most recently updated pages that you have access to on the site';
$string['viewstoshow'] = 'Maximum number of pages to show';
$string['viewstoshowdescription'] = 'Between 1 and 100';
$string['defaulttitledescription'] = 'A default title will be generated if you leave the title field blank';
......@@ -34,7 +34,7 @@ class PluginBlocktypeNewViews extends SystemBlocktype {
}
public static function get_description() {
return get_string('description', 'blocktype.newviews');
return get_string('description1', 'blocktype.newviews');
}
public static function get_categories() {
......
......@@ -199,6 +199,6 @@ $smarty = smarty(
array('stylesheets' => array('style/views.css'))
);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->assign('pagedescription', get_string('exportpagedescription', 'export'));
$smarty->assign('pagedescription', get_string('exportportfoliodescription', 'export'));
$smarty->assign('form', $form);
$smarty->display('form.tpl');
......@@ -263,7 +263,7 @@ $string['homepageinfodescription'] = 'If enabled, information about Mahara and h
$string['institutionautosuspend'] = 'Auto-suspend expired institutions';
$string['institutionautosuspenddescription'] = 'If checked, expired institutions will be automatically suspended';
$string['institutionexpirynotification'] = 'Warning time for institution expiry';
$string['institutionexpirynotificationdescription'] = 'A notification message will be sent to site and institution admins the long before a site expires';
$string['institutionexpirynotificationdescriptioninfo'] = 'A notification message will be sent to site and institution admins that long before an institution expires';
$string['language'] = 'Language';
$string['none'] = 'None';
$string['onlineuserssideblockmaxusers'] = 'Online users limit';
......@@ -285,11 +285,11 @@ $string['sessionlifetime'] = 'Session lifetime';
$string['sessionlifetimedescription'] = 'Time in minutes after which an inactive logged-in user will be automatically logged out';
$string['setsiteoptionsfailed'] = 'Failed setting the %s option';
$string['showonlineuserssideblock'] = 'Show online users';
$string['showonlineuserssideblockdescription'] = 'If checked, users will see a side block on the right hand side of the site with a list of the online users.';
$string['showonlineuserssideblockdescriptionmessage'] = 'If checked, users will see a side block with a list of the online users.';
$string['showselfsearchsideblock'] = 'Enable portfolio search';
$string['showselfsearchsideblockdescription'] = 'Display the "Search my portfolio" side block in the portfolio section of the site';
$string['showselfsearchsideblockdescription1'] = 'Display the "Search my portfolio" side block in a few places on the site';
$string['showtagssideblock'] = 'Enable tag cloud';
$string['showtagssideblockdescription'] = 'If enabled, users will see a side block in the portfolio section of the site with a list of their most frequently used tags';
$string['showtagssideblockdescription1'] = 'If enabled, users will see a side block in a few places on the site with a list of their most frequently used tags';
$string['simple'] = 'Simple';
$string['sitedefault'] = 'Site default';
$string['sitelanguagedescription'] = 'The default language for the site';
......@@ -322,9 +322,9 @@ $string['userscanhiderealnamesdescription'] = 'If checked, users who have set a
$string['usersseenewthemeonlogin'] = 'Other users will see the new theme the next time they log in.';
$string['viruschecking'] = 'Virus checking';
$string['viruscheckingdescription'] = 'If checked, virus checking will be enabled for all uploaded files using ClamAV';
$string['whocancreategroups'] = 'Who can create groups';
$string['whocancreategroups'] = 'Create groups';
$string['whocancreategroupsdescription'] = 'Which users will be able to create new groups';
$string['whocancreatepublicgroups'] = 'Who can create public groups';
$string['whocancreatepublicgroups'] = 'Create public groups';
$string['whocancreatepublicgroupsdescription'] = 'Which users will be able to make groups that are viewable by the general public';
$string['wysiwyg'] = 'HTML editor';
$string['wysiwygdescription'] = 'Defines whether or not the HTML editor is enabled globally or whether users are allowed to enable / disable it themselves.';
......@@ -703,13 +703,13 @@ $string['institutionexpiry'] = 'Institution expiry date';
$string['institutionexpirydescription'] = 'The date at which this institutions membership of %s will be suspended.';
$string['institutionupdatedsuccessfully'] = 'Institution updated successfully.';
$string['registrationallowed'] = 'Registration allowed';
$string['registrationalloweddescription2'] = 'Whether users can register for your site for this institution using the registration form. If registration is off, non-members cannot request membership of the institution and members cannot leave the institution or delete their user accounts themselves.';
$string['registrationalloweddescription3'] = 'Whether people can register for this institution on your site using the registration form. If registration is off, non-members cannot request membership of the institution and members cannot leave the institution or delete their user accounts themselves.';
$string['registrationconfirm'] = 'Confirm registration';
$string['registrationconfirmdescription'] = 'Registration must be approved by institution adminstrators.';
$string['defaultmembershipperiod'] = 'Default membership period';
$string['defaultmembershipperioddescription'] = 'How long new members remain associated with the institution';
$string['showonlineusers'] = 'Show online users';
$string['showonlineusersdesc'] = 'The online users to show to members of this institution. With different settings, the most permissive institution settings will be used.';
$string['showonlineusersdescription'] = 'The online users to show to members of this institution. If users are allowed to be in multiple institutions and these have different settings, the most permissive institution settings will be used.';
$string['Logo'] = 'Logo';
$string['logodescription'] = 'You can upload an image here that will be displayed to your institution\'s members in place of the standard header logo. For best results, this image should have the same dimensions as the site logo in your institution\'s theme. As each theme can have a different header height, no exact dimensions can be provided.';
......
......@@ -42,7 +42,7 @@ $string['exportingartefactsprogress'] = 'Exporting artefacts: %s/%s';
$string['exportingfooter'] = 'Exporting footer';
$string['exportingviews'] = 'Exporting pages';
$string['exportingviewsprogress'] = 'Exporting pages: %s/%s';
$string['exportpagedescription'] = 'This tool exports all of your portfolio information and pages, but it does not export your site settings.';
$string['exportportfoliodescription'] = 'This tool exports all of your portfolio information and pages. It does not export your site settings or any of the content you uploaded or created in groups.';
$string['exportyourportfolio'] = 'Export Your portfolio';
$string['generateexport'] = 'Generate export';
$string['noexportpluginsenabled'] = 'No export plugins have been enabled by the site administrator, so you are unable to use this feature';
......
<h3>Messages from other users</h3>
<p>Use this setting to choose who you wish to receive messages from.</p>
<p>Use the activity preferences area to decide how you will receive these messages.</p>
<p><strong>Note:</strong> These restrictions will not apply to site administrators or staff.</p>
<p><strong>Note:</strong> These restrictions will not apply to administrators or staff.</p>
......@@ -74,7 +74,7 @@ $string['privacydefaultcontent'] = '<h1>Privacy statement</h1>
<p>We will only use your personal information for the purpose for which you provided it to us.</p>
<p>As [<i>name of site</i>] users you are able to determine what personal information you make available to others. By default, unless assigned administrator, course creator or tutor access rights, a user may only view your display name. This includes listings within a notification report or visitor log.</p>
<p>As [<i>name of site</i>] users you are able to determine what personal information you make available to others. By default, unless assigned administrator or staff access rights, a user may only view your display name (or name if you have not chosen / could not choose a display name) and your default profile picture. This includes listings within a notification report or visitor log.</p>
<p>We may also collect system usage for statistical purposes. However this data will not identify any individual.</p>
......@@ -82,7 +82,7 @@ $string['privacydefaultcontent'] = '<h1>Privacy statement</h1>
<p>We will take all reasonable steps to ensure that any personal information we hold is not subject to loss or misuse or unauthorised access, disclosure or alteration.</p>
<p>In order to help protect your personal information, please do not disclose your username or password to any person other than the site administrator.</p>
<p>In order to help protect your personal information, please do not disclose your username or password to any person.</p>
<h2>Changes to this privacy statement</h2>
......@@ -105,7 +105,7 @@ $string['termsandconditionsdefaultcontent'] = '<h1>Terms and conditions</h1>
<p>You are encouraged to report objectionable material or inappropriate behaviour to the <a href="contact.php">site administrator</a> immediately. We will ensure the matter is investigated in a timely manner.</p>
<p>Site administrators may access your portfolio and its contents at anytime, however they will avoid doing so unless specifically required to support your use of [<i>name of site</i>] or as per these terms and conditions.</p>
<p>Administrators may access your portfolio and its contents at anytime, however they will avoid doing so unless specifically required to support your use of [<i>name of site</i>] or as per these terms and conditions.</p>
<h2>Your obligations</h2>
......@@ -115,11 +115,11 @@ $string['termsandconditionsdefaultcontent'] = '<h1>Terms and conditions</h1>
<p>All files and content you upload to [<i>name of site</i>] are subject to New Zealand Copyright legislation. You are responsible for ensuring you have appropriate permission to reproduce and publish any work that is not your own. Incidents of plagiarism will be dealt with in accordance to your educational institution\'s policy.</p>
<p>You must not use your portfolio to store or display offensive material. If the site administrator receives report of any objectionable material within your portfolio, your account will be suspended and your access to [<i>name of site</i>] frozen pending an investigation in accordance to the Student Conduct Policy or equivalent of your educational institution. Where no conduct policy exists, the matter will be referred to an appropriate staff member of your institution or organisation.</p>
<p>You must not use your portfolio to store or display offensive material. If an administrator receives report of any objectionable material within your portfolio, your account will be suspended and your access to [<i>name of site</i>] frozen pending an investigation in accordance to the Student Conduct Policy or equivalent of your educational institution. Where no conduct policy exists, the matter will be referred to an appropriate staff member of your institution or organisation.</p>
<p>If the site administrator receives report of any inappropriate behaviour on your part, where it relates to [<i>name of site</i>], your account will be suspended and your access to [<i>name of site</i>] frozen pending an investigation in accordance to the Student Conduct Policy or equivalent of your educational institution. Where no conduct policy exists, the matter will be referred to an appropriate staff member of your institution or organisation.</p>
<p>Inappropriate behaviour includes misuse of the objectionable material reporting system, intentionally attempting to load files with virus content, placing objectionable or excessive feedback or comments on any other user\'s portfolio and any other behaviour deemed to be a nuisance or offensive by the site administrator.</p>
<p>Inappropriate behaviour includes misuse of the objectionable material reporting system, intentionally attempting to load files with virus content, placing objectionable or excessive feedback or comments on any other user\'s portfolio and any other behaviour deemed to be a nuisance or offensive by an administrator.</p>
<p>Any unsolicited contact you receive as a result of personal information you have publicly released via your portfolio is your responsibility. However, any misconduct in behaviour from users of the system should be reported to the <a href="contact.php">site administrator</a> immediately.</p>
......
......@@ -387,7 +387,7 @@ $string['language'] = 'Language';
// Forgot password
$string['cantchangepassword'] = 'Sorry, you are unable to change your password through this interface - please use your institution\'s interface instead.';
$string['forgotusernamepassword'] = 'Forgotten your username or password?';
$string['forgotusernamepasswordtext'] = '<p>If you have forgotten your username or password, enter the email address listed in your profile and we will send you a message you can use to give yourself a new password.</p>
$string['forgotusernamepasswordtextprimaryemail'] = '<p>If you have forgotten your username or password, enter the primary email address listed in your profile and we will send you a message you can use to give yourself a new password.</p>
<p>If you know your username and have forgotten your password, you can also enter your username instead.</p>';
$string['lostusernamepassword'] = 'Lost username / password';
$string['emailaddressorusername'] = 'Email address or username';
......
{include file="header.tpl"}
{if $forgotpass_form}
{str tag="forgotusernamepasswordtext"}
{str tag="forgotusernamepasswordtextprimaryemail"}
{$forgotpass_form|safe}
{/if}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment