From ead837f6548898f98842fc2ad45ccee131e7fc89 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 20 Jan 2014 19:15:50 +0100 Subject: [PATCH] U4-4095 Missing Keys in English US Language File --- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 1 - .../umbraco/config/lang/en_us.xml | 332 +++++++++--------- 2 files changed, 162 insertions(+), 171 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 1c04ba81e1..9b4cca03d2 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -741,7 +741,6 @@ To manage your website, simply open the umbraco back office and start adding con Statistics Translation Users - Umbraco Contour Help 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 4311d1f04c..262d241c65 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1,11 +1,11 @@ - + umbraco http://umbraco.org - Manage hostnames + Culture and Hostnames Audit Trail Browse Node Change Document Type @@ -24,6 +24,7 @@ Notifications Public access Publish + Unpublish Reload nodes Republish entire site Permissions @@ -34,27 +35,41 @@ Send to publication Translate Update + Default value + Permission denied. Add new Domain - Invalid hostname + remove + Invalid node. + Invalid domain format. + Domain has already been assigned. Domain + Language New domain '%0%' has been created Domain '%0%' is deleted Domain '%0%' has already been assigned - - - https://www.example.com/, example.com/en, etc. Use * to match
- any domain and just set the culture.]]> - +
One-level paths in domains are supported, eg. "example.com/en". However, they + should be avoided. Better use the culture setting above.]]> Domain '%0%' has been updated Edit Current Domains + Inherit + Culture + or inherit culture from parent nodes. Will also apply
+ to the current node, unless a domain below applies too.]]> + Domains Viewing for + + Select + Select current folder + Do something else + Bold Cancel Paragraph Indent Insert form field @@ -84,9 +99,11 @@ To change the document type for the selected content, first select from the list of valid types for this location. Then confirm and/or amend the mapping of properties from the current type to the new, and click Save. + The content has been re-published. Current Property Current type The document type cannot be changed, as there are no alternatives valid for this location. + Document Type Changed Map Properties Map to Property New Template @@ -94,7 +111,8 @@ none Content Select New Document Type - The document type of the selected content has been successfully changed and the properties mapped. + The document type of the selected content has been successfully changed to [new type] and the following properties mapped: + to Could not complete property mapping as one or more properties have more than one mapping defined. Only alternate types valid for the current location are displayed. @@ -105,7 +123,10 @@ Alternative Links Click to edit this item Created by + Original author + Updated by Created + Date/time this document was created Document Type Editing Remove at @@ -125,6 +146,7 @@ Publish Publication Status Publish at + Unpublish at Clear Date Sortorder is updated To sort the nodes, simply drag the nodes or click one of the column headers. You can select multiple nodes by holding the "shift" or "control" key while selecting @@ -133,15 +155,27 @@ Type Unpublish Last edited - Remove file + Date/time this document was edited + Remove file(s) Link to document Member of group(s) Not a member of group(s) + + Child items + Target + + + Click to upload + Drop your files here... Where do you want to create the new %0% - Create at + Create an item under Choose a type and a title + + "document types".]]> + + "media types".]]> Browse your website @@ -192,26 +226,29 @@ The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. Number of columns Number of rows - - Set a placeholder id by setting an ID on your placeholder you can inject content into this template from child templates, - by refering this ID using a <asp:content /> element.]]> - - - Select a placeholder id from the list below. You can only - choose Id's from the current template's master.]]> - + Set a placeholder id by setting an ID on your placeholder you can inject content into this template from child templates, + by refering this ID using a <asp:content /> element.]]> + Select a placeholder id from the list below. You can only + choose Id's from the current template's master.]]> Click on the image to see full size Pick item View Cache Item - - %0%' below
You can add additional languages under the 'languages' in the menu on the left - ]]> - + ]]> Culture Name + + Enter your username + Enter your password + Name the %0%... + Enter a name... + Type to search... + Type to filter... + + Allowed child nodetypes Create @@ -220,6 +257,7 @@ New tab Tab Thumbnail + Enable list view Add prevalue @@ -264,15 +302,17 @@ You cannot split a cell that hasn't been merged. Error in XSLT source The XSLT has not been saved, because it contained error(s) + There is a configuration error with the data type used for this property, please check the data type About Action + Actions Add Alias Are you sure? Border - or + by Cancel Cell margin Choose @@ -317,6 +357,7 @@ Logout Macro Move + More Name New Next @@ -336,6 +377,7 @@ Remaining Rename Renew + Required Retry Permissions Search @@ -359,6 +401,8 @@ Width Yes Folder + + Search results Background color @@ -375,45 +419,34 @@ Could not save the web.config file. Please modify the connection string manually. Your database has been found and is identified as Database configuration - - install button to install the Umbraco %0% database - ]]> - + ]]> Next to proceed.]]> - - Database not found! Please check that the information in the "connection string" of the “web.config” file is correct.

+ Database not found! Please check that the information in the "connection string" of the “web.config” file is correct.

To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "umbracoDbDSN" and save the file.

