From 054033c73fcba10b3f5ca70c7a9891a9ace3cd3f Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Thu, 20 Nov 2014 12:24:49 +0000 Subject: [PATCH 01/10] Updated the language files to fix issue #U4-3979 and also corrected invalid URL's across all the language files. --- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 16 +-- .../umbraco/config/lang/en_us.xml | 114 +++++++++--------- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/no.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 4 +- 17 files changed, 121 insertions(+), 117 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index c4b85332fa..5209982322 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -1,8 +1,8 @@ - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Tilføj domæne @@ -368,7 +368,7 @@ installér knappen for at installere Umbraco %0% databasen]]> Næste for at fortsætte.]]> Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.

-

For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

Klik på Forsøg igen knappen når du er færdig.
Mere information om at redigere web.config her.

]]> +

For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

Klik på Forsøg igen knappen når du er færdig.
Mere information om at redigere web.config her.

]]> Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]> Tryk på Opgradér knappen for at opgradere din database til Umbraco %0%

Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!

]]> Tryk på Næste for at fortsætte.]]> @@ -446,7 +446,7 @@ Din session er udløbet - © 2001 - %0%
umbraco.org

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

]]> Skrivebord diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index c2c16cccec..9acf6b9375 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -2,7 +2,7 @@ The German Umbraco Community - http://umbraco.org + http://our.umbraco.org Hostnamen verwalten @@ -465,7 +465,7 @@ Wenn Sie sich für Runway entscheiden, können Sie optional Blöcke nutzen, die Erneuern Sie, um Ihre Arbeit zu speichern ... - <p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.org" style="text-decoration: none" target="_blank">umbraco.org</a></p> + <p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.org</a></p> Einen wunderbaren Sonntag Frohen freundlichen Freitag Donnerwetter Donnerstag diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index b034f935b2..3a097b6105 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -1,8 +1,8 @@  - umbraco - http://umbraco.org + Umbraco + http://umbraco.com Culture and Hostnames @@ -418,11 +418,11 @@ Press the 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.
+ done.
 More information on editing web.config here.

]]> Please contact your ISP if necessary. @@ -437,7 +437,7 @@ Press Next to proceed. ]]> next to continue the configuration wizard]]> - The Default users’ password needs to be changed!]]> + 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! @@ -478,11 +478,11 @@ ]]> 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? + You've just set up a clean Umbraco platform. What do you want to do next? Runway is installed @@ -493,7 +493,7 @@ "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, + 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.

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 ad78006b03..4f6f269b66 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1,8 +1,8 @@ - umbraco - http://umbraco.org + Umbraco + http://umbraco.com Culture and Hostnames @@ -133,6 +133,7 @@ This item has been changed after publication This item is not published Last published + There are no items show in the list. Media Type Link to media item(s) Member Group @@ -152,6 +153,7 @@ 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 Statistics Title (optional) + Alternative text (optional) Type Unpublish Last edited @@ -180,7 +182,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 @@ -208,7 +210,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 @@ -222,7 +224,7 @@ Remove Macro Required Field Site is reindexed - The website cache has been refreshed. All publish content is now uptodate. While all unpublished content is still unpublished + The website cache has been refreshed. All publish content is now up to date. While all unpublished content is still unpublished The website cache will be refreshed. All published content will be updated, while unpublished content will stay unpublished. Number of columns Number of rows @@ -250,7 +252,8 @@ - Allowed child nodetypes + Allowed child node types + Document Type Compositions Create Delete tab Description @@ -274,7 +277,7 @@ Your data has been saved, but before you can publish this page there are some errors you need to fix first: - The current MemberShip Provider does not support changing password (EnablePasswordRetrieval need to be true) + The current membership provider does not support changing password (EnablePasswordRetrieval need to be true) %0% already exists There were errors: There were errors: @@ -288,7 +291,7 @@ The specified file type has been disallowed by the administrator NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough. - Please fill both alias and name on the new propertytype! + Please fill both alias and name on the new property type! There is a problem with read/write access to a specific file or folder Please enter a title Please choose a type @@ -423,11 +426,11 @@ Press the 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.
+ done.
 More information on editing web.config here.

]]> Please contact your ISP if necessary. @@ -442,13 +445,13 @@ 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 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 + Umbraco creates a default user with a login ('admin') and password ('default'). It's important that the password is changed to something unique.

@@ -456,38 +459,38 @@

]]> 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 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? + You've just set up a clean Umbraco platform. What do you want to do next? Runway is installed @@ -498,7 +501,7 @@ "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, + 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.

@@ -511,25 +514,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.]]> @@ -552,8 +555,7 @@ To manage your website, simply open the umbraco back office and start adding con log in below Session timed out - - © 2001 - %0%
umbraco.org

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

]]> @@ -588,7 +590,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%

@@ -615,7 +617,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 @@ -623,7 +625,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 @@ -647,20 +649,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 @@ -668,7 +670,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 @@ -686,7 +688,7 @@ To manage your website, simply open the umbraco back office and start adding con %0% could not be published because these properties: %1% did not pass validation rules. ]]> %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. ]]> @@ -720,7 +722,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 @@ -743,13 +745,14 @@ To manage your website, simply open the umbraco back office and start adding con Users Help + Analytics Default template Dictionary Key To import a document type, find the ".udt" file on your computer by clicking the "Browse" button and click "Import" (you'll be asked for confirmation on the next screen) New Tab Title - Nodetype + Node type Type Stylesheet Script @@ -836,9 +839,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 @@ -847,8 +850,8 @@ To manage your website, simply open the umbraco back office and start adding con Casing Encoding Choose field - Convert Linebreaks - Replaces linebreaks with html-tag &lt;br&gt; + Convert line breaks + Replaces line breaks with html-tag &lt;br&gt; Custom Fields Yes, Date only Format as date @@ -879,9 +882,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 @@ -914,10 +917,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 @@ -948,6 +951,7 @@ To manage your website, simply open the umbraco back office and start adding con Stylesheets Templates XSLT Files + Analytics New update ready diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index 61a6764ad4..b9db48f439 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -1,8 +1,8 @@  - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Administrar hostnames @@ -347,7 +347,7 @@ Configuración de la base de datos instalar para instalar %0% la base de datos de Umbraco]]> Próximo para continuar]]> - ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

Pinche en reintentar cuando haya terminado.
Pinche aquí para mayor información de como editar el web.config (en inglés)

]]> + ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

Pinche en reintentar cuando haya terminado.
Pinche aquí para mayor información de como editar el web.config (en inglés)

]]> Por favor, contacta con tu ISP si es necesario. Si estás realizando la instalación en una máquina o servidor local, quizás necesites información de tu administrador de sistemas.]]> Pinche en actualizar para actualizar la base de datos a Umbraco %0%

Ningún contenido será borrado de la base de datos y seguirá funcionando después de la actualización

]]> Pinche en Próximo para continuar. ]]> @@ -411,7 +411,7 @@ However, Runway offers an easy foundation based on best practices to get you sta TRANSLATE ME: 'Renew now to save your work' - © 2001 - %0%
umbraco.org

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

]]> Bienvenido a umbraco, escribe tu nombre de usuario y clave en los campos de debajo: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index cf98bb9f3e..f07b0ac88e 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -1,8 +1,8 @@ - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Gérer les noms d'hôtes @@ -420,7 +420,7 @@

Pour poursuivre, éditez le fichier "web.config" (avec Visual Studio ou votre éditeur de texte favori), scrollez jusqu'en bas, ajoutez une "connection string" dans la ligne "umbracoDbDSN" et sauvegardez votre fichier.

Cliquez sur le bouton Réessayer lorsque cela est fait. -
+
Plus d'informations sur l'édition du fichier web.config ici.

]]> Contactez votre administrateur système si nécessaire. @@ -545,7 +545,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à Joyeux samedi Connectez-vous ci-dessous La session a expiré - © 2001 - %0%
umbraco.org

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

]]> Tableau de bord diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index d22a0474e1..dd6b8f49cc 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -2,7 +2,7 @@ Umbraco Hebrew 2011 - http://umbraco.org + http://our.umbraco.org נהל שמות מתחם @@ -354,7 +354,7 @@

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.
+ done.
 More information on editing web.config here.

]]> Please contact your ISP if necessary. @@ -469,7 +469,7 @@ To manage your website, simply open the umbraco back office and start adding con יש לבצע חידוש פעילות על מנת לשמור על התוכן - © 2001 - %0%
umbraco.org

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

]]> ברוכים הבאים לאומברקו, יש להזין שם משתמש וסיסמה בשדות למטה: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index f75a1d73be..98c9110dad 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -1,8 +1,8 @@  - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Gestisci hostnames @@ -343,7 +343,7 @@ Avanti per proseguire.]]> Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette.

