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 9f42eb7035..77955451c4 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -85,14 +85,14 @@ Domain '%0%' has been updated Edit Current Domains - Inherit Culture - or inherit culture from parent nodes. Will also apply
+ or inherit culture from parent nodes. Will also apply
to the current node, unless a domain below applies too.]]> Domains @@ -336,11 +336,11 @@ 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, + Set a placeholder id by setting an ID on your placeholder you can inject content into this template from child templates, by referring this ID using a <asp:content /> element.]]> - Select a placeholder id from the list below. You can only + 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 @@ -381,15 +381,15 @@ - %0%' below
You can add additional languages under the 'languages' in the menu on the left + %0%' below
You can add additional languages under the 'languages' in the menu on the left ]]> Culture Name Edit the key of the dictionary item. - @@ -669,35 +669,35 @@ Your database has been found and is identified as Database configuration - install button to install the Umbraco %0% database + 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.

-

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.
+ 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.

]]> - - Please contact your ISP if necessary. + + 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 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 + Press Next to proceed. ]]> next to continue the configuration wizard]]> @@ -706,7 +706,7 @@ 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! - ('admin') and password ('default'). It's important that the password is changed to something unique. + ('admin') and password ('default'). It's important that the password is changed to something unique. ]]> Get a great start, watch our introduction videos @@ -716,65 +716,65 @@ 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!

+ 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! -

+ 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!

+ 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. + 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 + + 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, - Runway offers an easy foundation based on best practices to get you started faster than ever. - If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages. -

- - Included with Runway: Home page, Getting Started page, Installing Modules page.
- Optional Modules: Top Navigation, Sitemap, Contact, Gallery. - + + "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, + Runway offers an easy foundation based on best practices to get you started faster than ever. + If you choose to install Runway, you can optionally select basic building blocks called Runway Modules to enhance your Runway pages. +

+ + Included with Runway: Home page, Getting Started page, Installing Modules page.
+ Optional Modules: Top Navigation, Sitemap, Contact, Gallery. + ]]> What is Runway @@ -785,24 +785,24 @@ Step 5/5: Umbraco is ready to get you started Thank you for choosing Umbraco - Browse your new site + Browse your new site You installed Runway, so why not see how your new website looks.]]> - Further help and information + 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, + 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 + 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. @@ -810,8 +810,8 @@ To manage your website, simply open the Umbraco back office and start adding con 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.]]> @@ -869,47 +869,47 @@ To manage your website, simply open the Umbraco back office and start adding con Edit your notification for %0% - - Hi %0%

- -

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

-
-
-      EDIT        -
-
-

-

Update summary:

- - %6% -
-

- -
-
-      EDIT        -
-
- -

Have a nice day!

- Cheers from the Umbraco robot + Hi %0%

+ +

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

+
+
+      EDIT        +
+
+

+

Update summary:

+ + %6% +
+

+ +
+
+      EDIT        +
+
+ +

Have a nice day!

+ Cheers from the Umbraco robot

]]> [%0%] Notification about %1% performed on %2% @@ -917,9 +917,9 @@ 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. ]]> Drop to upload @@ -962,7 +962,7 @@ To manage your website, simply open the Umbraco back office and start adding con Package name Package doesn't contain any items -
+
You can safely remove this from the system by clicking "uninstall package" below.]]> No upgrades available @@ -974,8 +974,8 @@ To manage your website, simply open the Umbraco back office and start adding con 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, + + 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.]]> Download update from the repository @@ -1022,28 +1022,28 @@ To manage your website, simply open the Umbraco back office and start adding con - - - - - Include unpublished subpages @@ -1053,8 +1053,8 @@ To manage your website, simply open the Umbraco back office and start adding con %0% and subpages have been published Publish %0% and all its subpages - Publish to publish %0% and thereby making its content publicly available.

- You can publish this page and all its subpages by checking Include unpublished subpages below. + Publish to publish %0% and thereby making its content publicly available.

+ You can publish this page and all its subpages by checking Include unpublished subpages below. ]]> @@ -1268,27 +1268,27 @@ To manage your website, simply open the Umbraco back office and start adding con Render child template - @RenderBody() placeholder. + @RenderBody() placeholder. ]]> Define a named section - @section { ... }. This can be rendered in a - specific area of the parent of this template, by using @RenderSection. + @section { ... }. This can be rendered in a + specific area of the parent of this template, by using @RenderSection. ]]> Render a named section - @RenderSection(name) placeholder. - This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. + @RenderSection(name) placeholder. + This renders an area of a child template which is wrapped in a corresponding @section [name]{ ... } definition. ]]> @@ -1491,9 +1491,9 @@ 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. - 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. + 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 @@ -1504,29 +1504,29 @@ To manage your website, simply open the Umbraco back office and start adding con 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, - 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. + 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 @@ -1567,6 +1567,8 @@ To manage your website, simply open the Umbraco back office and start adding con Relation Types Packages Packages + Partial Views + Partial View Macro Files Python Files Install from repository Install Runway