Click the retry button when done.
- More information on editing web.config here.

]]> - - - + More information on editing web.config here.

]]> + Please contact your ISP if necessary. - If you're installing on a local machine or server you might need information from your system administrator.]]> - - - + Press the upgrade button to upgrade your database to Umbraco %0%

Don't worry - no content will be deleted and everything will continue working afterwards!

- ]]> - - - Press Next to - proceed. ]]> - + ]]> + Press Next to + proceed. ]]> next to continue the configuration wizard]]> The Default users’ password needs to be changed!]]> The Default user has been disabled or has no access to umbraco!

No further actions needs to be taken. Click Next to proceed.]]> The Default user's password has been successfully changed since the installation!

No further actions needs to be taken. Click Next to proceed.]]> The password is changed! - - umbraco creates a default user with a login ('admin') and password ('default'). It's important that the password is changed to something unique. @@ -421,64 +454,48 @@

This step will check the default user's password and suggest if it needs to be changed.

- ]]> - + ]]> Get a great start, watch our introduction videos By clicking the next button (or modifying the umbracoConfigurationStatus in web.config), you accept the license for this software as specified in the box below. Notice that this umbraco distribution consists of two different licenses, the open source MIT license for the framework and the umbraco freeware license that covers the UI. Not installed yet. Affected files and folders More information on setting up permissions for umbraco here You need to grant ASP.NET modify permissions to the following files/folders - - Your permission settings are almost perfect!

- You can run umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of umbraco.]]> - + Your permission settings are almost perfect!

+ You can run umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of umbraco.]]> How to Resolve Click here to read the text version video tutorial on setting up folder permissions for umbraco or read the text version.]]> - - Your permission settings might be an issue! + Your permission settings might be an issue!

- You can run umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of umbraco.]]> - - - Your permission settings are not ready for umbraco! + You can run umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of umbraco.]]> + Your permission settings are not ready for umbraco!

- In order to run umbraco, you'll need to update your permission settings.]]> - - - Your permission settings are perfect!

- You are ready to run umbraco and install packages!]]> - + In order to run umbraco, you'll need to update your permission settings.]]> + Your permission settings are perfect!

+ You are ready to run umbraco and install packages!]]> Resolving folder issue Follow this link for more information on problems with ASP.NET and creating folders Setting up folder permissions - - - + ]]> I want to start from scratch - - learn how) You can still choose to install Runway later on. Please go to the Developer section and choose Packages. - ]]> - + ]]> You’ve just set up a clean Umbraco platform. What do you want to do next? Runway is installed - - This is our list of recommended modules, check off the ones you would like to install, or view the full list of modules - ]]> - + ]]> Only recommended for experienced users I want to start with a simple website - - "Runway" is a simple website providing some basic document types and templates. The installer can set up Runway for you automatically, but you can easily edit, extend or remove it. It’s not necessary and you can perfectly use Umbraco without it. However, @@ -489,8 +506,7 @@ Included with Runway: Home page, Getting Started page, Installing Modules page.
Optional Modules: Top Navigation, Sitemap, Contact, Gallery. - ]]> - + ]]> What is Runway Step 1/5 Accept license Step 2/5: Database configuration @@ -498,36 +514,24 @@ Step 4/5: Check umbraco security Step 5/5: Umbraco is ready to get you started Thank you for choosing umbraco - - Browse your new site -You installed Runway, so why not see how your new website looks.]]> - - - Further help and information -Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the umbraco terminology]]> - + Browse your new site +You installed Runway, so why not see how your new website looks.]]> + Further help and information +Get help from our award winning community, browse the documentation or watch some free videos on how to build a simple site, how to use packages and a quick guide to the umbraco terminology]]> Umbraco %0% is installed and ready for use - - /web.config file and update the AppSetting key umbracoConfigurationStatus in the bottom to the value of '%0%'.]]> - - - started instantly by clicking the "Launch Umbraco" button below.
If you are new to umbraco, -you can find plenty of resources on our getting started pages.]]> - - - Launch Umbraco -To manage your website, simply open the umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]> - + /web.config file and update the AppSetting key umbracoConfigurationStatus in the bottom to the value of '%0%'.]]> + started instantly by clicking the "Launch Umbraco" button below.
If you are new to umbraco, +you can find plenty of resources on our getting started pages.]]> + Launch Umbraco +To manage your website, simply open the umbraco back office and start adding content, updating the templates and stylesheets or add new functionality]]> Connection to database failed. Umbraco Version 3 Umbraco Version 4 Watch - - umbraco %0% for a fresh install or upgrading from version 3.0. + umbraco %0% for a fresh install or upgrading from version 3.0.