-

Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

Clicca il tasto riprova quando hai finito.
Maggiori dettagli per la modifica del file web.config qui.

]]> +

Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

Clicca il tasto riprova quando hai finito.
Maggiori dettagli per la modifica del file web.config qui.

]]> Premi il tasto aggiorna per aggiornare il database ad Umbraco %0%

Non preoccuparti, il contenuto non verrà perso e tutto continuerà a funzionare dopo l'aggiornamento!

]]> @@ -428,7 +428,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i Riconnetti adesso per salvare il tuo lavoro - © 2001 - %0%
umbraco.org

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

]]> Benvenuti in Umbraco, digita il tuo username e la tua password nelle caselle seguenti: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index bf60d41574..a5414e31b6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -1,8 +1,8 @@ - umbraco - http://umbraco.org + The Umbraco Community + http://our.umbraco.org ドメインの割り当て @@ -351,7 +351,7 @@

続行するには"web.config"ファイルを編集(Visual Studioないし使い慣れたテキストエディタで)し、下の方にスクロールし、"umbracoDbDSN"という名前のキーでデータベースの接続文字列を追加して保存します。

再施行ボタンをクリックして - 続けます。
+ 続けます。
 より詳細にはこちらの web.config を編集します。

]]> 必要ならISPに連絡するなどしてみてください。 @@ -466,7 +466,7 @@ Runwayをインストールして作られた新しいウェブサイトがど 作業を保存して今すぐ更新 - © 2001 - %0%
umbraco.org

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

]]> Umbraco にようこそ。ユーザー名とパスワードを入力してください: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index 2ec2088a01..7e984676be 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -2,7 +2,7 @@ The Umbraco community - http://umbraco.org/documentation/language-files + http://our.umbraco.org 호스트명 관리 @@ -344,7 +344,7 @@ 데이터베이스를 찾을 수 없습니다. “web.config”파일의 "connection string"이 바르게 설정되었는지 확인하세요.

"web.config" 파일에 맨아래에 ,키네임을 "umbracoDbDSN"로 하여 사용하시는 데이터베이스의 connection string 정보를 입력하시고 파일을 저장하세요.

- 완료 후재시도버튼을 누르세요.
+ 완료 후재시도버튼을 누르세요.
 web.config의 더많은 정보는 여기에 있습니다.

]]> 필요하시다면 사용하시는 ISP쪽에 문의하시기 바랍니다.. @@ -447,7 +447,7 @@ TRANSLATE ME: 'Renew now to save your work' - © 2001 - %0%
umbraco.org

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

]]> umbraco 에 오신것을 환영합니다. 사용자명과 비밀번호를 입력하십시오: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index ea2ec65877..8aaf283478 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -1,8 +1,8 @@ - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Beheer domeinnamen @@ -421,7 +421,7 @@ Database configuratie installeren om de Umbraco %0% database te installeren]]> Volgende om door te gaan.]]> - De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

Klik op de knop opnieuw proberen als je hiermee klaar bent.
Meer informatie over het aanpassen van de web.config vind je hier.

]]> + De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

Klik op de knop opnieuw proberen als je hiermee klaar bent.
Meer informatie over het aanpassen van de web.config vind je hier.

]]> Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> Klik de upgrade knop om je database te upgraden naar Umbraco %0%

Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!

]]> Klik Volgende om verder te gaan.]]> @@ -500,7 +500,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je log hieronder in Sessie is verlopen - © 2001 - %0%
umbraco.org

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

]]> Welkom bij umbraco, geef je gebruikersnaam en wachtwoord op in de onderstaande velden: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml index ed024af119..c43d5445c9 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml @@ -1,8 +1,8 @@  - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Angi domene @@ -352,7 +352,7 @@ Databasekonfigurasjon Klikk <strong>installer</strong>-knappen for å installere Umbraco %0% databasen Umbraco %0% har nå blitt kopiert til din database. Trykk <strong>Neste</strong> for å fortsette. - <p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="http://umbraco.org/redir/installWebConfig" target="_blank">Mer informasjon om redigering av web.config her.</a></p> + <p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="http://our.umbraco.org/wiki/reference/webconfig" target="_blank">Mer informasjon om redigering av web.config her.</a></p> For å fullføre dette steget, må du vite en del informasjon om din database server ("tilkoblingsstreng").<br/> Vennligst kontakt din ISP om nødvendig. Hvis du installerer på en lokal maskin eller server, må du kanskje skaffe informasjonen fra din systemadministrator. <p> Trykk på knappen <strong>oppgrader</strong> for å oppgradere databasen din til Umbraco %0%</p> <p> Ikke vær urolig - intet innhold vil bli slettet og alt vil fortsette å virke etterpå! </p> Databasen din har blitt oppgradert til den siste utgaven, %0%.<br/>Trykk <strong>Neste</strong> for å fortsette. @@ -415,7 +415,7 @@ Forny innlogging for å lagre - <p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.org" style="text-decoration: none" target="_blank">umbraco.org</a></p> + <p style="text-align:right;">&copy; 2001 - %0% <br /><a href="http://umbraco.com" style="text-decoration: none" target="_blank">umbraco.org</a></p> Velkommen til Umbraco, skriv inn ditt brukernavn og passord i feltene under: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index a9d419c9ab..80acd266fd 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -1,8 +1,8 @@  - The umbraco community - http://umbraco.org/documentation/language-files + The Umbraco community + http://our.umbraco.org Zarządzanie hostami @@ -339,7 +339,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> Konfiguracja bazy danych instaluj aby zainstalować bazę danych Umbraco %0%]]> Dalej aby kontynuować.]]> - Nie odnaleziono bazy danych! Sprawdź czy informacje w sekcji "connection string" w pliku "web.config" są prawidłowe.

Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.

Kliknij ponów próbę kiedy skończysz.
Tu znajdziesz więcej informacji na temat edycji pliku "web.config".

]]> + Nie odnaleziono bazy danych! Sprawdź czy informacje w sekcji "connection string" w pliku "web.config" są prawidłowe.

Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.

Kliknij ponów próbę kiedy skończysz.
Tu znajdziesz więcej informacji na temat edycji pliku "web.config".

]]> Skontaktuj się z Twoim dostawą usług internetowych jeśli zajdzie taka potrzeba. W przypadku instalacji na lokalnej maszynie lub serwerze możesz potrzebować pomocy administratora.]]> Naciśnij przycisk aktualizuj by zaktualizować swoją bazę danych do Umbraco %0%

Bez obaw - żadne dane nie zostaną usunięte i wszystko będzie działać jak należy!

]]> Naciśnij przycisk Dalej aby kontynuować.]]> @@ -402,7 +402,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> TRANSLATE ME: 'Renew now to save your work' - © 2001 - %0%
umbraco.org

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

]]> Witamy w umbraco. Wprowadź swój login oraz hasło w polach poniżej: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index bbb0e7e5e2..898d18be1c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -1,8 +1,8 @@  - Carlos Casalicchio - http://www.zueuz.net + The Umbraco community + http://our.umbraco.org Gerenciar hostnames @@ -340,7 +340,7 @@ Próximo para prosseguir.]]> Banco de dados não encontrado! Favor checar se a informação no "connection string" do "web.config" esteja correta.

Para prosseguir, favor editar o arquivo "web.config" (usando Visual Studio ou seu editor de texto favorito), role até embaixo, adicione a connection string para seu banco de dados com a chave de nome "umbracoDbDSN" e salve o arquivo

-

Clique o botão tentar novamente quando terminar.
+

