Commit 6cc7eb51 authored by Kristina Hoeppner's avatar Kristina Hoeppner Committed by Gerrit Code Review
Browse files

Minor lang string fixes for 1.8 RC (Bug #892959)



Fixing small language string problems prior to
the RC for 1.8.

Change-Id: Iadf84c061a8de55b67f1ae6bdc97dc650b067cee
Signed-off-by: Kristina Hoeppner's avatarKristina D.C. Hoeppner <kristina@catalyst.net.nz>
parent 7cca11eb
......@@ -28,4 +28,4 @@
defined('INTERNAL') || die();
$string['title'] = 'PDF';
$string['description'] = 'A single pdf file from your files area';
$string['description'] = 'A single PDF file from your files area';
......@@ -33,8 +33,8 @@ $string['sitefilesloaded'] = 'Site files loaded';
$string['addafile'] = 'Add a file';
$string['archive'] = 'Archive';
$string['bytes'] = 'bytes';
$string['cannotviewfolder'] = 'You do not have permission to view the content of this folder';
$string['cannoteditfolder'] = 'You do not have permission to add content to this folder';
$string['cannotviewfolder'] = 'You do not have permission to view the content of this folder.';
$string['cannoteditfolder'] = 'You do not have permission to add content to this folder.';
$string['cannoteditfoldersubmitted'] = 'You cannot add content to a folder in a submitted page.';
$string['cannotremovefromsubmittedfolder'] = 'You cannot remove content from a folder in a submitted page.';
$string['cannotextractfilesubmitted'] = 'You cannot extract a file in a submitted page.';
......@@ -109,8 +109,8 @@ $string['fileexists'] = 'File exists';
$string['fileexistsoverwritecancel'] = 'A file with that name already exists. You can try a different name or overwrite the existing file.';
$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['filenamefieldisrequired'] = 'The file field is required.';
$string['filenamefieldisrequired1'] = 'The file / folder name is required.';
$string['fileinstructions'] = 'Upload your images, documents or other files for inclusion in pages. You can select multiple files to upload them at once. Drag and drop the icons to move files between folders.';
$string['filethingdeleted'] = '%s deleted';
$string['filewithnameexists'] = 'A file or folder with the name "%s" already exists.';
......
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$string['title'] = 'Plans';
$string['description'] = 'Display your plans list (see Content -> Plans)';
$string['description1'] = 'Display a plan (see Content -> Plans)';
$string['defaulttitledescription'] = 'If this is left empty, the title of the plan will be used.';
$string['newerplans'] = 'Newer plans';
$string['noplansaddone'] = 'No plans yet. %sAdd one%s!';
......
......@@ -34,7 +34,7 @@ class PluginBlocktypePlans extends PluginBlocktype {
}
public static function get_description() {
return get_string('description', 'blocktype.plans/plans');
return get_string('description1', 'blocktype.plans/plans');
}
public static function get_categories() {
......
<h3>If a user is no longer present in LDAP</h3>
<p>This setting determines what the cron will do if a user in your
institution has no matching record in your LDAP server.</p>
<p><b>Note:</b> This setting only applies to users who have this auth instance
as their authentication method.</p>
<p><b>Note:</b> This setting only applies to users who have this authentication
instance as their authentication method.</p>
<dl>
<dt>Do nothing</dt>
<dd>No action will be taken. (This is the recommended setting.)</dd>
......@@ -14,4 +14,4 @@ or manually by an administrator.</dd>
<dt>Delete user's account and all content</dt>
<dd><b>Use with caution!</b> The user's account will be deleted, along with all their content and pages. The data
is fully deleted from the server, so this action requires a server backup to reverse.</dd>
</dl>
\ No newline at end of file
</dl>
......@@ -30,5 +30,5 @@ defined('INTERNAL') || die();
$string['defaulttitledescription'] = 'If no title is provided here, the title of the collection will be used.';
$string['collection'] = 'Collection';
$string['title'] = 'Navigation';
$string['description'] = 'Navigation for a collection of pages (see Portfolio -> Collections, or the Collections tab when inside a Group)';
$string['description'] = 'Navigation for a collection of pages (see Portfolio -> Collections, or the Collections tab when inside a group)';
$string['nocollections1'] = 'No collections. <a href="%s">Create one</a>.';
......@@ -93,13 +93,13 @@ $string['menus'] = 'Menus';
$string['menusdescription'] = 'Manage the links and files within the "Links and resources" and footer menus';
$string['sitefiles'] = 'Site files';
$string['sitefonts'] = 'Fonts';
$string['sitefontsdescription'] = 'Upload and manage fonts usable in skins by all users in the site';
$string['sitefontsdescription'] = 'Upload and manage fonts usable in skins by all users on the site';
$string['sitelicenses'] = 'Licenses';
$string['sitelicensesdescription'] = 'Configure the list of licenses that users can use for content.';
$string['sitelicensesdisablednote'] = '<b>Note</b>: License metadata is currently disabled. You will need to enable it in the "General settings" section of "<a href="%sadmin/site/options.php">Configure site</a>" before users will be able to specify licenses.';
$string['sitefilesdescription'] = 'Upload and administer files that can be put in the "Links and resources" menu and in site pages';
$string['siteskins'] = 'Site skins';
$string['siteskinsdescription'] = 'Create and administer page skins usable by all users in the site';
$string['siteskinsdescription'] = 'Create and administer page skins usable by all users on the site';
$string['siteviews'] = 'Site pages';
$string['siteviewsdescription'] = 'Create and administer pages and page templates for the entire site';
$string['networking'] = 'Networking';
......@@ -375,7 +375,7 @@ $string['siteoptionspagedescription'] = 'Here you can set some global options th
$string['siteoptionsset'] = 'Site options have been updated.';
$string['sitethemedescription'] = 'The default theme for the site. If your theme is not listed, check the error log.';
$string['skins'] = 'Page skins';
$string['skinsinstitutiondescription'] = 'Allow this institution\'s users to set "skins" on their Pages.';
$string['skinsinstitutiondescription'] = 'Allow this institution\'s users to set "skins" on their pages.';
$string['smallviewheaders'] = 'Small page headers';
$string['smallviewheadersdescription'] = 'If checked, a small header and site navigation block will be displayed when viewing or editing portfolio pages created by users.';
$string['spamhaus'] = 'Enable Spamhaus URL blacklist';
......
......@@ -109,7 +109,7 @@ $string['viewnotfoundexceptionmessage'] = 'You tried to access a page that does
$string['viewnotfound'] = 'Page with id %s not found.';
$string['viewnotfoundbyname'] = 'Page %s by %s not found.';
$string['youcannotviewthisusersprofile'] = 'You cannot view this user\'s profile.';
$string['invalidlayoutselection'] = 'You tried to select a layout that didn\'t exist!';
$string['invalidlayoutselection'] = 'You tried to select a layout that doesn\'t exist.';
$string['previewimagegenerationfailed'] = 'Sorry, there was a problem generating the preview image.';
$string['artefactnotfoundmaybedeleted'] = "Artefact with id %s not found (maybe it has been deleted already?)";
......@@ -135,7 +135,7 @@ $string['timezoneidentifierunusable'] = 'PHP on your website host does not retur
$string['postmaxlessthanuploadmax'] = 'Your PHP post_max_size setting (%s) is smaller than your upload_max_filesize setting (%s). Uploads larger than %s will fail without displaying an error. Usually, post_max_size should be much larger than upload_max_filesize.';
$string['smallpostmaxsize'] = 'Your PHP post_max_size setting (%s) is very small. Uploads larger than %s will fail without displaying an error.';
$string['notenoughsessionentropy'] = 'Your PHP session.entropy_length setting is too small. Set it to at least 16 in your php.ini to ensure that generated session IDs are random and unpredictable enough.';
$string['switchtomysqli'] = 'The <strong>mysqli</strong> PHP extension is not installed on your server, so Mahara is falling back to the deprecated original <strong>mysql</strong> PHP extension. We recommend installing <a href="http://php.net/manual/en/book.mysqli.php">mysqli</a>.';
$string['switchtomysqli'] = 'The <strong>mysqli</strong> PHP extension is not installed on your server. Thus, Mahara is falling back to the deprecated original <strong>mysql</strong> PHP extension. We recommend installing <a href="http://php.net/manual/en/book.mysqli.php">mysqli</a>.';
$string['noreplyaddressmissingorinvalid'] = 'The noreply address setting is either empty or has an invalid email address. Please check the configuration in the <a href="%s">site options in the email settings</a>.';
$string['openbasedirenabled'] = 'Your server has the php open_basedir restriction enabled.';
$string['openbasedirpaths'] = 'Mahara can only open files within the following path(s): %s.';
......
......@@ -64,7 +64,7 @@ $string['couldnotcreatestaticdirectory'] = "Could not create static directory '%
$string['couldnotcopystaticfile'] = "Could not copy static file '%s'";
$string['couldnotcopyattachment'] = "Could not copy attachment '%s'";
$string['couldnotcopyfilesfromto'] = "Could not copy files from the directory '%s' to '%s'";
$string['couldnotwriteLEAPdata'] = "Could not write LEAP data to the file";
$string['couldnotwriteLEAPdata'] = "Could not write Leap2A data to the file";
$string['pleasewaitwhileyourexportisbeinggenerated'] = 'Please wait while your export is being generated...';
$string['reverseselection'] = 'Reverse selection';
$string['selectall'] = 'Select all';
......
......@@ -8,8 +8,8 @@ authentication method.</p>
<ul>
<li>If you wipe the contents of this field and submit your changes,
the external username associated with the selected authentication
method will be reset to the default (username).</li>
<li>If you update the contents of this field the external username
method will be reset to the default username.</li>
<li>If you update the contents of this field, the external username
will be reset for this authentication method, or a new one will be
created if it doesn't exist yet.</li>
</ul>
<h3>Create Custom Layout</h3>
<p>You can add a new custom page layout made up of multiple rows, with your own choice of column arrangements.</p>
<p>Click on 'Add Row' to add a new row, and use the drop-down boxes to choose a column arrangment for that row.
<h3>Create a custom layout</h3>
<p>You can add a new custom page layout made up of multiple rows with your own choice of column arrangements.</p>
<p>Click the button "Add row" to add a new row, and use the drop-down boxes to choose a column arrangment for that row.
The thumbnail image gives you a preview of your new layout.</p>
<p>Once you are happy with your design, click on the 'Create new layout' button to add the new layout.
Your custom layout will be created and selected. Click on 'Save' at the bottom of the page to save your choice of layout for this page.</p>
<p>Your new layout will be available to you in future under 'Advanced Options' when you are editing your page layout.</p>
<p>Once you are happy with your design, click the "Create new layout" button to add the new layout.
Your custom layout will be created and selected. Click the "Save" button at the bottom of the page to save your choice of layout for this page.</p>
<p>Your new layout will be available to you in the future under "Advanced options" when you are editing your page layout.</p>
<h3>Select Layout</h3>
<h3>Select layout</h3>
<p>The thumbnails show the rows and columns which make up each available page layout.</p>
<p>Rest your mouse over each thumbnail to see the percentage-based widths of the columns in each row.
Click on a thumbnail to select that layout.</p>
<p>For more layout options, see Advanced Options.</p>
\ No newline at end of file
<p>For more layout options, see "Advanced options".</p>
......@@ -47,13 +47,13 @@ $string['createskin'] = 'Create skin';
$string['editskin'] = 'Edit skin';
$string['skinsaved'] = 'Skin saved successfully';
$string['skinimported'] = 'Skin imported successfully';
$string['clicktoedit'] = 'Click to edit skin';
$string['clicktoedit'] = 'Click to edit this skin';
$string['clickimagetoedit'] = 'Click image to edit';
$string['addtofavorites'] = 'Add to favorites';
$string['removefromfavorites'] = 'Remove from favorites';
$string['skinaddedtofavorites'] = 'Skin added to favorites';
$string['skinremovedfromfavorites'] = 'Skin removed from favorites';
$string['cantremoveskinfromfavorites'] = 'Can\'t remove skin from favorites';
$string['addtofavorites'] = 'Add to favourites';
$string['removefromfavorites'] = 'Remove from favourites';
$string['skinaddedtofavorites'] = 'Skin added to favourites';
$string['skinremovedfromfavorites'] = 'Skin removed from favourites';
$string['cantremoveskinfromfavorites'] = 'Can\'t remove skin from favourites';
$string['noskins'] = 'There are no skins';
$string['skin'] = 'skin';
......@@ -62,11 +62,11 @@ $string['skins'] = 'skins';
$string['allskins'] = 'All skins';
$string['siteskins'] = 'Site skins';
$string['userskins'] = 'My skins';
$string['favoriteskins'] = 'Favorite skins';
$string['favoriteskins'] = 'Favourite skins';
$string['publicskins'] = 'Public skins';
$string['currentskin'] = 'Current skin';
$string['skinnotselected'] = 'Skin not selected';
$string['skindefault'] = 'Default site skin';
$string['noskin'] = 'No skin';
// Create Skin Form Fieldsets
$string['skingeneraloptions'] = 'General';
......@@ -150,12 +150,12 @@ $string['manageskins'] = 'Manage skins';
/* SKINS - SITE FONTS */
$string['sitefontsmenu'] = 'Fonts';
$string['sitefonts'] = 'Fonts';
$string['sitefontsdescription'] = '<p>The following fonts have been installed in your site, for use in skins.</p>';
$string['sitefontsdescription'] = '<p>The following fonts have been installed on your site for use in skins.</p>';
$string['installfontinstructions'] = '<p>
Add fonts, which allow font embedding into web pages via the CSS @font-face rule. Remember that not all authors / foundries allow this.
Add fonts, which allow font embedding into web pages, via the CSS @font-face rule. Remember that not all authors / foundries allow this.
</p>
<p>
When you find an appropriate free font that you are allowed to embed into a web page, you must convert it into the formats:
When you find an appropriate free font that you are allowed to embed into a web page, you must convert it into the following formats:
<br />TrueType Font, Embedded OpenType Font, Web Open Font Format Font and Scalable Vector Graphic Font.
</p>
<p>
......@@ -180,14 +180,14 @@ $string['fontdeleted'] = 'Font deleted';
$string['cantdeletefont'] = 'You cannot delete this font.';
$string['fontname'] = 'Font name';
$string['invalidfonttitle'] = 'Invalid font title. (Must contain at least one alphanumeric character.)';
$string['invalidfonttitle'] = 'Invalid font title. It must contain at least one alphanumeric character.';
$string['genericfontfamily'] = 'Generic font family';
$string['fontstyle'] = 'Font style';
$string['regular'] = 'Regular';
$string['bold'] = 'Bold';
$string['italic'] = 'Italic';
$string['bolditalic'] = 'Bold Italic';
$string['bolditalic'] = 'Bold italic';
$string['fonttype'] = 'Font type';
$string['headingandtext'] = 'Heading and text';
......@@ -204,7 +204,7 @@ $string['fontfilettf'] = 'TTF font file';
$string['ttfdescription'] = 'TrueType font (for Firefox 3.5+, Opera 10+, Safari 3.1+, Chrome 4.0.249.4+)';
$string['fontfilewoff'] = 'WOFF font file';
$string['woffdescription'] = 'Web Open Font Format font (for Firefox 3.6+, Internet Explorer 9+, Chrome 5+)';
$string['fontfilelicence'] = 'Licence file';
$string['fontfilelicence'] = 'License file';
$string['fontnotice'] = 'Font notice';
$string['fontnoticedescription'] = 'One line added to the CSS file describing the font and the author.';
$string['filepathnotwritable'] = 'Cannot write the files to \'%s\'';
......@@ -221,7 +221,7 @@ $string['preview'] = 'Preview';
$string['samplesize'] = 'Size';
$string['samplesort'] = 'Sorting';
$string['sampletext'] = 'Text';
$string['samplefonttitle'] = 'Font Name';
$string['samplefonttitle'] = 'Font name';
$string['sampletitle11'] = 'Latin alphabet (ASCII only)';
$string['sampletext11'] = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz';
$string['sampletitle12'] = 'Latin alphabet (ISO/IEC 8859-1)';
......@@ -245,23 +245,23 @@ $string['sampletext22'] = 'The quick brown fox jumps over the lazy dog.';
/* SKINS - GOOGLE WEB FONTS */
$string['installgwfont'] = 'Install Google font(s)';
$string['archivereadingerror'] = 'Error reading ZIP archive!';
$string['archivereadingerror'] = 'Error reading ZIP archive.';
$string['gwfontadded'] = 'Google font(s) installed successfully';
$string['gwfontsnotavailable'] = 'Google Fonts are currently not available.';
$string['gwfontsnotavailable'] = 'Google fonts are currently not available.';
$string['gwfinstructions'] = '<ol>
<li>Visit <a href="http://www.google.com/fonts/" target="_blank">Google Fonts</a></li>
<li>Select fonts and add them to collection</li>
<li>Visit <a href="http://www.google.com/fonts/" target="_blank">Google fonts</a></li>
<li>Select fonts and add them to your collection</li>
<li>Download fonts in a collection as a ZIP file</li>
<li>Upload that ZIP file in this form</li>
<li>Install Google font(s)</li>
</ol>';
$string['gwfzipfile'] = 'Valid ZIP file';
$string['gwfzipdescription'] = 'A valid ZIP file which contains all selected Google fonts which will be installed.';
$string['notvalidzipfile'] = 'This is not a valid ZIP file';
$string['gwfzipdescription'] = 'A valid ZIP file that contains all selected Google fonts to be installed.';
$string['notvalidzipfile'] = 'This is not a valid ZIP file.';
$string['fontlicence'] = 'Font licence';
$string['fontlicencenotfound'] = 'Font licence not found';
$string['fontlicence'] = 'Font license';
$string['fontlicencenotfound'] = 'Font license not found';
$string['fontsort.alpha'] = 'Alphabet';
$string['fontsort.date'] = 'Date added';
......
......@@ -399,7 +399,7 @@ class Skin {
// to be able to choose no skin.
$defaultskin = new stdClass();
$defaultskin->id = 0;
$defaultskin->title = get_string('skindefault', 'skin');
$defaultskin->title = get_string('noskin', 'skin');
$site_skins[] = $defaultskin;
return $site_skins;
}
......
......@@ -31,7 +31,7 @@ $string['admin'] = 'Administrator';
$string['all'] = 'All';
$string['analyzer'] = 'Elasticsearch analyzer';
$string['analyzerdescription'] = 'The Elasticsearch analyzer class to use. Default is mahara_analyzer.';
$string['artefacttypedescription'] = 'Check the artefact types you want to include to the index. Only artefact types that have a hierarchy defined are valid. You will need to reset artefacts in the queue for your changes to take effect.';
$string['artefacttypedescription'] = 'Check the artefact types you want to include in the index. Only artefact types that have a hierarchy defined are valid. You will need to reset artefacts in the queue for your changes to take effect.';
$string['artefacttypelegend'] = 'Artefact types';
$string['artefacttypemapdescription'] = 'Enter the hierarchy for each artefact type separated by | (one artefact type per row).';
$string['artefacttypemaplegend'] = 'Artefact types hierarchy';
......@@ -43,7 +43,7 @@ $string['collection'] = 'Collection';
$string['confignotset'] = '(not set)';
$string['createdby'] = 'Created by %s';
$string['cronlimit'] = 'Cron record limit';
$string['cronlimitdescription'] = 'Maximum number of records to be passed from the queue to the Elasticsearch server on each cron run. (Empty or 0 for unlimited)';
$string['cronlimitdescription'] = 'Maximum number of records to be passed from the queue to the Elasticsearch server on each cron run (Empty or 0 for unlimited).';
$string['dateoldestfirst'] = 'Date (oldest first)';
$string['daterecentfirst'] = 'Date (most recent first)';
$string['deleted'] = 'Deleted';
......@@ -60,7 +60,7 @@ $string['indexnamedescription'] = 'Name of the Elasticsearch index. Default is m
$string['license'] = 'License';
$string['Media'] = 'Media';
$string['noticeenabled'] = 'The Elasticsearch plugin is currently active. To deactivate it, deselect it in the <a href="%s">site options search settings</a>.';
$string['noticenotenabled'] = 'The elasticsearch plugin is not currently enabled. To activate it, select it in the <a href="%s">site options in the search settings</a>.';
$string['noticenotenabled'] = 'The Elasticsearch plugin is not currently enabled. To activate it, select it in the <a href="%s">site options in the search settings</a>.';
$string['noticepostgresrequired'] = 'The Elasticsearch plugin only works with a PostgreSQL database at this time.';
$string['noticepostgresrequiredtitle'] = 'Feature not available';
$string['owner'] = 'Owner';
......
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