- Press "next" to start the wizard.]]> - + Press "next" to start the wizard.]]> Culture Code @@ -537,21 +541,20 @@ To manage your website, simply open the umbraco back office and start adding con You've been idle and logout will automatically occur in Renew now to save your work - - - Happy super sunday - Happy manic monday - Happy tremendous tuesday - Happy wonderfull wednesday - Happy thunder thursday - Happy friendly friday - Happy shiny saturday - log in below: - + Happy super sunday + Happy manic monday + Happy tremendous tuesday + Happy wonderful wednesday + Happy thunder thursday + Happy friendly friday + Happy shiny saturday + + log in below + Session timed out © 2001 - %0%
umbraco.org

]]> - + Dashboard @@ -574,8 +577,7 @@ To manage your website, simply open the umbraco back office and start adding con Edit your notification for %0% - - - - - Hi %0%

+ ]]> + Hi %0%

This is an automated mail to inform you that the task '%1%' - has been performed on the page '%2%' + has been performed on the page '%2%' by the user '%3%'

@@ -616,28 +616,23 @@ To manage your website, simply open the umbraco back office and start adding con

Have a nice day!

Cheers from the umbraco robot -

]]> - +

]]> [%0%] Notification about %1% performed on %2% Notifications - - button and locating the package. umbraco packages usually have a ".umb" or ".zip" extension. - ]]> - + ]]> Author Demonstration Documentation Package meta data Package name Package doesn't contain any items - -
- You can safely remove this from the system by clicking "uninstall package" below.]]> - +
+ You can safely remove this from the system by clicking "uninstall package" below.]]> No upgrades available Package options Package readme @@ -646,16 +641,15 @@ To manage your website, simply open the umbraco back office and start adding con Package was uninstalled The package was successfully uninstalled Uninstall package - - + Notice: any documents, media etc depending on the items you remove, will stop working, and could lead to system instability, - so uninstall with caution. If in doubt, contact the package author.]]> - + so uninstall with caution. If in doubt, contact the package author.]]> Download update from the repository Upgrade package Upgrade instructions There's an upgrade available for this package. You can download it directly from the umbraco package repository. Package version + Package version history View package website @@ -683,32 +677,32 @@ To manage your website, simply open the umbraco back office and start adding con If you just want to setup simple protection using a single login and password - + + + - - - + - - - + - + ]]> Include unpublished child pages Publishing in progress - please wait... %0% out of %1% pages have been published... %0% has been published %0% and subpages have been published Publish %0% and all its subpages - - ok to publish %0% and thereby making it's content publicly available.

+ ok to publish %0% and thereby making it's content publicly available.

You can publish this page and all it's sub-pages by checking publish all children below. - ]]> - + ]]> + + + You have not configured any approved colors Add external link @@ -747,6 +741,8 @@ To manage your website, simply open the umbraco back office and start adding con Statistics Translation Users + + Help Default template @@ -756,6 +752,7 @@ To manage your website, simply open the umbraco back office and start adding con Nodetype Type Stylesheet + Script Stylesheet property Tab Tab Title @@ -763,6 +760,7 @@ To manage your website, simply open the umbraco back office and start adding con Master Content Type enabled This Content Type uses as a Master Content Type. Tabs from Master Content Types are not shown and can only be edited on the Master Content Type itself + No properties defined on this tab. Click on the "add a new property" link at the top to create a new property. Sorting complete. @@ -818,6 +816,7 @@ To manage your website, simply open the umbraco back office and start adding con XSLT could not be saved, check file permissions XSLT saved No errors in XSLT + Content unpublished Partial view saved Partial view saved without any errors! Partial view not saved @@ -846,6 +845,7 @@ To manage your website, simply open the umbraco back office and start adding con Alternative field Alternative Text Casing + Encoding Choose field Convert Linebreaks Replaces linebreaks with html-tag &lt;br&gt; @@ -873,12 +873,10 @@ To manage your website, simply open the umbraco back office and start adding con Tasks assigned to you - - assigned to you. To see a detailed view including comments, click on "Details" or just the page name. + assigned to you. To see a detailed view including comments, click on "Details" or just the page name. You can also download the page as XML directly by clicking the "Download Xml" link.
To close a translation task, please go to the Details view and click the "Close" button. - ]]> - + ]]> close task Translation details Download all translation tasks as xml @@ -886,8 +884,7 @@ To manage your website, simply open the umbraco back office and start adding con Download xml DTD Fields Include subpages - - - + ]]> [%0%] Translation task for %1% No translator users found. Please create a translator user before you start sending content to translation Tasks created by you - - created by you. To see a detailed view including comments, + created by you. To see a detailed view including comments, click on "Details" or just the page name. You can also download the page as XML directly by clicking the "Download Xml" link. To close a translation task, please go to the Details view and click the "Close" button. - ]]> - + ]]> The page '%0%' has been send to translation Send the page '%0%' to translation Assigned by @@ -961,12 +955,6 @@ To manage your website, simply open the umbraco back office and start adding con No connection to server Error checking for update. Please review trace-stack for further information - - Enter your username - Enter your password - Type to search - Type to filter - Administrator Category field @@ -1005,5 +993,9 @@ To manage your website, simply open the umbraco back office and start adding con User type User types Writer + + Your profile + Your recent history + Session expires in