Clique o botão tentar novamente quando terminar.
Mais informações em como editar o web.config aqui.

]]> Favor contatar seu provedor de internet ou hospedagem web se necessário. Se você estiver instalando em uma máquina ou servidor local é possível que você precise dessas informações por um administrador de sistema.]]> @@ -440,7 +440,7 @@ Pressione "próximo" para iniciar o assistente.]]> Renovar agora para salvar seu trabalho - © 2001 - %0%
umbraco.org

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

]]> Bem vindo(a) à Umbraco, digite seu nome de usuário e senha nas caixas abaixo: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index 667dcfe4a9..2502e4e3c6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -1,8 +1,8 @@ - Alexander Bryukhov (Unico Design company) - http://unicodsgn.com + The Umbraco Community + http://our.umbraco.org Языки и домены @@ -369,7 +369,7 @@

Для настройки откройте файл "web.config" с помошью любого текстового редактора и добавьте нужную информацию в строку подключения (параметр "umbracoDbDSN"), затем сохраните файл.

Нажмите кнопку "Повторить" когда все будет готово
- Более подробно о внесении изменений в файл "web.config" расскзано здесь.

]]> @@ -484,7 +484,7 @@ Обновите сейчас, чтобы сохранить сделанные изменения - © 2001 - %0%
umbraco.org

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

]]> Рады приветствовать Вас в umbraco, укажите Ваши логин и пароль для входа в систему: diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index b98548b2c5..b6c0028f2f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -1,8 +1,8 @@  - Kalle Ekstrand, Toxic Interactive Solutions AB - http://www.toxic.se + The Umbraco community + http://our.umbraco.org Hantera domännamn @@ -400,7 +400,7 @@ Databaskonfiguration installera]]> Nästa för att fortsätta.]]> - Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

Klicka på Försök igen knappen när du är klar.
> Mer information om att redigera web.config hittar du här.

]]> + Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

Klicka på Försök igen knappen när du är klar.
> Mer information om att redigera web.config hittar du här.

]]> Eventuellt kan du behöva kontakta ditt webb-hotell. Om du installerar på en lokal maskin eller server kan du få informationen från din systemadministratör.]]> Tryck Uppgradera knappen för att uppgradera din databas till Umbraco {0}

Du behöver inte vara orolig. Inget innehåll kommer att raderas och efteråt kommer allt att fungera som vanligt!

]]> Tryck Nästa för att fortsätta.]]> @@ -466,7 +466,7 @@ Förnya nu för att spara ditt arbete - © 2001 - {0}
umbraco.org

]]> + © 2001 - {0}
umbraco.com

]]> Happy super Sunday Happy manic Monday Happy tremendous Tuesday diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index e868feb5b5..f610be9647 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -2,7 +2,7 @@ 孙柱梁 - + http://our.umbraco.org 管理主机名 @@ -384,7 +384,7 @@ 数据库未找到！请检查数据库连接串设置。

您可以自行编辑“web.config”文件，键名为 “umbracoDbDSN”

- 当自行编辑后，单击重试按钮
。 + 当自行编辑后，单击重试按钮
。 如何编辑web.config

]]> From dffcf100329979d9553ffae1091558f7263d4158 Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Thu, 20 Nov 2014 12:44:41 +0000 Subject: [PATCH 02/10] Fixed ticket U4-4840 invalid Italian words in the Italian language file. --- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 98c9110dad..c8dd6eb574 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -266,7 +266,7 @@ Trova Cartella Altezza - Aiuto + Guida Icona Importa @@ -630,7 +630,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i Tab creata Tab eliminata Tab con id: %0% eliminata - Contenuto non pubblicato + Contenuto non pubblicare From 9834352de29a0ea3a7acdbe205c95e4326840a09 Mon Sep 17 00:00:00 2001 From: Chris Houston Date: Sun, 23 Nov 2014 03:30:18 +0000 Subject: [PATCH 03/10] - Added all the missing Key's to the Spanish file - Updated the help documentation URL's - Updated the Community Contributor URL's --- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 14 +- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 14 +- .../umbraco/config/lang/en_us.xml | 8 +- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 177 +++++++++++++----- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/no.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 6 +- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 4 +- .../umbraco/create/nodeType.ascx | 2 +- .../settings/EditNodeTypeNew.aspx.designer.cs | 18 ++ .../umbraco/create/nodeType.ascx | 2 +- .../umbraco/create/nodeType.ascx.cs | 46 +++-- .../umbraco/create/nodeType.ascx.designer.cs | 9 + 22 files changed, 243 insertions(+), 107 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 5209982322..6325f7610f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Tilføj domæne @@ -368,7 +368,7 @@ installér knappen for at installere Umbraco %0% databasen]]> Næste for at fortsætte.]]> Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.

-

For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

Klik på Forsøg igen knappen når du er færdig.
Mere information om at redigere web.config her.

]]> +

For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

Klik på Forsøg igen knappen når du er færdig.
Mere information om at redigere web.config her.

]]> Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]> Tryk på Opgradér knappen for at opgradere din database til Umbraco %0%

Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!

]]> Tryk på Næste for at fortsætte.]]> @@ -481,7 +481,11 @@ Ha' en dejlig dag! Mange hilsner fra umbraco robotten ]]> - Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'

Opdateringssammendrag:

%6%

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> + Hej %0%

+

Dette er en automatisk mail for at informere dig om at opgaven '%1%' + er blevet udførtpå siden '%2%' af brugeren '%3%'

+

Opdateringssammendrag:

%6%

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> [%0%] Notificering om %1% udført på %2% Notificeringer @@ -542,7 +546,7 @@ Mange hilsner fra umbraco robotten %0% ud af %1% sider er blevet udgivet... %0% er nu publiceret %0% og alle undersider er nu publiceret - Publisér alle undersider + Publicér alle undersider ok for at udgive %0% og derved gøre indholdet offentligt tilgængeligt..

