Commit 61e2b0e7 authored by Kristina Hoeppner's avatar Kristina Hoeppner
Browse files

Minor lang string fixes (Bug 892959)



Various lang string fixes right before RC1

Change-Id: If25cca56b8dd6fff16d586f58d9df9b02fcde31f
Signed-off-by: Kristina Hoeppner's avatarKristina D.C. Hoeppner <kristina@catalyst.net.nz>
parent bb8f8d86
......@@ -214,7 +214,7 @@ $siteoptionform = array(
'exporttoqueue' => array(
'type' => 'checkbox',
'title' => get_string('exporttoqueue', 'admin'),
'description' => get_string('exporttoqueuedescription', 'admin'),
'description' => get_string('exporttoqueuedescription1', 'admin'),
'defaultvalue' => get_config('exporttoqueue'),
'disabled' => in_array('exporttoqueue', $OVERRIDDEN),
),
......
......@@ -580,7 +580,7 @@ foreach ($ALLOWEDKEYS as $type) {
}
$fields .= "<div class=cl></div></ul>\n";
$uploadcsvpagedescription = get_string('uploadcsvpagedescription3', 'admin', $fields);
$uploadcsvpagedescription = get_string('uploadcsvpagedescription4', 'admin', $fields);
$form = pieform($form);
......
......@@ -101,10 +101,10 @@ $string['filelistloaded'] = 'File list loaded';
$string['filemoved'] = 'File moved successfully';
$string['filenamefieldisrequired'] = 'The file field is required.';
$string['filenamefieldisrequired1'] = 'The file / folder name is required.';
$string['filespagedescription'] = 'Here are your images, documents or other files for inclusion in pages.';
$string['groupfilespagedescription'] = 'Here are the group images, documents or other files for inclusion in pages.';
$string['institutionfilespagedescription'] = 'Here are the institution images, documents or other files for inclusion in pages.';
$string['fileuploadinstructions'] = 'You can select multiple files to upload them at once. Drag and drop the icons to move files between folders.';
$string['filespagedescription1'] = 'Here are your images, documents and other files for inclusion in pages. Drag and drop a file or folder icon to move the file or folder between folders.';
$string['groupfilespagedescription1'] = 'Here are the group images, documents and other files for inclusion in pages.';
$string['institutionfilespagedescription1'] = 'Here are the institution images, documents and other files for inclusion in pages.';
$string['fileuploadinstructions1'] = 'You can select multiple files to upload them at once.';
$string['filethingdeleted'] = '%s deleted';
$string['filewithnameexists'] = 'A file or folder with the name "%s" already exists.';
$string['folder'] = 'Folder';
......@@ -180,16 +180,16 @@ $string['insufficientmemoryforresize'] = ' (Not enough memory available to resiz
// quotanotification
$string['quotanotificationheader'] = 'Quota notification';
$string['quotanotifylimitoutofbounds'] = 'The notificationlimit is given in percent and has to be a number between 0 and 100.';
$string['quotanotifylimitoutofbounds'] = 'The notification limit is given in percent and has to be a number between 0 and 100.';
$string['usernotificationsubject'] = 'Your file storage is almost full';
$string['usernotificationmessage'] = 'You are using %s%% of your %s quota. You should get in touch with your site administrator about having your limit increased.';
$string['adm_notificationsubject'] = 'A user has nearly reached their file quota limit';
$string['adm_notificationmessage'] = 'User %s has arrived at %s%% percent of their %s quota. ';
$string['adm_notificationmessage'] = 'User %s has reached %s%% percent of their %s quota. ';
$string['textlinktouser'] = 'Edit profile of %s';
$string['quotanotifylimittitle'] = 'Quota notify limit';
$string['quotanotifylimitdescr'] = 'At what percentage of a filled quota should a user (and maybe the admin) get notified, so they can delete old files or increase the quota?';
$string['quotanotifyadmin'] = 'Notify site admins?';
$string['quotanotifyadmindescr'] = 'Should the site admins also be notified when a user nearly reaches their quota?';
$string['quotanotificationlimittitle'] = 'Quota notification limit';
$string['quotanotificationlimitdescr'] = 'At what percentage of a filled quota will a user (and the site administrator, see below) be notified, so they can delete old files or increase the quota?';
$string['quotanotificationadmin'] = 'Notify site administrator';
$string['quotanotificationadmindescr'] = 'If checked, the site administrator will also be notified when a user nearly reaches their quota.';
// File types
$string['ai'] = 'Postscript document';
......
......@@ -1757,8 +1757,8 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
'quotanotifylimit' => array(
'type' => 'text',
'size' => 4,
'title' => get_string('quotanotifylimittitle', 'artefact.file'),
'description' => get_string('quotanotifylimitdescr', 'artefact.file'),
'title' => get_string('quotanotificationlimittitle', 'artefact.file'),
'description' => get_string('quotanotificationlimitdescr', 'artefact.file'),
'defaultvalue' => get_config_plugin('artefact', 'file', 'quotanotifylimit'),
'rules' => array(
'required' => true,
......@@ -1767,9 +1767,9 @@ class ArtefactTypeFile extends ArtefactTypeFileBase {
),
'quotanotifyadmin' => array(
'type' => 'checkbox',
'title' => get_string('quotanotifyadmin', 'artefact.file'),
'description' => get_string('quotanotifyadmindescr', 'artefact.file'),
'defaultvalue' => get_config_plugin('artefact', 'file', 'quotanotifyadmin'),
'title' => get_string('quotanotificationadmin', 'artefact.file'),
'description' => get_string('quotanotificationadmindescr', 'artefact.file'),
'defaultvalue' => get_config_plugin('artefact', 'file', 'quotanotificationadmin'),
),
),
'collapsible' => true,
......
......@@ -3,15 +3,15 @@
{$institutionselector|safe}
{/if}
{if $institution && $institution == 'mahara'}
<p class="intro">{str tag="adminfilespagedescription1" section="admin" args=$descriptionstrargs}</p>
<p class="intro">{str tag="adminfilespagedescription2" section="admin" args=$descriptionstrargs}</p>
{else}
{if $institution}
<p class="intro">{str tag='institutionfilespagedescription' section='artefact.file'}</p>
<p class="intro">{str tag='institutionfilespagedescription1' section='artefact.file'}</p>
{else}
{if $group}
<p class="intro">{str tag='groupfilespagedescription' section='artefact.file'}</p>
<p class="intro">{str tag='groupfilespagedescription1' section='artefact.file'}</p>
{else}
<p class="intro">{str tag='filespagedescription' section='artefact.file'}</p>
<p class="intro">{str tag='filespagedescription1' section='artefact.file'}</p>
{/if}
{/if}
{/if}
......
......@@ -37,7 +37,7 @@
{if $config.upload}
<div id="{$prefix}_upload_container" class="fileupload{if ($tabs && !$tabs.upload) || $uploaddisabled} hidden{/if}">
<p class="intro">{str tag='fileuploadinstructions' section='artefact.file'}</p>
<p class="intro">{str tag='fileuploadinstructions1' section='artefact.file'}</p>
{* config.uploadagreement: disable the file chooser unless the agreement is checked *}
{* config.simpleupload: the form only contains a file chooser *}
{* config.submitbutton: add submit button even if js is enabled & don't start uploading as soon as a file is chosen *}
......
......@@ -121,7 +121,7 @@ $string['mynotes'] = 'My notes';
$string['notesfor'] = "Notes for %s";
$string['containedin'] = "Contained in";
$string['currenttitle'] = "Titled";
$string['notesdescription1'] = 'These are the html notes you have created inside note blocks on your pages.';
$string['notesdescription1'] = 'These are the HTML notes you have created inside note blocks on your pages.';
$string['editnote'] = 'Edit note';
$string['confirmdeletenote'] = 'This note is used in %d blocks and %d pages. If you delete it, all the blocks which currently contain the text will appear empty.';
$string['notedeleted'] = 'Note deleted';
......
......@@ -271,7 +271,7 @@ function delete_all_notifications_submit() {
}
db_commit();
$SESSION->add_ok_msg(get_string('deletednotifications', 'activity', $count));
$SESSION->add_ok_msg(get_string('deletednotifications1', 'activity', $count));
redirect(get_config('wwwroot') . 'artefact/multirecipientnotification/inbox.php?type=' . $type);
}
......@@ -291,7 +291,7 @@ $pages[0]["url"] = "artefact/multirecipientnotification/inbox.php";
$pages[0]["title"] = get_string('labelinbox', 'artefact.multirecipientnotification');
$pages[0]["selected"] = 1;
$pages[1]["url"] = "artefact/multirecipientnotification/outbox.php";
$pages[1]["title"] = get_string('labeloutbox', 'artefact.multirecipientnotification');
$pages[1]["title"] = get_string('labeloutbox1', 'artefact.multirecipientnotification');
// show urls and titles
$smarty->assign('SUBPAGENAV', $pages);
......
......@@ -119,7 +119,7 @@ else if ($delete) {
$countdeleted += count($idspertable);
}
db_commit();
$message = get_string('deletednotifications', 'activity', $countdeleted);
$message = get_string('deletednotifications1', 'activity', $countdeleted);
}
// ------------ Change ------------
......
......@@ -79,7 +79,7 @@ else if ($delete) {
}
}
db_commit();
$message = get_string('deletednotifications', 'artefact.multirecipientnotification', $countdeleted);
$message = get_string('deletednotifications1', 'artefact.multirecipientnotification', $countdeleted);
}
// ------------ Change ------------
......
......@@ -17,7 +17,7 @@ $string['titlerecipient'] = 'Recipients';
$string['replysubjectprefix'] = 'Re:';
$string['labelrecipients'] = 'To: ';
$string['labelsubject'] = 'Subject:';
$string['deletednotifications'] = 'Deleted %s notifications. Note that internal notifications can\'t be deleted from the outbox!';
$string['deletednotifications1'] = 'Deleted %s notifications. Note that internal notifications can\'t be deleted from the "Sent" area.';
$string['notification'] = 'Notifications';
$string['cantsendemptysubject'] = 'Your subject is empty. Please enter a subject.';
$string['cantsendemptytext'] = 'Your message is empty. Please enter a message.';
......@@ -30,11 +30,11 @@ $string['returnurltext'] = 'Reply';
$string['replyurltext'] = 'Reply all';
$string['linkindicator'] = '»';
$string['labeloutbox'] = 'Outbox';
$string['labeloutbox1'] = 'Sent';
$string['labelinbox'] = 'Inbox';
$string['nothingtorender'] = '';
$string['selectallread'] = 'All unread notifications';
$string['selectalldelete'] = 'All notifications for deletion';
$string['clickformore'] = '(Press \'enter\' to display more information)';
\ No newline at end of file
$string['clickformore'] = '(Press \'Enter\' to display more information)';
\ No newline at end of file
<!-- @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>Inbox</h3>
<p>This is a list of system activities or events that apply to you. Use the Notifications page in the Settings area to decide how you will receive notifications of these. Once you have read a notification you can mark it for removal from your list.</p>
<p><strong>Note:</strong> Read notifications will automatically expire and be removed from your list after 6 months.</p>
<p>This is a list of system activities or notifications that were sent to you. Use the "Notifications" page in the "Settings" area to decide how you want to receive these notifications. Once you have read a notification, you can mark it for removal from your list.</p>
<p><strong>Note:</strong> The following notification types expire automatically when you choose an email notification option and are deleted from your inbox after 6 months:</p>
<ul>
<li>Page access notifications</li>
<li>Watchlist notifications</li>
<li>Institution messages</li>
\ No newline at end of file
<!-- @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>Outbox</h3>
<p>This is a list of system activities or events 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 outbox.</p>
<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>
......@@ -226,7 +226,7 @@ function delete_all_notifications_submit() {
}
$count = count($msgids);
}
$SESSION->add_ok_msg(get_string('deletednotifications', 'artefact.multirecipientnotification', $count));
$SESSION->add_ok_msg(get_string('deletednotifications1', 'artefact.multirecipientnotification', $count));
redirect(get_config('wwwroot') . 'artefact/multirecipientnotification/outbox.php?type=' . $type);
}
......@@ -246,7 +246,7 @@ $pages = array();
$pages[0]["url"] = "artefact/multirecipientnotification/inbox.php";
$pages[0]["title"] = get_string('labelinbox', 'artefact.multirecipientnotification');
$pages[1]["url"]="artefact/multirecipientnotification/outbox.php";
$pages[1]["title"] = get_string('labeloutbox', 'artefact.multirecipientnotification');
$pages[1]["title"] = get_string('labeloutbox1', 'artefact.multirecipientnotification');
$pages[1]["selected"] = 1;
// show urls and titles
$smarty->assign('SUBPAGENAV', $pages);
......
......@@ -127,7 +127,7 @@ $smarty->display('artefact:resume:index.tpl');
function personalinformation_validate(Pieform $form, $values) {
if (!empty($values['dateofbirth'])) {
if ($values['dateofbirth'] > time()) {
$form->json_reply(PIEFORM_ERR, get_string('dateofbirthinvalid','artefact.resume'));
$form->json_reply(PIEFORM_ERR, get_string('dateofbirthinvalid1','artefact.resume'));
}
}
}
......
......@@ -30,7 +30,7 @@ $string['interest'] = 'Interests';
$string['contactinformation'] = 'Contact information';
$string['personalinformation'] = 'Personal information';
$string['dateofbirth'] = 'Date of birth';
$string['dateofbirthinvalid'] = 'Date of birth invalid';
$string['dateofbirthinvalid1'] = 'This is not a valid date of birth. Please correct it.';
$string['placeofbirth'] = 'Place of birth';
$string['citizenship'] = 'Citizenship';
$string['visastatus'] = 'Visa status';
......
......@@ -17,4 +17,4 @@ $string['description'] = 'Embed Google calendar or docs';
$string['appscodeorurl'] = 'Embed code or URL';
$string['appscodeorurldesc'] = 'Paste the embed code or the URL of the page where Google Apps is publicly viewable.';
$string['height'] = 'Height';
$string['badurlerror'] = 'Unable to parse embedded code or url: %s';
\ No newline at end of file
$string['badurlerror'] = 'Unable to parse embedded code or URL: %s';
\ No newline at end of file
......@@ -19,9 +19,9 @@ $string['sortby'] = 'Sort groups by';
$string['earliest'] = 'Earliest joined';
$string['latest'] = 'Latest joined';
$string['alphabetical'] = 'A to Z';
$string['limitto'] = 'Maximum groups displayed';
$string['limitto1'] = 'Maximum number of groups to display';
$string['limittodesc'] = 'Maximum number of groups to display in the block. Leave empty to show all your groups.';
$string['limittodescsideblock'] = 'Maximum number of groups to display in the your "My groups" list. Leave blank to show all your groups.';
$string['limittodescsideblock'] = 'Maximum number of groups to display in the "My groups" list. Leave blank to show all your groups.';
$string['numberofmygroupsshowing'] = 'Showing %s of %s my groups';
$string['numberofmygroupsshowingearliest'] = 'Showing earliest %s of %s groups';
$string['numberofmygroupsshowinglatest'] = 'Showing latest %s of %s groups';
\ No newline at end of file
......@@ -129,9 +129,9 @@ class PluginBlocktypeMyGroups extends SystemBlocktype {
),
'limitto' => array(
'type' => 'text',
'title' => get_string('limitto', 'blocktype.mygroups'),
'title' => get_string('limitto1', 'blocktype.mygroups'),
'description' => get_string('limittodesc', 'blocktype.mygroups'),
'width' => '30%',
'size' => 3,
'defaultvalue' => isset($configdata['limitto']) ? $configdata['limitto'] : 20,
'rules' => array(
'maxlength' => 4,
......
......@@ -614,8 +614,8 @@ function export_process_queue($id = false) {
$exporter = new $class($user, $views, PluginExport::EXPORT_COLLECTIONS);
break;
default:
$errors[] = get_string('unabletoexportportfoliousingoptions', 'export');
log_warn(get_string('unabletoexportportfoliousingoptions', 'export'));
$errors[] = get_string('unabletoexportportfoliousingoptionsadmin', 'export');
log_warn(get_string('unabletoexportportfoliousingoptionsadmin', 'export'));
}
$exporter->includefeedback = false; // currently only doing leap2a exports and they can't handle feedback
......
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