From 5ab364781bb7f4d5f08e56f96cc6c9e557a502fe Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 14 Sep 2017 14:29:53 +0200 Subject: [PATCH] Sync en and en_us language --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 73 ++++++++++++++++--- .../umbraco/config/lang/en_us.xml | 2 +- 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 13731d7d12..49d120bf78 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -135,6 +135,7 @@ Show styles Insert table Generate models + Save and generate models Undo Redo @@ -235,6 +236,7 @@ Link to media or click here to choose files Only allowed file types are + Cannot upload this file, it does not have an approved file type Max file size is Media root @@ -245,6 +247,7 @@ Where do you want to create the new %0% Create an item under + Select the document type you want to make a content template for Choose a type and a title "document types".]]> "media types".]]> @@ -331,7 +334,10 @@ Macro Settings This macro does not contain any properties you can edit Paste - Edit Permissions for + Edit permissions for + Set permissions for + Set permissions for %0% for user group %1% + Select the users groups you want to set permissions for The items in the recycle bin are now being deleted. Please do not close this window while this operation takes place The recycle bin is now empty When items are deleted from the recycle bin, they will be gone forever @@ -363,14 +369,19 @@ Opens the linked document in a new window or tab Link to media Link to file + Select content start node Select media Select icon Select item Select link Select macro Select content + Select media start node Select member Select member group + Select node + Select sections + Select users No icons were found There are no parameters for this macro There are no macros available to insert @@ -412,6 +423,7 @@ Type to filter... Type to add tags (press enter after each tag)... Enter your email... + Enter a message... Your username is usually your email @@ -537,8 +549,10 @@ Error Find First + Groups Height Help + Hide Icon Import Inner margin @@ -546,6 +560,7 @@ Install Invalid Justify + Label Language Last Layout @@ -556,6 +571,7 @@ Logout Macro Mandatory + Message Move More Name @@ -563,9 +579,12 @@ Next No of + Off OK Open + On or + Order by Password Path Placeholder ID @@ -574,6 +593,7 @@ Properties Email to receive form data Recycle Bin + Your recycle bin is empty Remaining Remove Rename @@ -590,6 +610,7 @@ Show page on Send Size Sort + Status Submit Type Type to search... @@ -656,7 +677,6 @@ General Editor - Background colour Bold @@ -664,7 +684,6 @@ Font Text - Page @@ -920,11 +939,11 @@ To manage your website, simply open the Umbraco back office and start adding con - button and locating the package. Umbraco packages usually have a ".zip" extension. + button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. ]]> Drop to upload - or click here to choose files + or click here to choose package file Upload package Install a local package by selecting it from your machine. Only install packages from sources you know and trust Upload another package @@ -1067,8 +1086,8 @@ To manage your website, simply open the Umbraco back office and start adding con choose internal page Caption Link - New window - Enter a new caption + Open in new window + enter the display caption Enter the link @@ -1205,6 +1224,7 @@ To manage your website, simply open the Umbraco back office and start adding con Partial view saved without any errors! Partial view not saved An error occurred saving the file. + Permissions saved for Script view saved Script view saved without any errors! Script view not saved @@ -1221,6 +1241,12 @@ To manage your website, simply open the Umbraco back office and start adding con %0% is now disabled An error occurred while disabling the user User groups have been set + Deleted %0% user groups + %0% was deleted + Unlocked %0% users + An error occurred while unlocking the users + %0% is now unlocked + An error occurred while unlocking the user Uses CSS syntax ex: h1, .redHeader, .blueTex @@ -1440,7 +1466,15 @@ To manage your website, simply open the Umbraco back office and start adding con Member can edit Show on member profile + tab has no sort order + + + Building models + this can take a bit of time, don't worry + Models generated + Models could not be generated + Models generation has failed, see exception in U log @@ -1448,8 +1482,8 @@ To manage your website, simply open the Umbraco back office and start adding con Fallback field Add default value Default value - Alternative field - Alternative Text + Fallback field + Default value Casing Encoding Choose field @@ -1555,7 +1589,7 @@ To manage your website, simply open the Umbraco back office and start adding con Media Types Members Member Groups - Roles + Member Roles Member Types Document Types Relation Types @@ -1582,10 +1616,17 @@ To manage your website, simply open the Umbraco back office and start adding con Error checking for update. Please review trace-stack for further information + Access + Based on the assigned groups and start nodes, the user has access to the following nodes + Assign access Administrator Category field + User created Change Your Password + Change photo New password + hasn't been locked out + The password hasn't been changed Confirm new password You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button Content Channel @@ -1596,12 +1637,16 @@ To manage your website, simply open the Umbraco back office and start adding con Document Type Editor Excerpt field + Failed login attempts Go to user profile Add groups to assign access and permissions + Invite another user Invite new users to give them access to Umbraco. An invite email will be sent to the user with information on how to log in to Umbraco. Language Set the language you will see in menus and dialogs + Last lockout date Last login + Password last changed Username Media start node Limit the media library to a specific start node @@ -1632,10 +1677,12 @@ To manage your website, simply open the Umbraco back office and start adding con Search all children Add sections to give users access No start node selected + No start nodes selected Content start node Limit the content tree to a specific start node Content start nodes Limit the content tree to specific start nodes + User last updated has been created The new user has successfully been created. To log in to Umbraco use the password below. Name @@ -1643,6 +1690,10 @@ To manage your website, simply open the Umbraco back office and start adding con User group permissions User group User groups + has been invited + An invitation has been sent to the new user with details about how to log in to Umbraco. + Hello there and welcome to Umbraco! In just 1 minute you’ll be good to go, we just need you to setup a password and add a picture for your avatar. + Upload a picture to make it easy for other users to recognize you. Writer Translator Change @@ -1651,6 +1702,8 @@ To manage your website, simply open the Umbraco back office and start adding con Session expires in Invite user Create user + Send invite + Back to users Umbraco: Invitation

Hi %0%, you have been invited by %1% to the Umbraco Back Office.

Message from %1%: %2%

Click this link to accept the invite

If you cannot click on the link, copy and paste this URL into your browser window

%3%

]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 470da5141c..5924256c4d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1640,7 +1640,7 @@ To manage your website, simply open the Umbraco back office and start adding con Last lockout date Last login Password last changed - Login + Username Media start node Limit the media library to a specific start node Media start nodes