Du kan udgive denne side og dens undersider ved at klikke Udgiv alle undersider forneden]]> @@ -596,6 +600,8 @@ Mange hilsner fra umbraco robotten Faneblad Titel på faneblad Faneblade + Master Dokument Type + Opret matchende skabelon Sortering udført diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 9acf6b9375..352e6ffc01 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -1,8 +1,8 @@ - The German Umbraco Community - http://our.umbraco.org + The Umbraco community + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Hostnamen verwalten diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 3a097b6105..32b31750e6 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -1,8 +1,8 @@  - Umbraco - http://umbraco.com + The Umbraco community + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Culture and Hostnames @@ -44,16 +44,16 @@ Invalid node. Invalid domain format. Domain has already been assigned. - Domain Language + Domain New domain '%0%' has been created Domain '%0%' is deleted Domain '%0%' has already been assigned + Domain '%0%' has been updated + Edit Current Domains
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
@@ -422,7 +422,7 @@

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.
+ done.
 More information on editing web.config here.

]]> Please contact your ISP if necessary. @@ -751,6 +751,8 @@ To manage your website, simply open the Umbraco back office and start adding con 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. + Master Document Type + Create matching template Sorting complete. 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 4f6f269b66..48c366f30c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -1,8 +1,8 @@ - Umbraco - http://umbraco.com + The Umbraco community + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Culture and Hostnames @@ -430,7 +430,7 @@

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.
+ done.
 More information on editing web.config here.

]]> Please contact your ISP if necessary. @@ -764,6 +764,8 @@ To manage your website, simply open the Umbraco back office and start adding con 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. + Master Document Type + Create matching template Sorting complete. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index b9db48f439..44294f4504 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -2,12 +2,13 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Administrar hostnames Auditoría Nodo de Exploración + Cambiar tipo de documento Copiar Crear Crear Paquete @@ -15,8 +16,6 @@ Deshabilitar Vaciar Papelera Exportar Documento (tipo) - TRANSLATE ME: 'Export to .NET' - TRANSLATE ME: 'Export to .NET' Importar Documento (tipo) Importar Paquete Editar en lienzo @@ -25,6 +24,7 @@ Notificaciones Acceso Público Publicar + Unpublish Recargar Nodos Republicar sitio completo Permisos @@ -35,21 +35,42 @@ Enviar a publicación Traducir Actualizar + Default value + Permission denied. Añadir nuevo dominio + remove + Invalid node. + Invalid domain format. + Domain has already been assigned. + Language Dominio El nuevo dominio %0% ha sido creado El dominio %0% ha sido borrado El dominio'%0%' ya ha sido asignado - p.ej.: tudominio.com, www.tudominio.com El dominio %0% ha sido actualizado Editar dominios actuales + +
One-level paths in domains are supported, eg. "example.com/en". However, they + 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.]]> + + Domains Visualización de + Select + Select current folder + Do something else Negrita Cancelar Sangría del Párrafo Insertar campo de formulario @@ -71,10 +92,31 @@ Guardar y publicar Guardar y enviar para aprobación Previsualizar + Preview is disabled because there's no template assigned Elegir estilo Mostrar estilos Insertar tabla + + 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 + New Type + none + Content + Select New Document Type + 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. + Acerca de Link alternativo @@ -82,7 +124,10 @@ Vinculos Alternativos Click para editar esta entrada Creado por + Autor original + Actualizado por Creado + Fecha/hora de creación del documento Tipo de Documento Editando Remover el @@ -97,9 +142,11 @@ Título de la página Propiedades Este documento ha sido publicado pero no es visible porque el padre '%0%' no esta publicado + Oops: this document is published but is not in the cache (internal error) Publicar Estado de la Publicación Publicar el + Despublicar el Fecha de Eliminación El Orden esta actualizado Para organizar los nodos, simplemente arrastre los nodos o realice un clic en uno de los encabezados de columna. Puede seleccionar multiple nodos manteniendo presionados "Shift" o "Control" mientras selecciona @@ -108,17 +155,28 @@ Tipo No Publicar Última actualización + Fecha/hora este documento fue modificado Eliminar archivo Vínculo al documento + Member of group(s) + Not a member of group(s) + Child items + Target + + + Click to upload + Drop your files here... ¿Dónde quieres crear el nuevo %0% Crear debajo de Elije un tipo y un título + "document types".]]> + "media types".]]> Navega en tu sitio Web - TRANSLATE ME: '- Hide' + No volver a mostrar Si Umbraco no se ha abierto tendrás que permitir ventanas emergentes para este sitio Web se ha abierto en una nueva ventana Reinicio @@ -134,11 +192,11 @@ Por favor seleccione esta casilla para confirmar la eliminación de %0% entrada(s) Esta usted seguro? Esta usted Seguro? - TRANSLATE ME: 'Cut' + Cortar Editar entrada del Diccionario Editar idioma Agregar enlace interno - TRANSLATE ME: 'Insert character' + Insertar caracter Insertar titular gráfico Insertar imagen Insertar enlace @@ -149,7 +207,7 @@ Enlace interno Al usar enlaces locales, insertar "#" delante del enlace ¿Abrir en nueva ventana? - TRANSLATE ME: 'Macro Settings' + Ajustes para la Macro Esta macro no contiene ninguna propiedad que pueda editar Pegar Editar permisos para @@ -158,7 +216,7 @@ No podrá recuperar los items una vez sean borrados de la papelera regexlib.com está experimentando algunos problemas en estos momentos, de los cuales no somos responsables. Pedimos disculpas por las molestias.]]> Buscar una expresión regular para agregar validación a un campo de formulario. Ejemplo: 'correo electrónico', código postal "," url " - TRANSLATE ME: 'Remove Macro' + Eliminar macro Campo obligatorio El sitio ha sido reindexado Se ha actualizado la caché y se ha publicado el contenido del sitio web. @@ -176,14 +234,24 @@ + + Introduzca su nombre de usuario + Introduzca su contraseña + Nombre de %0%... + Introduzca un nombre ... + Buscar ... + Filtrar ... + Tipos de nodos hijos permitidos + Document Type Compositions Crear Borrar pestaña - TRANSLATE ME: 'Description' + Descripción Nueva pestaña Pestaña - TRANSLATE ME: 'Thumbnail' + Miniatura + Enable list view añadir prevalor @@ -215,7 +283,7 @@ Debe poner un formato correcto en %0% - TRANSLATE ME: 'NOTE! Even though CodeMirror is enabled by configuration, it is disabled in Internet Explorer because it's not stable enough.' + NOTA: Aunque CodeMirror esté activado en los ajustes de configuracion, no se muestra en Internet Explorer debido a que no es lo suficientemente estable.' Debe llenar el alias y el nombre en el propertytype Hay un problema de lectura y escritura al acceder a un archivo o carpeta Acerca de Acción + Acciones Añadir Alias ¿Está seguro? @@ -268,7 +337,7 @@ Editar Editado Elementos - Email + Mail Error Buscar Altura @@ -282,7 +351,7 @@ Idioma Diseño Cargando - TRANSLATE ME: 'Locked' + Bloqueado Iniciar sesión Cerrar sesión Cerrar sesión @@ -302,11 +371,11 @@ Un momento por favor... Anterior Propiedades - Email para recibir los datos del formulario + Mail para recibir los datos del formulario Papelera Restantes Renombrar - TRANSLATE ME: 'Renew' + Renovar Reintentar Permisos Buscar @@ -347,7 +416,7 @@ Configuración de la base de datos instalar para instalar %0% la base de datos de Umbraco]]> Próximo para continuar]]> - ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

Pinche en reintentar cuando haya terminado.
Pinche aquí para mayor información de como editar el web.config (en inglés)

]]> + ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

Pinche en reintentar cuando haya terminado.
Pinche aquí para mayor información de como editar el web.config (en inglés)

]]> Por favor, contacta con tu ISP si es necesario. Si estás realizando la instalación en una máquina o servidor local, quizás necesites información de tu administrador de sistemas.]]> Pinche en actualizar para actualizar la base de datos a Umbraco %0%

Ningún contenido será borrado de la base de datos y seguirá funcionando después de la actualización

]]> Pinche en Próximo para continuar. ]]> @@ -407,13 +476,23 @@ However, Runway offers an easy foundation based on best practices to get you sta Nombre de cultura - TRANSLATE ME: 'You've been idle and logout will automatically occur in' - TRANSLATE ME: 'Renew now to save your work' + No ha habido ninguna actividad y su sessión se cerrará en + Renovar su sessión para guardar sus cambios + Happy super Sunday + Happy manic Monday + Happy tubular Tuesday + Happy wonderful Wednesday + Happy thunderous Thursday + Happy funky Friday + Happy Caturday + Log in below + Session timed out © 2001 - %0%
umbraco.com

]]> Bienvenido a umbraco, escribe tu nombre de usuario y clave en los campos de debajo: + Panel de Administración Secciones @@ -429,7 +508,7 @@ However, Runway offers an easy foundation based on best practices to get you sta No ha seleccionado ningún nodo. Seleccione un nodo en la lista mostrada arriba antes the pinchar en 'continuar' (continue) No se puede colgar el nodo actual bajo el nodo elegido debido a su tipo El nodo actual no puede moverse a ninguna de sus subpáginas - TRANSLATE ME: 'The action isn't allowed since you have insufficient permissions on 1 or more child documents.' + Acción no permitida. No tiene permisos suficientes para uno o más subnodos.' Edite su notificación para %0% @@ -499,16 +578,16 @@ However, Runway offers an easy foundation based on best practices to get you sta aceptar para publicar %0% y por lo tanto, hacer que su contenido esté disponible al público.

