diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
index d4393dd20b..0308ab6197 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
@@ -132,6 +132,7 @@ angular.module('umbraco.mocks').
"content_membertype": "Member Type",
"content_noDate": "No date chosen",
"content_nodeName": "Page Title",
+ "defaultdialogs_nodeNameLinkPicker": "Link title",
"content_otherElements": "Properties",
"content_parentNotPublished": "This document is published but is not visible because the parent '%0%' is unpublished",
"content_parentNotPublishedAnomaly": "This document is published but is not in the cache",
@@ -148,7 +149,8 @@ angular.module('umbraco.mocks').
"content_updateDate": "Last edited",
"content_updateDateDesc": "Date/time this document was created",
"content_uploadClear": "Remove file",
- "content_urls": "Link to document",
+ "content_urls": "Link to document",
+ "defaultdialogs_urlLinkPicker":"Link",
"content_memberof": "Member of group(s)",
"content_notmemberof": "Not a member of group(s)",
"content_childItems": "Child items",
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
index badcc14487..442357edcc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
@@ -1,8 +1,8 @@
-
-
+
-
+
Opens the linked document in a new window or tab
- Opens the linked document in the full body of the window
- Opens the linked document in the parent frame
@@ -62,9 +60,9 @@
Cancel
-
-
Link to file
-
+
+ Select media
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
index 70a4ccb8b2..13bcfd9c3e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
@@ -1,6 +1,6 @@
-
+
-
+
Copied %0% out of %1% items
+ Name des Link
+ Link
Name
Hostnamen verwalten
Fenster schließen
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 52c0779733..f4bddf445e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -149,7 +149,7 @@
Role
Member Type
No date chosen
- Link title
+ Page title
Properties
This document is published but is not visible because the parent '%0%' is unpublished
This document is published but is not in the cache
@@ -253,6 +253,8 @@
Copied %0% out of %1% items
+ Link title
+ Link
Name
Manage hostnames
Close this window
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 54ec622b94..834680242e 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -55,13 +55,17 @@
Domain '%0%' has already been assigned
Domain '%0%' has been updated
Edit Current Domains
-
+
+ should be avoided. Better use the culture setting above.]]>
+
Inherit
Culture
- or inherit culture from parent nodes. Will also apply
- to the current node, unless a domain below applies too.]]>
+
+ or inherit culture from parent nodes. Will also apply
+ to the current node, unless a domain below applies too.]]>
+
Domains
@@ -182,7 +186,7 @@
Click to upload
Drop your files here...
- Link to media
+ 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
@@ -253,6 +257,8 @@
Copied %0% out of %1% items
+ Link title
+ Link
Name
Manage hostnames
Close this window
@@ -292,10 +298,14 @@
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 referring 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 referring 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
@@ -328,9 +338,11 @@
Select snippet
-
+ %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.
@@ -604,26 +616,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. ]]>
@@ -634,47 +654,61 @@
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
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
@@ -689,7 +723,8 @@
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
@@ -697,24 +732,36 @@
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
@@ -769,7 +816,8 @@ 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%'
@@ -809,15 +858,18 @@ 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.
- ]]>
+ ]]>
+
Drop to upload
or click here to choose package file
Upload package
@@ -857,8 +909,10 @@ To manage your website, simply open the Umbraco back office and start adding con
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
@@ -867,9 +921,11 @@ 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
@@ -918,27 +974,37 @@ To manage your website, simply open the Umbraco back office and start adding con
%0% could not be published because the item is scheduled for release.
]]>
-
+
-
+
+
+
-
+
+
+
-
+
+
+
+ ]]>
+
Include unpublished subpages
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
- Publish to publish %0% and thereby making its content publicly available.
+
+ 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.
- ]]>
+ ]]>
+
You have not configured any approved colors
@@ -1023,12 +1089,12 @@ To manage your website, simply open the Umbraco back office and start adding con
Do not close this window during sorting]]>
- Validation
- Validation errors must be fixed before the item can be saved
- Failed
- Insufficient user permissions, could not complete the operation
- Cancelled
- Operation was cancelled by a 3rd party add-in
+ Validation
+ Validation errors must be fixed before the item can be saved
+ Failed
+ Insufficient user permissions, could not complete the operation
+ Cancelled
+ Operation was cancelled by a 3rd party add-in
Publishing was cancelled by a 3rd party add-in
Property type already exists
Property type created
@@ -1307,11 +1373,11 @@ To manage your website, simply open the Umbraco back office and start adding con
- 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
+ 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
@@ -1355,10 +1421,12 @@ 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
@@ -1366,7 +1434,8 @@ 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
Please select the language that the content should be translated into
Send the page '%0%' to translation
@@ -1546,7 +1618,7 @@ To manage your website, simply open the Umbraco back office and start adding con
Your website's certificate is valid.
Certificate validation error: '%0%'
Your website's SSL certificate has expired.
- Your website's SSL certificate is expiring in %0% days.
+ Your website's SSL certificate is expiring in %0% days.
Error pinging the URL %0% - '%1%'
You are currently %0% viewing the site using the HTTPS scheme.
The appSetting 'umbracoUseSSL' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index ad0c3ecf30..9e813f136c 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -220,6 +220,8 @@
Copied %0% out of %1% items
+ Título del vínculo
+ Vínculo
Nombre
Administrar dominios
Cerrar esta ventana
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index 753f8513e4..838e605483 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -253,6 +253,8 @@
%0% éléments sur %1% copiés
+ Titre du lien
+ Lien
Nom
Gérer les noms d'hôtes
Fermer cette fenêtre
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index a9bc64d9f9..865703e213 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -162,6 +162,8 @@
Copied %0% out of %1% items
+ Titolo del Link
+ Link
Nome
Gestione alias Hostnames
Chiudi questa finestra
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index 0d7faa9f14..2ddc4851dc 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -248,6 +248,8 @@
item %0% van de %1% gekopieerd
+ Link Titel
+ Link
Naam
Beheer domeinnamen
Sluit dit venster