Commit 21f28f0b authored by Melissa Draper's avatar Melissa Draper Committed by Gerrit Code Review
Browse files

Merge "Fix lang string not requiring re-translations (Bug 892959)"

parents b8945230 c42e5c4e
......@@ -98,7 +98,7 @@ $string['posttitle'] = 'Title';
$string['posts'] = 'entries';
$string['publish'] = 'Publish';
$string['unpublish'] = 'Unpublish';
$string['publishfailed'] = 'An error occurred. Your entry was not published';
$string['publishfailed'] = 'An error occurred. Your entry was not published.';
$string['publishblogpost?'] = 'Are you sure you want to publish this entry?';
$string['published'] = 'Published';
$string['remove'] = 'Remove';
......@@ -114,8 +114,8 @@ $string['title'] = 'Title';
$string['update'] = 'Update';
$string['verticalspace'] = 'Vertical space';
$string['viewblog'] = 'View journal';
$string['youarenottheownerofthisblog'] = 'You are not the owner of this journal';
$string['youarenottheownerofthisblogpost'] = 'You are not the owner of this journal entry';
$string['youarenottheownerofthisblog'] = 'You are not the owner of this journal.';
$string['youarenottheownerofthisblogpost'] = 'You are not the owner of this journal entry.';
$string['cannotdeleteblogpost'] = 'An error occurred removing this journal entry.';
$string['baseline'] = 'Baseline';
......@@ -145,7 +145,7 @@ $string['feedsnotavailable'] = 'Feeds are not available for this artefact type.'
$string['feedrights'] = 'Copyright %s.';
$string['enablemultipleblogstext'] = 'You have one journal. If you would like to start a second one, enable the multiple journals option on the <a href="%saccount/">account settings</a> page.';
$string['hiddenblogsnotification'] = 'Additional journal(s) have been made for you, but your account does not have the multiple journals option. You can set that on the <a href="%saccount/">account settings</a> page.';
$string['hiddenblogsnotification'] = 'Additional journal(s) have been made for you, but your account does not have the multiple journals option activated. You can enable it on the <a href="%saccount/">account settings</a> page.';
$string['shortcutaddpost'] = 'Add a new entry to';
$string['shortcutgo'] = 'Go';
......
......@@ -45,7 +45,7 @@ $string['Created'] = 'Created';
$string['createfolder'] = 'Create folder';
$string['confirmdeletefile'] = 'Are you sure you want to delete this file?';
$string['confirmdeletefolder'] = 'Are you sure you want to delete this folder?';
$string['confirmdeletefolderandcontents'] = 'Are you sure you want to delete this folder and all its contents?';
$string['confirmdeletefolderandcontents'] = 'Are you sure you want to delete this folder and its content?';
$string['customagreement'] = 'Custom agreement';
$string['Date'] = 'Date';
$string['resizeonupload'] = 'Resize images on upload';
......
<h3>Resize large images on upload</h3>
<p>If enabled, any images which are larger than the height and width specified will be resized to fit the size limit.</p>
<p>This is highly recommended for images intended for normal display in a web browser. Very large images (e.g. straight from a digital camera) are slow to load in the browser, and take up unnecessary disk space, quickly using up your quota.
There is also no discernable gain in quality when viewing on a typical monitor.</p>
<p>This is highly recommended for images intended for normal display in a web browser. Very large images (e.g. straight from a digital camera) are slow to load in the browser and take up disk space unnecessarily, quickly using up your quota.
There is also no loss in quality when viewing on a typical monitor.</p>
<p>However, you may wish to upload the original <strong>without</strong> resizing if you are sharing an image for printing.</p>
<p>You can choose the default setting for this option on your Settings page.</p>
......@@ -29,8 +29,8 @@ $string['description'] = 'Authenticate using a BrowserID';
$string['badassertion'] = 'The given BrowserID assertion is not valid: %s';
$string['badverification'] = 'Mahara did not receive valid JSON output from the BrowserID verifier.';
$string['login'] = 'BrowserID Login';
$string['register'] = 'BrowserID Register';
$string['login'] = 'BrowserID';
$string['register'] = 'Register with BrowserID';
$string['missingassertion'] = 'BrowserID did not return an alpha-numeric assertion.';
$string['emailalreadyclaimed'] = "Another user account has already claimed the email address '%s'.";
......
......@@ -36,20 +36,20 @@ $string['errorretryexceeded'] = 'Maximum number of retries exceeded (%s) - there
$string['errnosamluser'] = 'No user found';
$string['errorbadlib'] = 'SimpleSAMLPHP lib directory %s is not correct.';
$string['errorbadconfig'] = 'SimpleSAMLPHP config directory %s is incorrect.';
$string['errorbadcombo'] = 'You can only choose user auto creation if you have not selected remoteuser';
$string['errorbadinstitutioncombo'] = 'There is already an existing authinstance with this institutionattribute and institutionvalue combination';
$string['errormissinguserattributes1'] = 'You seem to be authenticated but we did not receive the required user attributes. Please check that your Identity Provider releases the First Name, Surname, and Email fields for SSO to %s, or inform the administrator.';
$string['errorregistrationenabledwithautocreate'] = 'An institution has registration enabled, for security reasons this excludes user auto-creation.';
$string['errorbadcombo'] = 'You can only choose user auto-creation if you have not selected remoteuser';
$string['errorbadinstitutioncombo'] = 'There is already an existing authentication instance with this institution attribute and institution value combination.';
$string['errormissinguserattributes1'] = 'You seem to be authenticated, but we did not receive the required user attributes. Please check that your Identity Provider releases the First Name, Surname, and Email fields for SSO to %s or inform the administrator.';
$string['errorregistrationenabledwithautocreate'] = 'An institution has registration enabled. For security reasons this excludes user auto-creation.';
$string['errorremoteuser'] = 'Matching on remoteuser is mandatory if usersuniquebyusername is turned off';
$string['institutionattribute'] = 'Institution attribute (contains "%s")';
$string['institutionvalue'] = 'Institution value to check against attribute';
$string['link'] = 'Link accounts';
$string['linkaccounts'] = 'Do you want to link remote account %s with local account %s ?';
$string['linkaccounts'] = 'Do you want to link remote account %s with local account %s?';
$string['loginlink'] = 'Allow users to link own account';
$string['logintolink'] = 'Local login to %s to link to remote account';
$string['logintolinkdesc'] = '<p><b>You are currently connected with remote user %s. Please login with your local account to link them together, or register if you do not currently have an account on %s.</b></p>';
$string['logintolinkdesc'] = '<p><b>You are currently connected with remote user %s. Please login with your local account to link them together or register if you do not currently have an account on %s.</b></p>';
$string['institutionregex'] = 'Do partial string match with institution shortname';
$string['login'] = 'SSO Login';
$string['login'] = 'SSO';
$string['notusable'] = 'Please install the SimpleSAMLPHP SP libraries';
$string['samlfieldforemail'] = 'SSO field for Email';
$string['samlfieldforfirstname'] = 'SSO field for First Name';
......@@ -60,4 +60,4 @@ $string['userattribute'] = 'User attribute';
$string['simplesamlphplib'] = 'SimpleSAMLPHP lib directory';
$string['simplesamlphpconfig'] = 'SimpleSAMLPHP config directory';
$string['weautocreateusers'] = 'We auto-create users';
$string['remoteuser'] = 'Match username attribute to Remote username';
$string['remoteuser'] = 'Match username attribute to remote username';
......@@ -35,14 +35,14 @@ $string['changeusernameheading'] = 'Change username';
$string['changeusername'] = 'New username';
$string['changeusernamedesc'] = 'The username you use to log into %s. Usernames are 3-30 characters long, and may contain letters, numbers, and most common symbols excluding spaces.';
$string['usernameexists'] = 'This username is taken, please choose another.';
$string['usernameexists'] = 'This username is taken, please choose another one.';
$string['accountoptionsdesc'] = 'General account options';
$string['changeprofileurl'] = 'Change profile URL';
$string['profileurl'] = 'Profile URL';
$string['profileurldescription'] = 'A personalised URL for your profile page. This field must be 3-30 characters long.';
$string['urlalreadytaken'] = 'This profile URL is already taken. Please choose another.';
$string['urlalreadytaken'] = 'This profile URL is already taken. Please choose another one.';
$string['friendsnobody'] = 'Nobody may add me as a friend';
$string['friendsauth'] = 'New friends require my authorisation';
......@@ -96,4 +96,4 @@ $string['deleteaccountdescription'] = 'If you delete your account, all your con
$string['accountdeleted'] = 'Your account has been deleted.';
$string['resizeonuploaduserdefault'] = 'Enable "Resize large images on upload" by default';
$string['resizeonuploaduserdefaultdescription'] = 'Tick this box to set the "Resize large images on upload" checkbox option to "on" by default when uploading files. Untick to have that checkbox option set to "off" by default.';
$string['resizeonuploaduserdefaultdescription'] = 'Tick this box to set the "Resize large images on upload" option to "on" by default when uploading files. Untick it to have that option set to "off" by default.';
......@@ -148,11 +148,11 @@ $string['nofiltersinstalled'] = 'No HTML filters installed.';
$string['allowediframesites'] = 'Allowed iframe sources';
$string['allowediframesitesdescriptionshort'] = 'Configure permissions for embedding external iframe content';
$string['allowediframesitesdescription'] = 'Users are allowed to embed content from the following external sites on their pages, inside HTML &lt;iframe&gt; elements. Typically this is used to display videos hosted elsewhere. The list of allowed sites can be modified on this page.';
$string['allowediframesitesdescription'] = 'Users are allowed to embed content from the following external sites on their pages, inside HTML &lt;iframe&gt; elements. Typically this is used to display content hosted elsewhere. The list of allowed sites can be modified on this page.';
$string['allowediframesitesdescriptiondetail'] = 'The icon and display name will be visible to users when they configure an external media block. All sites with the same display name are grouped together in the configuration form, but iframe source text matching any of the sites will be allowed.';
$string['iframeurldescription'] = "Text to match at the beginning of the iframe source URL (without the http://). Only letters, digits, and the characters '.', '/', '_', and '-' are allowed.";
$string['iframeurldescription'] = "Text to match at the beginning of the iframe source URL (without the http://). Only letters, digits and the characters '.', '/', '_', and '-' are allowed.";
$string['iframedisplaynamedescription'] = 'The name of the site to be displayed to users.';
$string['iframeinvalidsite'] = "This field should contain a valid host, an optional path, and can contain only letters, digits, '.', '/', '_', and '-'.";
$string['iframeinvalidsite'] = "This field should contain a valid host and an optional path. It can contain only letters, digits, '.', '/', '_', and '-'.";
$string['iframeiconhost'] = 'Icon host';
$string['iframeiconhostdescription'] = 'If you wish, you may specify a different host for the favicon image. All sites with the same name will use this icon.';
......@@ -251,12 +251,12 @@ $string['cronnotrunning1'] = '<span class="error">Cron is not running.</span><br
$string['Loggedin'] = 'Logged in';
$string['youraverageuser'] = 'Your average user...';
$string['statsmaxfriends'] = 'Has %s friends (most is <a href="%s">%s</a> with %d)';
$string['statsnofriends'] = 'Has 0 friends :(';
$string['statsnofriends'] = 'Has 0 friends';
$string['statsmaxviews'] = 'Has made %s pages (most is <a href="%s">%s</a> with %d)';
$string['statsnoviews'] = 'Has made 0 pages :(';
$string['statsnoviews'] = 'Has made 0 pages';
$string['statsmaxgroups'] = 'Is in %s groups (most is <a href="%s">%s</a> with %d)';
$string['statsnogroups'] = 'Is in 0 groups :(';
$string['statsnoquota'] = 'Is using no storage :(';
$string['statsnogroups'] = 'Is in 0 groups';
$string['statsnoquota'] = 'Is using no storage';
$string['statsmaxquotaused'] = 'Has used about %s of disk quota (most is <a href="%s">%s</a> with %s)';
$string['groupcountsbytype'] = 'Number of groups by group type';
$string['groupcountsbyjointype'] = 'Number of groups by access type';
......@@ -270,7 +270,7 @@ $string['viewstatstabletitle'] = 'Most popular pages';
$string['exportstatsascsv'] = 'Export statistics in CSV format';
$string['nostats'] = 'No statistics available';
// Institutional statistics
// Institution statistics
$string['statistics'] = 'Statistics';
$string['institutionstatisticsfor'] = 'Institution statistics for \'%s\'';
$string['institutioncreated'] = 'Institution created';
......
......@@ -56,7 +56,7 @@ $string['wessoout'] = 'We SSO out';
$string['weimportcontent'] = 'We import content';
$string['weimportcontentdescription'] = '(some applications only)';
$string['theyssoin'] = 'They SSO in';
$string['authloginmsg2'] = "When you have not chosen a parent authority, enter a message to display when a user tries to log in via Mahara's login form";
$string['authloginmsg2'] = "When you have not chosen a parent authority, enter a message to display when a user tries to log in via the login form";
$string['application'] = 'Application';
$string['cantretrievekey'] = 'An error occurred while retrieving the public key from the remote server.<br>Please ensure that the Application and WWW Root fields are correct, and that networking is enabled on the remote host.';
$string['ssodirection'] = 'SSO direction';
......
......@@ -42,7 +42,7 @@ $string['addviewstocollection'] = 'Add pages to collection';
$string['back'] = 'Back';
$string['cantdeletecollection'] = 'You cannot delete this collection.';
$string['canteditdontown'] = 'You cannot edit this collection because you do not own it.';
$string['canteditsubmitted'] = 'You can\'t edit this collection because it has been submitted for assessment to %s. You will have to wait until a tutor releases it.';
$string['canteditsubmitted'] = 'You cannot edit this collection because it has been submitted for assessment to %s. You will have to wait until it is released.';
$string['collection'] = 'collection';
$string['Collection'] = 'Collection';
$string['collections'] = 'Collections';
......
......@@ -93,7 +93,7 @@ $string['first'] = 'First';
$string['firstpage'] = 'First page';
$string['last'] = 'Last';
$string['lastpage'] = 'Last page';
$string['maxitemsperpage'] = 'Max items per page:';
$string['maxitemsperpage'] = 'Maximum items per page:';
$string['accept'] = 'Accept';
$string['memberofinstitutions'] = 'Member of %s';
......@@ -1015,7 +1015,7 @@ $string['createyourresume'] = 'Create your <a href="%s">résumé</a>';
$string['publishablog'] = 'Publish a <a href="%s">journal</a>';
$string['Organise'] = 'Organise';
$string['organisesubtitle'] = 'Showcase your portfolio';
$string['organisedescription'] = 'Organise your portfolio into <a href="%s">pages.</a> Create different pages for different audiences - you choose the elements to include.';
$string['organisedescription'] = 'Organise your portfolio into <a href="%s">pages.</a> Create different pages for different audiences - you choose the elements to include.';
$string['sharenetwork'] = 'Share and network';
$string['sharenetworksubtitle'] = 'Find friends and join groups';
$string['findfriendslinked'] = 'Find <a href="%s">friends</a>';
......@@ -1033,7 +1033,7 @@ $string['filenotfound'] = 'File not found';
$string['betweenxandy'] = 'Between %s and %s';
// Clean URLs
$string['cleanurlallowedcharacters'] = 'Only lowercase letters from a-z, numbers, and - are allowed.';
$string['cleanurlallowedcharacters'] = 'Only lowercase letters from a-z, numbers and - are allowed.';
// Registration statistics
$string['content'] = 'Content';
......
......@@ -39,7 +39,7 @@ $string['back'] = 'Back';
$string['title'] = 'Page title';
$string['viewurl'] = 'Page URL';
$string['viewurldescription'] = 'A readable URL for your page. This field must be between 3 and 100 characters long.';
$string['userviewurltaken'] = 'This URL is already taken. Please choose another.';
$string['userviewurltaken'] = 'This URL is already taken. Please choose another one.';
$string['description'] = 'Page description';
$string['startdate'] = 'Access start date/time';
$string['stopdate'] = 'Access end date/time';
......
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