Puedes publicar esta página y todas sus subpáginas marcando publicar todos los hijos debajo. ]]> - TRANSLATE ME: 'Add external link' - TRANSLATE ME: 'Add internal link' - TRANSLATE ME: 'Add' - TRANSLATE ME: 'Caption' - TRANSLATE ME: 'Internal page' - TRANSLATE ME: 'URL' - TRANSLATE ME: 'Move Down' - TRANSLATE ME: 'Move Up' - TRANSLATE ME: 'Open in new window' - TRANSLATE ME: 'Remove link' + Añadir un enlace externo + Añadir un enlace interno + Añadir + Título + Página interna + Enlace + Bajar + Subir + Abrir en una nueva ventana + Quitar el enlace Versión actual @@ -535,6 +614,8 @@ However, Runway offers an easy foundation based on best practices to get you sta Estadísticas Traducción Usuarios + Ayuda + Analytics Plantilla por defecto @@ -548,6 +629,8 @@ However, Runway offers an easy foundation based on best practices to get you sta Pestaña Nombre de la pestaña Pestañas + Tipo de documento Maestro + Crear template correspondiente Ordenación completa. @@ -661,7 +744,7 @@ However, Runway offers an easy foundation based on best practices to get you sta Tipos de datos Diccionario Paquetes instalados - TRANSLATE ME: 'Install skin' - TRANSLATE ME: 'Install starter kit' + Instalar skin + Instalar starter kit Idiomas Instalar paquete local Macros @@ -710,7 +793,7 @@ However, Runway offers an easy foundation based on best practices to get you sta Instalar desde repositorio Instalar pasarela Módulos pasarela - TRANSLATE ME: 'Scripting Files' + Ficheros de script Scripts Hojas de estilo Plantillas @@ -725,8 +808,10 @@ However, Runway offers an easy foundation based on best practices to get you sta Administrador Campo de categoria - TRANSLATE ME: 'Change Your Password' - TRANSLATE ME: 'You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button' + Cambiar contraseña + Change Your Password + Confirm new password + Puede cambiar su contraseña para acceder al 'back office' de Umbraco rellenando el siguiente formulario y haciendo clic en el botón 'Cambiar contraseña' Canal de contenido Campo descriptivo Deshabilitar usuario @@ -738,13 +823,16 @@ However, Runway offers an easy foundation based on best practices to get you sta Nodo de comienzo en la libreria de medios Secciones Deshabilitar acceso a Umbraco - Password - TRANSLATE ME: 'Your password has been changed!' - TRANSLATE ME: 'Please confirm the new password' - TRANSLATE ME: 'Enter your new password' - TRANSLATE ME: 'Your new password cannot be blank!' - TRANSLATE ME: 'There was a difference between the new password and the confirmed password. Please try again!' - TRANSLATE ME: 'The confirmed password doesn't match the new password!' + Contraseña + Reset password + Su contraseña ha sido cambiada + Por favor confirme su nueva contraseña + Introduzca su nueva contraseña + La nueva contraseña no puede estar vacía + Current password + Invalid current password + La nueva contraseña no coincide con la contraseña de confirmación. Por favor, vuela a intentarlo!' + La contraseña de confirmación no coincide con la nueva contraseña!' Reemplazar los permisos de los nodos hijo Estas modificando los permisos para las páginas: Selecciona las páginas para modificar sus permisos @@ -755,5 +843,8 @@ However, Runway offers an easy foundation based on best practices to get you sta Tipo de usuario Tipos de usuarios Redactor + Your profile + Your recent history + Session expires in \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index f07b0ac88e..af1c39345b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Gérer les noms d'hôtes @@ -420,7 +420,7 @@

Pour poursuivre, éditez le fichier "web.config" (avec Visual Studio ou votre éditeur de texte favori), scrollez jusqu'en bas, ajoutez une "connection string" dans la ligne "umbracoDbDSN" et sauvegardez votre fichier.

Cliquez sur le bouton Réessayer lorsque cela est fait. -
+
Plus d'informations sur l'édition du fichier web.config ici.

]]> Contactez votre administrateur système si nécessaire. @@ -751,6 +751,8 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à Ce type de contenu utilise en tant que type de contenu master, les onglets du type de contenu master ne sont pas affichés et peuvent seulement être modifiés dans le type de contenu master lui-même. Aucune propriétés définies dans cet onglet. Cliquez sur le lien "Ajouter une nouvelle propriété" en haut pour créer une nouvelle propriété. + Type de contenu parent + Créer le template correspondant Tri achevé. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index dd6b8f49cc..005275dfb3 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -1,8 +1,8 @@  - Umbraco Hebrew 2011 - http://our.umbraco.org + The Umbraco community + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files נהל שמות מתחם @@ -354,7 +354,7 @@

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.
+ done.
 More information on editing web.config here.

]]> Please contact your ISP if necessary. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index c8dd6eb574..e5c628b60c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Gestisci hostnames @@ -343,7 +343,7 @@ Avanti per proseguire.]]> Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette.

-

Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

Clicca il tasto riprova quando hai finito.
Maggiori dettagli per la modifica del file web.config qui.

]]> +

Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

Clicca il tasto riprova quando hai finito.
Maggiori dettagli per la modifica del file web.config qui.

]]> Premi il tasto aggiorna per aggiornare il database ad Umbraco %0%

Non preoccuparti, il contenuto non verrà perso e tutto continuerà a funzionare dopo l'aggiornamento!

]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index a5414e31b6..43e015648d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -1,8 +1,8 @@ - The Umbraco Community - http://our.umbraco.org + The Umbraco community + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files ドメインの割り当て @@ -351,7 +351,7 @@

続行するには"web.config"ファイルを編集(Visual Studioないし使い慣れたテキストエディタで)し、下の方にスクロールし、"umbracoDbDSN"という名前のキーでデータベースの接続文字列を追加して保存します。

再施行ボタンをクリックして - 続けます。
+ 続けます。
 より詳細にはこちらの web.config を編集します。

]]> 必要ならISPに連絡するなどしてみてください。 diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index 7e984676be..fc6435d75c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files 호스트명 관리 @@ -344,7 +344,7 @@ 데이터베이스를 찾을 수 없습니다. “web.config”파일의 "connection string"이 바르게 설정되었는지 확인하세요.

"web.config" 파일에 맨아래에 ,키네임을 "umbracoDbDSN"로 하여 사용하시는 데이터베이스의 connection string 정보를 입력하시고 파일을 저장하세요.

- 완료 후재시도버튼을 누르세요.
+ 완료 후재시도버튼을 누르세요.
 web.config의 더많은 정보는 여기에 있습니다.

]]> 필요하시다면 사용하시는 ISP쪽에 문의하시기 바랍니다.. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 8aaf283478..1d4b0dd99b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Beheer domeinnamen @@ -421,7 +421,7 @@ Database configuratie installeren om de Umbraco %0% database te installeren]]> Volgende om door te gaan.]]> - De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

Klik op de knop opnieuw proberen als je hiermee klaar bent.
Meer informatie over het aanpassen van de web.config vind je hier.

]]> + De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

Klik op de knop opnieuw proberen als je hiermee klaar bent.
Meer informatie over het aanpassen van de web.config vind je hier.

]]> Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> Klik de upgrade knop om je database te upgraden naar Umbraco %0%

Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!

]]> Klik Volgende om verder te gaan.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml index c43d5445c9..9a1ae20259 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Angi domene @@ -352,7 +352,7 @@ Databasekonfigurasjon Klikk <strong>installer</strong>-knappen for å installere Umbraco %0% databasen Umbraco %0% har nå blitt kopiert til din database. Trykk <strong>Neste</strong> for å fortsette. - <p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="http://our.umbraco.org/wiki/reference/webconfig" target="_blank">Mer informasjon om redigering av web.config her.</a></p> + <p>Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.</p><p>For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.</p><p>Klikk <strong>prøv på nytt</strong> når du er ferdig.<br /> <a href="http://our.umbraco.org/documentation/Using-Umbraco/Config-files/webconfig7" target="_blank">Mer informasjon om redigering av web.config her.</a></p> For å fullføre dette steget, må du vite en del informasjon om din database server ("tilkoblingsstreng").<br/> Vennligst kontakt din ISP om nødvendig. Hvis du installerer på en lokal maskin eller server, må du kanskje skaffe informasjonen fra din systemadministrator. <p> Trykk på knappen <strong>oppgrader</strong> for å oppgradere databasen din til Umbraco %0%</p> <p> Ikke vær urolig - intet innhold vil bli slettet og alt vil fortsette å virke etterpå! </p> Databasen din har blitt oppgradert til den siste utgaven, %0%.<br/>Trykk <strong>Neste</strong> for å fortsette. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index 80acd266fd..74964d82c0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Zarządzanie hostami @@ -339,7 +339,7 @@ Możesz dodać dodatkowe języki w menu "Języki" po lewej stronie.]]> Konfiguracja bazy danych instaluj aby zainstalować bazę danych Umbraco %0%]]> Dalej aby kontynuować.]]> - Nie odnaleziono bazy danych! Sprawdź czy informacje w sekcji "connection string" w pliku "web.config" są prawidłowe.

Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.

Kliknij ponów próbę kiedy skończysz.
Tu znajdziesz więcej informacji na temat edycji pliku "web.config".

]]> + Nie odnaleziono bazy danych! Sprawdź czy informacje w sekcji "connection string" w pliku "web.config" są prawidłowe.

Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.

