diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index 570465fe6..8edcb6f40 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -98,7 +98,7 @@ define([
});
var me = this,
- themeNames = ['blank', 'pixel', 'classic', 'official', 'green', 'lines', 'office', 'safari', 'dotted', 'corner', 'turtle'],
+ themeNames = ['blank', 'pixel', 'classic', 'official', 'green', 'lines', 'office', 'safari', 'dotted', 'corner', 'turtle', 'basic', 'office theme', 'green leaf'],
translate = {
'Series': this.txtSeries,
'Diagram Title': this.txtDiagramTitle,
@@ -2021,6 +2021,9 @@ define([
txtTheme_dotted: 'Dotted',
txtTheme_corner: 'Corner',
txtTheme_turtle: 'Turtle',
+ txtTheme_basic: 'Basic',
+ txtTheme_green_leaf: 'Green leaf',
+ txtTheme_office_theme: 'Office Theme',
warnNoLicense: 'This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.',
warnNoLicenseUsers: 'This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.',
warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.',
diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 1314ae1c3..ea51fe00b 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -2037,7 +2037,7 @@ define([
if (themeStore) {
var arr1 = [], arr2 = [];
_.each(defaultThemes, function(theme, index) {
- var tip = mainController.translationTable[theme.get_Name()] || theme.get_Name();
+ var tip = mainController.translationTable[(theme.get_Name() || '').toLocaleLowerCase()] || theme.get_Name();
arr1.push(new Common.UI.DataViewModel({
uid : Common.UI.getId(),
themeId : theme.get_Index(),
@@ -2053,7 +2053,7 @@ define([
});
_.each(docThemes, function(theme) {
var image = theme.get_Image(),
- tip = mainController.translationTable[theme.get_Name()] || theme.get_Name();
+ tip = mainController.translationTable[(theme.get_Name() || '').toLocaleLowerCase()] || theme.get_Name();
arr1.push(new Common.UI.DataViewModel({
imageUrl: image,
uid : Common.UI.getId(),
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 8c51789f3..4f7de96eb 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -581,6 +581,9 @@
"PE.Controllers.Main.txtTheme_pixel": "Pixel",
"PE.Controllers.Main.txtTheme_safari": "Safari",
"PE.Controllers.Main.txtTheme_turtle": "Turtle",
+ "PE.Controllers.Main.txtTheme_basic": "Basic",
+ "PE.Controllers.Main.txtTheme_green_leaf": "Green leaf",
+ "PE.Controllers.Main.txtTheme_office_theme": "Office Theme",
"PE.Controllers.Main.txtXAxis": "X Axis",
"PE.Controllers.Main.txtYAxis": "Y Axis",
"PE.Controllers.Main.unknownErrorText": "Unknown error.",
diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json
index c5f4c2a69..6d66a60b2 100644
--- a/apps/presentationeditor/main/locale/ru.json
+++ b/apps/presentationeditor/main/locale/ru.json
@@ -581,6 +581,9 @@
"PE.Controllers.Main.txtTheme_pixel": "Пиксельная",
"PE.Controllers.Main.txtTheme_safari": "Сафари",
"PE.Controllers.Main.txtTheme_turtle": "Черепаха",
+ "PE.Controllers.Main.txtTheme_basic": "Базовая",
+ "PE.Controllers.Main.txtTheme_green_leaf": "Зеленый лист",
+ "PE.Controllers.Main.txtTheme_office_theme": "Тема Офис",
"PE.Controllers.Main.txtXAxis": "Ось X",
"PE.Controllers.Main.txtYAxis": "Ось Y",
"PE.Controllers.Main.unknownErrorText": "Неизвестная ошибка.",