From 031b728b6e4cc02bbe1ffbbd429ab71699ad0b47 Mon Sep 17 00:00:00 2001 From: Sergey Luzyanin Date: Mon, 15 Aug 2016 11:33:21 +0300 Subject: [PATCH 1/8] added builder scripts --- apps/presentationeditor/sdk_dev_scripts.js | 1 + apps/spreadsheeteditor/sdk_dev_scripts.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/apps/presentationeditor/sdk_dev_scripts.js b/apps/presentationeditor/sdk_dev_scripts.js index 69996b51e..0be236e9a 100644 --- a/apps/presentationeditor/sdk_dev_scripts.js +++ b/apps/presentationeditor/sdk_dev_scripts.js @@ -149,6 +149,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/common/Drawings/Format/DrawingContent.js", "../../../../sdkjs/common/clipboard_base.js", "../../../../sdkjs/common/plugins.js", + "../../../../sdkjs/word/apiBuilder.js", "../../../../sdkjs/slide/apiBuilder.js", "../../../../sdkjs/common/text_input.js" ]; \ No newline at end of file diff --git a/apps/spreadsheeteditor/sdk_dev_scripts.js b/apps/spreadsheeteditor/sdk_dev_scripts.js index 19a3996c5..b290dad2c 100644 --- a/apps/spreadsheeteditor/sdk_dev_scripts.js +++ b/apps/spreadsheeteditor/sdk_dev_scripts.js @@ -160,6 +160,8 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Math/borderBox.js", "../../../../sdkjs/word/apiCommon.js", "../../../../sdkjs/common/applyDocumentChanges.js", + "../../../../sdkjs/word/apiBuilder.js", + "../../../../sdkjs/slide/apiBuilder.js", "../../../../sdkjs/cell/apiBuilder.js", "../../../../sdkjs/common/Drawings/Format/OleObject.js", "../../../../sdkjs/common/Drawings/Format/DrawingContent.js", From 82d839ec2672808ea3313a8c57bb70f806627f1d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 Aug 2016 13:05:58 +0300 Subject: [PATCH 2/8] Bug 32932. --- apps/common/main/lib/view/Plugins.js | 2 +- apps/documenteditor/main/app/view/LeftMenu.js | 2 +- apps/presentationeditor/main/app/view/LeftMenu.js | 2 +- apps/spreadsheeteditor/main/app/view/LeftMenu.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index 7bf7bc9e0..4f82c5c78 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -187,7 +187,7 @@ define([ this.loadMask.hide(); }, - strPlugins: 'Add-ons', + strPlugins: 'Plugins', textLoading: 'Loading', textStart: 'Start' diff --git a/apps/documenteditor/main/app/view/LeftMenu.js b/apps/documenteditor/main/app/view/LeftMenu.js index c658b08e0..8b9679064 100644 --- a/apps/documenteditor/main/app/view/LeftMenu.js +++ b/apps/documenteditor/main/app/view/LeftMenu.js @@ -366,6 +366,6 @@ define([ tipSupport : 'Feedback & Support', tipFile : 'File', tipSearch : 'Search', - tipPlugins : 'Add-ons' + tipPlugins : 'Plugins' }, DE.Views.LeftMenu || {})); }); diff --git a/apps/presentationeditor/main/app/view/LeftMenu.js b/apps/presentationeditor/main/app/view/LeftMenu.js index 9071c6e73..2d246bb06 100644 --- a/apps/presentationeditor/main/app/view/LeftMenu.js +++ b/apps/presentationeditor/main/app/view/LeftMenu.js @@ -382,6 +382,6 @@ define([ tipFile : 'File', tipSearch : 'Search', tipSlides: 'Slides', - tipPlugins : 'Add-ons' + tipPlugins : 'Plugins' }, PE.Views.LeftMenu || {})); }); diff --git a/apps/spreadsheeteditor/main/app/view/LeftMenu.js b/apps/spreadsheeteditor/main/app/view/LeftMenu.js index 137c45737..6e63ce136 100644 --- a/apps/spreadsheeteditor/main/app/view/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/view/LeftMenu.js @@ -347,6 +347,6 @@ define([ tipSupport : 'Feedback & Support', tipFile : 'File', tipSearch : 'Search', - tipPlugins : 'Add-ons' + tipPlugins : 'Plugins' }, SSE.Views.LeftMenu || {})); }); From 795c85884e13830b41511870e79b0d1985dc1ff1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 Aug 2016 13:20:46 +0300 Subject: [PATCH 3/8] [DE] Changed advanced settings. --- apps/documenteditor/main/app/view/FileMenuPanels.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index f34003d4f..cd74d22be 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -110,10 +110,6 @@ define([ template: _.template([ '', - '', - '', - '', - '','', /** coauthoring begin **/ '', '', @@ -124,6 +120,10 @@ define([ '', '', '','', + '', + '', + '', + '','', '', '', '', From 84cf8d181ab44460be2899ccd728e272e3d7d41d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 Aug 2016 14:48:13 +0300 Subject: [PATCH 4/8] [SSE] Fix Bug 32936. --- apps/spreadsheeteditor/main/app/controller/Main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 073d6f438..dfe11889f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1527,7 +1527,6 @@ define([ case 'getMergeData': this.getMergeData(); break; case 'setAppDisabled': this.isAppDisabled = data.data; - this.api.asc_enableKeyEvents(false); break; case 'queryClose': if ($('body .asc-window:visible').length === 0) { From 58b7c3f97cf5b7df16532e697ae6a418a47c022f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 Aug 2016 15:32:12 +0300 Subject: [PATCH 5/8] [SSE] Fix Bug 32955. --- .../main/app/controller/CellEditor.js | 17 +++++------------ .../main/app/view/CellEditor.js | 6 ++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js index 8096f9126..2147bd64c 100644 --- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js @@ -117,11 +117,13 @@ define([ }, onApiEditCell: function(state) { - if (state == Asc.c_oAscCellEditorState.editStart) + if (state == Asc.c_oAscCellEditorState.editStart){ this.api.isCellEdited = true; - else if (state == Asc.c_oAscCellEditorState.editEnd) { + this.editor.cellNameDisabled(true); + } else if (state == Asc.c_oAscCellEditorState.editEnd) { this.api.isCellEdited = false; this.api.isCEditorFocused = false; + this.editor.cellNameDisabled(false); } }, @@ -144,16 +146,7 @@ define([ }, onCellsRange: function(status) { - var isRangeSelection = (status != Asc.c_oAscSelectionDialogType.None); - - if (isRangeSelection) { - this.editor.$cellname.attr('disabled', 'disabled'); - this.editor.$btnfunc['addClass']('disabled'); - } else { - this.editor.$cellname.removeAttr('disabled'); - this.editor.$btnfunc['removeClass']('disabled'); - } - this.editor.btnNamedRanges.setDisabled(isRangeSelection); + this.editor.cellNameDisabled(status != Asc.c_oAscSelectionDialogType.None); }, onLayoutResize: function(o, r) { diff --git a/apps/spreadsheeteditor/main/app/view/CellEditor.js b/apps/spreadsheeteditor/main/app/view/CellEditor.js index 14761b5fc..2e4671261 100644 --- a/apps/spreadsheeteditor/main/app/view/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/view/CellEditor.js @@ -100,6 +100,12 @@ define([ } }, + cellNameDisabled: function(disabled){ + (disabled) ? this.$cellname.attr('disabled', 'disabled') : this.$cellname.removeAttr('disabled'); + this.$btnfunc.toggleClass('disabled', disabled); + this.btnNamedRanges.setDisabled(disabled); + }, + tipFormula: 'Insert Function', textManager: 'Manager' }, SSE.Views.CellEditor || {})); From a27da8e193be6631388262c3d07f01f92b451cae Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 Aug 2016 15:52:18 +0300 Subject: [PATCH 6/8] Updated translations. --- apps/documenteditor/main/locale/en.json | 22 +++------------ apps/documenteditor/main/locale/ru.json | 21 ++++----------- apps/presentationeditor/main/locale/en.json | 30 +++++++-------------- apps/presentationeditor/main/locale/ru.json | 19 +++++++------ apps/spreadsheeteditor/main/locale/en.json | 26 +++++++----------- apps/spreadsheeteditor/main/locale/ru.json | 23 ++++++++++------ 6 files changed, 51 insertions(+), 90 deletions(-) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index e5c2b84d3..ee9c6ad10 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -161,7 +161,7 @@ "Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtPassword": "Password", "Common.Views.OpenDialog.txtTitleProtected": "Protected File", - "Common.Views.Plugins.strPlugins": "Add-ons", + "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", "Common.Views.ReviewChanges.txtAccept": "Accept", @@ -195,7 +195,6 @@ "DE.Controllers.Main.downloadTextText": "Downloading document...", "DE.Controllers.Main.downloadTitleText": "Downloading Document", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", - "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "DE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "DE.Controllers.Main.errorDataRange": "Incorrect data range.", @@ -210,6 +209,7 @@ "DE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", "DE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "DE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", + "DE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "DE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.", "DE.Controllers.Main.loadFontsTextText": "Loading data...", "DE.Controllers.Main.loadFontsTitleText": "Loading Data", @@ -846,8 +846,6 @@ "DE.Views.DropcapSettingsAdvanced.textRelative": "Relative to", "DE.Views.DropcapSettingsAdvanced.textRight": "Right", "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Height in rows", - "del_DE.Views.DropcapSettingsAdvanced.textStandartColors": "Standard Colors", - "del_DE.Views.DropcapSettingsAdvanced.textThemeColors": "Theme Colors", "DE.Views.DropcapSettingsAdvanced.textTitle": "Drop Cap - Advanced Settings", "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Frame - Advanced Settings", "DE.Views.DropcapSettingsAdvanced.textTop": "Top", @@ -1036,7 +1034,7 @@ "DE.Views.LeftMenu.tipChat": "Chat", "DE.Views.LeftMenu.tipComments": "Comments", "DE.Views.LeftMenu.tipFile": "File", - "DE.Views.LeftMenu.tipPlugins": "Add-ons", + "DE.Views.LeftMenu.tipPlugins": "Plugins", "DE.Views.LeftMenu.tipSearch": "Search", "DE.Views.LeftMenu.tipSupport": "Feedback & Support", "DE.Views.LeftMenu.tipTitles": "Titles", @@ -1119,8 +1117,6 @@ "DE.Views.ParagraphSettings.textBackColor": "Background color", "DE.Views.ParagraphSettings.textExact": "Exactly", "DE.Views.ParagraphSettings.textNewColor": "Add New Custom Color", - "del_DE.Views.ParagraphSettings.textStandartColors": "Standard Colors", - "del_DE.Views.ParagraphSettings.textThemeColors": "Theme Colors", "DE.Views.ParagraphSettings.txtAutoText": "Auto", "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Cancel", "DE.Views.ParagraphSettingsAdvanced.noTabs": "The specified tabs will appear in this field", @@ -1161,12 +1157,10 @@ "DE.Views.ParagraphSettingsAdvanced.textRight": "Right", "DE.Views.ParagraphSettingsAdvanced.textSet": "Specify", "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Spacing", - "del_DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Standard Colors", "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "Center", "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "Left", "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Tab Position", "DE.Views.ParagraphSettingsAdvanced.textTabRight": "Right", - "del_DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Theme Colors", "DE.Views.ParagraphSettingsAdvanced.textTitle": "Paragraph - Advanced Settings", "DE.Views.ParagraphSettingsAdvanced.textTop": "Top", "DE.Views.ParagraphSettingsAdvanced.tipAll": "Set Outer Border and All Inner Lines", @@ -1212,11 +1206,9 @@ "DE.Views.ShapeSettings.textPatternFill": "Pattern", "DE.Views.ShapeSettings.textRadial": "Radial", "DE.Views.ShapeSettings.textSelectTexture": "Select", - "del_DE.Views.ShapeSettings.textStandartColors": "Standard Colors", "DE.Views.ShapeSettings.textStretch": "Stretch", "DE.Views.ShapeSettings.textStyle": "Style", "DE.Views.ShapeSettings.textTexture": "From Texture", - "del_DE.Views.ShapeSettings.textThemeColors": "Theme Colors", "DE.Views.ShapeSettings.textTile": "Tile", "DE.Views.ShapeSettings.textWrap": "Wrapping Style", "DE.Views.ShapeSettings.txtBehind": "Behind", @@ -1297,9 +1289,7 @@ "DE.Views.TableSettings.textOK": "OK", "DE.Views.TableSettings.textRows": "Rows", "DE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above", - "del_DE.Views.TableSettings.textStandartColors": "Standard Colors", "DE.Views.TableSettings.textTemplate": "Select From Template", - "del_DE.Views.TableSettings.textThemeColors": "Theme Colors", "DE.Views.TableSettings.textTotal": "Total", "DE.Views.TableSettings.textWrap": "Text Wrapping", "DE.Views.TableSettings.textWrapNoneTooltip": "Inline table", @@ -1357,12 +1347,10 @@ "DE.Views.TableSettingsAdvanced.textRight": "Right", "DE.Views.TableSettingsAdvanced.textRightOf": "to the right of", "DE.Views.TableSettingsAdvanced.textRightTooltip": "Right", - "del_DE.Views.TableSettingsAdvanced.textStandartColors": "Standard Colors", "DE.Views.TableSettingsAdvanced.textTable": "Table", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Table Background", "DE.Views.TableSettingsAdvanced.textTablePosition": "Table Position", "DE.Views.TableSettingsAdvanced.textTableSize": "Table Size", - "del_DE.Views.TableSettingsAdvanced.textThemeColors": "Theme Colors", "DE.Views.TableSettingsAdvanced.textTitle": "Table - Advanced Settings", "DE.Views.TableSettingsAdvanced.textTop": "Top", "DE.Views.TableSettingsAdvanced.textVertical": "Vertical", @@ -1404,10 +1392,8 @@ "DE.Views.TextArtSettings.textNoFill": "No Fill", "DE.Views.TextArtSettings.textRadial": "Radial", "DE.Views.TextArtSettings.textSelectTexture": "Select", - "del_DE.Views.TextArtSettings.textStandartColors": "Standard Colors", "DE.Views.TextArtSettings.textStyle": "Style", "DE.Views.TextArtSettings.textTemplate": "Template", - "del_DE.Views.TextArtSettings.textThemeColors": "Theme Colors", "DE.Views.TextArtSettings.textTransform": "Transform", "DE.Views.TextArtSettings.txtNoBorders": "No Line", "DE.Views.Toolbar.mniCustomTable": "Insert Custom Table", @@ -1466,7 +1452,6 @@ "DE.Views.Toolbar.textPoint": "Point Chart", "DE.Views.Toolbar.textPortrait": "Portrait", "DE.Views.Toolbar.textRight": "Right: ", - "del_DE.Views.Toolbar.textStandartColors": "Standard Colors", "DE.Views.Toolbar.textStock": "Stock Chart", "DE.Views.Toolbar.textStrikeout": "Strikeout", "DE.Views.Toolbar.textStyleMenuDelete": "Delete style", @@ -1477,7 +1462,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Update from selection", "DE.Views.Toolbar.textSubscript": "Subscript", "DE.Views.Toolbar.textSuperscript": "Superscript", - "del_DE.Views.Toolbar.textThemeColors": "Theme Colors", "DE.Views.Toolbar.textTitleError": "Error", "DE.Views.Toolbar.textToCurrent": "To current position", "DE.Views.Toolbar.textTop": "Top: ", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 6ae15cf01..49c67478d 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -86,6 +86,8 @@ "Common.UI.SearchDialog.txtBtnReplaceAll": "Заменить все", "Common.UI.SynchronizeTip.textDontShow": "Больше не показывать это сообщение", "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", + "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", + "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -205,6 +207,7 @@ "DE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", "DE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "DE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", + "DE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать его до восстановления подключения.", "DE.Controllers.Main.leavePageText": "Документ содержит несохраненные изменения. Чтобы сохранить их, нажмите \"Остаться на этой странице\", затем \"Сохранить\". Нажмите \"Покинуть эту страницу\", чтобы сбросить все несохраненные изменения.", "DE.Controllers.Main.loadFontsTextText": "Загрузка данных...", "DE.Controllers.Main.loadFontsTitleText": "Загрузка данных", @@ -841,8 +844,6 @@ "DE.Views.DropcapSettingsAdvanced.textRelative": "Относительно", "DE.Views.DropcapSettingsAdvanced.textRight": "Справа", "DE.Views.DropcapSettingsAdvanced.textRowHeight": "Высота в строках", - "DE.Views.DropcapSettingsAdvanced.textStandartColors": "Стандартные цвета", - "DE.Views.DropcapSettingsAdvanced.textThemeColors": "Цвета темы", "DE.Views.DropcapSettingsAdvanced.textTitle": "Буквица - дополнительные параметры", "DE.Views.DropcapSettingsAdvanced.textTitleFrame": "Рамка - дополнительные параметры", "DE.Views.DropcapSettingsAdvanced.textTop": "Сверху", @@ -946,6 +947,8 @@ "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Это поле обязательно для заполнения", "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"", "DE.Views.ImageSettings.textAdvanced": "Дополнительные параметры", + "DE.Views.ImageSettings.textEdit": "Редактировать", + "DE.Views.ImageSettings.textEditObject": "Редактировать объект", "DE.Views.ImageSettings.textFromFile": "Из файла", "DE.Views.ImageSettings.textFromUrl": "По URL", "DE.Views.ImageSettings.textHeight": "Высота", @@ -1112,8 +1115,6 @@ "DE.Views.ParagraphSettings.textBackColor": "Цвет фона", "DE.Views.ParagraphSettings.textExact": "Точно", "DE.Views.ParagraphSettings.textNewColor": "Пользовательский цвет", - "DE.Views.ParagraphSettings.textStandartColors": "Стандартные цвета", - "DE.Views.ParagraphSettings.textThemeColors": "Цвета темы", "DE.Views.ParagraphSettings.txtAutoText": "Авто", "DE.Views.ParagraphSettingsAdvanced.cancelButtonText": "Отмена", "DE.Views.ParagraphSettingsAdvanced.noTabs": "В этом поле появятся позиции табуляции, которые вы зададите", @@ -1154,12 +1155,10 @@ "DE.Views.ParagraphSettingsAdvanced.textRight": "Справа", "DE.Views.ParagraphSettingsAdvanced.textSet": "Задать", "DE.Views.ParagraphSettingsAdvanced.textSpacing": "Интервал", - "DE.Views.ParagraphSettingsAdvanced.textStandartColors": "Стандартные цвета", "DE.Views.ParagraphSettingsAdvanced.textTabCenter": "По центру", "DE.Views.ParagraphSettingsAdvanced.textTabLeft": "По левому краю", "DE.Views.ParagraphSettingsAdvanced.textTabPosition": "Позиция", "DE.Views.ParagraphSettingsAdvanced.textTabRight": "По правому краю", - "DE.Views.ParagraphSettingsAdvanced.textThemeColors": "Цвета темы", "DE.Views.ParagraphSettingsAdvanced.textTitle": "Абзац - дополнительные параметры", "DE.Views.ParagraphSettingsAdvanced.textTop": "Сверху", "DE.Views.ParagraphSettingsAdvanced.tipAll": "Задать внешнюю границу и все внутренние линии", @@ -1205,11 +1204,9 @@ "DE.Views.ShapeSettings.textPatternFill": "Узор", "DE.Views.ShapeSettings.textRadial": "Радиальный", "DE.Views.ShapeSettings.textSelectTexture": "Выбрать", - "DE.Views.ShapeSettings.textStandartColors": "Стандартные цвета", "DE.Views.ShapeSettings.textStretch": "Растяжение", "DE.Views.ShapeSettings.textStyle": "Стиль", "DE.Views.ShapeSettings.textTexture": "Из текстуры", - "DE.Views.ShapeSettings.textThemeColors": "Цвета темы", "DE.Views.ShapeSettings.textTile": "Плитка", "DE.Views.ShapeSettings.textWrap": "Стиль обтекания", "DE.Views.ShapeSettings.txtBehind": "За текстом", @@ -1290,9 +1287,7 @@ "DE.Views.TableSettings.textOK": "OK", "DE.Views.TableSettings.textRows": "Строки", "DE.Views.TableSettings.textSelectBorders": "Выберите границы, к которым надо применить выбранный стиль", - "DE.Views.TableSettings.textStandartColors": "Стандартные цвета", "DE.Views.TableSettings.textTemplate": "По шаблону", - "DE.Views.TableSettings.textThemeColors": "Цвета темы", "DE.Views.TableSettings.textTotal": "Итоговая", "DE.Views.TableSettings.textWrap": "Обтекание текстом", "DE.Views.TableSettings.textWrapNoneTooltip": "Встроенная таблица", @@ -1350,12 +1345,10 @@ "DE.Views.TableSettingsAdvanced.textRight": "Справа", "DE.Views.TableSettingsAdvanced.textRightOf": "справа от", "DE.Views.TableSettingsAdvanced.textRightTooltip": "По правому краю", - "DE.Views.TableSettingsAdvanced.textStandartColors": "Стандартные цвета", "DE.Views.TableSettingsAdvanced.textTable": "Таблица", "DE.Views.TableSettingsAdvanced.textTableBackColor": "Фон таблицы", "DE.Views.TableSettingsAdvanced.textTablePosition": "Положение таблицы", "DE.Views.TableSettingsAdvanced.textTableSize": "Размер таблицы", - "DE.Views.TableSettingsAdvanced.textThemeColors": "Цвета темы", "DE.Views.TableSettingsAdvanced.textTitle": "Таблица - дополнительные параметры", "DE.Views.TableSettingsAdvanced.textTop": "Сверху", "DE.Views.TableSettingsAdvanced.textVertical": "По вертикали", @@ -1397,10 +1390,8 @@ "DE.Views.TextArtSettings.textNoFill": "Без заливки", "DE.Views.TextArtSettings.textRadial": "Радиальный", "DE.Views.TextArtSettings.textSelectTexture": "Выбрать", - "DE.Views.TextArtSettings.textStandartColors": "Стандартные цвета", "DE.Views.TextArtSettings.textStyle": "Стиль", "DE.Views.TextArtSettings.textTemplate": "Шаблон", - "DE.Views.TextArtSettings.textThemeColors": "Цвета темы", "DE.Views.TextArtSettings.textTransform": "Трансформация", "DE.Views.TextArtSettings.txtNoBorders": "Без обводки", "DE.Views.Toolbar.mniCustomTable": "Пользовательская таблица", @@ -1459,7 +1450,6 @@ "DE.Views.Toolbar.textPoint": "Точечная", "DE.Views.Toolbar.textPortrait": "Книжная", "DE.Views.Toolbar.textRight": "Правое: ", - "DE.Views.Toolbar.textStandartColors": "Стандартные цвета", "DE.Views.Toolbar.textStock": "Биржевая", "DE.Views.Toolbar.textStrikeout": "Зачеркнутый", "DE.Views.Toolbar.textStyleMenuDelete": "Удалить стиль", @@ -1470,7 +1460,6 @@ "DE.Views.Toolbar.textStyleMenuUpdate": "Обновить из выделенного фрагмента", "DE.Views.Toolbar.textSubscript": "Подстрочные знаки", "DE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "DE.Views.Toolbar.textThemeColors": "Цвета темы", "DE.Views.Toolbar.textTitleError": "Ошибка", "DE.Views.Toolbar.textToCurrent": "В текущей позиции", "DE.Views.Toolbar.textTop": "Верхнее: ", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 2959fcb6a..617b80c8e 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -93,7 +93,7 @@ "Common.Views.InsertTableDialog.txtMinText": "The minimum value for this field is {0}.", "Common.Views.InsertTableDialog.txtRows": "Number of Rows", "Common.Views.InsertTableDialog.txtTitle": "Table Size", - "Common.Views.Plugins.strPlugins": "Add-ons", + "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", "PE.Controllers.LeftMenu.newDocumentTitle": "Unnamed presentation", @@ -110,7 +110,6 @@ "PE.Controllers.Main.downloadTextText": "Downloading presentation...", "PE.Controllers.Main.downloadTitleText": "Downloading Presentation", "PE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", - "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "PE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "PE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "PE.Controllers.Main.errorDataRange": "Incorrect data range.", @@ -123,6 +122,7 @@ "PE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", "PE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "PE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", + "PE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "PE.Controllers.Main.leavePageText": "You have unsaved changes in this presentation. Click \"Stay on This Page\", then \"Save\" to save them. Click \"Leave This Page\" to discard all the unsaved changes.", "PE.Controllers.Main.loadFontsTextText": "Loading data...", "PE.Controllers.Main.loadFontsTitleText": "Loading Data", @@ -425,7 +425,7 @@ "PE.Views.LeftMenu.tipChat": "Chat", "PE.Views.LeftMenu.tipComments": "Comments", "PE.Views.LeftMenu.tipFile": "File", - "PE.Views.LeftMenu.tipPlugins": "Add-ons", + "PE.Views.LeftMenu.tipPlugins": "Plugins", "PE.Views.LeftMenu.tipSearch": "Search", "PE.Views.LeftMenu.tipSlides": "Slides", "PE.Views.LeftMenu.tipSupport": "Feedback & Support", @@ -500,11 +500,9 @@ "PE.Views.ShapeSettings.textPatternFill": "Pattern", "PE.Views.ShapeSettings.textRadial": "Radial", "PE.Views.ShapeSettings.textSelectTexture": "Select", - "del_PE.Views.ShapeSettings.textStandartColors": "Standard Colors", "PE.Views.ShapeSettings.textStretch": "Stretch", "PE.Views.ShapeSettings.textStyle": "Style", "PE.Views.ShapeSettings.textTexture": "From Texture", - "del_PE.Views.ShapeSettings.textThemeColors": "Theme Colors", "PE.Views.ShapeSettings.textTile": "Tile", "PE.Views.ShapeSettings.txtBrownPaper": "Brown Paper", "PE.Views.ShapeSettings.txtCanvas": "Canvas", @@ -590,11 +588,9 @@ "PE.Views.SlideSettings.textSelectTexture": "Select", "PE.Views.SlideSettings.textSmoothly": "Smoothly", "PE.Views.SlideSettings.textSplit": "Split", - "del_PE.Views.SlideSettings.textStandartColors": "Standard Colors", "PE.Views.SlideSettings.textStretch": "Stretch", "PE.Views.SlideSettings.textStyle": "Style", "PE.Views.SlideSettings.textTexture": "From Texture", - "del_PE.Views.SlideSettings.textThemeColors": "Theme Colors", "PE.Views.SlideSettings.textTile": "Tile", "PE.Views.SlideSettings.textTop": "Top", "PE.Views.SlideSettings.textTopLeft": "Top Left", @@ -619,14 +615,14 @@ "PE.Views.SlideSettings.txtLeather": "Leather", "PE.Views.SlideSettings.txtPapyrus": "Papyrus", "PE.Views.SlideSettings.txtWood": "Wood", - "PE.Views.SlideshowSettings.textTitle": "Show Settings", - "PE.Views.SlideshowSettings.textLoop": "Loop continuously until 'Esc' is pressed", "PE.Views.SlideshowSettings.cancelButtonText": "Cancel", "PE.Views.SlideshowSettings.okButtonText": "Ok", + "PE.Views.SlideshowSettings.textLoop": "Loop continuously until 'Esc' is pressed", + "PE.Views.SlideshowSettings.textTitle": "Show Settings", "PE.Views.SlideSizeSettings.cancelButtonText": "Cancel", "PE.Views.SlideSizeSettings.okButtonText": "OK", - "PE.Views.SlideSizeSettings.strPortrait": "Portrait", "PE.Views.SlideSizeSettings.strLandscape": "Landscape", + "PE.Views.SlideSizeSettings.strPortrait": "Portrait", "PE.Views.SlideSizeSettings.textHeight": "Height", "PE.Views.SlideSizeSettings.textSlideOrientation": "Slide Orientation", "PE.Views.SlideSizeSettings.textSlideSize": "Slide Size", @@ -688,9 +684,7 @@ "PE.Views.TableSettings.textNewColor": "Custom Color", "PE.Views.TableSettings.textRows": "Rows", "PE.Views.TableSettings.textSelectBorders": "Select borders you want to change applying style chosen above", - "del_PE.Views.TableSettings.textStandartColors": "Standard Colors", "PE.Views.TableSettings.textTemplate": "Select From Template", - "del_PE.Views.TableSettings.textThemeColors": "Theme Colors", "PE.Views.TableSettings.textTotal": "Total", "PE.Views.TableSettings.tipAll": "Set Outer Border and All Inner Lines", "PE.Views.TableSettings.tipBottom": "Set Outer Bottom Border Only", @@ -738,12 +732,10 @@ "PE.Views.TextArtSettings.textPatternFill": "Pattern", "PE.Views.TextArtSettings.textRadial": "Radial", "PE.Views.TextArtSettings.textSelectTexture": "Select", - "del_PE.Views.TextArtSettings.textStandartColors": "Standard Colors", "PE.Views.TextArtSettings.textStretch": "Stretch", "PE.Views.TextArtSettings.textStyle": "Style", "PE.Views.TextArtSettings.textTemplate": "Template", "PE.Views.TextArtSettings.textTexture": "From Texture", - "del_PE.Views.TextArtSettings.textThemeColors": "Theme Colors", "PE.Views.TextArtSettings.textTile": "Tile", "PE.Views.TextArtSettings.textTransform": "Transform", "PE.Views.TextArtSettings.txtBrownPaper": "Brown Paper", @@ -800,12 +792,13 @@ "PE.Views.Toolbar.textShapeAlignMiddle": "Align Middle", "PE.Views.Toolbar.textShapeAlignRight": "Align Right", "PE.Views.Toolbar.textShapeAlignTop": "Align Top", - "del_PE.Views.Toolbar.textStandartColors": "Standard Colors", + "PE.Views.Toolbar.textShowBegin": "Show from Beginning", + "PE.Views.Toolbar.textShowCurrent": "Show from Current slide", + "PE.Views.Toolbar.textShowSettings": "Show Settings", "PE.Views.Toolbar.textStock": "Stock Chart", "PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textSubscript": "Subscript", "PE.Views.Toolbar.textSuperscript": "Superscript", - "del_PE.Views.Toolbar.textThemeColors": "Theme Colors", "PE.Views.Toolbar.textTitleError": "Error", "PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.textZoom": "Zoom", @@ -872,8 +865,5 @@ "PE.Views.Toolbar.txtScheme7": "Equity", "PE.Views.Toolbar.txtScheme8": "Flow", "PE.Views.Toolbar.txtScheme9": "Foundry", - "PE.Views.Toolbar.txtUngroup": "Ungroup", - "PE.Views.Toolbar.textShowBegin": "Show from Beginning", - "PE.Views.Toolbar.textShowCurrent": "Show from Current slide", - "PE.Views.Toolbar.textShowSettings": "Show Settings" + "PE.Views.Toolbar.txtUngroup": "Ungroup" } \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 4f9c8ea6e..a39dd8fcd 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -28,6 +28,8 @@ "Common.UI.SearchDialog.txtBtnReplaceAll": "Заменить все", "Common.UI.SynchronizeTip.textDontShow": "Больше не показывать это сообщение", "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", + "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", + "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -91,6 +93,9 @@ "Common.Views.InsertTableDialog.txtMinText": "Минимальное значение для этого поля - {0}.", "Common.Views.InsertTableDialog.txtRows": "Количество строк", "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы", + "Common.Views.Plugins.strPlugins": "Дополнения", + "Common.Views.Plugins.textLoading": "Загрузка", + "Common.Views.Plugins.textStart": "Запустить", "PE.Controllers.LeftMenu.newDocumentTitle": "Презентация без имени", "PE.Controllers.LeftMenu.requestEditRightsText": "Запрос прав на редактирование...", "PE.Controllers.LeftMenu.textNoTextFound": "Искомые данные не найдены. Пожалуйста, измените параметры поиска.", @@ -117,6 +122,7 @@ "PE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", "PE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "PE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", + "PE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать его до восстановления подключения.", "PE.Controllers.Main.leavePageText": "Презентация содержит несохраненные изменения. Чтобы сохранить их, нажмите \"Остаться на этой странице\", затем \"Сохранить\". Нажмите \"Покинуть эту страницу\", чтобы сбросить все несохраненные изменения.", "PE.Controllers.Main.loadFontsTextText": "Загрузка данных...", "PE.Controllers.Main.loadFontsTitleText": "Загрузка данных", @@ -397,6 +403,8 @@ "PE.Views.HyperlinkSettingsDialog.txtPrev": "Предыдущий слайд", "PE.Views.HyperlinkSettingsDialog.txtSlide": "Слайд", "PE.Views.ImageSettings.textAdvanced": "Дополнительные параметры", + "PE.Views.ImageSettings.textEdit": "Редактировать", + "PE.Views.ImageSettings.textEditObject": "Редактировать объект", "PE.Views.ImageSettings.textFromFile": "Из файла", "PE.Views.ImageSettings.textFromUrl": "По URL", "PE.Views.ImageSettings.textHeight": "Высота", @@ -417,6 +425,7 @@ "PE.Views.LeftMenu.tipChat": "Чат", "PE.Views.LeftMenu.tipComments": "Комментарии", "PE.Views.LeftMenu.tipFile": "Файл", + "PE.Views.LeftMenu.tipPlugins": "Дополнения", "PE.Views.LeftMenu.tipSearch": "Поиск", "PE.Views.LeftMenu.tipSlides": "Слайды", "PE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка", @@ -491,11 +500,9 @@ "PE.Views.ShapeSettings.textPatternFill": "Узор", "PE.Views.ShapeSettings.textRadial": "Радиальный", "PE.Views.ShapeSettings.textSelectTexture": "Выбрать", - "PE.Views.ShapeSettings.textStandartColors": "Стандартные цвета", "PE.Views.ShapeSettings.textStretch": "Растяжение", "PE.Views.ShapeSettings.textStyle": "Стиль", "PE.Views.ShapeSettings.textTexture": "Из текстуры", - "PE.Views.ShapeSettings.textThemeColors": "Цвета темы", "PE.Views.ShapeSettings.textTile": "Плитка", "PE.Views.ShapeSettings.txtBrownPaper": "Крафт-бумага", "PE.Views.ShapeSettings.txtCanvas": "Холст", @@ -581,11 +588,9 @@ "PE.Views.SlideSettings.textSelectTexture": "Выбрать", "PE.Views.SlideSettings.textSmoothly": "Плавно", "PE.Views.SlideSettings.textSplit": "Панорама", - "PE.Views.SlideSettings.textStandartColors": "Стандартные цвета", "PE.Views.SlideSettings.textStretch": "Растяжение", "PE.Views.SlideSettings.textStyle": "Стиль", "PE.Views.SlideSettings.textTexture": "Из текстуры", - "PE.Views.SlideSettings.textThemeColors": "Цвета темы", "PE.Views.SlideSettings.textTile": "Плитка", "PE.Views.SlideSettings.textTop": "Сверху", "PE.Views.SlideSettings.textTopLeft": "Сверху слева", @@ -679,9 +684,7 @@ "PE.Views.TableSettings.textNewColor": "Пользовательский цвет", "PE.Views.TableSettings.textRows": "Строки", "PE.Views.TableSettings.textSelectBorders": "Выберите границы, к которым надо применить выбранный стиль", - "PE.Views.TableSettings.textStandartColors": "Стандартные цвета", "PE.Views.TableSettings.textTemplate": "По шаблону", - "PE.Views.TableSettings.textThemeColors": "Цвета темы", "PE.Views.TableSettings.textTotal": "Итоговая", "PE.Views.TableSettings.tipAll": "Задать внешнюю границу и все внутренние линии", "PE.Views.TableSettings.tipBottom": "Задать только внешнюю нижнюю границу", @@ -729,12 +732,10 @@ "PE.Views.TextArtSettings.textPatternFill": "Узор", "PE.Views.TextArtSettings.textRadial": "Радиальный", "PE.Views.TextArtSettings.textSelectTexture": "Выбрать", - "PE.Views.TextArtSettings.textStandartColors": "Стандартные цвета", "PE.Views.TextArtSettings.textStretch": "Растяжение", "PE.Views.TextArtSettings.textStyle": "Стиль", "PE.Views.TextArtSettings.textTemplate": "Шаблон", "PE.Views.TextArtSettings.textTexture": "Из текстуры", - "PE.Views.TextArtSettings.textThemeColors": "Цвета темы", "PE.Views.TextArtSettings.textTile": "Плитка", "PE.Views.TextArtSettings.textTransform": "Трансформация", "PE.Views.TextArtSettings.txtBrownPaper": "Крафт-бумага", @@ -794,12 +795,10 @@ "PE.Views.Toolbar.textShowBegin": "Показ слайдов с начала", "PE.Views.Toolbar.textShowCurrent": "Показ слайдов с текущего слайда", "PE.Views.Toolbar.textShowSettings": "Параметры показа слайдов", - "PE.Views.Toolbar.textStandartColors": "Стандартные цвета", "PE.Views.Toolbar.textStock": "Биржевая", "PE.Views.Toolbar.textStrikeout": "Зачеркнутый", "PE.Views.Toolbar.textSubscript": "Подстрочные знаки", "PE.Views.Toolbar.textSuperscript": "Надстрочные знаки", - "PE.Views.Toolbar.textThemeColors": "Цвета темы", "PE.Views.Toolbar.textTitleError": "Ошибка", "PE.Views.Toolbar.textUnderline": "Подчеркнутый", "PE.Views.Toolbar.textZoom": "Масштаб", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 5aefcc037..35bbe540b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -88,10 +88,12 @@ "Common.Views.OpenDialog.txtTitle": "Choose %1 options", "Common.Views.OpenDialog.txtPassword": "Password", "Common.Views.OpenDialog.txtTitleProtected": "Protected File", - "Common.Views.Plugins.strPlugins": "Add-ons", + "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", + "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.", "SSE.Controllers.DocumentHolder.guestText": "Guest", + "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning", "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Column Width {0} symbols ({1} pixels)", "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Row Height {0} points ({1} pixels)", "SSE.Controllers.DocumentHolder.textCtrlClick": "Press CTRL and click link", @@ -102,8 +104,6 @@ "SSE.Controllers.DocumentHolder.txtHeight": "Height", "SSE.Controllers.DocumentHolder.txtRowHeight": "Row Height", "SSE.Controllers.DocumentHolder.txtWidth": "Width", - "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Warning", - "SSE.Controllers.DocumentHolder.errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.", "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet", "SSE.Controllers.LeftMenu.textByColumns": "By columns", "SSE.Controllers.LeftMenu.textByRows": "By rows", @@ -137,7 +137,6 @@ "SSE.Controllers.Main.errorAutoFilterHiddenRange": "The operation cannot be performed because the area contains filtered cells.
Please unhide the filtered elements and try again.", "SSE.Controllers.Main.errorBadImageUrl": "Image URL is incorrect", "SSE.Controllers.Main.errorCoAuthoringDisconnect": "Server connection lost. The document cannot be edited right now.", - "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "SSE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.

Find more information about connecting Document Server here", "SSE.Controllers.Main.errorCountArg": "An error in the entered formula.
Incorrect number of arguments is used.", "SSE.Controllers.Main.errorCountArgExceed": "An error in the entered formula.
Number of arguments is exceeded.", @@ -167,6 +166,7 @@ "SSE.Controllers.Main.errorUpdateVersion": "The file version has been changed. The page will be reloaded.", "SSE.Controllers.Main.errorUserDrop": "The file cannot be accessed right now.", "SSE.Controllers.Main.errorUsersExceed": "The number of users allowed by the pricing plan was exceeded", + "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download until the connection is restored.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error or use the Esc button to cancel the formula editing.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.", @@ -464,6 +464,8 @@ "SSE.Views.DocumentHolder.txtAddNamedRange": "Define Name", "SSE.Views.DocumentHolder.txtArrange": "Arrange", "SSE.Views.DocumentHolder.txtAscending": "Ascending", + "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Auto Fit Column Width", + "SSE.Views.DocumentHolder.txtAutoRowHeight": "Auto Fit Row Height", "SSE.Views.DocumentHolder.txtClear": "Clear", "SSE.Views.DocumentHolder.txtClearAll": "All", "SSE.Views.DocumentHolder.txtClearComments": "Comments", @@ -473,6 +475,8 @@ "SSE.Views.DocumentHolder.txtColumn": "Entire column", "SSE.Views.DocumentHolder.txtColumnWidth": "Set Column Width", "SSE.Views.DocumentHolder.txtCopy": "Copy", + "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Custom Column Width", + "SSE.Views.DocumentHolder.txtCustomRowHeight": "Custom Row Height", "SSE.Views.DocumentHolder.txtCut": "Cut", "SSE.Views.DocumentHolder.txtDelete": "Delete", "SSE.Views.DocumentHolder.txtDescending": "Descending", @@ -503,10 +507,6 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", - "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Auto Fit Column Width", - "SSE.Views.DocumentHolder.txtAutoRowHeight": "Auto Fit Row Height", - "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Custom Column Width", - "SSE.Views.DocumentHolder.txtCustomRowHeight": "Custom Row Height", "SSE.Views.FileMenu.btnBackCaption": "Go to Documents", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", "SSE.Views.FileMenu.btnDownloadCaption": "Download as...", @@ -641,7 +641,7 @@ "SSE.Views.LeftMenu.tipChat": "Chat", "SSE.Views.LeftMenu.tipComments": "Comments", "SSE.Views.LeftMenu.tipFile": "File", - "SSE.Views.LeftMenu.tipPlugins": "Add-ons", + "SSE.Views.LeftMenu.tipPlugins": "Plugins", "SSE.Views.LeftMenu.tipSearch": "Search", "SSE.Views.LeftMenu.tipSupport": "Feedback & Support", "SSE.Views.MainSettingsPrint.okButtonText": "Save", @@ -808,11 +808,9 @@ "SSE.Views.ShapeSettings.textPatternFill": "Pattern", "SSE.Views.ShapeSettings.textRadial": "Radial", "SSE.Views.ShapeSettings.textSelectTexture": "Select", - "del_SSE.Views.ShapeSettings.textStandartColors": "Standard Colors", "SSE.Views.ShapeSettings.textStretch": "Stretch", "SSE.Views.ShapeSettings.textStyle": "Style", "SSE.Views.ShapeSettings.textTexture": "From Texture", - "del_SSE.Views.ShapeSettings.textThemeColors": "Theme Colors", "SSE.Views.ShapeSettings.textTile": "Tile", "SSE.Views.ShapeSettings.txtBrownPaper": "Brown Paper", "SSE.Views.ShapeSettings.txtCanvas": "Canvas", @@ -871,9 +869,7 @@ "SSE.Views.Statusbar.textCount": "COUNT", "SSE.Views.Statusbar.textNewColor": "Add New Custom Color", "SSE.Views.Statusbar.textNoColor": "No Color", - "del_SSE.Views.Statusbar.textStandartColors": "Standard Colors", "SSE.Views.Statusbar.textSum": "SUM", - "del_SSE.Views.Statusbar.textThemeColors": "Theme Colors", "SSE.Views.Statusbar.tipAccessRights": "Manage document access rights", "SSE.Views.Statusbar.tipAddTab": "Add worksheet", "SSE.Views.Statusbar.tipFirst": "Scroll to First Sheet", @@ -951,12 +947,10 @@ "SSE.Views.TextArtSettings.textPatternFill": "Pattern", "SSE.Views.TextArtSettings.textRadial": "Radial", "SSE.Views.TextArtSettings.textSelectTexture": "Select", - "del_SSE.Views.TextArtSettings.textStandartColors": "Standard Colors", "SSE.Views.TextArtSettings.textStretch": "Stretch", "SSE.Views.TextArtSettings.textStyle": "Style", "SSE.Views.TextArtSettings.textTemplate": "Template", "SSE.Views.TextArtSettings.textTexture": "From Texture", - "del_SSE.Views.TextArtSettings.textThemeColors": "Theme Colors", "SSE.Views.TextArtSettings.textTile": "Tile", "SSE.Views.TextArtSettings.textTransform": "Transform", "SSE.Views.TextArtSettings.txtBrownPaper": "Brown Paper", @@ -1016,8 +1010,6 @@ "SSE.Views.Toolbar.textRightBorders": "Right Borders", "SSE.Views.Toolbar.textRotateDown": "Rotate Text Down", "SSE.Views.Toolbar.textRotateUp": "Rotate Text Up", - "del_SSE.Views.Toolbar.textStandartColors": "Standard Colors", - "del_SSE.Views.Toolbar.textThemeColors": "Theme Colors", "SSE.Views.Toolbar.textTopBorders": "Top Borders", "SSE.Views.Toolbar.textUnderline": "Underline", "SSE.Views.Toolbar.textZoom": "Zoom", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index b35a88caf..c76b2c113 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -25,6 +25,8 @@ "Common.UI.SearchDialog.txtBtnReplaceAll": "Заменить все", "Common.UI.SynchronizeTip.textDontShow": "Больше не показывать это сообщение", "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", + "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", + "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -84,7 +86,12 @@ "Common.Views.OpenDialog.txtSpace": "Пробел", "Common.Views.OpenDialog.txtTab": "Табуляция", "Common.Views.OpenDialog.txtTitle": "Выбрать параметры %1", + "Common.Views.Plugins.strPlugins": "Дополнения", + "Common.Views.Plugins.textLoading": "Загрузка", + "Common.Views.Plugins.textStart": "Запустить", + "SSE.Controllers.DocumentHolder.errorInvalidLink": "Ссылка указывает на несуществующую ячейку. Исправьте или удалите ссылку.", "SSE.Controllers.DocumentHolder.guestText": "Гость", + "SSE.Controllers.DocumentHolder.notcriticalErrorTitle": "Внимание", "SSE.Controllers.DocumentHolder.textChangeColumnWidth": "Ширина столбца {0} символов ({1} пикселей)", "SSE.Controllers.DocumentHolder.textChangeRowHeight": "Высота строки {0} пунктов ({1} пикселей)", "SSE.Controllers.DocumentHolder.textCtrlClick": "Нажмите клавишу CTRL и щелкните по ссылке", @@ -157,6 +164,7 @@ "SSE.Controllers.Main.errorUpdateVersion": "Версия файла была изменена. Страница будет перезагружена.", "SSE.Controllers.Main.errorUserDrop": "В настоящий момент файл недоступен.", "SSE.Controllers.Main.errorUsersExceed": "Превышено количество пользователей, разрешенных согласно тарифному плану", + "SSE.Controllers.Main.errorViewerDisconnect": "Подключение прервано. Вы по-прежнему можете просматривать документ,
но не сможете скачать его до восстановления подключения.", "SSE.Controllers.Main.errorWrongBracketsCount": "Ошибка во введенной формуле.
Использовано неверное количество скобок.", "SSE.Controllers.Main.errorWrongOperator": "Ошибка во введенной формуле. Использован неправильный оператор.
Пожалуйста, исправьте ошибку или нажмите клавишу Esc, чтобы отменить редактирование формулы.", "SSE.Controllers.Main.leavePageText": "Электронная таблица содержит несохраненные изменения. Чтобы сохранить их, нажмите 'Остаться на этой странице', затем 'Сохранить'. Нажмите 'Покинуть эту страницу', чтобы сбросить все несохраненные изменения.", @@ -454,6 +462,8 @@ "SSE.Views.DocumentHolder.txtAddNamedRange": "Присвоить имя", "SSE.Views.DocumentHolder.txtArrange": "Порядок", "SSE.Views.DocumentHolder.txtAscending": "По возрастанию", + "SSE.Views.DocumentHolder.txtAutoColumnWidth": "Автоподбор ширины столбца", + "SSE.Views.DocumentHolder.txtAutoRowHeight": "Автоподбор высоты строки", "SSE.Views.DocumentHolder.txtClear": "Очистить", "SSE.Views.DocumentHolder.txtClearAll": "Всё", "SSE.Views.DocumentHolder.txtClearComments": "Комментарии", @@ -463,6 +473,8 @@ "SSE.Views.DocumentHolder.txtColumn": "Столбец", "SSE.Views.DocumentHolder.txtColumnWidth": "Задать ширину столбца", "SSE.Views.DocumentHolder.txtCopy": "Копировать", + "SSE.Views.DocumentHolder.txtCustomColumnWidth": "Особая ширина столбца", + "SSE.Views.DocumentHolder.txtCustomRowHeight": "Особая высота строки", "SSE.Views.DocumentHolder.txtCut": "Вырезать", "SSE.Views.DocumentHolder.txtDelete": "Удалить", "SSE.Views.DocumentHolder.txtDescending": "По убыванию", @@ -613,6 +625,8 @@ "SSE.Views.HyperlinkSettingsDialog.textTitle": "Параметры гиперссылки", "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Это поле необходимо заполнить", "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "Это поле должно быть URL-адресом в формате \"http://www.example.com\"", + "SSE.Views.ImageSettings.textEdit": "Редактировать", + "SSE.Views.ImageSettings.textEditObject": "Редактировать объект", "SSE.Views.ImageSettings.textFromFile": "Из файла", "SSE.Views.ImageSettings.textFromUrl": "По URL", "SSE.Views.ImageSettings.textHeight": "Высота", @@ -625,6 +639,7 @@ "SSE.Views.LeftMenu.tipChat": "Чат", "SSE.Views.LeftMenu.tipComments": "Комментарии", "SSE.Views.LeftMenu.tipFile": "Файл", + "SSE.Views.LeftMenu.tipPlugins": "Дополнения", "SSE.Views.LeftMenu.tipSearch": "Поиск", "SSE.Views.LeftMenu.tipSupport": "Обратная связь и поддержка", "SSE.Views.MainSettingsPrint.okButtonText": "Сохранить", @@ -791,11 +806,9 @@ "SSE.Views.ShapeSettings.textPatternFill": "Узор", "SSE.Views.ShapeSettings.textRadial": "Радиальный", "SSE.Views.ShapeSettings.textSelectTexture": "Выбрать", - "SSE.Views.ShapeSettings.textStandartColors": "Стандартные цвета", "SSE.Views.ShapeSettings.textStretch": "Растяжение", "SSE.Views.ShapeSettings.textStyle": "Стиль", "SSE.Views.ShapeSettings.textTexture": "Из текстуры", - "SSE.Views.ShapeSettings.textThemeColors": "Цвета темы", "SSE.Views.ShapeSettings.textTile": "Плитка", "SSE.Views.ShapeSettings.txtBrownPaper": "Крафт-бумага", "SSE.Views.ShapeSettings.txtCanvas": "Холст", @@ -854,9 +867,7 @@ "SSE.Views.Statusbar.textCount": "КОЛИЧЕСТВО", "SSE.Views.Statusbar.textNewColor": "Пользовательский цвет", "SSE.Views.Statusbar.textNoColor": "Без цвета", - "SSE.Views.Statusbar.textStandartColors": "Стандартные цвета", "SSE.Views.Statusbar.textSum": "СУММА", - "SSE.Views.Statusbar.textThemeColors": "Цвета темы", "SSE.Views.Statusbar.tipAccessRights": "Управление правами доступа к документу", "SSE.Views.Statusbar.tipAddTab": "Добавить лист", "SSE.Views.Statusbar.tipFirst": "Прокрутить до первого листа", @@ -934,12 +945,10 @@ "SSE.Views.TextArtSettings.textPatternFill": "Узор", "SSE.Views.TextArtSettings.textRadial": "Радиальный", "SSE.Views.TextArtSettings.textSelectTexture": "Выбрать", - "SSE.Views.TextArtSettings.textStandartColors": "Стандартные цвета", "SSE.Views.TextArtSettings.textStretch": "Растяжение", "SSE.Views.TextArtSettings.textStyle": "Стиль", "SSE.Views.TextArtSettings.textTemplate": "Шаблон", "SSE.Views.TextArtSettings.textTexture": "Из текстуры", - "SSE.Views.TextArtSettings.textThemeColors": "Цвета темы", "SSE.Views.TextArtSettings.textTile": "Плитка", "SSE.Views.TextArtSettings.textTransform": "Трансформация", "SSE.Views.TextArtSettings.txtBrownPaper": "Крафт-бумага", @@ -999,8 +1008,6 @@ "SSE.Views.Toolbar.textRightBorders": "Правые границы", "SSE.Views.Toolbar.textRotateDown": "Повернуть текст вниз", "SSE.Views.Toolbar.textRotateUp": "Повернуть текст вверх", - "SSE.Views.Toolbar.textStandartColors": "Стандартные цвета", - "SSE.Views.Toolbar.textThemeColors": "Цвета темы", "SSE.Views.Toolbar.textTopBorders": "Верхние границы", "SSE.Views.Toolbar.textUnderline": "Подчеркнутый", "SSE.Views.Toolbar.textZoom": "Масштаб", From e160ed19975867a14e52290393a49556b9746139 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 16 Aug 2016 17:23:03 +0300 Subject: [PATCH 7/8] [SSE] Fix Bug 32961. --- apps/spreadsheeteditor/main/app/view/Toolbar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 55a2384cc..26b8d8cdc 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -328,7 +328,8 @@ define([ colorVal.css('background-color', btn.currentColor || 'transparent'); me.mnuBackColorPicker = new Common.UI.ThemeColorPalette({ - el: $('#id-toolbar-menu-paracolor') + el: $('#id-toolbar-menu-paracolor'), + transparent: true }); }); From 9c5b6f5ba5ae05d6949244a96b08923dbc1c4204 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 17 Aug 2016 14:55:28 +0300 Subject: [PATCH 8/8] [DE] Bug with mail merge: select locked paragraph, press Mail merge button on the toolbar, select xls file -> Mail merge settings on the right panel are not disabled (Insert Merge fields must be disabled). --- apps/documenteditor/main/app/controller/RightMenu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index f9072dcdc..0539710de 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -310,6 +310,7 @@ define([ this._settings[type].hidden = 0; this._settings[type].btn.setDisabled(false); this.rightmenu.SetActivePane(type, true); + this._settings[type].panel.setLocked(this._settings[type].locked); this._settings[type].panel.ChangeSettings.call(this._settings[type].panel); },