Kliknij ponów próbę kiedy skończysz.
Tu znajdziesz więcej informacji na temat edycji pliku "web.config".

]]> Skontaktuj się z Twoim dostawą usług internetowych jeśli zajdzie taka potrzeba. W przypadku instalacji na lokalnej maszynie lub serwerze możesz potrzebować pomocy administratora.]]> Naciśnij przycisk aktualizuj by zaktualizować swoją bazę danych do Umbraco %0%

Bez obaw - żadne dane nie zostaną usunięte i wszystko będzie działać jak należy!

]]> Naciśnij przycisk Dalej aby kontynuować.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 898d18be1c..c2f200746e 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Gerenciar hostnames @@ -340,7 +340,7 @@ Próximo para prosseguir.]]> Banco de dados não encontrado! Favor checar se a informação no "connection string" do "web.config" esteja correta.

Para prosseguir, favor editar o arquivo "web.config" (usando Visual Studio ou seu editor de texto favorito), role até embaixo, adicione a connection string para seu banco de dados com a chave de nome "umbracoDbDSN" e salve o arquivo

-

Clique o botão tentar novamente quando terminar.
+

Clique o botão tentar novamente quando terminar.
Mais informações em como editar o web.config aqui.

]]> Favor contatar seu provedor de internet ou hospedagem web se necessário. Se você estiver instalando em uma máquina ou servidor local é possível que você precise dessas informações por um administrador de sistema.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index 2502e4e3c6..d9b53320e9 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -1,8 +1,8 @@ - The Umbraco Community - http://our.umbraco.org + The Umbraco community + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Языки и домены @@ -369,7 +369,7 @@

Для настройки откройте файл "web.config" с помошью любого текстового редактора и добавьте нужную информацию в строку подключения (параметр "umbracoDbDSN"), затем сохраните файл.

Нажмите кнопку "Повторить" когда все будет готово
- Более подробно о внесении изменений в файл "web.config" расскзано здесь.

]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index b6c0028f2f..3f7c7dd397 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Hantera domännamn @@ -400,7 +400,7 @@ Databaskonfiguration installera]]> Nästa för att fortsätta.]]> - Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

Klicka på Försök igen knappen när du är klar.
> Mer information om att redigera web.config hittar du här.

]]> + Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

Klicka på Försök igen knappen när du är klar.
> Mer information om att redigera web.config hittar du här.

]]> Eventuellt kan du behöva kontakta ditt webb-hotell. Om du installerar på en lokal maskin eller server kan du få informationen från din systemadministratör.]]> Tryck Uppgradera knappen för att uppgradera din databas till Umbraco {0}

Du behöver inte vara orolig. Inget innehåll kommer att raderas och efteråt kommer allt att fungera som vanligt!

]]> Tryck Nästa för att fortsätta.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index f610be9647..6c12644c73 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -2,7 +2,7 @@ 孙柱梁 - http://our.umbraco.org + http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files 管理主机名 @@ -384,7 +384,7 @@ 数据库未找到！请检查数据库连接串设置。

您可以自行编辑“web.config”文件，键名为 “umbracoDbDSN”

