diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js index 610f8546a3..84b3adb471 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbpagination.directive.js @@ -86,7 +86,7 @@ Use this directive to generate a pagination. (function() { 'use strict'; - function PaginationDirective() { + function PaginationDirective(localizationService) { function link(scope, el, attr, ctrl) { @@ -123,12 +123,12 @@ Use this directive to generate a pagination. //now, if the start is greater than 0 then '1' will not be displayed, so do the elipses thing if (start > 0) { - scope.pagination.unshift({ name: "First", val: 1, isActive: false }, {val: "...",isActive: false}); + scope.pagination.unshift({ name: localizationService.localize("general_first"), val: 1, isActive: false }, {val: "...",isActive: false}); } //same for the end if (start < maxIndex) { - scope.pagination.push({ val: "...", isActive: false }, { name: "Last", val: scope.totalPages, isActive: false }); + scope.pagination.push({ val: "...", isActive: false }, { name: localizationService.localize("general_last"), val: scope.totalPages, isActive: false }); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html index 96ab990447..c159aafd6e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/iconpicker.html @@ -7,7 +7,8 @@ style="width: 100%" ng-model="searchTerm" class="umb-search-field search-query input-block-level" - placeholder="Filter..." + localize="plceholder" + placeholder="@placeholders_filter" no-dirty-check> @@ -17,12 +18,12 @@
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html index 287e16049e..e6c757ef1e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/legacydelete.html @@ -3,7 +3,7 @@

- Are you sure you want to delete {{currentNode.name}} ? + Are you sure you want to delete {{currentNode.name}} ?

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html index be9024045e..6914a992da 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html @@ -22,7 +22,7 @@ @@ -63,7 +63,7 @@ Cancel - Link to file + Link to file
- \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html index 194752f2bc..99102fed19 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html @@ -75,7 +75,8 @@ + localize="placeholder" + placeholder="@placeholders_filter">
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html index 62b0340769..4c5cac62fd 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/rteembed.html @@ -1,4 +1,4 @@ -
+
@@ -11,7 +11,7 @@ x - +
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html index 1c0aaf7209..812bbf23ed 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/querybuilder.html @@ -17,7 +17,7 @@
-

Build a query

+

Build a query

@@ -149,10 +149,10 @@ Close - Insert + Insert
- \ No newline at end of file + diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html index 7b5187303e..0d6c05091c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/template/snippet.html @@ -29,7 +29,7 @@ Close - Insert + Insert diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html index 2b2d3bd1cf..a6798d5199 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html @@ -42,7 +42,7 @@
-
External login providers
+
External login providers
@@ -55,7 +55,7 @@ onclick="document.forms.oauthloginform.submit();"> - Link your {{login.caption}} account + Link your {{login.caption}} account @@ -67,7 +67,7 @@ name="provider" value="{{login.authType}}"> - Un-link your {{login.caption}} account + Un-link your {{login.caption}} account
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html index 7c457ac4c9..03ae935f47 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/propertysettings/propertysettings.html @@ -69,12 +69,13 @@ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html index 0d1fae3f6f..aba4c52ed3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html @@ -1,3 +1,3 @@ - -Required - \ No newline at end of file + +Required + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html index c55fc350fa..1848574f8b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/textbox/textbox.html @@ -1,9 +1,9 @@ -
+
- Required + Required
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index d99cd8f43f..04b1ddce30 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -177,6 +177,8 @@ Target This translates to the following time on the server: What does this mean?]]> + Add another text box + Remove this text box Click to upload @@ -323,6 +325,7 @@ Un-Link your account Select editor + Select snippet Related stylesheets Show label Width and height + All property types & property data + using this data type will be deleted permanently, please confirm you want to delete these as well + Yes, delete + and all property types & property data using this data type + Select the folder to move + to in the tree structure below + was moved underneath Your data has been saved, but before you can publish this page there are some errors you need to fix first: @@ -449,6 +459,7 @@ Deleted Deleting... Design + Dictionary Dimensions Down Download @@ -458,6 +469,7 @@ Email Error Find + First Height Help Icon @@ -468,6 +480,7 @@ Invalid Justify Language + Last Layout Loading Locked @@ -495,6 +508,7 @@ Email to receive form data Recycle Bin Remaining + Remove Rename Renew Required @@ -806,6 +820,39 @@ To manage your website, simply open the Umbraco back office and start adding con Choose Package from your machine, by clicking the Browse
button and locating the package. Umbraco packages usually have a ".zip" extension. ]]> + Drop to upload + or click here to choose package file + Upload package + Install a local package by selecting it from your machine. Only install packages from sources you know and trust + Upload another package + Cancel and upload another package + License + I accept + terms of use + Install package + Finish + Installed packages + You don’t have any packages installed + 'Packages' icon in the top right of your screen]]> + Search for packages + Results for + We couldn’t find anything for + Please try searching for another package or browse through the categories + Popular + New releases + has + karma points + Information + Owner + Contributors + Created + Current version + .NET version + Downloads + Likes + Compatibility + This package is compatible with the following versions of Umbraco, as reported by community members. Full compatability cannot be gauranteed for versions reported below 100% + External sources Author Demonstration Documentation @@ -818,7 +865,7 @@ To manage your website, simply open the Umbraco back office and start adding con Package options Package readme Package repository - Confirm uninstall + Confirm package uninstall Package was uninstalled The package was successfully uninstalled Uninstall package @@ -833,14 +880,15 @@ To manage your website, simply open the Umbraco back office and start adding con Package version history View package website Package already installed - This package cannot be installed, it requires a minimum Umbraco version of %0% + This package cannot be installed, it requires a minimum Umbraco version of Uninstalling... Downloading... Importing... Installing... Restarting, please wait... All done, your browser will now refresh, please wait... - Please click finish to complete installation and reload page. + Please click 'Finish' to complete installation and reload page. + Uploading package... Paste with full formatting (Not recommended) @@ -908,6 +956,10 @@ To manage your website, simply open the Umbraco back office and start adding con Reset + Define crop + Give the crop an alias and it's default width and height + Save crop + Add new crop Current version @@ -1116,6 +1168,7 @@ To manage your website, simply open the Umbraco back office and start adding con Query builder + Build a query items returned, in I want @@ -1261,34 +1314,42 @@ To manage your website, simply open the Umbraco back office and start adding con + Add fallback field + Add default value Alternative field Alternative Text Casing Encoding Choose field Convert line breaks - Replaces line breaks with html-tag &lt;br&gt; + Replaces line breaks with 'br' html tag Custom Fields - Yes, Date only + Date only + Format and encoding Format as date + Format the value as a date, or a date with time, accoring to the active culture HTML encode Will replace special characters by their HTML equivalent. Will be inserted after the field value Will be inserted before the field value Lowercase + Modify output None + Output sample Insert after field Insert before field Recursive + Yes, make it recursive Remove Paragraph tags - Will remove any &lt;P&gt; in the beginning and end of the text + Will remove any paragraph tag in the beginning and end of the text + Separator Standard Fields Uppercase URL encode Will format special characters in URLs Will only be used when the field values above are empty This field will only be used if the primary field is empty - Yes, with time. Separator: + Date and time Tasks assigned to you @@ -1425,12 +1486,20 @@ To manage your website, simply open the Umbraco back office and start adding con Session expires in - Validation - Validate as email - Validate as a number - Validate as a Url - ...or enter a custom validation - Field is mandatory + Validation + Validate as email + Validate as a number + Validate as a Url + ...or enter a custom validation + Field is mandatory + Enter a regular expression + You need to add at least + You can only have + items + items selected + Invalid date + Not a number + Invalid email