diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 16b943481b..25b09bb013 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -175,7 +175,7 @@ Browse your website - Hide - If umbraco isn't opening, you might need to allow popups from this site + If Umbraco isn't opening, you might need to allow popups from this site has opened in a new window Restart Visit @@ -203,7 +203,7 @@ Last Edited Link Internal link: - When using local links, insert "#" infront of link + When using local links, insert "#" in front of link Open in new window? Macro Settings This macro does not contain any properties you can edit @@ -245,6 +245,7 @@ Allowed child node types + Document Type Compositions Create Delete tab Description @@ -436,12 +437,12 @@ 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 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 + Umbraco creates a default user with a login ('admin') and password ('default'). It's important that the password is changed to something unique.

@@ -449,29 +450,29 @@

]]> 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. + 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 + 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.]]> + 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.]]> + video tutorial on setting up folder permissions for Umbraco or read the text version.]]> 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.]]> + 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!]]> + 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 @@ -504,25 +505,25 @@ Step 1/5 Accept license Step 2/5: Database configuration Step 3/5: Validating File Permissions - Step 4/5: Check umbraco security + Step 4/5: Check Umbraco security Step 5/5: Umbraco is ready to get you started - Thank you for choosing umbraco + 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]]> +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, + 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]]> +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.]]> @@ -544,7 +545,7 @@ To manage your website, simply open the umbraco back office and start adding con Happy Caturday Log in below Session timed out - © 2001 - %0%
umbraco.org

]]> + © 2001 - %0%
Umbraco.com

]]> Dashboard @@ -578,7 +579,7 @@ To manage your website, simply open the umbraco back office and start adding con Have a nice day! - Cheers from the umbraco robot + Cheers from the Umbraco robot ]]> Hi %0%

@@ -605,7 +606,7 @@ To manage your website, simply open the umbraco back office and start adding con

Have a nice day!

- Cheers from the umbraco robot + Cheers from the Umbraco robot

]]> [%0%] Notification about %1% performed on %2% Notifications @@ -613,7 +614,7 @@ To manage your website, simply open the umbraco back office and start adding con - button and locating the package. umbraco packages usually have a ".umb" or ".zip" extension. + button and locating the package. Umbraco packages usually have a ".umb" or ".zip" extension. ]]> Author Demonstration @@ -637,20 +638,20 @@ To manage your website, simply open the umbraco back office and start adding con 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. + 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 Paste with full formatting (Not recommended) - The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. + The text you're trying to paste contains special characters or formatting. This could be caused by copying text from Microsoft Word. Umbraco can remove special characters or formatting automatically, so the pasted content will be more suitable for the web. Paste as raw text without any formatting at all Paste, but remove formatting (Recommended) Role based protection - using umbraco's member groups.]]> + using Umbraco's member groups.]]> role-based authentication.]]> Error Page Used when people are logged on, but do not have access @@ -658,7 +659,7 @@ To manage your website, simply open the umbraco back office and start adding con %0% is now protected Protection removed from %0% Login Page - Choose the page that has the login formular + Choose the page that contains the login form Remove Protection Select the pages that contain login form and error messages Pick the roles who have access to this page @@ -667,16 +668,14 @@ 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 - - - + ]]> %0% and subpages have been published Publish %0% and all its subpages ok to publish %0% and thereby making its content publicly available.

- You can publish this page and all its sub-pages by checking publish all children below. + You can publish this page and all it's sub-pages by checking publish all children below. ]]> @@ -710,7 +709,7 @@ To manage your website, simply open the umbraco back office and start adding con Current version Red text will not be shown in the selected version. , green means added]]> Document has been rolled back - This displays the selected version as html, if you wish to see the difference between 2 versions at the same time, use the diff view + This displays the selected version as HTML, if you wish to see the difference between 2 versions at the same time, use the diff view Rollback to Select version View @@ -732,6 +731,7 @@ To manage your website, simply open the umbraco back office and start adding con Translation Users Help + Analytics Default template @@ -825,9 +825,9 @@ To manage your website, simply open the umbraco back office and start adding con Insert content area placeholder Insert dictionary item Insert Macro - Insert umbraco page field + Insert Umbraco page field Master template - Quick Guide to umbraco template tags + Quick Guide to Umbraco template tags Template @@ -868,9 +868,9 @@ To manage your website, simply open the umbraco back office and start adding con ]]> close task Translation details - Download all translation tasks as xml - Download xml - Download xml DTD + Download all translation tasks as XML + Download XML + 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 @@ -903,10 +903,10 @@ To manage your website, simply open the umbraco back office and start adding con Translate to Translation completed. You can preview the pages, you've just translated, by clicking below. If the original page is found, you will get a comparison of the 2 pages. - Translation failed, the xml file might be corrupt + Translation failed, the XML file might be corrupt Translation options Translator - Upload translation xml + Upload translation XML Cache Browser @@ -937,6 +937,7 @@ To manage your website, simply open the umbraco back office and start adding con Stylesheets Templates XSLT Files + Analytics New update ready @@ -986,4 +987,4 @@ To manage your website, simply open the umbraco back office and start adding con Your recent history Session expires in - + \ No newline at end of file