- 当自行编辑后，单击重试按钮
。 + 当自行编辑后，单击重试按钮
。 如何编辑web.config

]]> diff --git a/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx b/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx index bb498c0f0f..b6776b2ef3 100644 --- a/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx @@ -2,7 +2,7 @@ <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - + diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx.designer.cs index 349f5daab1..e322b494bd 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx.designer.cs +++ b/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx.designer.cs @@ -11,5 +11,23 @@ namespace Umbraco.Web.UI.Umbraco.Settings { public partial class EditNodeTypeNew { + + /// + /// allowedTemplates control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel allowedTemplates; + + /// + /// defaultTemplate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel defaultTemplate; } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx index bb498c0f0f..b6776b2ef3 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx @@ -2,7 +2,7 @@ <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %> - + diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs index 3cb32f364b..d3d53be0c4 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs @@ -1,31 +1,37 @@ -using System.Globalization; -using Umbraco.Core; -using Umbraco.Web.UI; -using Umbraco.Web; - namespace umbraco.cms.presentation.create.controls { - using System; - using System.Data; - using System.Drawing; - using System.Web; - using System.Web.UI.WebControls; - using System.Web.UI.HtmlControls; - using umbraco.cms.helpers; - using umbraco.BasePages; + using System; + using System.Globalization; + using System.Web; + using System.Web.UI.WebControls; + + using umbraco.BasePages; using umbraco.cms.businesslogic.web; - /// + using Umbraco.Core; + using Umbraco.Web; + using Umbraco.Web.UI; + + /// /// Summary description for nodeType. /// public partial class nodeType : System.Web.UI.UserControl { - - - protected void Page_Load(object sender, EventArgs e) - { - sbmt.Text = ui.Text("create"); - pp_name.Text = ui.Text("name"); + /// + /// The page_load. + /// + /// + /// The sender. + /// + /// + /// The e. + /// + protected void Page_Load(object sender, EventArgs e) + { + this.sbmt.Text = ui.Text("create"); + this.pp_name.Text = ui.Text("name"); + this.pp_MasterDocumentType.Text = ui.Text("masterDocumentType"); + this.createTemplate.Text = ui.Text("createMatchingTemplate"); if (!IsPostBack) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.designer.cs index 58a30d39aa..88ab7a0f31 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.designer.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.designer.cs @@ -12,6 +12,15 @@ namespace umbraco.cms.presentation.create.controls { public partial class nodeType { + /// + /// pp_MasterDocumentType control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::umbraco.uicontrols.PropertyPanel pp_MasterDocumentType; + /// /// masterType control. /// From 60263c90401f54b8a4e832cc1de07f55ec51512b Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Nov 2014 09:48:54 +1100 Subject: [PATCH 04/10] Re Fixes: U4-5220 XSLT Extensions in App_Code or /bin not working in 7.1.4 - this is just a work-around fix, the real problem is the dll's in the user's bin folder. --- src/Umbraco.Core/TypeFinder.cs | 55 +++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Core/TypeFinder.cs b/src/Umbraco.Core/TypeFinder.cs index 2b8ebb99cc..32989ca394 100644 --- a/src/Umbraco.Core/TypeFinder.cs +++ b/src/Umbraco.Core/TypeFinder.cs @@ -15,6 +15,7 @@ using System.Web.Compilation; using System.Web.Hosting; using Umbraco.Core.Configuration; using Umbraco.Core.IO; +using Umbraco.Core.Logging; namespace Umbraco.Core { @@ -450,14 +451,23 @@ namespace Umbraco.Core var allTypes = GetTypesWithFormattedException(a) .ToArray(); - //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes but have - //the specified attribute - var attributedTypes = allTypes - .Where(t => (TypeHelper.IsNonStaticClass(t) - && (onlyConcreteClasses == false || t.IsAbstract == false)) - //the type must have this attribute - && t.GetCustomAttributes(attributeType, false).Any()) - .ToArray(); + var attributedTypes = new Type[] {}; + try + { + //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes but have + //the specified attribute + attributedTypes = allTypes + .Where(t => (TypeHelper.IsNonStaticClass(t) + && (onlyConcreteClasses == false || t.IsAbstract == false)) + //the type must have this attribute + && t.GetCustomAttributes(attributeType, false).Any()) + .ToArray(); + } + catch (TypeLoadException ex) + { + LogHelper.Error(typeof(TypeFinder), "Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", ex); + continue; + } //add the types to our list to return foreach (var t in attributedTypes) @@ -583,16 +593,25 @@ namespace Umbraco.Core .Where(assignTypeFrom.IsAssignableFrom) .ToArray(); - //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes - var filteredTypes = allSubTypes - .Where(t => (TypeHelper.IsNonStaticClass(t) - //Do not include nested private classes - since we are in full trust now this will find those too! - && t.IsNestedPrivate == false - && (onlyConcreteClasses == false || t.IsAbstract == false) - //Do not include classes that are flagged to hide from the type finder - && t.GetCustomAttribute() == null - && additionalFilter(t))) - .ToArray(); + var filteredTypes = new Type[] { }; + try + { + //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes + filteredTypes = allSubTypes + .Where(t => (TypeHelper.IsNonStaticClass(t) + //Do not include nested private classes - since we are in full trust now this will find those too! + && t.IsNestedPrivate == false + && (onlyConcreteClasses == false || t.IsAbstract == false) + //Do not include classes that are flagged to hide from the type finder + && t.GetCustomAttribute() == null + && additionalFilter(t))) + .ToArray(); + } + catch (TypeLoadException ex) + { + LogHelper.Error(typeof(TypeFinder), "Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", ex); + continue; + } //add the types to our list to return foreach (var t in filteredTypes) From 9d50a4d2a5c6e1174abe87f4e8129be57e47d82a Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Nov 2014 09:50:16 +1100 Subject: [PATCH 05/10] Re Fixes: U4-5220 XSLT Extensions in App_Code or /bin not working in 7.1.4 - this is just a work-around fix, the real problem is the dll's in the user's bin folder. --- src/Umbraco.Core/TypeFinder.cs | 55 +++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/src/Umbraco.Core/TypeFinder.cs b/src/Umbraco.Core/TypeFinder.cs index 2b8ebb99cc..32989ca394 100644 --- a/src/Umbraco.Core/TypeFinder.cs +++ b/src/Umbraco.Core/TypeFinder.cs @@ -15,6 +15,7 @@ using System.Web.Compilation; using System.Web.Hosting; using Umbraco.Core.Configuration; using Umbraco.Core.IO; +using Umbraco.Core.Logging; namespace Umbraco.Core { @@ -450,14 +451,23 @@ namespace Umbraco.Core var allTypes = GetTypesWithFormattedException(a) .ToArray(); - //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes but have - //the specified attribute - var attributedTypes = allTypes - .Where(t => (TypeHelper.IsNonStaticClass(t) - && (onlyConcreteClasses == false || t.IsAbstract == false)) - //the type must have this attribute - && t.GetCustomAttributes(attributeType, false).Any()) - .ToArray(); + var attributedTypes = new Type[] {}; + try + { + //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes but have + //the specified attribute + attributedTypes = allTypes + .Where(t => (TypeHelper.IsNonStaticClass(t) + && (onlyConcreteClasses == false || t.IsAbstract == false)) + //the type must have this attribute + && t.GetCustomAttributes(attributeType, false).Any()) + .ToArray(); + } + catch (TypeLoadException ex) + { + LogHelper.Error(typeof(TypeFinder), "Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", ex); + continue; + } //add the types to our list to return foreach (var t in attributedTypes) @@ -583,16 +593,25 @@ namespace Umbraco.Core .Where(assignTypeFrom.IsAssignableFrom) .ToArray(); - //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes - var filteredTypes = allSubTypes - .Where(t => (TypeHelper.IsNonStaticClass(t) - //Do not include nested private classes - since we are in full trust now this will find those too! - && t.IsNestedPrivate == false - && (onlyConcreteClasses == false || t.IsAbstract == false) - //Do not include classes that are flagged to hide from the type finder - && t.GetCustomAttribute() == null - && additionalFilter(t))) - .ToArray(); + var filteredTypes = new Type[] { }; + try + { + //now filter the types based on the onlyConcreteClasses flag, not interfaces, not static classes + filteredTypes = allSubTypes + .Where(t => (TypeHelper.IsNonStaticClass(t) + //Do not include nested private classes - since we are in full trust now this will find those too! + && t.IsNestedPrivate == false + && (onlyConcreteClasses == false || t.IsAbstract == false) + //Do not include classes that are flagged to hide from the type finder + && t.GetCustomAttribute() == null + && additionalFilter(t))) + .ToArray(); + } + catch (TypeLoadException ex) + { + LogHelper.Error(typeof(TypeFinder), "Could not query types on {0} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", ex); + continue; + } //add the types to our list to return foreach (var t in filteredTypes) From fa0f15f5c41653b003384989fc524f111fb254f2 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Nov 2014 10:05:10 +1100 Subject: [PATCH 06/10] fix merge --- src/Umbraco.Web.UI/umbraco/create/nodeType.ascx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx b/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx index 79647a355f..4b11f4d990 100644 --- a/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx +++ b/src/Umbraco.Web.UI/umbraco/create/nodeType.ascx @@ -9,7 +9,7 @@ * - + From 46a8e586cee8aac351d68213d30e95f054974516 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Nov 2014 12:51:55 +1100 Subject: [PATCH 07/10] Fixes: U4-5872 Using list view editor as a standard property on media type causes error --- .../views/propertyeditors/listview/listview.controller.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js index 36085541f5..a0c0c8b517 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js @@ -1,4 +1,4 @@ -function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location) { +function listViewController($rootScope, $scope, $routeParams, $injector, notificationsService, iconHelper, dialogService, editorState, localizationService, $location, appState) { //this is a quick check to see if we're in create mode, if so just exit - we cannot show children for content // that isn't created yet, if we continue this will use the parent id in the route params which isn't what @@ -12,7 +12,8 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific //Now we need to check if this is for media, members or content because that will depend on the resources we use var contentResource, getContentTypesCallback, getListResultsCallback, deleteItemCallback, getIdCallback, createEditUrlCallback; - if ($scope.model.config.entityType && $scope.model.config.entityType === "member") { + //check the config for the entity type, or the current section name (since the config is only set in c#, not in pre-vals) + if (($scope.model.config.entityType && $scope.model.config.entityType === "member") || (appState.getSectionState("currentSection") === "member")) { $scope.entityType = "member"; contentResource = $injector.get('memberResource'); getContentTypesCallback = $injector.get('memberTypeResource').getTypes; @@ -26,7 +27,8 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific }; } else { - if ($scope.model.config.entityType && $scope.model.config.entityType === "media") { + //check the config for the entity type, or the current section name (since the config is only set in c#, not in pre-vals) + if (($scope.model.config.entityType && $scope.model.config.entityType === "media") || (appState.getSectionState("currentSection") === "media")) { $scope.entityType = "media"; contentResource = $injector.get('mediaResource'); getContentTypesCallback = $injector.get('mediaTypeResource').getAllowedTypes; From ea785a65855a00e6fae36b6e0f574ca3504dee37 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Nov 2014 13:14:18 +1100 Subject: [PATCH 08/10] Fixes: U4-5867 Installer, no starter kit link moves when starter kit list is populated --- .../src/installer/steps/starterkit.html | 7 +++++-- .../src/less/installer.less | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html index 1868798bcb..78e90445db 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html @@ -1,14 +1,17 @@ -
+

Install a starter website

Installing a starter website helps you learn how Umbraco works, and gives you a solid and simple foundation to build on top of.

+ + Loading... -
    +
    • + Loading... {{pck.name}}
      • diff --git a/src/Umbraco.Web.UI.Client/src/less/installer.less b/src/Umbraco.Web.UI.Client/src/less/installer.less index 298f4f4728..574fde27a9 100644 --- a/src/Umbraco.Web.UI.Client/src/less/installer.less +++ b/src/Umbraco.Web.UI.Client/src/less/installer.less @@ -288,4 +288,21 @@ select { width:100%; overflow:auto; border:none; +} +#starterKits .thumbnails{ + min-height:128px; +} +#starterKits a.thumbnail { + position:relative; + height:98px; +} +#starterKits a.thumbnail small { + position:absolute; + z-index: 50; + top:10px; + left:10px; +} +#starterKits a.thumbnail img { + position:relative; + z-index:100; } \ No newline at end of file From e2cc342adfd60117b76725a9c26136fe439d5c00 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 25 Nov 2014 17:36:44 +1100 Subject: [PATCH 09/10] Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. --- .../src/common/resources/template.resource.js | 82 ------------ .../Editors/BackOfficeController.cs | 5 - src/Umbraco.Web/Editors/TemplateController.cs | 117 ------------------ .../Models/ContentEditing/TemplateDisplay.cs | 16 --- src/Umbraco.Web/Umbraco.Web.csproj | 2 - 5 files changed, 222 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js delete mode 100644 src/Umbraco.Web/Editors/TemplateController.cs delete mode 100644 src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js deleted file mode 100644 index d6fec8640f..0000000000 --- a/src/Umbraco.Web.UI.Client/src/common/resources/template.resource.js +++ /dev/null @@ -1,82 +0,0 @@ -/** - * @ngdoc service - * @name umbraco.resources.stylesheetResource - * @description service to retrieve available stylesheets - * - * - **/ -function templateResource($q, $http, umbRequestHelper) { - - //the factory object returned - return { - - /** - * @ngdoc method - * @name umbraco.resources.stylesheetResource#getAll - * @methodOf umbraco.resources.stylesheetResource - * - * @description - * Gets all registered stylesheets - * - * ##usage - * 
      -         * stylesheetResource.getAll()
-         *    .then(function(stylesheets) {
-         *        alert('its here!');
-         *    });
-         *
      - * - * @returns {Promise} resourcePromise object containing the stylesheets. - * - */ - getAll: function () { - return umbRequestHelper.resourcePromise( - $http.get( - umbRequestHelper.getApiUrl( - "templateApiBaseUrl", - "GetAll")), - 'Failed to retrieve stylesheets '); - }, - - /** - * @ngdoc method - * @name umbraco.resources.stylesheetResource#getRulesByName - * @methodOf umbraco.resources.stylesheetResource - * - * @description - * Returns all defined child rules for a stylesheet with a given name - * - * ##usage - * 
      -         * stylesheetResource.getRulesByName("ie7stylesheet")
-         *    .then(function(rules) {
-         *        alert('its here!');
-         *    });
-         *
      - * - * @returns {Promise} resourcePromise object containing the rules. - * - */ - getById: function (id) { - return umbRequestHelper.resourcePromise( - $http.get( - umbRequestHelper.getApiUrl( - "templateApiBaseUrl", - "GetById", - [{ id: id }])), - 'Failed to retreive template '); - }, - - saveAndRender: function(html, templateId, pageId){ - return umbRequestHelper.resourcePromise( - $http.post( - umbRequestHelper.getApiUrl( - "templateApiBaseUrl", - "PostSaveAndRender"), - {templateId: templateId, pageId: pageId, html: html }), - 'Failed to retreive template '); - } - }; -} - -angular.module('umbraco.resources').factory('templateResource', templateResource); diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 0e7d48d3d9..91c26c603a 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -196,11 +196,6 @@ namespace Umbraco.Web.Editors "stylesheetApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( controller => controller.GetAll()) }, - - { - "templateApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( - controller => controller.GetById(0)) - }, { "memberTypeApiBaseUrl", Url.GetUmbracoApiServiceBaseUrl( controller => controller.GetAllTypes()) diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs deleted file mode 100644 index 3799be7e23..0000000000 --- a/src/Umbraco.Web/Editors/TemplateController.cs +++ /dev/null @@ -1,117 +0,0 @@ -using AutoMapper; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using System.Web.Http; -using Umbraco.Core.Models; -using Umbraco.Web.Models.ContentEditing; -using Umbraco.Web.Mvc; -using Umbraco.Web.WebApi; -using Umbraco.Web.WebApi.Filters; - -namespace Umbraco.Web.Editors -{ - [PluginController("UmbracoApi")] - [UmbracoTreeAuthorize(Core.Constants.Trees.Templates)] - public class TemplateController : UmbracoAuthorizedJsonController - { - /// - /// Gets the content json for the content id - /// - /// - /// - public TemplateDisplay GetById(int id) - { - var template = Services.FileService.GetTemplate(id); - if (template == null) - { - throw new HttpResponseException(HttpStatusCode.NotFound); - } - - TemplateDisplay t = new TemplateDisplay(); - t.Alias = template.Alias; - t.Content = template.Content; - t.Id = template.Id; - t.Name = template.Name; - - return t; - } - - /// - /// Deletes a data type wth a given ID - /// - /// - /// - [HttpDelete] - [HttpPost] - public HttpResponseMessage DeleteById(int id) - { - var foundTemplate = Services.FileService.GetTemplate(id); - if (foundTemplate == null) - { - throw new HttpResponseException(HttpStatusCode.NotFound); - } - Services.FileService.DeleteTemplate(foundTemplate.Alias); - return Request.CreateResponse(HttpStatusCode.OK); - } - - [HttpPost] - public HttpResponseMessage PostSaveAndRender(dynamic model) - { - var foundTemplate = Services.FileService.GetTemplate((int)model.templateId); - if (foundTemplate == null) - { - throw new HttpResponseException(HttpStatusCode.NotFound); - } - foundTemplate.Content = model.html; - Services.FileService.SaveTemplate(foundTemplate); - - string result = string.Empty; - try - { - var url = "http://" + Request.RequestUri.Host + "/" + model.pageId + ".aspx?altTemplate=" + foundTemplate.Alias; - result = url; - - WebClient wc = new WebClient(); - result = wc.DownloadString(new Uri(url)); - } - catch (WebException exception) - { - if (exception.Response != null) - { - var responseStream = exception.Response.GetResponseStream(); - - if (responseStream != null) - { - using (var reader = new StreamReader(responseStream)) - { - result = reader.ReadToEnd(); - } - } - } - } - catch (Exception ex) - { - result += ex.ToString(); - } - - - return new HttpResponseMessage() - { - Content = new StringContent( - result, - Encoding.UTF8, - "text/html" - ) - }; - } - - - - } -} diff --git a/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs deleted file mode 100644 index 5291b9cca3..0000000000 --- a/src/Umbraco.Web/Models/ContentEditing/TemplateDisplay.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.Text; -using System.Threading.Tasks; - -namespace Umbraco.Web.Models.ContentEditing -{ - [DataContract(Name = "template", Namespace = "")] - public class TemplateDisplay : EntityBasic - { - [DataMember(Name = "content")] - public string Content { get; set; } - } -} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index c197ae6852..4c7e862f95 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -308,7 +308,6 @@ - @@ -329,7 +328,6 @@ - From d7cc626396c5955036f9d3ed10abc9ffc6efec87 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 20 Nov 2014 12:36:07 +0100 Subject: [PATCH 10/10] U4-1083 - proper error message on content type alias duplicate --- .../umbraco/create/nodeType.ascx.cs | 53 ++++++++++++++++--- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs index 3cb32f364b..4908c80981 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs @@ -1,5 +1,6 @@ using System.Globalization; using Umbraco.Core; +using Umbraco.Core.Strings; using Umbraco.Web.UI; using Umbraco.Web; @@ -60,10 +61,34 @@ namespace umbraco.cms.presentation.create.controls e.IsValid = false; } + private bool ValidateAlias(string text) + { + // get the alias - same way we do it in nodetypeTasks.PerformSave() + // ensure it's not empty + var alias = text.ToCleanString(CleanStringType.Alias | CleanStringType.PascalCase, ' '); + if (string.IsNullOrWhiteSpace(alias)) + return false; + + // ensure no content with that alias exists + var existing = ApplicationContext.Current.Services.ContentTypeService.GetContentType(alias); + if (existing != null) + return false; + + // all is ok + return true; + } + protected void sbmt_Click(object sender, EventArgs e) { if (Page.IsValid) { + if (ValidateAlias(rename.Text) == false) + { + BasePage.Current.ClientTools.ShowSpeechBubble(BasePage.speechBubbleIcon.error, "Error", + "Name is empty, invalid, or causing an invalid or duplicate alias."); + return; + } + var createTemplateVal = 0; if (createTemplate.Checked) createTemplateVal = 1; @@ -71,15 +96,27 @@ namespace umbraco.cms.presentation.create.controls // check master type string masterTypeVal = String.IsNullOrEmpty(Request.GetItemAsString("nodeId")) || Request.GetItemAsString("nodeId") == "init" ? masterType.SelectedValue : Request.GetItemAsString("nodeId"); - var returnUrl = LegacyDialogHandler.Create( - new HttpContextWrapper(Context), - BasePage.Current.getUser(), - Request.GetItemAsString("nodeType"), - createTemplateVal, - rename.Text, - int.Parse(masterTypeVal)); + string returnUrl; + try + { + // this *may* throw even if Page.IsValid because of race conditions + returnUrl = LegacyDialogHandler.Create( + new HttpContextWrapper(Context), + BasePage.Current.getUser(), + Request.GetItemAsString("nodeType"), + createTemplateVal, + rename.Text, + int.Parse(masterTypeVal)); + } + catch (Exception ex) + { + // because it's always nicer to show a message to user vs YSOD + BasePage.Current.ClientTools.ShowSpeechBubble(BasePage.speechBubbleIcon.error, "Error", + ex.GetType().FullName + ": " + ex.Message); + return; + } - BasePage.Current.ClientTools + BasePage.Current.ClientTools .ChangeContentFrameUrl(returnUrl) .ChildNodeCreated() .CloseModalWindow();