yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Stephan
2017-10-17 15:00:13 +02:00
parent 39c534ef54 838e86469a
commit d0fbc362b2
23 changed files with 480 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
View File

@@ -1260,6 +1260,9 @@ Mange hilsner fra Umbraco robotten
<key alias="chooseDefault">Vælg standard</key>
<key alias="areAdded">er tilføjet</key>
<key alias="maxItems">Maksimalt emner</key>
<key alias="maxItemsDescription">Efterlad blank eller sat til 0 ubegrænset for</key>
</area>
<area alias="contentTypeEditor">

2
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1419,6 +1419,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="allowAllEditors">Allow all editors</key>
<key alias="allowAllRowConfigurations">Allow all row configurations</key>
<key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
<key alias="maxItems">Maximum items</key>
<key alias="setAsDefault">Set as default</key>
<key alias="chooseExtra">Choose extra</key>
<key alias="chooseDefault">Choose default</key>

2
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1406,6 +1406,8 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="allowAllEditors">Allow all editors</key>
<key alias="allowAllRowConfigurations">Allow all row configurations</key>
<key alias="maxItems">Maximum items</key>
<key alias="maxItemsDescription">Leave blank or set to 0 for unlimited</key>
<key alias="setAsDefault">Set as default</key>
<key alias="chooseExtra">Choose extra</key>
<key alias="chooseDefault">Choose default</key>

3
src/Umbraco.Web.UI/umbraco/config/lang/es.xml
View File

@@ -789,6 +789,9 @@
<key alias="allowAllEditors">Permitir todos los controles de edición</key>
<key alias="allowAllRowConfigurations">Permitir todas las configuraciones de fila</key>
<key alias="maxItems">Artículos máximos</key>
<key alias="maxItemsDescription">Laat dit leeg of is ingesteld op -1 voor onbeperkt</key>
<key alias="maxItemsDescription">Dejar en blanco o se establece en 0 para ilimitada</key>
</area>
<area alias="templateEditor">
<key alias="alternativeField">Campo opcional</key>

4
src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
View File

@@ -1077,7 +1077,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
<key alias="allowAllEditors">Alle editors toelaten</key>
<key alias="allowAllRowConfigurations">Alle rijconfiguraties toelaten</key>
<key alias="setAsDefault">Instellen als standaard</key>
<key alias="maxItems">Maximale artikelen</key>
<key alias="maxItemsDescription">Laat dit leeg of is ingesteld op -1 voor onbeperkt</key>
<key alias="setAsDefault">Instellen als standaard</key>
<key alias="chooseExtra">Kies extra</key>
<key alias="chooseDefault">Kies standaard</key>
<key alias="areAdded">zijn toegevoegd</key>