Merge branch 'BatJan-7.1.5-localizatiob-5025' into 7.2.0
Conflicts: src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
This commit is contained in:
Shannon
@@ -1,4 +1,4 @@
|
||||
angular.module('umbraco.mocks').
|
||||
angular.module('Umbraco.mocks').
|
||||
factory('localizationMocks', ['$httpBackend', 'mocksUtils', function ($httpBackend, mocksUtils) {
|
||||
'use strict';
|
||||
|
||||
@@ -159,7 +159,7 @@ angular.module('umbraco.mocks').
|
||||
"create_noMediaTypes": "There are no allowed media types available. You must enable these in the settings section under <strong>'media types'</strong>.",
|
||||
"dashboard_browser": "Browse your website",
|
||||
"dashboard_dontShowAgain": "- Hide",
|
||||
"dashboard_nothinghappens": "If umbraco isn't opening, you might need to allow popups from this site",
|
||||
"dashboard_nothinghappens": "If Umbraco isn't opening, you might need to allow popups from this site",
|
||||
"dashboard_openinnew": "has opened in a new window",
|
||||
"dashboard_restart": "Restart",
|
||||
"dashboard_visit": "Visit",
|
||||
@@ -369,35 +369,35 @@ angular.module('umbraco.mocks').
|
||||
"installer_databaseHeader": "Database configuration",
|
||||
"installer_databaseInstall": " Press the <strong>install</strong> button to install the Umbraco %0% database ",
|
||||
"installer_databaseInstallDone": "Umbraco %0% has now been copied to your database. Press <strong>Next</strong> to proceed.",
|
||||
"installer_databaseNotFound": "<p>Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.</p> <p>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. </p> <p> Click the <strong>retry</strong> button when done.<br /><a href='http://umbraco.org/redir/installWebConfig' target='_blank'> More information on editing web.config here.</a></p>",
|
||||
"installer_databaseNotFound": "<p>Database not found! Please check that the information in the 'connection string' of the \"web.config\" file is correct.</p> <p>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. </p> <p> Click the <strong>retry</strong> button when done.<br /><a href='http://Umbraco.org/redir/installWebConfig' target='_blank'> More information on editing web.config here.</a></p>",
|
||||
"installer_databaseText": "To complete this step, you must know some information regarding your database server ('connection string').<br /> Please contact your ISP if necessary. If you're installing on a local machine or server you might need information from your system administrator.",
|
||||
"installer_databaseUpgrade": " <p> Press the <strong>upgrade</strong> button to upgrade your database to Umbraco %0%</p> <p> Don't worry - no content will be deleted and everything will continue working afterwards! </p> ",
|
||||
"installer_databaseUpgradeDone": "Your database has been upgraded to the final version %0%.<br />Press <strong>Next</strong> to proceed. ",
|
||||
"installer_databaseUpToDate": "Your current database is up-to-date!. Click <strong>next</strong> to continue the configuration wizard",
|
||||
"installer_defaultUserChangePass": "<strong>The Default users' password needs to be changed!</strong>",
|
||||
"installer_defaultUserDisabled": "<strong>The Default user has been disabled or has no access to umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.",
|
||||
"installer_defaultUserDisabled": "<strong>The Default user has been disabled or has no access to Umbraco!</strong></p><p>No further actions needs to be taken. Click <b>Next</b> to proceed.",
|
||||
"installer_defaultUserPassChanged": "<strong>The Default user's password has been successfully changed since the installation!</strong></p><p>No further actions needs to be taken. Click <strong>Next</strong> to proceed.",
|
||||
"installer_defaultUserPasswordChanged": "The password is changed!",
|
||||
"installer_defaultUserText": " <p> umbraco creates a default user with a login <strong>('admin')</strong> and password <strong>('default')</strong>. It's <strong>important</strong> that the password is changed to something unique. </p> <p> This step will check the default user's password and suggest if it needs to be changed. </p> ",
|
||||
"installer_defaultUserText": " <p> Umbraco creates a default user with a login <strong>('admin')</strong> and password <strong>('default')</strong>. It's <strong>important</strong> that the password is changed to something unique. </p> <p> This step will check the default user's password and suggest if it needs to be changed. </p> ",
|
||||
"installer_greatStart": "Get a great start, watch our introduction videos",
|
||||
"installer_licenseText": "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.",
|
||||
"installer_licenseText": "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.",
|
||||
"installer_None": "Not installed yet.",
|
||||
"installer_permissionsAffectedFolders": "Affected files and folders",
|
||||
"installer_permissionsAffectedFoldersMoreInfo": "More information on setting up permissions for umbraco here",
|
||||
"installer_permissionsAffectedFoldersMoreInfo": "More information on setting up permissions for Umbraco here",
|
||||
"installer_permissionsAffectedFoldersText": "You need to grant ASP.NET modify permissions to the following files/folders",
|
||||
"installer_permissionsAlmostPerfect": "<strong>Your permission settings are almost perfect!</strong><br /><br /> You can run umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of umbraco.",
|
||||
"installer_permissionsAlmostPerfect": "<strong>Your permission settings are almost perfect!</strong><br /><br /> You can run Umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of Umbraco.",
|
||||
"installer_permissionsHowtoResolve": "How to Resolve",
|
||||
"installer_permissionsHowtoResolveLink": "Click here to read the text version",
|
||||
"installer_permissionsHowtoResolveText": "Watch our <strong>video tutorial</strong> on setting up folder permissions for umbraco or read the text version.",
|
||||
"installer_permissionsMaybeAnIssue": "<strong>Your permission settings might be an issue!</strong> <br/><br /> 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.",
|
||||
"installer_permissionsNotReady": "<strong>Your permission settings are not ready for umbraco!</strong> <br /><br /> In order to run umbraco, you'll need to update your permission settings.",
|
||||
"installer_permissionsPerfect": "<strong>Your permission settings are perfect!</strong><br /><br /> You are ready to run umbraco and install packages!",
|
||||
"installer_permissionsHowtoResolveText": "Watch our <strong>video tutorial</strong> on setting up folder permissions for Umbraco or read the text version.",
|
||||
"installer_permissionsMaybeAnIssue": "<strong>Your permission settings might be an issue!</strong> <br/><br /> 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.",
|
||||
"installer_permissionsNotReady": "<strong>Your permission settings are not ready for Umbraco!</strong> <br /><br /> In order to run Umbraco, you'll need to update your permission settings.",
|
||||
"installer_permissionsPerfect": "<strong>Your permission settings are perfect!</strong><br /><br /> You are ready to run Umbraco and install packages!",
|
||||
"installer_permissionsResolveFolderIssues": "Resolving folder issue",
|
||||
"installer_permissionsResolveFolderIssuesLink": "Follow this link for more information on problems with ASP.NET and creating folders",
|
||||
"installer_permissionsSettingUpPermissions": "Setting up folder permissions",
|
||||
"installer_permissionsText": " umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's. It also stores temporary data (aka: cache) for enhancing the performance of your website. ",
|
||||
"installer_permissionsText": " Umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's. It also stores temporary data (aka: cache) for enhancing the performance of your website. ",
|
||||
"installer_runwayFromScratch": "I want to start from scratch",
|
||||
"installer_runwayFromScratchText": " Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates. (<a href='http://umbraco.tv/documentation/videos/for-site-builders/foundation/document-types'>learn how</a>) You can still choose to install Runway later on. Please go to the Developer section and choose Packages. ",
|
||||
"installer_runwayFromScratchText": " Your website is completely empty at the moment, so that's perfect if you want to start from scratch and create your own document types and templates. (<a href='http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types'>learn how</a>) You can still choose to install Runway later on. Please go to the Developer section and choose Packages. ",
|
||||
"installer_runwayHeader": "You've just set up a clean Umbraco platform. What do you want to do next?",
|
||||
"installer_runwayInstalled": "Runway is installed",
|
||||
"installer_runwayInstalledText": " You have the foundation in place. Select what modules you wish to install on top of it.<br /> This is our list of recommended modules, check off the ones you would like to install, or view the <a href='#' onclick='toggleModules(); return false;' id='toggleModuleList'>full list of modules</a> ",
|
||||
@@ -408,20 +408,20 @@ angular.module('umbraco.mocks').
|
||||
"installer_step1": "Step 1/5 Accept license",
|
||||
"installer_step2": "Step 2/5: Database configuration",
|
||||
"installer_step3": "Step 3/5: Validating File Permissions",
|
||||
"installer_step4": "Step 4/5: Check umbraco security",
|
||||
"installer_step4": "Step 4/5: Check Umbraco security",
|
||||
"installer_step5": "Step 5/5: Umbraco is ready to get you started",
|
||||
"installer_thankYou": "Thank you for choosing umbraco",
|
||||
"installer_thankYou": "Thank you for choosing Umbraco",
|
||||
"installer_theEndBrowseSite": "<h3>Browse your new site</h3>You installed Runway, so why not see how your new website looks.",
|
||||
"installer_theEndFurtherHelp": "<h3>Further help and information</h3>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",
|
||||
"installer_theEndFurtherHelp": "<h3>Further help and information</h3>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",
|
||||
"installer_theEndHeader": "Umbraco %0% is installed and ready for use",
|
||||
"installer_theEndInstallFailed": "To finish the installation, you'll need to manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>umbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.",
|
||||
"installer_theEndInstallSuccess": "You can get <strong>started instantly</strong> by clicking the 'Launch Umbraco' button below. <br />If you are <strong>new to umbraco</strong>, you can find plenty of resources on our getting started pages.",
|
||||
"installer_theEndOpenUmbraco": "<h3>Launch Umbraco</h3>To manage your website, simply open the umbraco back office and start adding content, updating the templates and stylesheets or add new functionality",
|
||||
"installer_theEndInstallFailed": "To finish the installation, you'll need to manually edit the <strong>/web.config file</strong> and update the AppSetting key <strong>UmbracoConfigurationStatus</strong> in the bottom to the value of <strong>'%0%'</strong>.",
|
||||
"installer_theEndInstallSuccess": "You can get <strong>started instantly</strong> by clicking the 'Launch Umbraco' button below. <br />If you are <strong>new to Umbraco</strong>, you can find plenty of resources on our getting started pages.",
|
||||
"installer_theEndOpenUmbraco": "<h3>Launch Umbraco</h3>To manage your website, simply open the Umbraco back office and start adding content, updating the templates and stylesheets or add new functionality",
|
||||
"installer_Unavailable": "Connection to database failed.",
|
||||
"installer_Version3": "Umbraco Version 3",
|
||||
"installer_Version4": "Umbraco Version 4",
|
||||
"installer_watch": "Watch",
|
||||
"installer_welcomeIntro": "This wizard will guide you through the process of configuring <strong>umbraco %0%</strong> for a fresh install or upgrading from version 3.0. <br /><br /> Press <strong>'next'</strong> to start the wizard.",
|
||||
"installer_welcomeIntro": "This wizard will guide you through the process of configuring <strong>Umbraco %0%</strong> for a fresh install or upgrading from version 3.0. <br /><br /> Press <strong>'next'</strong> to start the wizard.",
|
||||
"language_cultureCode": "Culture Code",
|
||||
"language_displayName": "Culture Name",
|
||||
"lockout_lockoutWillOccur": "You've been idle and logout will automatically occur in",
|
||||
@@ -434,7 +434,7 @@ angular.module('umbraco.mocks').
|
||||
"login_greeting6": "Happy friendly Friday",
|
||||
"login_greeting7": "Happy shiny Saturday",
|
||||
"login_instruction": "Log in below:",
|
||||
"login_bottomText": "<p style='text-align:right;'>© 2001 - %0% <br /><a href='http://umbraco.org' style='text-decoration: none' target='_blank'>umbraco.org</a></p> ",
|
||||
"login_bottomText": "<p style='text-align:right;'>© 2001 - %0% <br /><a href='http://Umbraco.org' style='text-decoration: none' target='_blank'>Umbraco.org</a></p> ",
|
||||
"main_dashboard": "Dashboard",
|
||||
"main_sections": "Sections",
|
||||
"main_tree": "Content",
|
||||
@@ -451,11 +451,11 @@ angular.module('umbraco.mocks').
|
||||
"moveOrCopy_notValid": "The action isn't allowed since you have insufficient permissions on 1 or more child documents.",
|
||||
"moveOrCopy_relateToOriginal": "Relate copied items to original",
|
||||
"notifications_editNotifications": "Edit your notification for %0%",
|
||||
"notifications_mailBody": " Hi %0% This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%' Go to http://%4%/actions/editContent.aspx?id=%5% to edit. Have a nice day! Cheers from the umbraco robot ",
|
||||
"notifications_mailBodyHtml": "<p>Hi %0%</p> <p>This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a href='http://%4%/actions/preview.aspx?id=%5%'><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong> </p> <div style='margin: 8px 0; padding: 8px; display: block;'><br /><a style='color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;' href='http://%4%/actions/publish.aspx?id=%5%'> PUBLISH </a> <a style='color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;' href='http://%4%/actions/editContent.aspx?id=%5%'> EDIT </a> <a style='color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;' href='http://%4%/actions/delete.aspx?id=%5%'> DELETE </a><br /> </div> <p> <h3>Update summary:</h3> <table style='width: 100%;'> %6%</table> </p> <div style='margin: 8px 0; padding: 8px; display: block;'><br /><a style='color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;' href='http://%4%/actions/publish.aspx?id=%5%'> PUBLISH </a> <a style='color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;' href='http://%4%/actions/editContent.aspx?id=%5%'> EDIT </a> <a style='color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;' href='http://%4%/actions/delete.aspx?id=%5%'> DELETE </a><br /> </div> <p>Have a nice day!<br /><br /> Cheers from the umbraco robot </p>",
|
||||
"notifications_mailBody": " Hi %0% This is an automated mail to inform you that the task '%1%' has been performed on the page '%2%' by the user '%3%' Go to http://%4%/actions/editContent.aspx?id=%5% to edit. Have a nice day! Cheers from the Umbraco robot ",
|
||||
"notifications_mailBodyHtml": "<p>Hi %0%</p> <p>This is an automated mail to inform you that the task <strong>'%1%'</strong> has been performed on the page <a href='http://%4%/actions/preview.aspx?id=%5%'><strong>'%2%'</strong></a> by the user <strong>'%3%'</strong> </p> <div style='margin: 8px 0; padding: 8px; display: block;'><br /><a style='color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;' href='http://%4%/actions/publish.aspx?id=%5%'> PUBLISH </a> <a style='color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;' href='http://%4%/actions/editContent.aspx?id=%5%'> EDIT </a> <a style='color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;' href='http://%4%/actions/delete.aspx?id=%5%'> DELETE </a><br /> </div> <p> <h3>Update summary:</h3> <table style='width: 100%;'> %6%</table> </p> <div style='margin: 8px 0; padding: 8px; display: block;'><br /><a style='color: white; font-weight: bold; background-color: #66cc66; text-decoration : none; margin-right: 20px; border: 8px solid #66cc66; width: 150px;' href='http://%4%/actions/publish.aspx?id=%5%'> PUBLISH </a> <a style='color: white; font-weight: bold; background-color: #5372c3; text-decoration : none; margin-right: 20px; border: 8px solid #5372c3; width: 150px;' href='http://%4%/actions/editContent.aspx?id=%5%'> EDIT </a> <a style='color: white; font-weight: bold; background-color: #ca4a4a; text-decoration : none; margin-right: 20px; border: 8px solid #ca4a4a; width: 150px;' href='http://%4%/actions/delete.aspx?id=%5%'> DELETE </a><br /> </div> <p>Have a nice day!<br /><br /> Cheers from the Umbraco robot </p>",
|
||||
"notifications_mailSubject": "[%0%] Notification about %1% performed on %2%",
|
||||
"notifications_notifications": "Notifications",
|
||||
"packager_chooseLocalPackageText": " Choose Package from your machine, by clicking the Browse<br /> button and locating the package. umbraco packages usually have a '.umb' or '.zip' extension. ",
|
||||
"packager_chooseLocalPackageText": " Choose Package from your machine, by clicking the Browse<br /> button and locating the package. Umbraco packages usually have a '.umb' or '.zip' extension. ",
|
||||
"packager_packageAuthor": "Author",
|
||||
"packager_packageDemonstration": "Demonstration",
|
||||
"packager_packageDocumentation": "Documentation",
|
||||
@@ -475,16 +475,16 @@ angular.module('umbraco.mocks').
|
||||
"packager_packageUpgradeDownload": "Download update from the repository",
|
||||
"packager_packageUpgradeHeader": "Upgrade package",
|
||||
"packager_packageUpgradeInstructions": "Upgrade instructions",
|
||||
"packager_packageUpgradeText": " There's an upgrade available for this package. You can download it directly from the umbraco package repository.",
|
||||
"packager_packageUpgradeText": " There's an upgrade available for this package. You can download it directly from the Umbraco package repository.",
|
||||
"packager_packageVersion": "Package version",
|
||||
"packager_packageVersionHistory": "Package version history",
|
||||
"packager_viewPackageWebsite": "View package website",
|
||||
"paste_doNothing": "Paste with full formatting (Not recommended)",
|
||||
"paste_errorMessage": "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_errorMessage": "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_removeAll": "Paste as raw text without any formatting at all",
|
||||
"paste_removeSpecialFormattering": "Paste, but remove formatting (Recommended)",
|
||||
"publicAccess_paAdvanced": "Role based protection",
|
||||
"publicAccess_paAdvancedHelp": "If you wish to control access to the page using role-based authentication,<br /> using umbraco's member groups.",
|
||||
"publicAccess_paAdvancedHelp": "If you wish to control access to the page using role-based authentication,<br /> using Umbraco's member groups.",
|
||||
"publicAccess_paAdvancedNoGroups": "You need to create a membergroup before you can use <br />role-based authentication.",
|
||||
"publicAccess_paErrorPage": "Error Page",
|
||||
"publicAccess_paErrorPageHelp": "Used when people are logged on, but do not have access",
|
||||
@@ -623,9 +623,9 @@ angular.module('umbraco.mocks').
|
||||
"template_insertContentAreaPlaceHolder": "Insert content area placeholder",
|
||||
"template_insertDictionaryItem": "Insert dictionary item",
|
||||
"template_insertMacro": "Insert Macro",
|
||||
"template_insertPageField": "Insert umbraco page field",
|
||||
"template_insertPageField": "Insert Umbraco page field",
|
||||
"template_mastertemplate": "Master template",
|
||||
"template_quickGuide": "Quick Guide to umbraco template tags",
|
||||
"template_quickGuide": "Quick Guide to Umbraco template tags",
|
||||
"template_template": "Template",
|
||||
"templateEditor_alternativeField": "Alternative field",
|
||||
"templateEditor_alternativeText": "Alternative Text",
|
||||
@@ -664,7 +664,7 @@ angular.module('umbraco.mocks').
|
||||
"translation_DownloadXmlDTD": "Download xml DTD",
|
||||
"translation_fields": "Fields",
|
||||
"translation_includeSubpages": "Include subpages",
|
||||
"translation_mailBody": " Hi %0% This is an automated mail to inform you that the document '%1%' has been requested for translation into '%5%' by %2%. Go to http://%3%/translation/details.aspx?id=%4% to edit. Or log into umbraco to get an overview of your translation tasks http://%3% Have a nice day! Cheers from the umbraco robot ",
|
||||
"translation_mailBody": " Hi %0% This is an automated mail to inform you that the document '%1%' has been requested for translation into '%5%' by %2%. Go to http://%3%/translation/details.aspx?id=%4% to edit. Or log into Umbraco to get an overview of your translation tasks http://%3% Have a nice day! Cheers from the Umbraco robot ",
|
||||
"translation_mailSubject": "[%0%] Translation task for %1%",
|
||||
"translation_noTranslators": "No translator users found. Please create a translator user before you start sending content to translation",
|
||||
"translation_ownedTasks": "Tasks created by you",
|
||||
|
||||
Reference in New Issue
Block a user