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

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
......
<!-- @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>Objectionable content in forum</h3>
<h3>Objectionable content in forum topics and posts</h3>
<p>Messages to administrators that contain complaints by users about objectionable forum content. Forum topics and posts can be flagged as containing objectionable content.</p>
\ No newline at end of file
......@@ -3,4 +3,4 @@
<h3>Forum indent mode</h3>
<p><strong>Fully expand:</strong> Displays all the forum posts in parent/child order. Replies to a forum post are appended as children of that post.</p>
<p><strong>Expand to maximum:</strong> Displays the forum posts in parent/child order up to a maximum depth indicated by the value for 'Maximum indent level'. Replies to a forum post are appended as children of that post.</p>
<p><strong>No indents:</strong> Displays the forum posts in chrologial order. Replies to the forum are appended on the end of the forum thread.</p>
<p><strong>No indents:</strong> Displays the forum posts in chronologial order. Replies to the forum are appended to the end of the forum thread.</p>
......@@ -2,10 +2,10 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Update</h3>
<p>Select topics by checking the box to the left of each topic, then choose an action to update the selected topics.</p>
<p><strong>Subscribe</strong>: you will receive notifications for posts to selected topics.</p>
<p><strong>Unsubscribe</strong>: you will not receive notifications for posts to selected topics.</p>
<p><strong>Sticky</strong>: selected topics will appear at the top of every page.</p>
<p><strong>Unsticky</strong>: selected topics will no longer appear at the top of every page.</p>
<p><strong>Open</strong>: all group members will be able to post to selected topics.</p>
<p><strong>Close</strong>: only the group administrators and forum moderators will be able to post to selected topics.</p>
<p><strong>Move to</strong>: only the group administrators and forum moderators will be able to move selected topics to another forum.</p>
<p><strong>Subscribe</strong>: You will receive notifications for posts to selected topics.</p>
<p><strong>Unsubscribe</strong>: You will not receive notifications for posts to selected topics.</p>
<p><strong>Sticky</strong>: Selected topics will appear at the top of every page.</p>
<p><strong>Unsticky</strong>: Selected topics will no longer appear at the top of every page.</p>
<p><strong>Open</strong>: All group members will be able to post to selected topics.</p>
<p><strong>Close</strong>: Only the group administrators and forum moderators will be able to post to selected topics.</p>
<p><strong>Move to</strong>: Only the group administrators and forum moderators will be able to move selected topics to another forum.</p>
......@@ -45,7 +45,10 @@ $string['alltypes'] = 'All types';
$string['markedasread'] = 'Marked your notifications as read';
$string['failedtomarkasread'] = 'Failed to mark your notifications as read';
$string['deletednotifications'] = 'Deleted %s notifications';
$string['deletednotifications1'] = array(
0 => 'Deleted %s notification',
1 => 'Deleted %s notifications'
);
$string['failedtodeletenotifications'] = 'Failed to delete your notifications';
$string['stopmonitoring'] = 'Stop monitoring';
......
......@@ -79,7 +79,7 @@ $string['institutionstaticpages'] = 'Institution static pages';
$string['staticpageinstitutionbad'] = "You can't access and/or edit static pages for institution '%s'";
$string['usedefault'] = 'Use site default';
$string['usedefaultdescription1'] = 'Use the site\'s default text for this particular page type instead.';
$string['staticpagesdescription'] = 'Edit the content of static pages in Mahara (Home, Terms and Conditions, etc)';
$string['staticpagesdescription'] = 'Edit the content of static pages in Mahara (Home, Terms and Conditions, etc.)';
$string['menus'] = 'Menus';
$string['menusdescription'] = 'Manage the links and files within the "Links and resources" and footer menus';
$string['sitefiles'] = 'Site files';
......@@ -491,7 +491,7 @@ $string['footerupdated'] = 'Footer updated';
$string['footercustomlink'] = 'You can override the default page, <em>%s</em>, by entering a URL here or leave it empty to use the default value.';
// Admin Files
$string['adminfilespagedescription1'] = 'Here are files that can be included in the %s"Links and resources"%s menu. Files in the home directory will be able to be added to the logged-in menu, while files in the public directory will be able to be added to the public menu.';
$string['adminfilespagedescription2'] = 'Here are files that you can include in the %s"Links and resources"%s menu. You can add files from the home directory to the logged-in menu and files from the "public" folder to the public menu.';
// License settings
$string['extralicensesdescription'] = 'Note: The following licenses are used by some content but have not been configured.';
......@@ -551,8 +551,8 @@ $string['emailsmtpsecuretls'] = 'TLS';
$string['emailnoreplyaddress'] = 'System mail address';
$string['emailnoreplyaddressdescription'] = 'Emails come out as from this address';
$string['notificationsettings'] = 'Notification settings';
$string['notificationsettingsdescription'] = 'Here you can set the default options for new users to get notifications. Users can override these settings on their own "Settings -> Notifications" page.<br>
If you select either of the email options, notifications will still arrive in the user\'s inbox, but they will be automatically marked as read.';
$string['notificationsettingsdescription'] = 'Here you can set the default options for new users to get notifications. Users can override these settings on their own "Settings Notifications" page.<br>
If you select either of the email options, notifications will still arrive in the user\'s inbox, but they will be marked as read automatically.';
// Upload CSV and CSV errors
$string['csvfile'] = 'CSV file';
......@@ -585,7 +585,7 @@ $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['uploadcsvpagedescription3'] = '<p>You may use this facility to upload new users via a <acronym title="Comma Separated Values">CSV</acronym> file.</p>
$string['uploadcsvpagedescription4'] = '<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>
......@@ -687,7 +687,7 @@ $string['invalidlistingfile'] = 'Invalid username listing. Did you use the Mahar
// Admin Users
$string['adminuserspagedescription1'] = '<p>Here you can choose which users are administrators for the site. The current administrators are listed in the "Current administrators" field, and potential administrators are in the "Potential administrators" field.</p><p>The system must have at least one administrator.</p>';
$string['institutionadminuserspagedescription1'] = 'Here you can choose which users are administrators for the institution. The current administrators are listed in the "Current administrators" field, and potential administrators are in the "Institution members" field.';
$string['institutionadminuserspagedescription1'] = 'Here you can choose which users are administrators for the institution. The current administrators are listed in the "Current administrators" field, and potential administrators are shown in the "Institution members" field.';
$string['potentialadmins'] = 'Potential administrators';
$string['currentadmins'] = 'Current administrators';
$string['adminusersupdated'] = 'Administrators updated';
......@@ -796,8 +796,8 @@ $string['exportqueuearchived'] = array(
);
$string['exportdataascsv'] = 'Export all data in CSV format';
$string['nocsvresults'] = 'No results found for CSV file';
$string['exportdownloademailsubject'] = 'Your Leap2A export for %s is ready for download';
$string['exportdownloademailmessage'] = '%s, your Leap2A export for %s is ready for download. This file will only be available for up to 24 hours after it was generated. Please follow the link below to download the file:';
$string['exportdownloademailsubject'] = 'Your Leap2A export for "%s" is ready for download';
$string['exportdownloademailmessage'] = '%s, your Leap2A export for "%s" is ready for download. This file will only be available for up to 24 hours after it was generated. Please follow the link below to download the file:';
$string['exportdownloadurl'] = 'Download exported file';
// Add User
......@@ -1154,4 +1154,4 @@ $string['profilecompletenessdesc'] = 'Select artefacts that will count towards t
$string['profilecompletenesspreview'] = 'You can preview what the profile completion looks like in the "Profile completion preview" side block.';
$string['exporttoqueue'] = 'Export to queue';
$string['exporttoqueuedescription'] = 'Have the exporting of user portfolios via Leap2A to be handled by export queue for better server load management.';
$string['exporttoqueuedescription1'] = 'If checked, the export queue will handle the exporting of user portfolios via Leap2A for better server load management.';
......@@ -58,7 +58,8 @@ $string['deletespecifiedcollection'] = 'Delete collection \'%s\'';
$string['deletingcollection'] = 'Deleting collection';
$string['deleteview'] = 'Remove page from collection';
$string['description'] = 'Collection description';
$string['collectiondragupdate'] = 'Drag page names or use the arrow buttons to reorder pages in the \'Pages already in collection\' box.<br>You can tick and click \'Add pages\', or drag page names to the \'Pages already in collection\' box to add them to your collection.';
$string['collectiondragupdate1'] = 'Drag page names from the \'Add pages to collection\' box or tick the check boxes and click the \'Add pages\' button to move pages to \'Pages already in collection\'.<br>
You can drag page names or use the arrow buttons to re-order pages in the \'Pages already in collection\' area.';
$string['viewsincollection'] = 'Pages already in collection';
$string['editcollection'] = 'Edit collection';
$string['editingcollection'] = 'Editing collection';
......
......@@ -63,15 +63,15 @@ $string['writingfiles'] = 'Writing files';
$string['youarehere'] = 'You are here';
$string['youmustselectatleastonecollectiontoexport'] = 'You must select at least one collection to export';
$string['youmustselectatleastoneviewtoexport'] = 'You must select at least one page to export';
$string['zipnotinstalled'] = 'Your system does not have the zip command. Please install zip to enable this feature.';
$string['addedleap2atoexportqueuecollections'] = 'Added some of my collections to the export queue.';
$string['addedleap2atoexportqueueviews'] = 'Added some of my pages to the export queue.';
$string['addedleap2atoexportqueueall'] = 'Added all my data to the export queue.';
$string['zipnotinstalled'] = 'Your system does not have the ZIP command. Please install ZIP to enable this feature.';
$string['addedleap2atoexportqueuecollections'] = 'Added some of your collections to the export queue.';
$string['addedleap2atoexportqueueviews'] = 'Added some of your pages to the export queue.';
$string['addedleap2atoexportqueueall'] = 'Added all your data to the export queue.';
$string['exportqueuenotempty'] = 'Items in the export queue for this user. Please wait until they have been archived.';
// Export queue errors
$string['unabletogenerateexport'] = 'Insufficient information';
$string['unabletoexportportfoliousingoptions'] = 'The item is not a page or collection object';
$string['unabletoexportportfoliousingoptionsadmin'] = 'The item is not a page or collection object';
$string['exportzipfileerror'] = 'Generating the ZIP file failed: %s';
$string['submissiondirnotwritable'] = 'Cannot write to submission archive directory: %s';
$string['exportarchivesavefailed'] = 'Cannot save export archive information to database';
......
......@@ -91,7 +91,7 @@ $string['hasbeeninvitedtojoin'] = 'has been invited to join this group';
$string['groupinvitesfrom'] = 'Invited to join:';
$string['requestedmembershipin'] = 'Requested membership in:';
$string['viewnotify'] = 'Shared page notifications';
$string['viewnotifydescription2'] = 'Select which group members should receive a notification whenever a new group page is created, and whenever a group member shares one of their pages with the group (the group member sharing the page will not receive this notification). For very large groups it would be best to limit to non ordinary members as it can produce a lot of notifications.';
$string['viewnotifydescription2'] = 'Select which group members should receive a notification when a new group page is created and when a group member shares one of their pages with the group. The group member sharing the page will not receive this notification. For very large groups it would be best to limit this to non ordinary members as it can produce a lot of notifications.';
$string['feedbacknotify'] = 'Feedback notifications';
$string['feedbacknotifydescription'] = 'Select which group members should receive a notification when feedback is submitted to a group page.';
$string['allowsendnow'] = 'Send forum posts immediately';
......@@ -369,7 +369,7 @@ $string['allowssubmissions'] = 'Allows submissions';
$string['allowsubmissions'] = 'Allow submissions';
$string['allowssubmissionsdescription1'] = "Members can submit pages to the group that are then locked. These pages cannot be edited until they are released by a group tutor or administrator.";
$string['allowssubmissionsdescription'] = 'Members can submit pages to the group.';
$string['allowsarchives'] = 'Allow submission archiving';
$string['allowsarchives'] = 'Allow archiving of submissions';
$string['allowsarchivesdescription'] = 'Pages / collections are archived as zipped Leap2A files during the submission release process.';
// Group reports
......
<!-- @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>Contact us</h3>
<p>Messages to administrators that are sent via the Contact us form.</p>
\ No newline at end of file
<p>Messages to administrators that are sent via the "Contact us" form.</p>
\ 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>System message</h3>
<p>Automatically generated by the system or sent to you by one of the site administrators, e.g. account confirmation message.</p>
\ No newline at end of file
<p>Automatically generated by the system or sent by one of the site administrators, e.g. account confirmation message.</p>
\ 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>Objectionable content</h3>
<p>Messages to administrators that contain complaints by users about objectionable content. Pages and artefacts can be flagged as containing objectionable content.</p>
\ No newline at end of file
<p>Messages to administrators that contain complaints by users about objectionable content. Pages, artefacts, forum topics and forum posts can be flagged as containing objectionable content.</p>
\ 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>Message from other users</h3>
<p>Sent to you directly from other users of the site.</p>
\ No newline at end of file
<p>Messages that are sent to you by other users of the site.</p>
\ 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>New page access</h3>
<p>Notification that you or one of your groups have been given access to a new or existing non-public page. You do not receive notifications about pages accessible to all logged-in users and the public.</p>
\ No newline at end of file
<p>Notification that you or one of your groups have been given access to a page. You do not receive notifications about pages accessible to all logged-in users and the public.</p>
\ 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>Watchlist</h3>
<p>Notification of activity on any artefact, page, group or journal you are monitoring.</p>
\ No newline at end of file
<p>Notification of activity on any artefact, page, group or journal that is on the watchlist.</p>
\ 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>Allow submission archiving</h3>
<p>This relies on having allow submissions enabled and the site being able to create zipped files.</p>
<h3>Allow the archiving of submissions</h3>
<p>This relies on having the option "Allow submissions" enabled and the site being able to create zipped files.</p>
<p>If you can export portfolio pages or collections in general, you will be able to archive them here. If not, please contact your site administrator to have the PHP ZIP extension installed on the server.</p>
<!-- @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 60 days.</p>
<p>This is a list of system messages and notifications that apply to you. Use the "Notifications" page in the "Settings" area to decide how you will receive 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>
......@@ -2,7 +2,12 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Notification types</h3>
<p>You may select how you receive notifications for each activity type.</p>
<p><strong>Inbox:</strong> your notifications area will display a list of activity notifications received.</p>
<p><strong>Email:</strong> your primary email address will receive an email each time the activity occurs.</p>
<p><strong>Email digest:</strong> your primary email address will receive an email each day with a list of the activities of the last 24 hours.</p>
<p><strong>Note:</strong> If you select either email option, all activities will also be recorded in your notifications log as they happen. They will all be marked as already read. These notifications automatically expire and are removed from your log after 60 days.</p>
<p><strong>Inbox:</strong> Your inbox will display a list of activity notifications that you received.</p>
<p><strong>Email:</strong> Your primary email address will receive an email each time the activity occurs.</p>
<p><strong>Email digest:</strong> Your primary email address will receive an email each day with a list of the activities of the last 24 hours.</p>
<p><strong>Note:</strong> If you select either email option, all activities will also be recorded in your inbox as they happen. They will all be marked as already read.</p>
<p>The following notifications 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
......@@ -2,10 +2,10 @@
<!-- @copyright For copyright information on Mahara, please see the README file distributed with this software. -->
<h3>Institution static pages</h3>
<p>Some built-in pages of your site may be edited dynamically by a site or institution administrator.
If you wish to customise the content of a built-in page (About, Home, Logged-out home, Privacy statement, Terms and conditions
If you wish to customise the content of a built-in page (About, Home, Logged-out home, Privacy statement, Terms and conditions)
from the default text, select the page you wish to modify and edit it using the editor. Ensure you save your changes before
loading another page or exiting the static pages area.</p>
<p>Changes you make here will be reflected in the page content viewed by members of your institution. They will not
be shown to members of other institutions.</p>
<p>If you tick "Use site default" for a specific page, then your institution members will see the site default version
of that page rather than your institution's custom version.</p>
<p>If you tick "Use site default" for a specific page, then your institution members will see the site's default version
of that page.</p>
......@@ -797,7 +797,7 @@ $string['virusfounduser'] = 'The file you have uploaded, %s, has been scanned by
$string['fileunknowntype'] = 'The type of your uploaded file could not be determined. Your file may be corrupted, or it could be a configuration problem. Please contact your administrator.';
$string['virusrepeatsubject'] = 'Warning: %s is a repeat virus uploader.';
$string['virusrepeatmessage'] = 'The user %s has uploaded multiple files which have been scanned by a virus checker and found to be infected.';
$string['exportfiletoobig'] = 'The file about to be generated will be too big. Please clear some diskspace';
$string['exportfiletoobig'] = 'The file about to be generated will be too big. Please clear some disk space.';
$string['phpuploaderror'] = 'An error occurred during file upload: %s (Error code %s).';
$string['phpuploaderror_1'] = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
$string['phpuploaderror_2'] = 'The uploaded file exceeds the max_file_size directive that was specified in the HTML form.';
......
......@@ -205,13 +205,13 @@ $string['fonttype'] = 'Font type';
$string['headingandtext'] = 'Heading and text';
$string['headingonly'] = 'Heading only';
$string['fontuploadinstructions'] = '<br />To upload the needed font files you can either upload the zip file generated by the <a href="http://www.fontsquirrel.com/fontface/generator/" target="_blank">FontSquirrel Online Generator</a> directly,
$string['fontuploadinstructions'] = '<br />To upload the needed font files, you can either upload the ZIP file generated by the <a href="http://www.fontsquirrel.com/fontface/generator/" target="_blank">FontSquirrel Online Generator</a> directly
<br />or upload the EOT, SVG, TTF, WOFF, and license files individually.';
$string['fontfiles'] = 'Font files';
$string['fontfilemissing'] = 'Zip file does not contain a \'%s\' font file.';
$string['zipfontfiles'] = 'Font files in Zip archive';
$string['fontfilezip'] = 'Zip archive';
$string['zipdescription'] = 'Zip file containing the EOT, SVG, TTF, WOFF, and License files for a font';
$string['fontfilemissing'] = 'ZIP file does not contain a \'%s\' font file.';
$string['zipfontfiles'] = 'Font files in ZIP archive';
$string['fontfilezip'] = 'ZIP archive';
$string['zipdescription'] = 'ZIP file containing the EOT, SVG, TTF, WOFF, and license files for a font';
$string['fontfileeot'] = 'EOT font file';
$string['eotdescription'] = 'Embedded OpenType font (for Internet Explorer 4+)';
$string['notvalidfontfile'] = 'This is not a valid %s font file.';
......
......@@ -396,7 +396,7 @@ $string['profile'] = 'Profile';
$string['portfolio'] = 'Portfolio';
$string['grouphomepage'] = 'Group homepage';
$string['grouphomepagedescription'] = 'The Group homepage is the content that appears on the About tab for this group';
$string['grouphomepagedescription'] = 'The group homepage contains the content that appears on the "About" tab for this group';
// Shared views
$string['sharedwithme'] = 'Shared with me';
......
......@@ -3,7 +3,7 @@
<h2>{$PAGESUBHEADING}{if $SUBPAGEHELPNAME}<span class="page-help-icon">{$PAGEHELPICON|safe}</span>{/if}</h2>
{/if}
<div id="collectionpageswrap">
<div id="draginstruction">{str tag=collectiondragupdate section=collection}</div>
<div id="draginstruction">{str tag=collectiondragupdate1 section=collection}</div>
<div id="collectionpages">
<fieldset id="pagestoadd">
<legend>{str tag=addviewstocollection section=collection}</legend>
......
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