diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 52503867a..1dfdf981b 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -866,7 +866,8 @@ path += app + "/"; path += (config.type === "mobile" || isSafari_mobile) ? "mobile" - : (config.type === "embedded" || (app=='documenteditor') && config.document.permissions && (config.document.permissions.fillForms===true) && (config.document.permissions.edit === false) && (config.editorConfig.mode !== 'view')) + : (config.type === "embedded" || (app=='documenteditor') && config.document && config.document.permissions && (config.document.permissions.fillForms===true) && + (config.document.permissions.edit === false) && (config.document.permissions.review !== true) && (config.editorConfig.mode !== 'view')) ? "embed" : "main"; diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index 0efe310ff..15367696b 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -246,7 +246,9 @@ define([ 'modal:show': _onModalDialog.bind(this, 'open'), 'modal:close': _onModalDialog.bind(this, 'close') , 'uitheme:changed' : function (name) { - native.execCommand("uitheme:changed", name); + var theme = Common.UI.Themes.get(name); + if ( theme ) + native.execCommand("uitheme:changed", JSON.stringify({name:name, type:theme.type})); } }); } diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 7d41f09ff..e230a013d 100644 --- a/apps/common/main/lib/util/utils.js +++ b/apps/common/main/lib/util/utils.js @@ -641,6 +641,14 @@ Common.Utils.String = new (function() { var nTrailingChar = 0xDC00 | (nUnicode & 0x3FF); return String.fromCharCode(nLeadingChar) + String.fromCharCode(nTrailingChar); } + }, + + fixedDigits: function(num, digits, fill) { + (fill===undefined) && (fill = '0'); + var strfill = "", + str = num.toString(); + for (var i=str.length; i', '
', '', - '', + '', '', '', '
' diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon.png b/apps/common/main/resources/img/right-panels/rowscols_icon.png index 4936930c4..61ad3eb8f 100644 Binary files a/apps/common/main/resources/img/right-panels/rowscols_icon.png and b/apps/common/main/resources/img/right-panels/rowscols_icon.png differ diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png index ed7943a0b..b00e33d9f 100644 Binary files a/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png and b/apps/common/main/resources/img/right-panels/rowscols_icon@1.5x.png differ diff --git a/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png index 113f8835b..a2a69e6bd 100644 Binary files a/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png and b/apps/common/main/resources/img/right-panels/rowscols_icon@2x.png differ diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index d732bc597..b4a0128b6 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -222,49 +222,34 @@ textarea { .btn-edit-table, .btn-change-shape { - .background-ximage-v2('right-panels/rowscols_icon.png', 84px); + .background-ximage-v2('right-panels/rowscols_icon.png', 56px); margin-right: 2px !important; margin-bottom: 1px !important; + + background-position-x: calc(@button-small-normal-icon-offset-x - 8px); + + .btn-group.open &, + button.active:not(.disabled) &, + button:active:not(.disabled) & + { + background-position-x: calc(@button-small-active-icon-offset-x - 8px); + } } .btn-edit-table { - background-position: 0 0; + background-position-y: 0; button.over & { //background-position: -28px 0; } - - .btn-group.open &, - button.active:not(.disabled) &, - button:active:not(.disabled) & - { - //background-position: -56px 0; - } - - // TODO: not good, must be controled by variable - .theme-dark & { - background-position-x: -56px; - } } .btn-change-shape { - background-position: 0 -16px; + background-position-y: -16px; button.over & { //background-position: -28px -16px; } - - .btn-group.open &, - button.active:not(.disabled) &, - button:active:not(.disabled) & - { - //background-position: -56px -16px; - } - - // TODO: not good, must be controled by variable - .theme-dark & { - background-position-x: -56px; - } } .doc-content-color { diff --git a/apps/common/main/resources/less/loadmask.less b/apps/common/main/resources/less/loadmask.less index 3d7133631..19d53f109 100644 --- a/apps/common/main/resources/less/loadmask.less +++ b/apps/common/main/resources/less/loadmask.less @@ -49,6 +49,7 @@ .asc-loadmask-title { .fontsize(@font-size-large); margin: 0 8px 0 12px; + white-space: pre-wrap; } .left-panel & { diff --git a/apps/common/mobile/lib/controller/Plugins.jsx b/apps/common/mobile/lib/controller/Plugins.jsx index e4f889def..146407841 100644 --- a/apps/common/mobile/lib/controller/Plugins.jsx +++ b/apps/common/mobile/lib/controller/Plugins.jsx @@ -35,8 +35,6 @@ const PluginsController = inject('storeAppOptions')(observer(props => { api.asc_unregisterCallback("asc_onPluginClose", pluginClose); api.asc_unregisterCallback("asc_onPluginResize", pluginResize); api.asc_unregisterCallback('asc_onPluginsInit', onPluginsInit); - - Common.Gateway.off('init', loadConfig); }; }); @@ -46,7 +44,6 @@ const PluginsController = inject('storeAppOptions')(observer(props => { api.asc_pluginButtonClick(index); }; - const showPluginModal = (plugin, variationIndex, frameId, urlAddition) => { let isAndroid = Device.android; let variation = plugin.get_Variations()[variationIndex]; @@ -68,7 +65,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => { if ((storeAppOptions.isEdit || b.isViewer !== false)) { newBtns[index] = { text: b.text, - attributes: {result: index} + attributes: {result: index}, + close: false }; } }); @@ -123,8 +121,8 @@ const PluginsController = inject('storeAppOptions')(observer(props => { }; const pluginClose = plugin => { - if (iframe) { - iframe = null; + if (plugin) { + modal.close(); } }; diff --git a/apps/common/mobile/lib/controller/collaboration/Collaboration.jsx b/apps/common/mobile/lib/controller/collaboration/Collaboration.jsx index 8104543e3..6cb82db7c 100644 --- a/apps/common/mobile/lib/controller/collaboration/Collaboration.jsx +++ b/apps/common/mobile/lib/controller/collaboration/Collaboration.jsx @@ -17,6 +17,7 @@ class CollaborationController extends Component { api.asc_registerCallback('asc_OnTryUndoInFastCollaborative', this.onTryUndoInFastCollaborative.bind(this)); }); + Common.Notifications.on('api:disconnect', this.onCoAuthoringDisconnect.bind(this)); Common.Notifications.on('document:ready', this.onDocumentReady.bind(this)); } diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index b8292d970..1371c75b2 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -196,6 +196,9 @@ display: flex; flex-wrap: wrap; justify-content: space-around; + &::before, &::after { + display: none; + } } li { position: relative; @@ -784,9 +787,6 @@ input[type="number"]::-webkit-inner-spin-button { padding: 0; text-align: left; font-size: 16px; - span { - padding: 0; - } } } .picker-center-highlight { diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index e2aa0592d..bab462149 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -255,12 +255,15 @@ DE.ApplicationController = new(function(){ common.utils.dialogPrint(url, api); } - function onFillRequiredFields() { - if (btnSubmit) { + function onFillRequiredFields(isFilled) { + if (isFilled) { btnSubmit.removeAttr('disabled'); btnSubmit.css("pointer-events", "auto"); + // $requiredTooltip && $requiredTooltip.hide(); + } else { + btnSubmit.attr({disabled: true}); + btnSubmit.css("pointer-events", "none"); } - $requiredTooltip && $requiredTooltip.hide(); } function hidePreloader() { @@ -338,7 +341,7 @@ DE.ApplicationController = new(function(){ api.asc_registerCallback('asc_onDownloadUrl', onDownloadUrl); api.asc_registerCallback('asc_onPrint', onPrint); api.asc_registerCallback('asc_onPrintUrl', onPrintUrl); - api.asc_registerCallback('asc_onFillRequiredFields', onFillRequiredFields); + api.asc_registerCallback('sync_onAllRequiredFormsFilled', onFillRequiredFields); Common.Gateway.on('processmouse', onProcessMouse); Common.Gateway.on('downloadas', onDownloadAs); @@ -420,8 +423,8 @@ DE.ApplicationController = new(function(){ }); // TODO: add asc_hasRequiredFields to sdk - /* - if (appOptions.canSubmitForms && api.asc_hasRequiredFields()) { + + if (appOptions.canSubmitForms && !api.asc_IsAllRequiredFormsFilled()) { var sgroup = $('#id-submit-group'); btnSubmit.attr({disabled: true}); btnSubmit.css("pointer-events", "none"); @@ -432,6 +435,7 @@ DE.ApplicationController = new(function(){ $requiredTooltip.css({top : offset.top + btnSubmit.height() + 'px', left: offset.left + btnSubmit.outerWidth()/2 - $requiredTooltip.outerWidth() + 'px'}); $requiredTooltip.find('.close-div').on('click', function() { $requiredTooltip.hide(); + api.asc_MoveToFillingForm(true, true, true); common.localStorage.setItem("de-embed-hide-submittip", 1); sgroup.attr('data-toggle', 'tooltip'); sgroup.tooltip({ @@ -448,7 +452,6 @@ DE.ApplicationController = new(function(){ }); } } - */ var documentMoveTimer; var ismoved = false; diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index ba2a995f1..d1d9306a2 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -21,18 +21,18 @@ "DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "DE.ApplicationController.textAnonymous": "Anonymous", "DE.ApplicationController.textClear": "Clear All Fields", + "DE.ApplicationController.textGotIt": "Got it", "DE.ApplicationController.textGuest": "Guest", "DE.ApplicationController.textLoadingDocument": "Loading document", "DE.ApplicationController.textNext": "Next Field", "DE.ApplicationController.textOf": "of", + "DE.ApplicationController.textRequired": "Fill all required fields to send form.", "DE.ApplicationController.textSubmit": "Submit", "DE.ApplicationController.textSubmited": "Form submitted successfully
Click to close the tip", "DE.ApplicationController.txtClose": "Close", "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", - "DE.ApplicationController.textRequired": "Fill all required fields to send form.", - "DE.ApplicationController.textGotIt": "Got it", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtDownloadDocx": "Download as docx", "DE.ApplicationView.txtDownloadPdf": "Download as pdf", diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 9ef385626..43500dbdf 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -233,6 +233,18 @@ define([ }, onSubmitClick: function() { + if (!this.api.asc_IsAllRequiredFormsFilled()) { + var me = this; + Common.UI.warning({ + msg: this.view.textRequired, + callback: function() { + me.api.asc_MoveToFillingForm(true, true, true); + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + }); + return; + } + this.api.asc_SendForm(); Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index ae3ba4a75..1a3e619b7 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -942,7 +942,7 @@ define([ break; case LoadingDocument: - title = this.loadingDocumentTitleText; + title = this.loadingDocumentTitleText + ' '; text = this.loadingDocumentTextText; break; default: @@ -1246,7 +1246,7 @@ define([ onOpenDocument: function(progress) { var elem = document.getElementById('loadmask-text'); var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%'; + proc = this.textLoadingDocument + ': ' + Common.Utils.String.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + "%"; elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 8a36cc75b..a48fe02ad 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1227,8 +1227,12 @@ define([ onHorizontalAlign: function(type, btn, e) { this._state.pralign = undefined; - if (this.api) + if (this.api) { + if (!btn.pressed) { + type = (type==1) ? 3 : 1; + } this.api.put_PrAlign(type); + } Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.component.Analytics.trackEvent('ToolBar', 'Align'); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 97ad0f1bd..d087ec28f 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2378,6 +2378,7 @@ define([ properties.put_Width(originalImageSize.get_ImageWidth()); properties.put_Height(originalImageSize.get_ImageHeight()); properties.put_ResetCrop(true); + properties.put_Rot(0); me.api.ImgApply(properties); me.fireEvent('editcomplete', this); diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index fa93c0802..2437a1451 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -388,7 +388,8 @@ define([ tipPrevForm: 'Go to the previous field', tipNextForm: 'Go to the next field', tipSubmit: 'Submit form', - textSubmited: 'Form submitted successfully' + textSubmited: 'Form submitted successfully', + textRequired: 'Fill all required fields to send form.' } }()), DE.Views.FormsTab || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index f48827afc..9a754a41e 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -410,6 +410,7 @@ define([ properties.put_Width(w); properties.put_Height(h); properties.put_ResetCrop(true); + properties.put_Rot(0); this.api.ImgApply(properties); this.fireEvent('editcomplete', this); } diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 4637114d2..75278fe85 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -174,6 +174,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat el: $('#image-advanced-button-original-size') }); this.btnOriginalSize.on('click', _.bind(function(btn, e) { + this.spnAngle.setValue(0); this.spnWidth.setValue(this.sizeOriginal.width, true); this.spnHeight.setValue(this.sizeOriginal.height, true); this._nRatio = this.sizeOriginal.width/this.sizeOriginal.height; @@ -181,6 +182,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat this._changedProps.put_Height(Common.Utils.Metric.fnRecalcToMM(this.spnHeight.getNumberValue())); this._changedProps.put_Width(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); this._changedProps.put_ResetCrop(true); + this._changedProps.put_Rot(0); } }, this)); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 76b0d9fe5..534b5fad1 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -82,7 +82,7 @@ define([ * UI Components */ - this.SchemeNames = [ + this.SchemeNames = [ this.txtScheme22, this.txtScheme1, this.txtScheme2, this.txtScheme3, this.txtScheme4, this.txtScheme5, this.txtScheme6, this.txtScheme7, this.txtScheme8, this.txtScheme9, this.txtScheme10, this.txtScheme11, this.txtScheme12, this.txtScheme13, this.txtScheme14, this.txtScheme15, @@ -311,7 +311,6 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-align-left', enableToggle: true, - allowDepress: false, toggleGroup: 'alignGroup' }); this.paragraphControls.push(this.btnAlignLeft); @@ -321,7 +320,6 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-align-center', enableToggle: true, - allowDepress: false, toggleGroup: 'alignGroup' }); this.paragraphControls.push(this.btnAlignCenter); @@ -331,7 +329,6 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-align-right', enableToggle: true, - allowDepress: false, toggleGroup: 'alignGroup' }); this.paragraphControls.push(this.btnAlignRight); @@ -341,12 +338,10 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-align-just', enableToggle: true, - allowDepress: false, toggleGroup: 'alignGroup' }); this.paragraphControls.push(this.btnAlignJust); - this.btnDecLeftOffset = new Common.UI.Button({ id: 'id-toolbar-btn-decoffset', cls: 'btn-toolbar', @@ -2130,7 +2125,7 @@ define([ schemecolors.push(clr); } - if (index == 21) { + if (index == 22) { this.mnuColorSchema.addItem({ caption: '--' }); @@ -2140,7 +2135,7 @@ define([ template: itemTemplate, cls: 'color-schemas-menu', colors: schemecolors, - caption: (index < 21) ? (me.SchemeNames[index] || name) : name, + caption: (index < 22) ? (me.SchemeNames[index] || name) : name, value: index, checkable: true, toggleGroup: 'menuSchema' @@ -2471,7 +2466,8 @@ define([ mniCapitalizeWords: 'Capitalize Each Word', mniToggleCase: 'tOGGLE cASE', textChangeLevel: 'Change List Level', - mniTextToTable: 'Convert Text to Table' + mniTextToTable: 'Convert Text to Table', + txtScheme22: 'New Office' } })(), DE.Views.Toolbar || {})); }); diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json index 2a6409d74..cfe438cef 100644 --- a/apps/documenteditor/main/locale/el.json +++ b/apps/documenteditor/main/locale/el.json @@ -370,6 +370,7 @@ "Common.Views.ReviewChanges.txtCommentRemMy": "Αφαίρεση των Σχολίων Μου", "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Αφαίρεση Πρόσφατων Σχολίων Μου", "Common.Views.ReviewChanges.txtCommentRemove": "Αφαίρεση", + "Common.Views.ReviewChanges.txtCommentResolve": "Επίλυση", "Common.Views.ReviewChanges.txtCommentResolveAll": "Επίλυση όλων των σχολίων", "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Επίλυση των τρεχόντων σχολίων", "Common.Views.ReviewChanges.txtCommentResolveMy": "Επίλυση των σχολίων μου", @@ -1688,7 +1689,7 @@ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Θα χρειαστεί να αποδεχτείτε τις αλλαγές προτού τις δείτε", "DE.Views.FileMenuPanels.Settings.strFast": "Γρήγορη", "DE.Views.FileMenuPanels.Settings.strFontRender": "Βελτιστοποίηση Γραμματοσειράς", - "DE.Views.FileMenuPanels.Settings.strForcesave": "Πάντα να αποθηκεύεται σε διακομιστή (διαφορετικά αποθηκεύεται στο διακομιστή κατά το κλείσιμο του εγγράφου)", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Προσθήκη έκδοσης στο χώρο αποθήκευσης μετά την Αποθήκευση ή Ctrl+S", "DE.Views.FileMenuPanels.Settings.strInputMode": "Ενεργοποίηση ιερογλυφικών", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Ενεργοποίηση προβολής σχολίων", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Ρυθμίσεις Mακροεντολών", @@ -1710,7 +1711,7 @@ "DE.Views.FileMenuPanels.Settings.textAutoSave": "Αυτόματη αποθήκευση", "DE.Views.FileMenuPanels.Settings.textCompatible": "Συμβατότητα", "DE.Views.FileMenuPanels.Settings.textDisabled": "Απενεργοποιημένο", - "DE.Views.FileMenuPanels.Settings.textForceSave": "Αποθήκευση στον Διακομιστή", + "DE.Views.FileMenuPanels.Settings.textForceSave": "Αποθήκευση ενδιάμεσων εκδόσεων", "DE.Views.FileMenuPanels.Settings.textMinute": "Κάθε Λεπτό", "DE.Views.FileMenuPanels.Settings.textOldVersions": "Τα αρχεία να γίνονται συμβατά με παλαιότερες εκδόσεις MS Word όταν αποθηκεύονται ως DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "Προβολή Όλων", @@ -1745,6 +1746,7 @@ "DE.Views.FormSettings.textDisconnect": "Αποσύνδεση", "DE.Views.FormSettings.textDropDown": "Πτυσσόμενη Λίστα", "DE.Views.FormSettings.textField": "Πεδίο Κειμένου", + "DE.Views.FormSettings.textFixed": "Πεδίο σταθερού μεγέθους", "DE.Views.FormSettings.textFromFile": "Από Αρχείο", "DE.Views.FormSettings.textFromStorage": "Από Αποθηκευτικό Χώρο", "DE.Views.FormSettings.textFromUrl": "Από διεύθυνση URL", @@ -2473,8 +2475,13 @@ "DE.Views.TableSettingsAdvanced.txtNoBorders": "Χωρίς περιγράμματα", "DE.Views.TableSettingsAdvanced.txtPercent": "Επί τοις εκατό", "DE.Views.TableSettingsAdvanced.txtPt": "Σημείο", + "DE.Views.TableToTextDialog.textEmpty": "Πρέπει να εισάγετε έναν χαρακτήρα για το προσαρμοσμένο διαχωριστικό.", "DE.Views.TableToTextDialog.textNested": "Μετατροπή εμφωλευμένων πινάκων", "DE.Views.TableToTextDialog.textOther": "Άλλο", + "DE.Views.TableToTextDialog.textPara": "Σημεία παραγράφων", + "DE.Views.TableToTextDialog.textSemicolon": "Ερωτηματικό", + "DE.Views.TableToTextDialog.textSeparator": "Ξεχωρίστε το κείμενο με", + "DE.Views.TableToTextDialog.textTab": "Στηλοθέτες", "DE.Views.TableToTextDialog.textTitle": "Μετατροπή Πίνακα σε Κείμενο", "DE.Views.TextArtSettings.strColor": "Χρώμα", "DE.Views.TextArtSettings.strFill": "Γέμισμα", @@ -2502,10 +2509,15 @@ "DE.Views.TextToTableDialog.textAutofit": "Συμπεριφορά Αυτόματης Προσαρμογής", "DE.Views.TextToTableDialog.textColumns": "Στήλες", "DE.Views.TextToTableDialog.textContents": "Αυτόματη προσαρμογή στα περιεχόμενα", + "DE.Views.TextToTableDialog.textEmpty": "Πρέπει να εισάγετε έναν χαρακτήρα για το προσαρμοσμένο διαχωριστικό.", "DE.Views.TextToTableDialog.textFixed": "Σταθερό πλάτος στήλης", "DE.Views.TextToTableDialog.textOther": "Άλλο", "DE.Views.TextToTableDialog.textPara": "Παράγραφοι", "DE.Views.TextToTableDialog.textRows": "Γραμμές", + "DE.Views.TextToTableDialog.textSemicolon": "Ερωτηματικό", + "DE.Views.TextToTableDialog.textSeparator": "Ξεχωρίστε το κείμενο σε", + "DE.Views.TextToTableDialog.textTab": "Στηλοθέτες", + "DE.Views.TextToTableDialog.textTableSize": "Μέγεθος πίνακα", "DE.Views.TextToTableDialog.textTitle": "Μετατροπή Κειμένου σε Πίνακα", "DE.Views.TextToTableDialog.textWindow": "Αυτόματη προσαρμογή στο παράθυρο", "DE.Views.TextToTableDialog.txtAutoText": "Αυτόματα", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d6a5bcb78..22135ced5 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1689,7 +1689,7 @@ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", "DE.Views.FileMenuPanels.Settings.strFast": "Fast", "DE.Views.FileMenuPanels.Settings.strFontRender": "Font Hinting", - "DE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Add version to storage after clicking Save or Ctrl+S", "DE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Turn on display of the comments", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Macros Settings", @@ -1711,7 +1711,7 @@ "DE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave", "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibility", "DE.Views.FileMenuPanels.Settings.textDisabled": "Disabled", - "DE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server", + "DE.Views.FileMenuPanels.Settings.textForceSave": "Saving intermediate versions", "DE.Views.FileMenuPanels.Settings.textMinute": "Every Minute", "DE.Views.FileMenuPanels.Settings.textOldVersions": "Make the files compatible with older MS Word versions when saved as DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "View All", @@ -1783,6 +1783,7 @@ "DE.Views.FormsTab.textHighlight": "Highlight Settings", "DE.Views.FormsTab.textNewColor": "Add New Custom Color", "DE.Views.FormsTab.textNoHighlight": "No highlighting", + "DE.Views.FormsTab.textRequired": "Fill all required fields to send form.", "DE.Views.FormsTab.textSubmited": "Form submitted successfully", "DE.Views.FormsTab.tipCheckBox": "Insert checkbox", "DE.Views.FormsTab.tipComboBox": "Insert combo box", @@ -2721,6 +2722,7 @@ "DE.Views.Toolbar.txtScheme2": "Grayscale", "DE.Views.Toolbar.txtScheme20": "Urban", "DE.Views.Toolbar.txtScheme21": "Verve", + "DE.Views.Toolbar.txtScheme22": "New Office", "DE.Views.Toolbar.txtScheme3": "Apex", "DE.Views.Toolbar.txtScheme4": "Aspect", "DE.Views.Toolbar.txtScheme5": "Civic", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index 1f08bc52f..bb2a4e06d 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -182,7 +182,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.
Por favor haga clic para guardar sus cambios y recargue las actualizaciones.", "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar", "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema", - "Common.UI.Themes.txtThemeClassicLight": "Claro clásico", + "Common.UI.Themes.txtThemeClassicLight": "Clásico claro", "Common.UI.Themes.txtThemeDark": "Oscuro", "Common.UI.Themes.txtThemeLight": "Claro", "Common.UI.Window.cancelButtonText": "Cancelar", @@ -1689,7 +1689,7 @@ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Usted tendrá que aceptar los cambios antes de poder verlos", "DE.Views.FileMenuPanels.Settings.strFast": "rápido", "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting", - "DE.Views.FileMenuPanels.Settings.strForcesave": "Siempre guardar en el servidor (de lo contrario guardar en el servidor al cerrar documento)", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Añadir la versión al almacenamiento después de hacer clic en Guardar o Ctrl+S", "DE.Views.FileMenuPanels.Settings.strInputMode": "Activar jeroglíficos", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activar opción de demostración de comentarios", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Ajustes de macros", @@ -1711,7 +1711,7 @@ "DE.Views.FileMenuPanels.Settings.textAutoSave": "Guardar automáticamente", "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilidad", "DE.Views.FileMenuPanels.Settings.textDisabled": "Desactivado", - "DE.Views.FileMenuPanels.Settings.textForceSave": "Guardar al Servidor", + "DE.Views.FileMenuPanels.Settings.textForceSave": "Guardar versiones intermedias", "DE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto", "DE.Views.FileMenuPanels.Settings.textOldVersions": "Hacer que los archivos sean compatibles con versiones anteriores de MS Word cuando se guarden como DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "Ver todo", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 2a1df83ce..4452b337f 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -182,7 +182,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Le document a été modifié par un autre utilisateur.
Cliquez pour enregistrer vos modifications et recharger les mises à jour.", "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard", "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème", - "Common.UI.Themes.txtThemeClassicLight": "Clair classique", + "Common.UI.Themes.txtThemeClassicLight": "Classique clair", "Common.UI.Themes.txtThemeDark": "Sombre", "Common.UI.Themes.txtThemeLight": "Clair", "Common.UI.Window.cancelButtonText": "Annuler", @@ -1689,7 +1689,7 @@ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Avant de pouvoir afficher les modifications, vous avez besoin de les accépter ", "DE.Views.FileMenuPanels.Settings.strFast": "Rapide", "DE.Views.FileMenuPanels.Settings.strFontRender": "Hinting de la police", - "DE.Views.FileMenuPanels.Settings.strForcesave": "Toujours enregistrer sur le serveur ( sinon enregistrer sur le serveur lors de la fermeture du document )", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Ajouter une version à l'espace de stockage en cliquant Enregistrer ou Ctrl+S", "DE.Views.FileMenuPanels.Settings.strInputMode": "Activer des hiéroglyphes", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activer l'affichage des commentaires", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Réglages macros", @@ -1711,7 +1711,7 @@ "DE.Views.FileMenuPanels.Settings.textAutoSave": "Enregistrement automatique", "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilité", "DE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé", - "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur", + "DE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer des versions intermédiaires", "DE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute", "DE.Views.FileMenuPanels.Settings.textOldVersions": "Rendre les fichiers compatibles avec les anciennes versions de MS Word lorsqu'ils sont enregistrés au format DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "Surligner toutes les modifications", diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index 28ff2d255..711516688 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -182,7 +182,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "O documento foi alterado por outro usuário.
Clique para salvar suas alterações e recarregar as atualizações.", "Common.UI.ThemeColorPalette.textStandartColors": "Cores padronizadas", "Common.UI.ThemeColorPalette.textThemeColors": "Cores de tema", - "Common.UI.Themes.txtThemeClassicLight": "Claro clássico", + "Common.UI.Themes.txtThemeClassicLight": "Clássico claro", "Common.UI.Themes.txtThemeDark": "Escuro", "Common.UI.Themes.txtThemeLight": "Claro", "Common.UI.Window.cancelButtonText": "Cancelar", diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json index af2967761..895228b08 100644 --- a/apps/documenteditor/main/locale/ro.json +++ b/apps/documenteditor/main/locale/ro.json @@ -182,7 +182,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Documentul a fost modificat de către un alt utilizator.
Salvați modificările făcute de dumneavoastră și reîmprospătați documentul.", "Common.UI.ThemeColorPalette.textStandartColors": "Culori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Culori temă", - "Common.UI.Themes.txtThemeClassicLight": "Luminos Clasic", + "Common.UI.Themes.txtThemeClassicLight": "Clasic Luminos", "Common.UI.Themes.txtThemeDark": "Întunecat", "Common.UI.Themes.txtThemeLight": "Luminos", "Common.UI.Window.cancelButtonText": "Revocare", @@ -206,10 +206,12 @@ "Common.Views.About.txtVersion": "Versiune", "Common.Views.AutoCorrectDialog.textAdd": "Adaugă", "Common.Views.AutoCorrectDialog.textApplyText": "Se aplică în timp ce tastați", + "Common.Views.AutoCorrectDialog.textAutoCorrect": "AutoCorecție", "Common.Views.AutoCorrectDialog.textAutoFormat": "Formatare automată la tastare", "Common.Views.AutoCorrectDialog.textBulleted": "Creare automată a listei cu marcatori", "Common.Views.AutoCorrectDialog.textBy": "După", "Common.Views.AutoCorrectDialog.textDelete": "Ștergere", + "Common.Views.AutoCorrectDialog.textFLSentence": "Scrie cu majusculă prima literă a propoziției", "Common.Views.AutoCorrectDialog.textHyphens": "Cratime (--) cu linie de dialog (—)", "Common.Views.AutoCorrectDialog.textMathCorrect": "Autocorecție matematică", "Common.Views.AutoCorrectDialog.textNumbered": "Creare automată a listei numerotate", @@ -346,6 +348,8 @@ "Common.Views.ReviewChanges.tipCoAuthMode": "Activare modul de colaborare", "Common.Views.ReviewChanges.tipCommentRem": "Ștergere comentarii", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Se șterg aceste comentarii", + "Common.Views.ReviewChanges.tipCommentResolve": "Soluționare comentarii", + "Common.Views.ReviewChanges.tipCommentResolveCurrent": "Soluționarea comentariilor curente", "Common.Views.ReviewChanges.tipCompare": "Comparați acest document cu altul", "Common.Views.ReviewChanges.tipHistory": "Afișare istoricul versiunei", "Common.Views.ReviewChanges.tipRejectCurrent": "Respinge modificare", @@ -366,6 +370,11 @@ "Common.Views.ReviewChanges.txtCommentRemMy": "Se șterg comentariile mele", "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Se șterg comentariile mele curente", "Common.Views.ReviewChanges.txtCommentRemove": "Ștergere", + "Common.Views.ReviewChanges.txtCommentResolve": "Rezolvare", + "Common.Views.ReviewChanges.txtCommentResolveAll": "Marchează toate comentarii ca soluționate", + "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Soluționarea comentariilor curente", + "Common.Views.ReviewChanges.txtCommentResolveMy": "Soluționarea comentariilor mele", + "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Soluționarea comentariilor mele curente", "Common.Views.ReviewChanges.txtCompare": "Comparare", "Common.Views.ReviewChanges.txtDocLang": "Limbă", "Common.Views.ReviewChanges.txtFinal": "Toate modificările sunt acceptate (Previzualizare)", @@ -526,6 +535,7 @@ "DE.Controllers.Main.errorUsersExceed": "Limita de utilizatori stipulată de planul tarifar a fost depășită", "DE.Controllers.Main.errorViewerDisconnect": "Conexiunea a fost pierdută. Încă mai puteți vizualiza documentul,
dar nu și să-l descărcați sau imprimați până când conexiunea se restabilește și pagina se reîmprospătează.", "DE.Controllers.Main.leavePageText": "Nu ați salvat modificările din documentul. Faceți clic pe Rămâi în pagină și apoi pe Salvare dacă doriți să le salvați. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.", + "DE.Controllers.Main.leavePageTextOnClose": "Toate modificările nesalvate din documentul vor fi pierdute.
Pentru a le salva, faceți clic pe Revocare și apoi pe Salvare. Apăsați OK dacă doriți să renunțați la modificările nesalvate.", "DE.Controllers.Main.loadFontsTextText": "Încărcarea datelor...", "DE.Controllers.Main.loadFontsTitleText": "Încărcare date", "DE.Controllers.Main.loadFontTextText": "Încărcarea datelor...", @@ -581,6 +591,7 @@ "DE.Controllers.Main.textShape": "Forma", "DE.Controllers.Main.textStrict": "Modul strict", "DE.Controllers.Main.textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.
Faceți clic pe Modul strict ca să comutați la modul Strict de editare colaborativă și să nu intrați în conflict cu alte persoane. Toate modificările vor fi trimise numai după ce le salvați. Ulilizati Setări avansate ale editorului ca să comutați între moduri de editare colaborativă. ", + "DE.Controllers.Main.textTryUndoRedoWarn": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.", "DE.Controllers.Main.titleLicenseExp": "Licența a expirat", "DE.Controllers.Main.titleServerVersion": "Editorul a fost actualizat", "DE.Controllers.Main.titleUpdateVersion": "Versiunea s-a modificat", @@ -614,6 +625,7 @@ "DE.Controllers.Main.txtMissArg": "Argumentul lipsește", "DE.Controllers.Main.txtMissOperator": "Operatorul lipsește", "DE.Controllers.Main.txtNeedSynchronize": "Aveți actualizări disponibile", + "DE.Controllers.Main.txtNone": "Niciunul", "DE.Controllers.Main.txtNoTableOfContents": "Documentul nu are anteturi. Aplicați un stil de titlu pentru textul care va fi inclus în cuprins.", "DE.Controllers.Main.txtNoTableOfFigures": "Nu s-a găsit nici o rubrică din tabel de figuri", "DE.Controllers.Main.txtNoText": "Eroare! Textul formatat cu stilul specificat nu este găsit în document.", @@ -1677,7 +1689,7 @@ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Pentru a vizualiza modificările, trebuie mai întâi să le acceptați", "DE.Views.FileMenuPanels.Settings.strFast": "Rapid", "DE.Views.FileMenuPanels.Settings.strFontRender": "Sugestie font", - "DE.Views.FileMenuPanels.Settings.strForcesave": "Se salvează întotdeauna pe server (altfel utilizați metoda document close pentru salvare)", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Versiunea se adaugă la stocarea după ce faceți clic pe Salvare sau Ctrl+S", "DE.Views.FileMenuPanels.Settings.strInputMode": "Activare hieroglife", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Activarea afișare comentarii", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Setări macrocomandă", @@ -1699,7 +1711,7 @@ "DE.Views.FileMenuPanels.Settings.textAutoSave": "Salvare automată", "DE.Views.FileMenuPanels.Settings.textCompatible": "Compatibilitate", "DE.Views.FileMenuPanels.Settings.textDisabled": "Dezactivat", - "DE.Views.FileMenuPanels.Settings.textForceSave": "Salvare pe server", + "DE.Views.FileMenuPanels.Settings.textForceSave": "Salvarea versiunilor intermediare", "DE.Views.FileMenuPanels.Settings.textMinute": "La fiecare minută", "DE.Views.FileMenuPanels.Settings.textOldVersions": "Faceți ca fișierele salvate în formatul DOCX să fie compatibile cu versiunile mai vechi ale MS Word ", "DE.Views.FileMenuPanels.Settings.txtAll": "Vizualizare toate", @@ -1734,6 +1746,7 @@ "DE.Views.FormSettings.textDisconnect": "Deconectare", "DE.Views.FormSettings.textDropDown": "Derulant", "DE.Views.FormSettings.textField": "Câmp text", + "DE.Views.FormSettings.textFixed": "Câmpul cu dimensiunea fixă ", "DE.Views.FormSettings.textFromFile": "Din fișier", "DE.Views.FormSettings.textFromStorage": "Din serviciul stocare", "DE.Views.FormSettings.textFromUrl": "Prin URL-ul", @@ -1745,6 +1758,7 @@ "DE.Views.FormSettings.textNoBorder": "Fără bordură", "DE.Views.FormSettings.textPlaceholder": "Substituent", "DE.Views.FormSettings.textRadiobox": "Buton opțiune", + "DE.Views.FormSettings.textRequired": "Obligatoriu", "DE.Views.FormSettings.textSelectImage": "Selectați imaginea", "DE.Views.FormSettings.textTip": "Tip", "DE.Views.FormSettings.textTipAdd": "Se adaugă o valoare nouă", @@ -2356,6 +2370,7 @@ "DE.Views.TableSettings.textBorders": "Stil borduri", "DE.Views.TableSettings.textCellSize": "Dimensiune rânduri și coloane", "DE.Views.TableSettings.textColumns": "Coloane", + "DE.Views.TableSettings.textConvert": "Conversie tabel în text", "DE.Views.TableSettings.textDistributeCols": "Distribuire coloane", "DE.Views.TableSettings.textDistributeRows": "Distribuire rânduri", "DE.Views.TableSettings.textEdit": "Rânduri și coloane", @@ -2460,7 +2475,14 @@ "DE.Views.TableSettingsAdvanced.txtNoBorders": "Fără borduri", "DE.Views.TableSettingsAdvanced.txtPercent": "Procent", "DE.Views.TableSettingsAdvanced.txtPt": "Punct", + "DE.Views.TableToTextDialog.textEmpty": "Introduceți caracterul separator particularizat.", + "DE.Views.TableToTextDialog.textNested": "Conversia tabelelor imbricate", "DE.Views.TableToTextDialog.textOther": "Altă", + "DE.Views.TableToTextDialog.textPara": "Semne de paragraf", + "DE.Views.TableToTextDialog.textSemicolon": "Semicoloană", + "DE.Views.TableToTextDialog.textSeparator": "Separator", + "DE.Views.TableToTextDialog.textTab": "Tabulatori", + "DE.Views.TableToTextDialog.textTitle": "Conversie tabel în text", "DE.Views.TextArtSettings.strColor": "Culoare", "DE.Views.TextArtSettings.strFill": "Umplere", "DE.Views.TextArtSettings.strSize": "Dimensiune", @@ -2484,7 +2506,21 @@ "DE.Views.TextArtSettings.tipAddGradientPoint": "Adăugare stop gradient", "DE.Views.TextArtSettings.tipRemoveGradientPoint": "Eliminare stop gradient", "DE.Views.TextArtSettings.txtNoBorders": "Fără linie", + "DE.Views.TextToTableDialog.textAutofit": "Comportament potrivire automată", + "DE.Views.TextToTableDialog.textColumns": "Coloane", + "DE.Views.TextToTableDialog.textContents": "Potrivire automată conținut", + "DE.Views.TextToTableDialog.textEmpty": "Introduceți caracterul separator particularizat.", + "DE.Views.TextToTableDialog.textFixed": "Lățime fixă a coloanei", "DE.Views.TextToTableDialog.textOther": "Altă", + "DE.Views.TextToTableDialog.textPara": "Paragrafe", + "DE.Views.TextToTableDialog.textRows": "Rânduri", + "DE.Views.TextToTableDialog.textSemicolon": "Semicoloană", + "DE.Views.TextToTableDialog.textSeparator": "Separarea textului la", + "DE.Views.TextToTableDialog.textTab": "Tabulatori", + "DE.Views.TextToTableDialog.textTableSize": "Dimensiune tabel", + "DE.Views.TextToTableDialog.textTitle": "Conversie text în tabel", + "DE.Views.TextToTableDialog.textWindow": "Potrivire automată fereastră", + "DE.Views.TextToTableDialog.txtAutoText": "Automat", "DE.Views.Toolbar.capBtnAddComment": "Adaugă comentariu", "DE.Views.Toolbar.capBtnBlankPage": "Pagina necompletată", "DE.Views.Toolbar.capBtnColumns": "Coloane", @@ -2528,6 +2564,7 @@ "DE.Views.Toolbar.mniImageFromUrl": "Imaginea prin URL", "DE.Views.Toolbar.mniLowerCase": "minuscule", "DE.Views.Toolbar.mniSentenceCase": "Tip propoziție.", + "DE.Views.Toolbar.mniTextToTable": "Conversie text în tabel", "DE.Views.Toolbar.mniToggleCase": "cOMURARE LITERE MARI/MICI.", "DE.Views.Toolbar.mniUpperCase": "MAJUSCULE", "DE.Views.Toolbar.strMenuNoFill": "Fără umplere", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 0f4faf0aa..261e06c30 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -182,7 +182,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", - "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeClassicLight": "Классическая светлая", "Common.UI.Themes.txtThemeDark": "Темная", "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", @@ -1689,7 +1689,7 @@ "DE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Прежде чем вы сможете увидеть изменения, их надо будет принять", "DE.Views.FileMenuPanels.Settings.strFast": "Быстрый", "DE.Views.FileMenuPanels.Settings.strFontRender": "Хинтинг шрифтов", - "DE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Добавлять версию в хранилище после нажатия кнопки Сохранить или Ctrl+S", "DE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Включить отображение комментариев в тексте", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "Настройки макросов", @@ -1711,7 +1711,7 @@ "DE.Views.FileMenuPanels.Settings.textAutoSave": "Автосохранение", "DE.Views.FileMenuPanels.Settings.textCompatible": "Совместимость", "DE.Views.FileMenuPanels.Settings.textDisabled": "Отключено", - "DE.Views.FileMenuPanels.Settings.textForceSave": "Сохранять на сервере", + "DE.Views.FileMenuPanels.Settings.textForceSave": "Сохранение промежуточных версий", "DE.Views.FileMenuPanels.Settings.textMinute": "Каждую минуту", "DE.Views.FileMenuPanels.Settings.textOldVersions": "Сделать файлы совместимыми с более старыми версиями MS Word при сохранении как DOCX", "DE.Views.FileMenuPanels.Settings.txtAll": "Все", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index a88cbe0cc..e36c42a85 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -755,7 +755,7 @@ "DE.Controllers.Main.txtXAxis": "X轴", "DE.Controllers.Main.txtYAxis": "Y轴", "DE.Controllers.Main.txtZeroDivide": "除数为零", - "DE.Controllers.Main.unknownErrorText": "示知错误", + "DE.Controllers.Main.unknownErrorText": "未知错误", "DE.Controllers.Main.unsupportedBrowserErrorText": "您的浏览器不受支持", "DE.Controllers.Main.uploadDocExtMessage": "未知的文档格式", "DE.Controllers.Main.uploadDocFileCountMessage": "没有文档上载了", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index ee1e7ff8d..0492ef13d 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -134,14 +134,14 @@ }, "Toolbar": { "dlgLeaveTitleText": "You leave the application", - "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", + "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "leaveButtonText": "Leave this Page", "stayButtonText": "Stay on this Page" }, "Common": { "ThemeColorPalette": { "textThemeColors": "Theme Colors", - "textStandartColors": "Standart Colors", + "textStandartColors": "Standard Colors", "textCustomColors": "Custom Colors" }, "Collaboration": { diff --git a/apps/documenteditor/mobile/src/controller/Toolbar.jsx b/apps/documenteditor/mobile/src/controller/Toolbar.jsx index a0028b81c..79286c70a 100644 --- a/apps/documenteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/controller/Toolbar.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; -import { inject } from 'mobx-react'; +import { inject, observer } from 'mobx-react'; import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import ToolbarView from "../view/Toolbar"; -const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(props => { +const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(observer(props => { const {t} = useTranslation(); const _t = t("Toolbar", { returnObjects: true }); @@ -23,8 +23,6 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop api.asc_registerCallback('asc_onCanUndo', onApiCanUndo); api.asc_registerCallback('asc_onCanRedo', onApiCanRedo); api.asc_registerCallback('asc_onFocusObject', onApiFocusObject); - api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); - Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.on('toolbar:activatecontrols', activateControls); Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.on('goback', goBack); @@ -37,10 +35,15 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop onDocumentReady(); } + if (isDisconnected) { + f7.popover.close(); + f7.sheet.close(); + f7.popup.close(); + } + return () => { Common.Notifications.off('document:ready', onDocumentReady); Common.Notifications.off('setdoctitle', setDocTitle); - Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.off('toolbar:activatecontrols', activateControls); Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.off('goback', goBack); @@ -49,7 +52,6 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop api.asc_unregisterCallback('asc_onCanUndo', onApiCanUndo); api.asc_unregisterCallback('asc_onCanRedo', onApiCanRedo); api.asc_unregisterCallback('asc_onFocusObject', onApiFocusObject); - api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); } }); @@ -163,15 +165,6 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop } }; - const onCoAuthoringDisconnect = (enableDownload) => { - deactivateEditControls(enableDownload); - setCanUndo(false); - setCanRedo(false); - f7.popover.close(); - f7.sheet.close(); - f7.popup.close(); - }; - const [disabledControls, setDisabledControls] = useState(true); const activateControls = () => { setDisabledControls(false); @@ -200,8 +193,9 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeReview')(prop readerMode={readerMode} showEditDocument={showEditDocument} onEditDocument={onEditDocument} + isDisconnected={isDisconnected} /> ) -}); +})); export {ToolbarController as Toolbar}; \ No newline at end of file diff --git a/apps/documenteditor/mobile/src/controller/edit/EditImage.jsx b/apps/documenteditor/mobile/src/controller/edit/EditImage.jsx index 108056b23..ca94da190 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditImage.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditImage.jsx @@ -30,6 +30,7 @@ class EditImageController extends Component { properties.put_Width(imgSize.get_ImageWidth()); properties.put_Height(imgSize.get_ImageHeight()); properties.put_ResetCrop(true); + properties.put_Rot(0); api.ImgApply(properties); } } diff --git a/apps/documenteditor/mobile/src/controller/settings/Download.jsx b/apps/documenteditor/mobile/src/controller/settings/Download.jsx index a0d54ab35..81cfa0dfe 100644 --- a/apps/documenteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/Download.jsx @@ -25,6 +25,7 @@ class DownloadController extends Component { const _t = t("Settings", { returnObjects: true }); if(format) { + this.closeModal(); if (format == Asc.c_oAscFileType.TXT || format == Asc.c_oAscFileType.RTF) { f7.dialog.confirm( (format === Asc.c_oAscFileType.TXT) ? _t.textDownloadTxt : _t.textDownloadRtf, @@ -35,16 +36,18 @@ class DownloadController extends Component { onAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, api.asc_getAdvancedOptions(), 2, new Asc.asc_CDownloadOptions(format), _t, isDocReady, isDRM); } else { - api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + setTimeout(() => { + api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + }, 400); } } ); } else { - api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + setTimeout(() => { + api.asc_DownloadAs(new Asc.asc_CDownloadOptions(format)); + }, 400); } - - this.closeModal(); } } diff --git a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx index d0b1fe751..0dff72abe 100644 --- a/apps/documenteditor/mobile/src/controller/settings/Settings.jsx +++ b/apps/documenteditor/mobile/src/controller/settings/Settings.jsx @@ -19,11 +19,6 @@ const Settings = props => { } }); - const onviewclosed = () => { - if ( props.onclosed ) - props.onclosed(); - }; - const closeModal = () => { if (Device.phone) { f7.sheet.close('.settings-popup'); @@ -46,15 +41,14 @@ const Settings = props => { }; const onPrint = () => { + closeModal(); setTimeout(() => { Common.EditorApi.get().asc_Print(); - }, 1); - closeModal(); + }, 400); }; const showHelp = () => { let url = __HELP_URL__; - // let url = 'https://helpcenter.onlyoffice.com'; if (url.charAt(url.length-1) !== '/') { url += '/'; @@ -68,17 +62,21 @@ const Settings = props => { } closeModal(); - window.open(url, "_blank"); + setTimeout(() => { + window.open(url, "_blank"); + }, 400); }; const onOrthographyCheck = () => { closeModal(); - Common.EditorApi.get().asc_pluginRun("asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", 0); + setTimeout(() => { + Common.EditorApi.get().asc_pluginRun("asc.{B631E142-E40B-4B4C-90B9-2D00222A286E}", 0); + }, 400); }; return '); } + &.icon-prev { + width: 20px; + height: 20px; + .encoded-svg-background(''); + } + &.icon-next { + width: 20px; + height: 20px; + .encoded-svg-background(''); + } &.icon-expand-down { width: 22px; height: 22px; diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index 9bc3c3b24..a502fca1a 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -129,7 +129,7 @@ class MainPage extends Component { } { !this.state.settingsVisible ? null : - + } { !this.state.collaborationVisible ? null : diff --git a/apps/documenteditor/mobile/src/view/Toolbar.jsx b/apps/documenteditor/mobile/src/view/Toolbar.jsx index aa45f2793..6a801fdd1 100644 --- a/apps/documenteditor/mobile/src/view/Toolbar.jsx +++ b/apps/documenteditor/mobile/src/view/Toolbar.jsx @@ -4,14 +4,15 @@ import { Device } from '../../../../common/mobile/utils/device'; import EditorUIController from '../lib/patch' const ToolbarView = props => { - const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls; + const isDisconnected = props.isDisconnected; + const disableEditBtn = props.isObjectLocked || props.stateDisplayMode || props.disabledEditControls || isDisconnected; return ( {props.isShowBack && } {Device.ios && props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({ - disabledUndo: !props.isCanUndo, - disabledRedo: !props.isCanRedo, + disabledUndo: !props.isCanUndo || isDisconnected, + disabledRedo: !props.isCanRedo || isDisconnected, onUndoClick: props.onUndo, onRedoClick: props.onRedo })} diff --git a/apps/documenteditor/mobile/src/view/edit/Edit.jsx b/apps/documenteditor/mobile/src/view/edit/Edit.jsx index bd9bb4c7a..42001e455 100644 --- a/apps/documenteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/documenteditor/mobile/src/view/edit/Edit.jsx @@ -202,7 +202,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => { editors.length > 1 ?
{editors.map((item, index) => {item.caption})} - {isAndroid && } + {isAndroid && }
: { editors[0].caption } } diff --git a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx index a539c9339..6d0981d07 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditChart.jsx @@ -147,6 +147,7 @@ const PageStyle = props => { const types = storeChartSettings.types; const curType = chartProperties ? chartProperties.getType() : null; const chartStyles = storeChartSettings.chartStyles; + const isAndroid = Device.android; // console.log(chartStyles, curType); // console.log(Asc.c_oAscChartTypeSettings.comboBarLine, Asc.c_oAscChartTypeSettings.comboBarLineSecondary, Asc.c_oAscChartTypeSettings.comboAreaBar, Asc.c_oAscChartTypeSettings.comboCustom); @@ -184,6 +185,7 @@ const PageStyle = props => { {chartStyles ? {_t.textStyle} : null} {_t.textFill} {_t.textBorder} + {isAndroid && } {Device.phone && diff --git a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx index 227dc6f1f..b4c785b50 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditShape.jsx @@ -144,6 +144,7 @@ const PageStyle = props => { const _t = t('Edit', {returnObjects: true}); const storeShapeSettings = props.storeShapeSettings; const shapeObject = props.storeFocusObjects.shapeObject; + const isAndroid = Device.android; let borderSize, borderType, transparent; if (shapeObject) { @@ -177,9 +178,10 @@ const PageStyle = props => {
- {_t.textFill} - {_t.textBorder} - {_t.textEffects} + {_t.textFill} + {_t.textBorder} + {_t.textEffects} + {isAndroid && }
{Device.phone && diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx index 528c3bf23..d17639b5b 100644 --- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx @@ -466,6 +466,7 @@ const PageStyle = props => { const _t = t('Edit', {returnObjects: true}); const storeTableSettings = props.storeTableSettings; const templates = storeTableSettings.styles; + const isAndroid = Device.android; const tableObject = props.storeFocusObjects.tableObject; if (!tableObject && Device.phone) { @@ -477,9 +478,10 @@ const PageStyle = props => {
- {_t.textStyle} - {_t.textFill} - {_t.textBorder} + {_t.textStyle} + {_t.textFill} + {_t.textBorder} + {isAndroid && }
{Device.phone && diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 6326bf485..2cbff6ff1 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -691,7 +691,7 @@ define([ break; case LoadingDocument: - title = this.loadingDocumentTitleText; + title = this.loadingDocumentTitleText + ' '; text = this.loadingDocumentTextText; break; default: @@ -981,7 +981,7 @@ define([ onOpenDocument: function(progress) { var elem = document.getElementById('loadmask-text'); var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%'; + proc = this.textLoadingDocument + ': ' + Common.Utils.String.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + "%"; elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); }, diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 71a7fc834..9285ce0ee 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2887,6 +2887,7 @@ define([ properties.put_Width(originalImageSize.get_ImageWidth()); properties.put_Height(originalImageSize.get_ImageHeight()); properties.put_ResetCrop(true); + properties.put_Rot(0); me.api.ImgApply(properties); } diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 343e8e852..f5c6bcac8 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -300,6 +300,7 @@ define([ properties.put_Width(w); properties.put_Height(h); properties.put_ResetCrop(true); + properties.put_Rot(0); this.api.ImgApply(properties); this.fireEvent('editcomplete', this); } diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index d475e0f7a..54a874037 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -133,6 +133,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem el: $('#image-advanced-button-original-size') }); this.btnOriginalSize.on('click', _.bind(function(btn, e) { + this.spnAngle.setValue(0); this.spnWidth.setValue(this.sizeOriginal.width, true); this.spnHeight.setValue(this.sizeOriginal.height, true); this._nRatio = this.sizeOriginal.width/this.sizeOriginal.height; diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 2cfc5e353..8fc62a9cd 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -104,7 +104,7 @@ define([ me.synchTooltip = undefined; me.needShowSynchTip = false; - me.SchemeNames = [ + me.SchemeNames = [me.txtScheme22, me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5, me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10, me.txtScheme11, me.txtScheme12, me.txtScheme13, me.txtScheme14, me.txtScheme15, @@ -1444,7 +1444,7 @@ define([ schemecolors.push(clr); } - if (index == 21) { + if (index == 22) { mnuColorSchema.addItem({ caption: '--' }); @@ -1454,7 +1454,7 @@ define([ template: itemTemplate, cls: 'color-schemas-menu', colors: schemecolors, - caption: (index < 21) ? (me.SchemeNames[index] || name) : name, + caption: (index < 22) ? (me.SchemeNames[index] || name) : name, value: index, checkable: true, toggleGroup: 'menuSchema' @@ -1815,7 +1815,8 @@ define([ mniCapitalizeWords: 'Capitalize Each Word', mniToggleCase: 'tOGGLE cASE', strMenuNoFill: 'No Fill', - tipHighlightColor: 'Highlight color' + tipHighlightColor: 'Highlight color', + txtScheme22: 'New Office' } }()), PE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index a4d838038..8728d69f5 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -1182,7 +1182,7 @@ "PE.Views.DocumentHolder.txtBorderProps": "Rahmeneigenschaften", "PE.Views.DocumentHolder.txtBottom": "Unten", "PE.Views.DocumentHolder.txtChangeLayout": "Layout ändern", - "PE.Views.DocumentHolder.txtChangeTheme": "Thema ändern", + "PE.Views.DocumentHolder.txtChangeTheme": "Design ändern", "PE.Views.DocumentHolder.txtColumnAlign": "Spaltenausrichtung", "PE.Views.DocumentHolder.txtDecreaseArg": "Argumentgröße reduzieren", "PE.Views.DocumentHolder.txtDeleteArg": "Argument löschen", diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index 6f73c9965..c5fe20844 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -1088,7 +1088,7 @@ "PE.Views.DocumentHolder.addCommentText": "Προσθήκη Σχολίου", "PE.Views.DocumentHolder.addToLayoutText": "Προσθήκη στη Διάταξη", "PE.Views.DocumentHolder.advancedImageText": "Προηγμένες Ρυθμίσεις Εικόνας", - "PE.Views.DocumentHolder.advancedParagraphText": "Προηγμένες Ρυθμίσεις Κειμένου", + "PE.Views.DocumentHolder.advancedParagraphText": "Προηγμένες Ρυθμίσεις Παραγράφου", "PE.Views.DocumentHolder.advancedShapeText": "Προηγμένες Ρυθμίσεις Σχήματος", "PE.Views.DocumentHolder.advancedTableText": "Προηγμένες Ρυθμίσεις Πίνακα", "PE.Views.DocumentHolder.alignmentText": "Στοίχιση", @@ -1334,7 +1334,7 @@ "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Θα χρειαστεί να αποδεχτείτε αλλαγές πριν να τις δείτε", "PE.Views.FileMenuPanels.Settings.strFast": "Γρήγορη", "PE.Views.FileMenuPanels.Settings.strFontRender": "Βελτιστοποίηση Γραμματοσειράς", - "PE.Views.FileMenuPanels.Settings.strForcesave": "Πάντα να αποθηκεύεται σε διακομιστή (διαφορετικά αποθηκεύεται στο διακομιστή κατά το κλείσιμο του εγγράφου)", + "PE.Views.FileMenuPanels.Settings.strForcesave": "Προσθήκη έκδοσης στο χώρο αποθήκευσης μετά την Αποθήκευση ή Ctrl+S", "PE.Views.FileMenuPanels.Settings.strInputMode": "Ενεργοποίηση ιερογλυφικών", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Ρυθμίσεις Mακροεντολών", "PE.Views.FileMenuPanels.Settings.strPaste": "Αποκοπή, αντιγραφή και επικόλληση", @@ -1353,7 +1353,7 @@ "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Αυτόματη ανάκτηση", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Αυτόματη αποθήκευση", "PE.Views.FileMenuPanels.Settings.textDisabled": "Απενεργοποιημένο", - "PE.Views.FileMenuPanels.Settings.textForceSave": "Αποθήκευση στον Διακομιστή", + "PE.Views.FileMenuPanels.Settings.textForceSave": "Αποθήκευση ενδιάμεσων εκδόσεων", "PE.Views.FileMenuPanels.Settings.textMinute": "Κάθε Λεπτό", "PE.Views.FileMenuPanels.Settings.txtAll": "Προβολή Όλων", "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Επιλογής αυτόματης διόρθωσης...", @@ -1509,7 +1509,7 @@ "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Αυτόματα", "PE.Views.RightMenu.txtChartSettings": "Ρυθμίσεις γραφήματος", "PE.Views.RightMenu.txtImageSettings": "Ρυθμίσεις εικόνας", - "PE.Views.RightMenu.txtParagraphSettings": "Ρυθμίσεις κειμένου", + "PE.Views.RightMenu.txtParagraphSettings": "Ρυθμίσεις Παραγράφου", "PE.Views.RightMenu.txtShapeSettings": "Ρυθμίσεις σχήματος", "PE.Views.RightMenu.txtSignatureSettings": "Ρυθμίσεις υπογραφής", "PE.Views.RightMenu.txtSlideSettings": "Ρυθμίσεις διαφάνειας", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index f286defe2..922388c7c 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1334,7 +1334,7 @@ "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", "PE.Views.FileMenuPanels.Settings.strFast": "Fast", "PE.Views.FileMenuPanels.Settings.strFontRender": "Font Hinting", - "PE.Views.FileMenuPanels.Settings.strForcesave": "Always save to server (otherwise save to server on document close)", + "PE.Views.FileMenuPanels.Settings.strForcesave": "Add version to storage after clicking Save or Ctrl+S", "PE.Views.FileMenuPanels.Settings.strInputMode": "Turn on hieroglyphs", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Macros Settings", "PE.Views.FileMenuPanels.Settings.strPaste": "Cut, copy and paste", @@ -1353,7 +1353,7 @@ "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorecover", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Autosave", "PE.Views.FileMenuPanels.Settings.textDisabled": "Disabled", - "PE.Views.FileMenuPanels.Settings.textForceSave": "Save to Server", + "PE.Views.FileMenuPanels.Settings.textForceSave": "Saving intermediate versions", "PE.Views.FileMenuPanels.Settings.textMinute": "Every Minute", "PE.Views.FileMenuPanels.Settings.txtAll": "View All", "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "AutoCorrect options...", @@ -1988,6 +1988,7 @@ "PE.Views.Toolbar.txtScheme2": "Grayscale", "PE.Views.Toolbar.txtScheme20": "Urban", "PE.Views.Toolbar.txtScheme21": "Verve", + "PE.Views.Toolbar.txtScheme22": "New Office", "PE.Views.Toolbar.txtScheme3": "Apex", "PE.Views.Toolbar.txtScheme4": "Aspect", "PE.Views.Toolbar.txtScheme5": "Civic", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 120196578..69f1d3545 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -75,7 +75,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.
Por favor haga clic para guardar sus cambios y recargue las actualizaciones.", "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar", "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema", - "Common.UI.Themes.txtThemeClassicLight": "Claro clásico", + "Common.UI.Themes.txtThemeClassicLight": "Clásico claro", "Common.UI.Themes.txtThemeDark": "Oscuro", "Common.UI.Themes.txtThemeLight": "Claro", "Common.UI.Window.cancelButtonText": "Cancelar", @@ -1088,7 +1088,7 @@ "PE.Views.DocumentHolder.addCommentText": "Añadir comentario", "PE.Views.DocumentHolder.addToLayoutText": "Añadir al Diseño", "PE.Views.DocumentHolder.advancedImageText": "Ajustes avanzados de imagen", - "PE.Views.DocumentHolder.advancedParagraphText": "Ajustes avanzados de texto", + "PE.Views.DocumentHolder.advancedParagraphText": "Ajustes avanzados de párrafo", "PE.Views.DocumentHolder.advancedShapeText": "Ajustes avanzados de forma", "PE.Views.DocumentHolder.advancedTableText": "Ajustes avanzados de tabla", "PE.Views.DocumentHolder.alignmentText": "Alineación", @@ -1334,7 +1334,7 @@ "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Usted tendrá que aceptar los cambios antes de poder verlos", "PE.Views.FileMenuPanels.Settings.strFast": "rápido", "PE.Views.FileMenuPanels.Settings.strFontRender": "Hinting", - "PE.Views.FileMenuPanels.Settings.strForcesave": "Siempre guardar en el servidor (de lo contrario guardar en el servidor al cerrar documento)", + "PE.Views.FileMenuPanels.Settings.strForcesave": "Añadir la versión al almacenamiento después de hacer clic en Guardar o Ctrl+S", "PE.Views.FileMenuPanels.Settings.strInputMode": "Activar jeroglíficos", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Ajustes de macros", "PE.Views.FileMenuPanels.Settings.strPaste": "Cortar, copiar y pegar", @@ -1353,7 +1353,7 @@ "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Autorrecuperación", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Guardar automáticamente", "PE.Views.FileMenuPanels.Settings.textDisabled": "Desactivado", - "PE.Views.FileMenuPanels.Settings.textForceSave": "Guardar al servidor", + "PE.Views.FileMenuPanels.Settings.textForceSave": "Guardar versiones intermedias", "PE.Views.FileMenuPanels.Settings.textMinute": "Cada minuto", "PE.Views.FileMenuPanels.Settings.txtAll": "Ver todo", "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opciones de autocorrección", @@ -1509,7 +1509,7 @@ "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", "PE.Views.RightMenu.txtChartSettings": "Ajustes de gráfico", "PE.Views.RightMenu.txtImageSettings": "Ajustes de imagen", - "PE.Views.RightMenu.txtParagraphSettings": "Ajustes de texto", + "PE.Views.RightMenu.txtParagraphSettings": "Ajustes de párrafo", "PE.Views.RightMenu.txtShapeSettings": "Ajustes de forma", "PE.Views.RightMenu.txtSignatureSettings": "Configuración de firma", "PE.Views.RightMenu.txtSlideSettings": "Ajustes de diapositiva", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index bf28fbc38..0e10003f8 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -75,7 +75,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Le document a été modifié par un autre utilisateur.
Cliquez pour enregistrer vos modifications et recharger les mises à jour.", "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard", "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème", - "Common.UI.Themes.txtThemeClassicLight": "Clair classique", + "Common.UI.Themes.txtThemeClassicLight": "Classique clair", "Common.UI.Themes.txtThemeDark": "Sombre", "Common.UI.Themes.txtThemeLight": "Clair", "Common.UI.Window.cancelButtonText": "Annuler", @@ -1334,7 +1334,7 @@ "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Avant de pouvoir afficher les modifications, vous avez besoin de les accépter ", "PE.Views.FileMenuPanels.Settings.strFast": "Rapide", "PE.Views.FileMenuPanels.Settings.strFontRender": "Hinting de la police", - "PE.Views.FileMenuPanels.Settings.strForcesave": "Toujours enregistrer sur le serveur ( sinon enregistrer sur le serveur lors de la fermeture du document )", + "PE.Views.FileMenuPanels.Settings.strForcesave": "Ajouter une version dans l'espace de stockage en cliquant Enregistrer ou Ctrl+S", "PE.Views.FileMenuPanels.Settings.strInputMode": "Activer les hiéroglyphes", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Réglages macros", "PE.Views.FileMenuPanels.Settings.strPaste": "Couper, copier et coller", @@ -1353,7 +1353,7 @@ "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Récupération automatique", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Enregistrement automatique", "PE.Views.FileMenuPanels.Settings.textDisabled": "Désactivé", - "PE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer sur le serveur", + "PE.Views.FileMenuPanels.Settings.textForceSave": "Enregistrer des versions intermédiaires", "PE.Views.FileMenuPanels.Settings.textMinute": "Chaque minute", "PE.Views.FileMenuPanels.Settings.txtAll": "Surligner toutes les modifications", "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Options de correction automatique", @@ -1509,7 +1509,7 @@ "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", "PE.Views.RightMenu.txtChartSettings": "Paramètres du graphique", "PE.Views.RightMenu.txtImageSettings": "Paramètres de l'image", - "PE.Views.RightMenu.txtParagraphSettings": "Paramètres du texte", + "PE.Views.RightMenu.txtParagraphSettings": "Paramètres du paragraphe", "PE.Views.RightMenu.txtShapeSettings": "Paramètres de la forme", "PE.Views.RightMenu.txtSignatureSettings": "Paramètre de signature", "PE.Views.RightMenu.txtSlideSettings": "Paramètres de la diapositive", diff --git a/apps/presentationeditor/main/locale/pt.json b/apps/presentationeditor/main/locale/pt.json index 989ee5dcd..53d18946d 100644 --- a/apps/presentationeditor/main/locale/pt.json +++ b/apps/presentationeditor/main/locale/pt.json @@ -75,7 +75,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "O documento foi alterado por outro usuário.
Clique para salvar suas alterações e recarregar as atualizações.", "Common.UI.ThemeColorPalette.textStandartColors": "Cores padrão", "Common.UI.ThemeColorPalette.textThemeColors": "Cores do tema", - "Common.UI.Themes.txtThemeClassicLight": "Claro clássico", + "Common.UI.Themes.txtThemeClassicLight": "Clássico claro", "Common.UI.Themes.txtThemeDark": "Escuro", "Common.UI.Themes.txtThemeLight": "Claro", "Common.UI.Window.cancelButtonText": "Cancelar", @@ -1088,7 +1088,7 @@ "PE.Views.DocumentHolder.addCommentText": "Adicionar comentário", "PE.Views.DocumentHolder.addToLayoutText": "Adicionar ao Layout", "PE.Views.DocumentHolder.advancedImageText": "Configurações avançadas de imagem", - "PE.Views.DocumentHolder.advancedParagraphText": "Configurações avançadas de texto", + "PE.Views.DocumentHolder.advancedParagraphText": "Configurações avançadas de parágrafo", "PE.Views.DocumentHolder.advancedShapeText": "Configurações avançadas de forma", "PE.Views.DocumentHolder.advancedTableText": "Configurações avançadas de tabela", "PE.Views.DocumentHolder.alignmentText": "Alinhamento", @@ -1509,7 +1509,7 @@ "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automático", "PE.Views.RightMenu.txtChartSettings": "Configurações do gráfico", "PE.Views.RightMenu.txtImageSettings": "Configurações de imagem", - "PE.Views.RightMenu.txtParagraphSettings": "Configurações de texto", + "PE.Views.RightMenu.txtParagraphSettings": "Configurações do parágrafo", "PE.Views.RightMenu.txtShapeSettings": "Configurações da forma", "PE.Views.RightMenu.txtSignatureSettings": "Configurações de Assinatura", "PE.Views.RightMenu.txtSlideSettings": "Configurações de slide", diff --git a/apps/presentationeditor/main/locale/ro.json b/apps/presentationeditor/main/locale/ro.json index f93fc2faa..e8febcf90 100644 --- a/apps/presentationeditor/main/locale/ro.json +++ b/apps/presentationeditor/main/locale/ro.json @@ -75,7 +75,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Documentul a fost modificat de către un alt utilizator.
Salvați modificările făcute de dumneavoastră și reîmprospătați documentul.", "Common.UI.ThemeColorPalette.textStandartColors": "Culori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Culori temă", - "Common.UI.Themes.txtThemeClassicLight": "Luminos Clasic", + "Common.UI.Themes.txtThemeClassicLight": "Clasic Luminos", "Common.UI.Themes.txtThemeDark": "Întunecat", "Common.UI.Themes.txtThemeLight": "Luminos", "Common.UI.Window.cancelButtonText": "Anulare", @@ -99,10 +99,12 @@ "Common.Views.About.txtVersion": "Versiune", "Common.Views.AutoCorrectDialog.textAdd": "Adaugă", "Common.Views.AutoCorrectDialog.textApplyText": "Se aplică în timp ce tastați", + "Common.Views.AutoCorrectDialog.textAutoCorrect": "AutoCorecție", "Common.Views.AutoCorrectDialog.textAutoFormat": "Formatare automată la tastare", "Common.Views.AutoCorrectDialog.textBulleted": "Creare automată a listei cu marcatori", "Common.Views.AutoCorrectDialog.textBy": "După", "Common.Views.AutoCorrectDialog.textDelete": "Ștergere", + "Common.Views.AutoCorrectDialog.textFLSentence": "Scrie cu majusculă prima literă a propoziției", "Common.Views.AutoCorrectDialog.textHyphens": "Cratime (--) cu linie de dialog (—)", "Common.Views.AutoCorrectDialog.textMathCorrect": "Autocorecție matematică", "Common.Views.AutoCorrectDialog.textNumbered": "Creare automată a listei numerotate", @@ -154,6 +156,7 @@ "Common.Views.Header.textBack": "Deschidere locația fișierului", "Common.Views.Header.textCompactView": "Ascundere bară de instrumente", "Common.Views.Header.textHideLines": "Ascundere rigle", + "Common.Views.Header.textHideNotes": "Ascunde notele", "Common.Views.Header.textHideStatusBar": "Ascundere bară de stare", "Common.Views.Header.textRemoveFavorite": "Eliminare din Preferințe", "Common.Views.Header.textSaveBegin": "Salvare în progres...", @@ -239,6 +242,8 @@ "Common.Views.ReviewChanges.tipCoAuthMode": "Activare modul de colaborare", "Common.Views.ReviewChanges.tipCommentRem": "Ștergere comentarii", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Se șterg aceste comentarii", + "Common.Views.ReviewChanges.tipCommentResolve": "Soluționare comentarii", + "Common.Views.ReviewChanges.tipCommentResolveCurrent": "Soluționarea comentariilor curente", "Common.Views.ReviewChanges.tipHistory": "Afișare istoricul versiunei", "Common.Views.ReviewChanges.tipRejectCurrent": "Respinge modificare", "Common.Views.ReviewChanges.tipReview": "Urmărirea modificărilor", @@ -258,6 +263,11 @@ "Common.Views.ReviewChanges.txtCommentRemMy": "Se șterg comentariile mele", "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Se șterg comentariile mele curente", "Common.Views.ReviewChanges.txtCommentRemove": "Ștergere", + "Common.Views.ReviewChanges.txtCommentResolve": "Rezolvare", + "Common.Views.ReviewChanges.txtCommentResolveAll": "Marchează toate comentarii ca soluționate", + "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Soluționarea comentariilor curente", + "Common.Views.ReviewChanges.txtCommentResolveMy": "Soluționarea comentariilor mele", + "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Soluționarea comentariilor mele curente", "Common.Views.ReviewChanges.txtDocLang": "Limbă", "Common.Views.ReviewChanges.txtFinal": "Toate modificările sunt acceptate (Previzualizare)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -344,9 +354,11 @@ "Common.Views.UserNameDialog.textDontShow": "Nu mai întreabă", "Common.Views.UserNameDialog.textLabel": "Etichetă:", "Common.Views.UserNameDialog.textLabelError": "Etichetă trebuie completată", + "PE.Controllers.LeftMenu.leavePageText": "Toate modificările nesalvate din documentul vor fi pierdute.
Pentru a le salva, faceți clic pe Revocare și apoi pe Salvare. Apăsați OK dacă doriți să renunțați la modificările nesalvate.", "PE.Controllers.LeftMenu.newDocumentTitle": "Prezentare fără titlu", "PE.Controllers.LeftMenu.notcriticalErrorTitle": "Avertisment", "PE.Controllers.LeftMenu.requestEditRightsText": "Solicitarea permisiunii pentru editare...", + "PE.Controllers.LeftMenu.textLoadHistory": "Încărcarea istoricului versiunii...", "PE.Controllers.LeftMenu.textNoTextFound": "Datele căutate nu au fost găsite. Alegeți alte opțiuni de căutare.", "PE.Controllers.LeftMenu.textReplaceSkipped": "A avut loc o înlocuire. {0} apariții ignorate.", "PE.Controllers.LeftMenu.textReplaceSuccess": "Căutarea a fost finalizată. Înlocuiri: {0}", @@ -391,6 +403,7 @@ "PE.Controllers.Main.errorUsersExceed": "Limita de utilizatori stipulată de planul tarifar a fost depășită", "PE.Controllers.Main.errorViewerDisconnect": "Conexiunea a fost pierdută. Încă mai puteți vizualiza documentul,
dar nu și să-l descărcați sau imprimați până când conexiunea se restabilește și pagina se reîmprospătează.", "PE.Controllers.Main.leavePageText": "Nu ați salvat modificările din prezentarea. Faceți clic pe \"Rămâi în pagină\" și apoi pe Salvare dacă doriți să le salvați. Faceți clic pe 'Părăsește aceasta pagina' ca să renunțați la toate modificările nesalvate.", + "PE.Controllers.Main.leavePageTextOnClose": "Toate modificările vor fi pierdute dacă nu au fost salvate.
Faceți clic pe Anulare și apoi pe Salvează ca să le salvați. Faceți clic pe OK ca să renunțați la toate modificările nesalvate.", "PE.Controllers.Main.loadFontsTextText": "Încărcarea datelor...", "PE.Controllers.Main.loadFontsTitleText": "Încărcare date", "PE.Controllers.Main.loadFontTextText": "Încărcarea datelor...", @@ -441,6 +454,7 @@ "PE.Controllers.Main.textShape": "Forma", "PE.Controllers.Main.textStrict": "Modul strict", "PE.Controllers.Main.textTryUndoRedo": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.
Faceți clic pe Modul strict ca să comutați la modul Strict de editare colaborativă și să nu intrați în conflict cu alte persoane. Toate modificările vor fi trimise numai după ce le salvați. Ulilizati Setări avansate ale editorului ca să comutați între moduri de editare colaborativă. ", + "PE.Controllers.Main.textTryUndoRedoWarn": "Funcții Anulare/Refacere sunt dezactivate în modul Rapid de editare colaborativă.", "PE.Controllers.Main.titleLicenseExp": "Licența a expirat", "PE.Controllers.Main.titleServerVersion": "Editorul a fost actualizat", "PE.Controllers.Main.txtAddFirstSlide": "Faceți clic pentru a adăuga primul diapozitiv", @@ -455,6 +469,7 @@ "PE.Controllers.Main.txtDiagram": "SmartArt", "PE.Controllers.Main.txtDiagramTitle": "Titlu diagramă", "PE.Controllers.Main.txtEditingMode": "Setare modul de editare...", + "PE.Controllers.Main.txtErrorLoadHistory": "Încărcarea istoricului a eșuat", "PE.Controllers.Main.txtFiguredArrows": "Săgeți în forme diferite", "PE.Controllers.Main.txtFooter": "Subsol", "PE.Controllers.Main.txtHeader": "Antet", @@ -464,6 +479,7 @@ "PE.Controllers.Main.txtMath": "Matematica", "PE.Controllers.Main.txtMedia": "Media", "PE.Controllers.Main.txtNeedSynchronize": "Aveți actualizări disponibile", + "PE.Controllers.Main.txtNone": "Niciunul", "PE.Controllers.Main.txtPicture": "Imagine", "PE.Controllers.Main.txtRectangles": "Dreptunghiuri", "PE.Controllers.Main.txtSeries": "Serie", @@ -1072,7 +1088,7 @@ "PE.Views.DocumentHolder.addCommentText": "Adaugă comentariu", "PE.Views.DocumentHolder.addToLayoutText": "Adăugare aspect", "PE.Views.DocumentHolder.advancedImageText": "Setări avansate imagine", - "PE.Views.DocumentHolder.advancedParagraphText": "Setări avansate text", + "PE.Views.DocumentHolder.advancedParagraphText": "Setări avansate paragraf ", "PE.Views.DocumentHolder.advancedShapeText": "Setări avansate forma", "PE.Views.DocumentHolder.advancedTableText": "Setări avansate tabel", "PE.Views.DocumentHolder.alignmentText": "Aliniere", @@ -1263,6 +1279,7 @@ "PE.Views.FileMenu.btnCreateNewCaption": "Crearea unui document nou", "PE.Views.FileMenu.btnDownloadCaption": "Descărcare ca...", "PE.Views.FileMenu.btnHelpCaption": "Asistență...", + "PE.Views.FileMenu.btnHistoryCaption": "Istoricul versiune", "PE.Views.FileMenu.btnInfoCaption": "Informații despre prezentare...", "PE.Views.FileMenu.btnPrintCaption": "Imprimare", "PE.Views.FileMenu.btnProtectCaption": "Protejare", @@ -1317,7 +1334,7 @@ "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Pentru a vizualiza modificările, trebuie mai întâi să le acceptați", "PE.Views.FileMenuPanels.Settings.strFast": "Rapid", "PE.Views.FileMenuPanels.Settings.strFontRender": "Sugestie font", - "PE.Views.FileMenuPanels.Settings.strForcesave": "Se salvează întotdeauna pe server (altfel utilizați metoda document close pentru salvare)", + "PE.Views.FileMenuPanels.Settings.strForcesave": "Versiunea se adaugă la stocarea după ce faceți clic pe Salvare sau Ctrl+S", "PE.Views.FileMenuPanels.Settings.strInputMode": "Activare hieroglife", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Setări macrocomandă", "PE.Views.FileMenuPanels.Settings.strPaste": "Decupare, copiere și lipire", @@ -1336,7 +1353,7 @@ "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Recuperare automată", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Salvare automată", "PE.Views.FileMenuPanels.Settings.textDisabled": "Dezactivat", - "PE.Views.FileMenuPanels.Settings.textForceSave": "Salvare pe server", + "PE.Views.FileMenuPanels.Settings.textForceSave": "Salvarea versiunilor intermediare", "PE.Views.FileMenuPanels.Settings.textMinute": "La fiecare minută", "PE.Views.FileMenuPanels.Settings.txtAll": "Vizualizare toate", "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Opțiuni AutoCorecție...", @@ -1492,7 +1509,7 @@ "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", "PE.Views.RightMenu.txtChartSettings": "Setări diagramă", "PE.Views.RightMenu.txtImageSettings": "Setări imagine", - "PE.Views.RightMenu.txtParagraphSettings": "Setări text", + "PE.Views.RightMenu.txtParagraphSettings": "Setări paragraf", "PE.Views.RightMenu.txtShapeSettings": "Setări forma", "PE.Views.RightMenu.txtSignatureSettings": "Setări semnătura", "PE.Views.RightMenu.txtSlideSettings": "Setări diapozitiv", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index e64240417..6937cec7e 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -75,7 +75,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", - "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeClassicLight": "Классическая светлая", "Common.UI.Themes.txtThemeDark": "Темная", "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", @@ -1334,7 +1334,7 @@ "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "Прежде чем вы сможете увидеть изменения, их надо будет принять", "PE.Views.FileMenuPanels.Settings.strFast": "Быстрый", "PE.Views.FileMenuPanels.Settings.strFontRender": "Хинтинг шрифтов", - "PE.Views.FileMenuPanels.Settings.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)", + "PE.Views.FileMenuPanels.Settings.strForcesave": "Добавлять версию в хранилище после нажатия кнопки Сохранить или Ctrl+S", "PE.Views.FileMenuPanels.Settings.strInputMode": "Включить иероглифы", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "Настройки макросов", "PE.Views.FileMenuPanels.Settings.strPaste": "Вырезание, копирование и вставка", @@ -1353,7 +1353,7 @@ "PE.Views.FileMenuPanels.Settings.textAutoRecover": "Автовосстановление", "PE.Views.FileMenuPanels.Settings.textAutoSave": "Автосохранение", "PE.Views.FileMenuPanels.Settings.textDisabled": "Отключено", - "PE.Views.FileMenuPanels.Settings.textForceSave": "Сохранять на сервере", + "PE.Views.FileMenuPanels.Settings.textForceSave": "Сохранение промежуточных версий", "PE.Views.FileMenuPanels.Settings.textMinute": "Каждую минуту", "PE.Views.FileMenuPanels.Settings.txtAll": "Все", "PE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Параметры автозамены...", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index ecbf2eec2..f15c47a41 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -638,7 +638,7 @@ "PE.Controllers.Main.txtTheme_turtle": "龟", "PE.Controllers.Main.txtXAxis": "X轴", "PE.Controllers.Main.txtYAxis": "Y轴", - "PE.Controllers.Main.unknownErrorText": "示知错误", + "PE.Controllers.Main.unknownErrorText": "未知错误", "PE.Controllers.Main.unsupportedBrowserErrorText": "你的浏览器不支持", "PE.Controllers.Main.uploadImageExtMessage": "未知图像格式", "PE.Controllers.Main.uploadImageFileCountMessage": "没有图片上传", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 5546b0303..381d210e9 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -149,7 +149,7 @@ }, "Toolbar": { "dlgLeaveTitleText": "You leave the application", - "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", + "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "leaveButtonText": "Leave this Page", "stayButtonText": "Stay on this Page" }, diff --git a/apps/presentationeditor/mobile/src/controller/Preview.jsx b/apps/presentationeditor/mobile/src/controller/Preview.jsx index df6cd83aa..feeab5209 100644 --- a/apps/presentationeditor/mobile/src/controller/Preview.jsx +++ b/apps/presentationeditor/mobile/src/controller/Preview.jsx @@ -3,6 +3,7 @@ import { inject } from 'mobx-react'; import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import Preview from "../view/Preview"; +import ContextMenu from './ContextMenu'; const PreviewController = props => { const { t } = useTranslation(); @@ -20,6 +21,7 @@ const PreviewController = props => { api.DemonstrationEndShowMessage(_t.textFinalMessage); }; + ContextMenu.closeContextMenu(); show(); onDocumentReady(); diff --git a/apps/presentationeditor/mobile/src/controller/Toolbar.jsx b/apps/presentationeditor/mobile/src/controller/Toolbar.jsx index 42a240a7b..87225a53d 100644 --- a/apps/presentationeditor/mobile/src/controller/Toolbar.jsx +++ b/apps/presentationeditor/mobile/src/controller/Toolbar.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; -import { inject } from 'mobx-react'; +import { inject, observer } from 'mobx-react'; import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import ToolbarView from "../view/Toolbar"; -const ToolbarController = inject('storeAppOptions', 'users')(props => { +const ToolbarController = inject('storeAppOptions', 'users')(observer(props => { const {t} = useTranslation(); const _t = t("Toolbar", { returnObjects: true }); @@ -20,9 +20,7 @@ const ToolbarController = inject('storeAppOptions', 'users')(props => { api.asc_registerCallback('asc_onCanUndo', onApiCanUndo); api.asc_registerCallback('asc_onCanRedo', onApiCanRedo); api.asc_registerCallback('asc_onFocusObject', onApiFocusObject); - api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); api.asc_registerCallback('asc_onCountPages', onApiCountPages); - Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.on('toolbar:activatecontrols', activateControls); Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.on('goback', goBack); @@ -35,10 +33,15 @@ const ToolbarController = inject('storeAppOptions', 'users')(props => { onDocumentReady(); } + if (isDisconnected) { + f7.popover.close(); + f7.sheet.close(); + f7.popup.close(); + } + return () => { Common.Notifications.off('document:ready', onDocumentReady); Common.Notifications.off('setdoctitle', setDocTitle); - Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.off('toolbar:activatecontrols', activateControls); Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.off('goback', goBack); @@ -47,7 +50,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(props => { api.asc_unregisterCallback('asc_onCanUndo', onApiCanUndo); api.asc_unregisterCallback('asc_onCanRedo', onApiCanRedo); api.asc_unregisterCallback('asc_onFocusObject', onApiFocusObject); - api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); api.asc_unregisterCallback('asc_onCountPages', onApiCountPages); } }); @@ -178,15 +180,6 @@ const ToolbarController = inject('storeAppOptions', 'users')(props => { setDisabledControls(false); }; - const onCoAuthoringDisconnect = (enableDownload) => { - deactivateEditControls(enableDownload); - setCanUndo(false); - setCanRedo(false); - f7.popover.close(); - f7.sheet.close(); - f7.popup.close(); - }; - const onEditDocument = () => { Common.Gateway.requestEditRights(); }; @@ -210,8 +203,9 @@ const ToolbarController = inject('storeAppOptions', 'users')(props => { displayCollaboration={displayCollaboration} showEditDocument={showEditDocument} onEditDocument={onEditDocument} + isDisconnected={isDisconnected} /> ) -}); +})); export {ToolbarController as Toolbar}; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx index 609372460..1c054a041 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx @@ -64,7 +64,7 @@ class AddLinkController extends Component { break; case 1: url = url + "showjump?jump=previousslide"; - slidetip = _t.textPrevSlide; + slidetip = _t.textPreviousSlide; break; case 2: url = url + "showjump?jump=firstslide"; diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditImage.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditImage.jsx index eb607e1f6..5c59109c2 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditImage.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditImage.jsx @@ -79,6 +79,7 @@ class EditImageController extends Component { properties.put_Width(imgsize.get_ImageWidth()); properties.put_Height(imgsize.get_ImageHeight()); properties.put_ResetCrop(true); + properties.put_Rot(0); api.ImgApply(properties); } diff --git a/apps/presentationeditor/mobile/src/view/Preview.jsx b/apps/presentationeditor/mobile/src/view/Preview.jsx index 96a618b42..aeba8cf40 100644 --- a/apps/presentationeditor/mobile/src/view/Preview.jsx +++ b/apps/presentationeditor/mobile/src/view/Preview.jsx @@ -2,7 +2,7 @@ import React from 'react'; const Preview = () => { return ( -
+
) diff --git a/apps/presentationeditor/mobile/src/view/Toolbar.jsx b/apps/presentationeditor/mobile/src/view/Toolbar.jsx index 903d9a05d..42f93da4f 100644 --- a/apps/presentationeditor/mobile/src/view/Toolbar.jsx +++ b/apps/presentationeditor/mobile/src/view/Toolbar.jsx @@ -4,13 +4,14 @@ import { Device } from '../../../../common/mobile/utils/device'; import EditorUIController from '../lib/patch' const ToolbarView = props => { + const isDisconnected = props.isDisconnected; return ( {props.isShowBack && } {Device.ios && props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({ - disabledUndo: !props.isCanUndo, - disabledRedo: !props.isCanRedo, + disabledUndo: !props.isCanUndo || isDisconnected, + disabledRedo: !props.isCanRedo || isDisconnected, onUndoClick: props.onUndo, onRedoClick: props.onRedo })} @@ -18,8 +19,8 @@ const ToolbarView = props => { {!Device.phone && {props.docTitle}} {Device.android && props.isEdit && EditorUIController.getUndoRedo && EditorUIController.getUndoRedo({ - disabledUndo: !props.isCanUndo, - disabledRedo: !props.isCanRedo, + disabledUndo: !props.isCanUndo || isDisconnected, + disabledRedo: !props.isCanRedo || isDisconnected, onUndoClick: props.onUndo, onRedoClick: props.onRedo })} @@ -28,8 +29,8 @@ const ToolbarView = props => { } {props.isEdit && EditorUIController.getToolbarOptions && EditorUIController.getToolbarOptions({ - disabledAdd: props.disabledAdd || props.disabledControls, - disabledEdit: props.disabledEdit || props.disabledControls, + disabledAdd: props.disabledAdd || props.disabledControls || isDisconnected, + disabledEdit: props.disabledEdit || props.disabledControls || isDisconnected, onEditClick: () => props.openOptions('edit'), onAddClick: () => props.openOptions('add') })} diff --git a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx index 3f9537494..f4d43fb8a 100644 --- a/apps/presentationeditor/mobile/src/view/edit/Edit.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/Edit.jsx @@ -231,7 +231,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => { editors.length > 1 ?
{editors.map((item, index) => {item.caption})} - {isAndroid && } + {isAndroid && }
: { editors[0].caption } } diff --git a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx index 2112aa589..a9929cc34 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditChart.jsx @@ -159,6 +159,7 @@ const PageStyle = props => { const styles = storeChartSettings.styles; const shapeObject = props.storeFocusObjects.shapeObject; const chartStyles = storeChartSettings.chartStyles; + const isAndroid = Device.android; let borderSize, borderType, borderColor; @@ -194,6 +195,7 @@ const PageStyle = props => { {chartStyles ? {_t.textStyle} : null} {_t.textFill} {_t.textBorder} + {isAndroid && }
{Device.phone && diff --git a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx index 71210945c..39a55a8b4 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditShape.jsx @@ -89,6 +89,7 @@ const PageStyle = props => { const storeFocusObjects = props.storeFocusObjects; const storeShapeSettings = props.storeShapeSettings; const shapeObject = storeFocusObjects.shapeObject; + const isAndroid = Device.android; let borderSize, borderType, transparent; if (shapeObject) { @@ -125,6 +126,7 @@ const PageStyle = props => { {_t.textFill} {_t.textBorder} {_t.textEffects} + {isAndroid && } {Device.phone && diff --git a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx index 4557b9f72..60acd7b49 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditSlide.jsx @@ -4,6 +4,7 @@ import {f7, Page, Navbar, List, ListItem, Row, BlockTitle, Link, Toggle, Icon, V import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; import { useTranslation } from 'react-i18next'; import {Device} from '../../../../../common/mobile/utils/device'; +import { element } from 'prop-types'; const EditSlide = props => { const { t } = useTranslation(); @@ -45,8 +46,6 @@ const PageTheme = props => { const storeSlideSettings = props.storeSlideSettings; const arrayThemes = storeSlideSettings.arrayThemes; const slideThemeIndex = storeSlideSettings.slideThemeIndex; - const defaultThemes = arrayThemes[0]; - const docThemes = arrayThemes[1]; return ( @@ -59,32 +58,21 @@ const PageTheme = props => { } - {arrayThemes.length ? ( + {arrayThemes.length && ( - {defaultThemes.map((elem, index) => { + {arrayThemes.map(theme => { return ( - { - storeSlideSettings.changeSlideThemeIndex(elem.Index); - props.onThemeClick(elem.Index); - }}> - - ); - })} - {docThemes.map((elem, index) => { - return ( - { - storeSlideSettings.changeSlideThemeIndex(elem.Index); - props.onThemeClick(elem.Index); + storeSlideSettings.changeSlideThemeIndex(theme.themeId); + props.onThemeClick(theme.themeId); }}> ); })} - ) : null} + )} ); }; @@ -95,7 +83,7 @@ const PageLayout = props => { const storeFocusObjects = props.storeFocusObjects; const storeSlideSettings = props.storeSlideSettings; storeSlideSettings.changeSlideLayoutIndex(storeFocusObjects.slideObject.get_LayoutIndex()); - const arrayLayouts = storeSlideSettings.arrayLayouts; + const arrayLayouts = storeSlideSettings.slideLayouts; const slideLayoutIndex = storeSlideSettings.slideLayoutIndex; return ( @@ -109,21 +97,25 @@ const PageLayout = props => { } - {arrayLayouts.length ? ( - - {arrayLayouts.map((elem, index) => { - return ( - { - storeSlideSettings.changeSlideLayoutIndex(index); - props.onLayoutClick(index); - }}> - - - ) - })} - - ) : null} + {arrayLayouts.length && + arrayLayouts.map((layouts, index) => { + return ( + + {layouts.map(layout => { + return ( + { + storeSlideSettings.changeSlideLayoutIndex(layout.type); + props.onLayoutClick(layout.type); + }}> + + + ) + })} + + ); + }) + } ); }; @@ -310,7 +302,7 @@ const PageTransition = props => { - {_t.textApplyAll} + {_t.textApplyAll} ); diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx index 2377f9295..789ba0a45 100644 --- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx +++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx @@ -313,14 +313,16 @@ const PageStyle = props => { const _t = t('View.Edit', {returnObjects: true}); const storeTableSettings = props.storeTableSettings; const templates = storeTableSettings.styles; + const isAndroid = Device.android; return (
- {_t.textStyle} - {_t.textFill} - {_t.textBorder} + {_t.textStyle} + {_t.textFill} + {_t.textBorder} + {isAndroid && }
{Device.phone && diff --git a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx index 9fbb4f59f..54a805d50 100644 --- a/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -16,14 +16,14 @@ const PageApplicationSettings = props => { }; // set mode - // const appOptions = props.storeAppOptions; - // const _isEdit = appOptions.isEdit; + const appOptions = props.storeAppOptions; + const _isEdit = appOptions.isEdit; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; return ( - {/* {_isEdit && */} + {_isEdit && {_t.textUnitOfMeasurement} @@ -46,7 +46,7 @@ const PageApplicationSettings = props => { - {/* } */} + } {/* {_isShowMacros && */} { ); }; -const ApplicationSettings = inject("storeApplicationSettings")(observer(PageApplicationSettings)); +const ApplicationSettings = inject("storeApplicationSettings", "storeAppOptions")(observer(PageApplicationSettings)); const MacrosSettings = inject("storeApplicationSettings")(observer(PageMacrosSettings)); export {ApplicationSettings, MacrosSettings}; \ No newline at end of file diff --git a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx index 22f9a2339..6a3704aea 100644 --- a/apps/presentationeditor/mobile/src/view/settings/Settings.jsx +++ b/apps/presentationeditor/mobile/src/view/settings/Settings.jsx @@ -130,9 +130,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => { : null} - - - + {_isEdit && + + + + } diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 657726150..7e1ede550 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -3512,6 +3512,7 @@ define([ properties.asc_putWidth(w); properties.asc_putHeight(h); properties.put_ResetCrop(true); + properties.put_Rot(0); this.api.asc_setGraphicObjectProps(properties); Common.NotificationCenter.trigger('edit:complete', this.documentHolder); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 1c151ad97..6ee4976a2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -739,7 +739,7 @@ define([ break; case LoadingDocument: - title = this.loadingDocumentTitleText; + title = this.loadingDocumentTitleText + ' '; break; default: if (typeof action.id == 'string'){ @@ -1043,7 +1043,7 @@ define([ onOpenDocument: function(progress) { var elem = document.getElementById('loadmask-text'); var proc = (progress.asc_getCurrentFont() + progress.asc_getCurrentImage())/(progress.asc_getFontsCount() + progress.asc_getImagesCount()); - proc = this.textLoadingDocument + ': ' + Math.min(Math.round(proc*100), 100) + '%'; + proc = this.textLoadingDocument + ': ' + Common.Utils.String.fixedDigits(Math.min(Math.round(proc*100), 100), 3, " ") + "%"; elem ? elem.innerHTML = proc : this.loadMask && this.loadMask.setTitle(proc); }, @@ -1739,7 +1739,7 @@ define([ } if (!Common.Utils.ModalWindow.isVisible() || $('.asc-window.modal.alert[data-value=' + id + ']').length<1) - Common.UI.alert(config).$window.attr('data-value', id); + setTimeout(function() {Common.UI.alert(config).$window.attr('data-value', id);}, 1); (id!==undefined) && Common.component.Analytics.trackEvent('Internal Error', id.toString()); }, diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index ad14d1b3b..687f68387 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -1419,6 +1419,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' this.cmbLegendPos.setValue(props.getLegendPos()); this.updateDataLabels(this._state.ChartType, props.getDataLabelsPos()); + this.cmbDataLabels.setDisabled(this._state.ChartType==Asc.c_oAscChartTypeSettings.surfaceNormal || + this._state.ChartType == Asc.c_oAscChartTypeSettings.surfaceWireframe); this.chSeriesName.setValue(this.chartSettings.getShowSerName(), true); this.chCategoryName.setValue(this.chartSettings.getShowCatName(), true); diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index ba3f190ee..a7708b77c 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -232,8 +232,25 @@ define([ this.mnuChartTypePicker.selectRecord(record, true); if (record) { this.btnChartType.setIconCls('svgicon ' + 'chart-' + record.get('iconCls')); - } else - this.btnChartType.setIconCls('svgicon'); + } else { + var iconcls = ''; + switch (this.currentChartType) { + case Asc.c_oAscChartTypeSettings.surfaceNormal: + iconcls = 'chart-surface-normal'; + break; + case Asc.c_oAscChartTypeSettings.surfaceWireframe: + iconcls = 'chart-surface-wireframe'; + break; + case Asc.c_oAscChartTypeSettings.contourNormal: + iconcls = 'chart-contour-wireframe'; + break; + case Asc.c_oAscChartTypeSettings.contourWireframe: + iconcls = 'chart-contour-wireframe'; + break; + + } + this.btnChartType.setIconCls('svgicon ' + iconcls); + } this.seriesList.on('item:add', _.bind(this.addControls, this)); this.seriesList.on('item:change', _.bind(this.addControls, this)); this.ShowHideSettings(this.currentChartType); diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 86e6c9324..0c342a78b 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -428,6 +428,7 @@ define([ properties.asc_putWidth(w); properties.asc_putHeight(h); properties.put_ResetCrop(true); + properties.put_Rot(0); this.api.asc_setGraphicObjectProps(properties); Common.NotificationCenter.trigger('edit:complete', this); } diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 54e6b0f38..444f1e459 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -116,7 +116,7 @@ define([ var me = this, options = {}; - me.SchemeNames = [ + me.SchemeNames = [me.txtScheme22, me.txtScheme1, me.txtScheme2, me.txtScheme3, me.txtScheme4, me.txtScheme5, me.txtScheme6, me.txtScheme7, me.txtScheme8, me.txtScheme9, me.txtScheme10, me.txtScheme11, me.txtScheme12, me.txtScheme13, me.txtScheme14, me.txtScheme15, @@ -2263,7 +2263,7 @@ define([ schemecolors.push(clr); } - if (index == 21) { + if (index == 22) { this.mnuColorSchema.addItem({ caption : '--' }); @@ -2273,7 +2273,7 @@ define([ template: itemTemplate, cls : 'color-schemas-menu', colors : schemecolors, - caption: (index < 21) ? (me.SchemeNames[index] || name) : name, + caption: (index < 22) ? (me.SchemeNames[index] || name) : name, value: index, checkable: true, toggleGroup: 'menuSchema' @@ -2694,6 +2694,7 @@ define([ textAutoColor: 'Automatic', textItems: 'Items', tipInsertSpark: 'Insert sparkline', - capInsertSpark: 'Sparklines' + capInsertSpark: 'Sparklines', + txtScheme22: 'New Office' }, SSE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index a15ac6ce6..52f389a82 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -48,8 +48,22 @@ "Common.define.chartData.textStock": "Μετοχή", "Common.define.chartData.textSurface": "Επιφάνεια", "Common.define.chartData.textWinLossSpark": "Νίκες/Ήττες", + "Common.define.conditionalData.exampleText": "ΑαΒβΓγΨψΩω", + "Common.define.conditionalData.text1Above": "1 τυπική απόκλιση πάνω", + "Common.define.conditionalData.text1Below": "1 τυπική απόκλιση κάτω", + "Common.define.conditionalData.text2Above": "2 τυπική απόκλιση πάνω", + "Common.define.conditionalData.text2Below": "2 τυπική απόκλιση κάτω", + "Common.define.conditionalData.text3Above": "3 τυπική απόκλιση πάνω", + "Common.define.conditionalData.text3Below": "3 τυπική απόκλιση κάτω", + "Common.define.conditionalData.textAbove": "Πάνω από", "Common.define.conditionalData.textDate": "Ημερομηνία", "Common.define.conditionalData.textFormula": "Τύπος", + "Common.define.conditionalData.textText": "Κείμενο", + "Common.define.conditionalData.textThisWeek": "Αυτή την εβδομάδα", + "Common.define.conditionalData.textToday": "Σήμερα", + "Common.define.conditionalData.textTomorrow": "Αύριο", + "Common.define.conditionalData.textTop": "Επάνω", + "Common.define.conditionalData.textYesterday": "Χθες", "Common.Translation.warnFileLocked": "Το αρχείο τελεί υπό επεξεργασία σε άλλη εφαρμογή. Μπορείτε να συνεχίσετε την επεξεργασία και να το αποθηκεύσετε ως αντίγραφo.", "Common.Translation.warnFileLockedBtnEdit": "Δημιουργία αντιγράφου", "Common.Translation.warnFileLockedBtnView": "Άνοιγμα για προβολή", @@ -257,6 +271,7 @@ "Common.Views.ReviewChanges.txtCommentRemMy": "Αφαίρεση των Σχολίων Μου", "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Αφαίρεση Πρόσφατων Σχολίων Μου", "Common.Views.ReviewChanges.txtCommentRemove": "Αφαίρεση", + "Common.Views.ReviewChanges.txtCommentResolve": "Επίλυση", "Common.Views.ReviewChanges.txtDocLang": "Γλώσσα", "Common.Views.ReviewChanges.txtFinal": "Όλες οι αλλαγές έγιναν αποδεκτές (Προεπισκόπηση)", "Common.Views.ReviewChanges.txtFinalCap": "Τελικός", @@ -1970,12 +1985,30 @@ "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Γενικά", "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Ρυθμίσεις Σελίδας", "SSE.Views.FileMenuPanels.Settings.txtSpellChecking": "Έλεγχος ορθογραφίας", + "SSE.Views.FormatRulesEditDlg.notcriticalErrorTitle": "Προειδοποίηση", + "SSE.Views.FormatRulesEditDlg.text2Scales": "Δίχρωμη κλίμακα", + "SSE.Views.FormatRulesEditDlg.text3Scales": "Τρίχρωμη κλίμακα", + "SSE.Views.FormatRulesEditDlg.textAllBorders": "Όλα τα περιγράμματα", + "SSE.Views.FormatRulesEditDlg.textColor": "Χρώμα κειμένου", "SSE.Views.FormatRulesEditDlg.textFill": "Γέμισμα", "SSE.Views.FormatRulesEditDlg.textFormat": "Μορφή", "SSE.Views.FormatRulesEditDlg.textFormula": "Τύπος", + "SSE.Views.FormatRulesEditDlg.textNewColor": "Προσθήκη Νέου Προσαρμοσμένου Χρώματος", + "SSE.Views.FormatRulesEditDlg.textStrikeout": "Διαγραφή", + "SSE.Views.FormatRulesEditDlg.textSubscript": "Δείκτης", + "SSE.Views.FormatRulesEditDlg.textSuperscript": "Εκθέτης", + "SSE.Views.FormatRulesEditDlg.textUnderline": "Υπογράμμιση", "SSE.Views.FormatRulesEditDlg.txtDate": "Ημερομηνία", "SSE.Views.FormatRulesEditDlg.txtFraction": "Κλάσμα", + "SSE.Views.FormatRulesEditDlg.txtText": "Κείμενο", "SSE.Views.FormatRulesManagerDlg.guestText": "Επισκέπτης", + "SSE.Views.FormatRulesManagerDlg.text1Above": "1 τυπική απόκλιση πάνω από το μέσο όρο", + "SSE.Views.FormatRulesManagerDlg.text1Below": "1 τυπική απόκλιση κάτω από το μέσο όρο", + "SSE.Views.FormatRulesManagerDlg.text2Above": "2 τυπική απόκλιση πάνω από το μέσο όρο", + "SSE.Views.FormatRulesManagerDlg.text2Below": "2 τυπική απόκλιση κάτω από το μέσο όρο", + "SSE.Views.FormatRulesManagerDlg.text3Above": "3 τυπική απόκλιση πάνω από το μέσο όρο", + "SSE.Views.FormatRulesManagerDlg.text3Below": "3 τυπική απόκλιση κάτω από το μέσο όρο", + "SSE.Views.FormatRulesManagerDlg.textAbove": "Πάνω από τον μέσο όρο", "SSE.Views.FormatRulesManagerDlg.textDelete": "Διαγραφή", "SSE.Views.FormatRulesManagerDlg.textEdit": "Επεξεργασία", "SSE.Views.FormatRulesManagerDlg.textFormat": "Μορφή", @@ -2863,6 +2896,7 @@ "SSE.Views.Toolbar.capInsertHyperlink": "Υπερσύνδεσμος", "SSE.Views.Toolbar.capInsertImage": "Εικόνα", "SSE.Views.Toolbar.capInsertShape": "Σχήμα", + "SSE.Views.Toolbar.capInsertSpark": "Μικρογραφήματα", "SSE.Views.Toolbar.capInsertTable": "Πίνακας", "SSE.Views.Toolbar.capInsertText": "Πλαίσιο Κειμένου", "SSE.Views.Toolbar.mniImageFromFile": "Εικόνα από Αρχείο", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 9737392c3..06340e575 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1995,7 +1995,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strDecimalSeparator": "Decimal separator", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFast": "Fast", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFontRender": "Font Hinting", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Always save to server (otherwise save to server on document close)", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Add version to storage after clicking Save or Ctrl+S", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocale": "Formula Language", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "Example: SUM; MIN; MAX; COUNT", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "Turn on display of the comments", @@ -2020,7 +2020,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoRecover": "Autorecover", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoSave": "Autosave", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Disabled", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Save to Server", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Saving intermediate versions", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Every Minute", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Reference Style", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBe": "Belarusian", @@ -3329,6 +3329,7 @@ "SSE.Views.Toolbar.txtScheme2": "Grayscale", "SSE.Views.Toolbar.txtScheme20": "Urban", "SSE.Views.Toolbar.txtScheme21": "Verve", + "SSE.Views.Toolbar.txtScheme22": "New Office", "SSE.Views.Toolbar.txtScheme3": "Apex", "SSE.Views.Toolbar.txtScheme4": "Aspect", "SSE.Views.Toolbar.txtScheme5": "Civic", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index c02edc188..0b6d29ed9 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -127,7 +127,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "El documento ha sido cambiado por otro usuario.
Por favor haga clic para guardar sus cambios y recargue las actualizaciones.", "Common.UI.ThemeColorPalette.textStandartColors": "Colores estándar", "Common.UI.ThemeColorPalette.textThemeColors": "Colores de tema", - "Common.UI.Themes.txtThemeClassicLight": "Claro clásico", + "Common.UI.Themes.txtThemeClassicLight": "Clásico claro", "Common.UI.Themes.txtThemeDark": "Oscuro", "Common.UI.Themes.txtThemeLight": "Claro", "Common.UI.Window.cancelButtonText": "Cancelar", @@ -1914,7 +1914,7 @@ "SSE.Views.DocumentHolder.txtSortFontColor": "Color de letra seleccionado en la parte superior", "SSE.Views.DocumentHolder.txtSparklines": "Sparklines", "SSE.Views.DocumentHolder.txtText": "Texto", - "SSE.Views.DocumentHolder.txtTextAdvanced": "Ajustes avanzados de texto", + "SSE.Views.DocumentHolder.txtTextAdvanced": "Ajustes avanzados de párrafo", "SSE.Views.DocumentHolder.txtTime": "Hora", "SSE.Views.DocumentHolder.txtUngroup": "Desagrupar", "SSE.Views.DocumentHolder.txtWidth": "Ancho", @@ -1994,7 +1994,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strDecimalSeparator": "Separador decimal", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFast": "rápido", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFontRender": "Hinting", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Siempre guardar en el servidor (de lo contrario guardar en el servidor al cerrar documento)", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Añadir la versión al almacenamiento después de hacer clic en Guardar o Ctrl+S", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocale": "Idioma de fórmulas", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "Ejemplo: SUMA; MIN; MAX; CONTAR", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "Activar la visualización de comentarios", @@ -2019,7 +2019,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoRecover": "Autorrecuperación", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoSave": "Guardar automáticamente", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Desactivado", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Guardar al servidor", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Guardar versiones intermedias", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Cada minuto", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Estilo de referencias", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBe": "Bieloruso", @@ -2679,7 +2679,7 @@ "SSE.Views.RightMenu.txtCellSettings": "Ajustes de celda", "SSE.Views.RightMenu.txtChartSettings": "Ajustes de gráfico", "SSE.Views.RightMenu.txtImageSettings": "Ajustes de imagen", - "SSE.Views.RightMenu.txtParagraphSettings": "Ajustes de texto", + "SSE.Views.RightMenu.txtParagraphSettings": "Ajustes de párrafo", "SSE.Views.RightMenu.txtPivotSettings": "Ajustes de tabla de pivote", "SSE.Views.RightMenu.txtSettings": "Ajustes comunes", "SSE.Views.RightMenu.txtShapeSettings": "Ajustes de forma", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 4b0d750f4..48318d550 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -127,7 +127,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Le document a été modifié par un autre utilisateur.
Cliquez pour enregistrer vos modifications et recharger les mises à jour.", "Common.UI.ThemeColorPalette.textStandartColors": "Couleurs standard", "Common.UI.ThemeColorPalette.textThemeColors": "Couleurs de thème", - "Common.UI.Themes.txtThemeClassicLight": "Clair classique", + "Common.UI.Themes.txtThemeClassicLight": "Classique clair", "Common.UI.Themes.txtThemeDark": "Sombre", "Common.UI.Themes.txtThemeLight": "Clair", "Common.UI.Window.cancelButtonText": "Annuler", @@ -1914,7 +1914,7 @@ "SSE.Views.DocumentHolder.txtSortFontColor": "Couleur sélectionné de la police sur le dessus", "SSE.Views.DocumentHolder.txtSparklines": "Graphiques sparkline", "SSE.Views.DocumentHolder.txtText": "Texte", - "SSE.Views.DocumentHolder.txtTextAdvanced": "Paramètres avancés du texte", + "SSE.Views.DocumentHolder.txtTextAdvanced": "Paramètres avancés du paragraphe", "SSE.Views.DocumentHolder.txtTime": "Heure", "SSE.Views.DocumentHolder.txtUngroup": "Dissocier", "SSE.Views.DocumentHolder.txtWidth": "Largeur", @@ -1994,7 +1994,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strDecimalSeparator": "Séparateur décimal", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFast": "Rapide", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFontRender": "Hinting de la police", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Toujours enregistrer sur le serveur (sinon enregistrer sur le serveur lors de la fermeture du document)", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Ajouter une version dans l'espace de stockage en cliquant Enregistrer ou Ctrl+S", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocale": "La langue de formule", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "Example: SUM; MIN; MAX; COUNT", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "Activer l'affichage des commentaires", @@ -2019,7 +2019,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoRecover": "Récupération automatique", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoSave": "Enregistrement automatique", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Désactivé", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Enregistrer sur le serveur", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Enregistrer des versions intermédiaires", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Chaque minute", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Style de références", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBe": "Biélorusse", @@ -2679,7 +2679,7 @@ "SSE.Views.RightMenu.txtCellSettings": "Paramètres de cellule", "SSE.Views.RightMenu.txtChartSettings": "Paramètres du graphique", "SSE.Views.RightMenu.txtImageSettings": "Paramètres de l'image", - "SSE.Views.RightMenu.txtParagraphSettings": "Paramètres du texte", + "SSE.Views.RightMenu.txtParagraphSettings": "Paramètres du paragraphe", "SSE.Views.RightMenu.txtPivotSettings": "Paramètres de tableau croisé", "SSE.Views.RightMenu.txtSettings": "Paramètres communs", "SSE.Views.RightMenu.txtShapeSettings": "Paramètres de forme", diff --git a/apps/spreadsheeteditor/main/locale/pt.json b/apps/spreadsheeteditor/main/locale/pt.json index bcfda5ce6..a406c8eb7 100644 --- a/apps/spreadsheeteditor/main/locale/pt.json +++ b/apps/spreadsheeteditor/main/locale/pt.json @@ -50,6 +50,12 @@ "Common.define.chartData.textWinLossSpark": "Ganhos/Perdas", "Common.define.conditionalData.exampleText": "AaBbCcYyZz", "Common.define.conditionalData.noFormatText": "Nenhum conjunto de formatos", + "Common.define.conditionalData.text1Above": "1 desvio padrão acima", + "Common.define.conditionalData.text1Below": "1 desvio padrão abaixo", + "Common.define.conditionalData.text2Above": "2 desvios padrão acima", + "Common.define.conditionalData.text2Below": "2 desvios padrão abaixo", + "Common.define.conditionalData.text3Above": "3 desvios padrão acima", + "Common.define.conditionalData.text3Below": "3 desvios padrão abaixo", "Common.define.conditionalData.textAbove": "Acima", "Common.define.conditionalData.textAverage": "Média", "Common.define.conditionalData.textBegins": "Começa com", @@ -81,8 +87,18 @@ "Common.define.conditionalData.textNextWeek": "Próxima semana", "Common.define.conditionalData.textNotBetween": "Não entre...", "Common.define.conditionalData.textNotBlanks": "Não contém espaços em branco", + "Common.define.conditionalData.textNotContains": "Não contém", "Common.define.conditionalData.textNotEqual": "Não igual a", "Common.define.conditionalData.textNotErrors": "Não contém erros", + "Common.define.conditionalData.textText": "Тexto", + "Common.define.conditionalData.textThisMonth": "Este mês", + "Common.define.conditionalData.textThisWeek": "Esta semana", + "Common.define.conditionalData.textToday": "Hoje", + "Common.define.conditionalData.textTomorrow": "Amanhã", + "Common.define.conditionalData.textTop": "Superior", + "Common.define.conditionalData.textUnique": "Único", + "Common.define.conditionalData.textValue": "O valor é", + "Common.define.conditionalData.textYesterday": "Ontem", "Common.Translation.warnFileLocked": "Documento está em uso por outra aplicação. Você pode continuar editando e salvá-lo como uma cópia.", "Common.Translation.warnFileLockedBtnEdit": "Criar uma cópia", "Common.Translation.warnFileLockedBtnView": "Aberto para visualização", @@ -111,7 +127,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "O documento foi alterado por outro usuário.
Clique para salvar suas alterações e recarregar as atualizações.", "Common.UI.ThemeColorPalette.textStandartColors": "Cores padrão", "Common.UI.ThemeColorPalette.textThemeColors": "Cores do tema", - "Common.UI.Themes.txtThemeClassicLight": "Claro clássico", + "Common.UI.Themes.txtThemeClassicLight": "Clássico claro", "Common.UI.Themes.txtThemeDark": "Escuro", "Common.UI.Themes.txtThemeLight": "Claro", "Common.UI.Window.cancelButtonText": "Cancelar", @@ -224,11 +240,13 @@ "Common.Views.ListSettingsDialog.txtType": "Tipo", "Common.Views.OpenDialog.closeButtonText": "Fechar arquivo", "Common.Views.OpenDialog.textInvalidRange": "Intervalo de células inválido", + "Common.Views.OpenDialog.textSelectData": "Selecionar dados", "Common.Views.OpenDialog.txtAdvanced": "Avançado", "Common.Views.OpenDialog.txtColon": "Cólon", "Common.Views.OpenDialog.txtComma": "Vírgula", "Common.Views.OpenDialog.txtDelimiter": "Delimiter", "Common.Views.OpenDialog.txtDestData": "Escolha onde colocar os dados", + "Common.Views.OpenDialog.txtEmpty": "Este campo é obrigatório", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Senha incorreta.", "Common.Views.OpenDialog.txtOpenFile": "Inserir a Senha para Abrir o Arquivo", @@ -275,6 +293,8 @@ "Common.Views.ReviewChanges.tipCoAuthMode": "Definir o modo de co-edição", "Common.Views.ReviewChanges.tipCommentRem": "Remover comentários", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Remover comentários atuais", + "Common.Views.ReviewChanges.tipCommentResolve": "Resolver comentários", + "Common.Views.ReviewChanges.tipCommentResolveCurrent": "Resolver comentários atuais", "Common.Views.ReviewChanges.tipHistory": "Mostrar histórico de versão", "Common.Views.ReviewChanges.tipRejectCurrent": "Rejeitar alteração atual", "Common.Views.ReviewChanges.tipReview": "Rastrear alterações", @@ -294,6 +314,11 @@ "Common.Views.ReviewChanges.txtCommentRemMy": "Remover meus comentários", "Common.Views.ReviewChanges.txtCommentRemMyCurrent": "Remover meus comentários atuais", "Common.Views.ReviewChanges.txtCommentRemove": "Retirar", + "Common.Views.ReviewChanges.txtCommentResolve": "Resolver", + "Common.Views.ReviewChanges.txtCommentResolveAll": "Resolver todos os comentários", + "Common.Views.ReviewChanges.txtCommentResolveCurrent": "Resolver comentários atuais", + "Common.Views.ReviewChanges.txtCommentResolveMy": "Resolver meus comentários", + "Common.Views.ReviewChanges.txtCommentResolveMyCurrent": "Resolver meus comentários atuais", "Common.Views.ReviewChanges.txtDocLang": "Idioma", "Common.Views.ReviewChanges.txtFinal": "Todas as alterações aceitas (Visualização)", "Common.Views.ReviewChanges.txtFinalCap": "Final", @@ -381,12 +406,14 @@ "Common.Views.UserNameDialog.textLabel": "Rótulo:", "Common.Views.UserNameDialog.textLabelError": "Etiqueta não deve estar vazia.", "SSE.Controllers.DataTab.textColumns": "Colunas", + "SSE.Controllers.DataTab.textEmptyUrl": "Você precisa especificar o URL.", "SSE.Controllers.DataTab.textRows": "Linhas", "SSE.Controllers.DataTab.textWizard": "Texto para colunas", "SSE.Controllers.DataTab.txtDataValidation": "Validação de dados", "SSE.Controllers.DataTab.txtExpand": "Expandir", "SSE.Controllers.DataTab.txtExpandRemDuplicates": "Os dados próximos à seleção não serão removidos. Deseja expandir a seleção para incluir os dados adjacentes ou continuar apenas com as células atualmente selecionadas?", "SSE.Controllers.DataTab.txtExtendDataValidation": "A seleção contém algumas células sem configurações de validação de dados.
Você deseja estender a validação de dados a essas células?", + "SSE.Controllers.DataTab.txtImportWizard": "Assistente de importação de texto", "SSE.Controllers.DataTab.txtRemDuplicates": "Remover Duplicatas", "SSE.Controllers.DataTab.txtRemoveDataValidation": "A seleção contém mais de um tipo de validação.
Configurações de corrente de partida e continua?", "SSE.Controllers.DataTab.txtRemSelected": "Remover em selecionado", @@ -707,6 +734,7 @@ "SSE.Controllers.Main.textShape": "Forma", "SSE.Controllers.Main.textStrict": "Strict mode", "SSE.Controllers.Main.textTryUndoRedo": "The Undo/Redo functions are disabled for the Fast co-editing mode.
Click the 'Strict mode' button to switch to the Strict co-editing mode to edit the file without other users interference and send your changes only after you save them. You can switch between the co-editing modes using the editor Advanced settings.", + "SSE.Controllers.Main.textTryUndoRedoWarn": "As funções Desfazer/Refazer estão desabilitadas para o modo de coedição rápido", "SSE.Controllers.Main.textYes": "Sim", "SSE.Controllers.Main.titleLicenseExp": "Licença expirada", "SSE.Controllers.Main.titleRecalcFormulas": "Calculando...", @@ -1008,7 +1036,9 @@ "SSE.Controllers.Toolbar.textOperator": "Operadores", "SSE.Controllers.Toolbar.textPivot": "Tabela Dinâmica", "SSE.Controllers.Toolbar.textRadical": "Radicais", + "SSE.Controllers.Toolbar.textRating": "Classificações", "SSE.Controllers.Toolbar.textScript": "Scripts", + "SSE.Controllers.Toolbar.textShapes": "Formas", "SSE.Controllers.Toolbar.textSymbols": "Símbolos", "SSE.Controllers.Toolbar.textWarning": "Aviso", "SSE.Controllers.Toolbar.txtAccent_Accent": "Agudo", @@ -1427,6 +1457,7 @@ "SSE.Views.CellSettings.textRadial": "Radial", "SSE.Views.CellSettings.textSelectBorders": "Selecione as bordas que você deseja alterar aplicando o estilo escolhido acima", "SSE.Views.CellSettings.textSelection": "Da seleção atual", + "SSE.Views.CellSettings.textThisPivot": "De uma tabela dinâmica", "SSE.Views.CellSettings.textThisSheet": "A partir desta folha de trabalho", "SSE.Views.CellSettings.textThisTable": "A partir desta tabela", "SSE.Views.CellSettings.tipAddGradientPoint": "Adicionar ponto de gradiente", @@ -1640,9 +1671,12 @@ "SSE.Views.CreatePivotDialog.textSelectData": "Selecionar dados", "SSE.Views.CreatePivotDialog.textTitle": "Criar tabela dinâmica", "SSE.Views.CreatePivotDialog.txtEmpty": "Este campo é obrigatório", + "SSE.Views.CreateSparklineDialog.textDataRange": "Intervalo de dados de origem", "SSE.Views.CreateSparklineDialog.textDestination": "Escolha, onde colocar os sparklines", "SSE.Views.CreateSparklineDialog.textInvalidRange": "Intervalo de células inválido", + "SSE.Views.CreateSparklineDialog.textSelectData": "Selecionar dados", "SSE.Views.CreateSparklineDialog.textTitle": "Criar Sparklines", + "SSE.Views.CreateSparklineDialog.txtEmpty": "Este campo é obrigatório", "SSE.Views.DataTab.capBtnGroup": "Grupo", "SSE.Views.DataTab.capBtnTextCustomSort": "Classificação personalizada", "SSE.Views.DataTab.capBtnTextDataValidation": "Validação de dados", @@ -1880,7 +1914,7 @@ "SSE.Views.DocumentHolder.txtSortFontColor": "Selecionou cor da fonte no topo", "SSE.Views.DocumentHolder.txtSparklines": "Minigráficos", "SSE.Views.DocumentHolder.txtText": "Texto", - "SSE.Views.DocumentHolder.txtTextAdvanced": "Configurações avançadas de texto", + "SSE.Views.DocumentHolder.txtTextAdvanced": "Configurações avançadas de parágrafo", "SSE.Views.DocumentHolder.txtTime": "Tempo", "SSE.Views.DocumentHolder.txtUngroup": "Desagrupar", "SSE.Views.DocumentHolder.txtWidth": "Largura", @@ -2016,11 +2050,19 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNl": "Holandês", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Polonês", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Ponto", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPtlang": "Português", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRo": "Romeno", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Russian", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacros": "Habilitar todos", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Habilitar todas as macros sem uma notificação", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtSk": "Eslovaco", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtSl": "Esloveno", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Desabilitar tudo", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Desativar todas as macros sem uma notificação", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtSv": "Sueco", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtTr": "Turco", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtUk": "Ucraniano", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtVi": "Vietnamita", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Mostrar notificação", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Desativar todas as macros com uma notificação", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", @@ -2046,6 +2088,9 @@ "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Configurações de página", "SSE.Views.FileMenuPanels.Settings.txtSpellChecking": "Verificação ortográfica", "SSE.Views.FormatRulesEditDlg.fillColor": "Cor do plano de fundo", + "SSE.Views.FormatRulesEditDlg.notcriticalErrorTitle": "Aviso", + "SSE.Views.FormatRulesEditDlg.text2Scales": "Escala Bicolor", + "SSE.Views.FormatRulesEditDlg.text3Scales": "Escala Tricolor", "SSE.Views.FormatRulesEditDlg.textAllBorders": "Todas as bordas", "SSE.Views.FormatRulesEditDlg.textAppearance": "Aparência de barra", "SSE.Views.FormatRulesEditDlg.textApply": "Aplicar ao intervalo", @@ -2058,19 +2103,28 @@ "SSE.Views.FormatRulesEditDlg.textBordersStyle": "Estilo de borda", "SSE.Views.FormatRulesEditDlg.textBottomBorders": "Bordas inferiores", "SSE.Views.FormatRulesEditDlg.textCannotAddCF": "Não é possível adicionar a formatação condicional.", + "SSE.Views.FormatRulesEditDlg.textCellMidpoint": "Ponto médio da célula", "SSE.Views.FormatRulesEditDlg.textCenterBorders": "Bordas verticais interiores", "SSE.Views.FormatRulesEditDlg.textClear": "Limpar", + "SSE.Views.FormatRulesEditDlg.textColor": "Cor do texto", "SSE.Views.FormatRulesEditDlg.textContext": "Contexto", "SSE.Views.FormatRulesEditDlg.textCustom": "Personalizado", "SSE.Views.FormatRulesEditDlg.textDiagDownBorder": "Borda inferior diagonal", "SSE.Views.FormatRulesEditDlg.textDiagUpBorder": "Borda superior diagonal", "SSE.Views.FormatRulesEditDlg.textEmptyFormula": "Insira uma fórmula válida.", + "SSE.Views.FormatRulesEditDlg.textEmptyFormulaExt": "A fórmula que você inseriu não avalia para um número, data, hora ou string.", "SSE.Views.FormatRulesEditDlg.textEmptyText": "Digite um valor.", + "SSE.Views.FormatRulesEditDlg.textEmptyValue": "O valor inserido não é um número, data, hora ou string válido.", + "SSE.Views.FormatRulesEditDlg.textErrorGreater": "O valor para o {0} deve ser maior do que o valor para o {1}.", "SSE.Views.FormatRulesEditDlg.textErrorTop10Between": "Digite um número entre {0} e {1}.", "SSE.Views.FormatRulesEditDlg.textFill": "Preencher", "SSE.Views.FormatRulesEditDlg.textFormat": "Formato", "SSE.Views.FormatRulesEditDlg.textFormula": "Fórmula", "SSE.Views.FormatRulesEditDlg.textGradient": "Gradiente", + "SSE.Views.FormatRulesEditDlg.textIconLabel": "quando {0} {1} e", + "SSE.Views.FormatRulesEditDlg.textIconLabelFirst": "quando {0} {1}", + "SSE.Views.FormatRulesEditDlg.textIconLabelLast": "quando o valor é", + "SSE.Views.FormatRulesEditDlg.textIconsOverlap": "Um ou mais intervalos de dados de ícones se sobrepõem.
Ajustar valores de intervalos de dados de ícones para que os intervalos não se sobreponham.", "SSE.Views.FormatRulesEditDlg.textIconStyle": "Estilo Ícone", "SSE.Views.FormatRulesEditDlg.textInsideBorders": "Bordas interiores", "SSE.Views.FormatRulesEditDlg.textInvalid": "Faixa de dados inválida.", @@ -2090,22 +2144,64 @@ "SSE.Views.FormatRulesEditDlg.textNewColor": "Adicionar nova cor personalizada", "SSE.Views.FormatRulesEditDlg.textNoBorders": "Sem bordas", "SSE.Views.FormatRulesEditDlg.textNone": "Nenhum", + "SSE.Views.FormatRulesEditDlg.textNotValidPercentage": "Um ou mais dos valores especificados não é uma porcentagem válida.", + "SSE.Views.FormatRulesEditDlg.textNotValidPercentageExt": "O valor especificado {0} não é uma porcentagem válida.", + "SSE.Views.FormatRulesEditDlg.textNotValidPercentile": "Um ou mais dos valores especificados não é um percentil válido.", + "SSE.Views.FormatRulesEditDlg.textNotValidPercentileExt": "O valor especificado {0} não é um percentil válido.", + "SSE.Views.FormatRulesEditDlg.textOutBorders": "Bordas externas", + "SSE.Views.FormatRulesEditDlg.textPercent": "Por cento", + "SSE.Views.FormatRulesEditDlg.textPercentile": "Percentil", + "SSE.Views.FormatRulesEditDlg.textPosition": "Posição", + "SSE.Views.FormatRulesEditDlg.textPositive": "Positivo", + "SSE.Views.FormatRulesEditDlg.textPresets": "Predefinições", + "SSE.Views.FormatRulesEditDlg.textPreview": "Pré-visualizar", + "SSE.Views.FormatRulesEditDlg.textRelativeRef": "Não é possível utilizar referências relativas em critérios de formatação condicional para escalas de cores, barras de dados e conjuntos de ícones.", + "SSE.Views.FormatRulesEditDlg.textReverse": "Ordem Reversa dos Ícones", + "SSE.Views.FormatRulesEditDlg.textRight2Left": "Da direita para a esquerda", + "SSE.Views.FormatRulesEditDlg.textRightBorders": "Bordas direitas", + "SSE.Views.FormatRulesEditDlg.textRule": "Regra", + "SSE.Views.FormatRulesEditDlg.textSameAs": "O mesmo que positivo", + "SSE.Views.FormatRulesEditDlg.textSelectData": "Selecionar dados", + "SSE.Views.FormatRulesEditDlg.textShortBar": "barra mais curta", + "SSE.Views.FormatRulesEditDlg.textShowBar": "Mostrar apenas barra", + "SSE.Views.FormatRulesEditDlg.textShowIcon": "Mostrar apenas ícone", + "SSE.Views.FormatRulesEditDlg.textSingleRef": "Este tipo de referência não pode ser usado em uma fórmula de formatação condicional.
Alterar a referência para uma única célula, ou usar a referência com uma função de planilha, tal como =SOMA(A1:B5).", + "SSE.Views.FormatRulesEditDlg.textSolid": "Sólido", + "SSE.Views.FormatRulesEditDlg.textStrikeout": "Tachado", + "SSE.Views.FormatRulesEditDlg.textSubscript": "Subscrito", + "SSE.Views.FormatRulesEditDlg.textSuperscript": "Sobrescrito", + "SSE.Views.FormatRulesEditDlg.textTopBorders": "Bordas superiores", + "SSE.Views.FormatRulesEditDlg.textUnderline": "Sublinhado", "SSE.Views.FormatRulesEditDlg.tipBorders": "Bordas", "SSE.Views.FormatRulesEditDlg.tipNumFormat": "Formato Numérico", "SSE.Views.FormatRulesEditDlg.txtAccounting": "Contabilidade", "SSE.Views.FormatRulesEditDlg.txtCurrency": "Moeda", "SSE.Views.FormatRulesEditDlg.txtDate": "Data", + "SSE.Views.FormatRulesEditDlg.txtEmpty": "Este campo é obrigatório", "SSE.Views.FormatRulesEditDlg.txtFraction": "Fração", "SSE.Views.FormatRulesEditDlg.txtGeneral": "Geral", "SSE.Views.FormatRulesEditDlg.txtNumber": "Número", + "SSE.Views.FormatRulesEditDlg.txtPercentage": "Porcentagem", + "SSE.Views.FormatRulesEditDlg.txtScientific": "Científico", + "SSE.Views.FormatRulesEditDlg.txtText": "Тexto", + "SSE.Views.FormatRulesEditDlg.txtTime": "Hora", "SSE.Views.FormatRulesEditDlg.txtTitleEdit": "Editar regra de formatação", "SSE.Views.FormatRulesEditDlg.txtTitleNew": "Nova regra de formatação", "SSE.Views.FormatRulesManagerDlg.guestText": "Convidado(a)", + "SSE.Views.FormatRulesManagerDlg.text1Above": "1 desvio padrão acima da Média", + "SSE.Views.FormatRulesManagerDlg.text1Below": "1 desvio padrão abaixo da Média", + "SSE.Views.FormatRulesManagerDlg.text2Above": "2 desvios padrão acima da Média", + "SSE.Views.FormatRulesManagerDlg.text2Below": "2 desvios padrão abaixo da Média", + "SSE.Views.FormatRulesManagerDlg.text3Above": "3 desvios padrão acima da Média", + "SSE.Views.FormatRulesManagerDlg.text3Below": "3 desvios padrão abaixo da Média", "SSE.Views.FormatRulesManagerDlg.textAbove": "Acima da média", "SSE.Views.FormatRulesManagerDlg.textApply": "Aplicar à", + "SSE.Views.FormatRulesManagerDlg.textBeginsWith": "O valor da célula começa com", "SSE.Views.FormatRulesManagerDlg.textBelow": "Abaixo da média", "SSE.Views.FormatRulesManagerDlg.textBetween": "está entre {0} e {1}", + "SSE.Views.FormatRulesManagerDlg.textCellValue": "Valor da célula", "SSE.Views.FormatRulesManagerDlg.textColorScale": "Escala de cor graduada", + "SSE.Views.FormatRulesManagerDlg.textContains": "O valor da célula contém", "SSE.Views.FormatRulesManagerDlg.textContainsBlank": "A célula contém um valor em branco", "SSE.Views.FormatRulesManagerDlg.textContainsError": "A célula contém um erro", "SSE.Views.FormatRulesManagerDlg.textDelete": "Excluir", @@ -2119,9 +2215,19 @@ "SSE.Views.FormatRulesManagerDlg.textIconSet": "Conjunto de ícones", "SSE.Views.FormatRulesManagerDlg.textNew": "Novo", "SSE.Views.FormatRulesManagerDlg.textNotBetween": "não se encontra entre {0} e {1}.", + "SSE.Views.FormatRulesManagerDlg.textNotContains": "O valor da célula não contém", "SSE.Views.FormatRulesManagerDlg.textNotContainsBlank": "A célula não contém um valor em branco", + "SSE.Views.FormatRulesManagerDlg.textNotContainsError": "A célula não contém um erro", + "SSE.Views.FormatRulesManagerDlg.textRules": "Regras", + "SSE.Views.FormatRulesManagerDlg.textScope": "Mostrar regras de formatação para", + "SSE.Views.FormatRulesManagerDlg.textSelectData": "Selecionar dados", "SSE.Views.FormatRulesManagerDlg.textSelection": "Seleção atual", + "SSE.Views.FormatRulesManagerDlg.textThisPivot": "Tabela dinâmica", + "SSE.Views.FormatRulesManagerDlg.textThisSheet": "Esta folha de trabalho", + "SSE.Views.FormatRulesManagerDlg.textThisTable": "Esta tabela", + "SSE.Views.FormatRulesManagerDlg.textUnique": "Valores únicos", "SSE.Views.FormatRulesManagerDlg.textUp": "Mover regra para cima", + "SSE.Views.FormatRulesManagerDlg.tipIsLocked": "Este elemento está sendo editado por outro usuário.", "SSE.Views.FormatRulesManagerDlg.txtTitle": "Formatação condicional", "SSE.Views.FormatSettingsDialog.textCategory": "Categoria", "SSE.Views.FormatSettingsDialog.textDecimal": "Decimal", @@ -2573,7 +2679,7 @@ "SSE.Views.RightMenu.txtCellSettings": "Configurações de célula", "SSE.Views.RightMenu.txtChartSettings": "Configurações do gráfico", "SSE.Views.RightMenu.txtImageSettings": "Configurações de imagem", - "SSE.Views.RightMenu.txtParagraphSettings": "Configurações de texto", + "SSE.Views.RightMenu.txtParagraphSettings": "Configurações do parágrafo", "SSE.Views.RightMenu.txtPivotSettings": "Configurações de tabela dinâmica", "SSE.Views.RightMenu.txtSettings": "Configurações comuns", "SSE.Views.RightMenu.txtShapeSettings": "Configurações da forma", @@ -3010,6 +3116,7 @@ "SSE.Views.Toolbar.capInsertHyperlink": "Hiperlink", "SSE.Views.Toolbar.capInsertImage": "Imagem", "SSE.Views.Toolbar.capInsertShape": "Forma", + "SSE.Views.Toolbar.capInsertSpark": "Minigráficos", "SSE.Views.Toolbar.capInsertTable": "Tabela", "SSE.Views.Toolbar.capInsertText": "Caixa de texto", "SSE.Views.Toolbar.mniImageFromFile": "Imagem do arquivo", @@ -3094,6 +3201,7 @@ "SSE.Views.Toolbar.textTabLayout": "Layout", "SSE.Views.Toolbar.textTabProtect": "Proteção", "SSE.Views.Toolbar.textTabView": "Ver", + "SSE.Views.Toolbar.textThisPivot": "De uma tabela dinâmica", "SSE.Views.Toolbar.textThisSheet": "A partir desta folha de trabalho", "SSE.Views.Toolbar.textThisTable": "A partir desta tabela", "SSE.Views.Toolbar.textTop": "Superior: ", diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index 010536dc3..d046ea724 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -48,6 +48,39 @@ "Common.define.chartData.textStock": "Bursiere", "Common.define.chartData.textSurface": "Suprafața", "Common.define.chartData.textWinLossSpark": "Câștig/pierdere", + "Common.define.conditionalData.exampleText": "AaBbCcYyZz", + "Common.define.conditionalData.text1Above": "1 abatere standard deasupra", + "Common.define.conditionalData.text1Below": "1 abatere standard dedesubt ", + "Common.define.conditionalData.text2Above": "2 abateri standard deasupra", + "Common.define.conditionalData.text2Below": "2 abateri standard dedesubt", + "Common.define.conditionalData.text3Above": "3 abateri standard deasupra", + "Common.define.conditionalData.text3Below": "3 abateri standard dedesubt", + "Common.define.conditionalData.textAbove": "Deasupra", + "Common.define.conditionalData.textAverage": "Medie", + "Common.define.conditionalData.textBegins": "Începe cu", + "Common.define.conditionalData.textBelow": "Dedesubt", + "Common.define.conditionalData.textBetween": "Între", + "Common.define.conditionalData.textBlank": "Necompletat", + "Common.define.conditionalData.textBlanks": "Conțime celule goale", + "Common.define.conditionalData.textBottom": "Jos", + "Common.define.conditionalData.textContains": "Conține", + "Common.define.conditionalData.textDataBar": "Bară de date", + "Common.define.conditionalData.textDate": "Dată", + "Common.define.conditionalData.textDuplicate": "Dubluri", + "Common.define.conditionalData.textEnds": "Se termină cu", + "Common.define.conditionalData.textEqAbove": "Egal cu sau deasupra", + "Common.define.conditionalData.textEqBelow": "Egal cu sau sub", + "Common.define.conditionalData.textEqual": "Egal cu", + "Common.define.conditionalData.textError": "Eroare", + "Common.define.conditionalData.textErrors": "Conține erori", + "Common.define.conditionalData.textFormula": "Formula", + "Common.define.conditionalData.textGreater": "Mai mare decât", + "Common.define.conditionalData.textGreaterEq": "Mai mare sau egal", + "Common.define.conditionalData.textIconSets": "Ansamble de icoane", + "Common.define.conditionalData.textLast7days": "În ultimele 7 zile", + "Common.define.conditionalData.textNotBlanks": "Nu conțime celule goale", + "Common.define.conditionalData.textNotContains": "Nu conține", + "Common.define.conditionalData.textNotErrors": "Nu conține erori", "Common.Translation.warnFileLocked": "Fișierul este editat într-o altă aplicație. Puteți continua să editați și să-l salvați ca o copie.", "Common.Translation.warnFileLockedBtnEdit": "Crează o copie", "Common.Translation.warnFileLockedBtnView": "Deschide vizualizarea", @@ -76,7 +109,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Documentul a fost modificat de către un alt utilizator.
Salvați modificările făcute de dumneavoastră și reîmprospătați documentul.", "Common.UI.ThemeColorPalette.textStandartColors": "Culori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Culori temă", - "Common.UI.Themes.txtThemeClassicLight": "Luminos Clasic", + "Common.UI.Themes.txtThemeClassicLight": "Clasic Luminos", "Common.UI.Themes.txtThemeDark": "Întunecat", "Common.UI.Themes.txtThemeLight": "Luminos", "Common.UI.Window.cancelButtonText": "Anulare", @@ -100,6 +133,7 @@ "Common.Views.About.txtVersion": "Versiune", "Common.Views.AutoCorrectDialog.textAdd": "Adaugă", "Common.Views.AutoCorrectDialog.textApplyAsWork": "Se aplică în timp ce lucrați", + "Common.Views.AutoCorrectDialog.textAutoCorrect": "AutoCorecție", "Common.Views.AutoCorrectDialog.textAutoFormat": "Formatare automată la tastare", "Common.Views.AutoCorrectDialog.textBy": "După", "Common.Views.AutoCorrectDialog.textDelete": "Ștergere", @@ -190,6 +224,7 @@ "Common.Views.OpenDialog.txtColon": "Două puncte", "Common.Views.OpenDialog.txtComma": "Virgulă", "Common.Views.OpenDialog.txtDelimiter": "Delimitator", + "Common.Views.OpenDialog.txtDestData": "Alegeți locul unde se va plasa datele", "Common.Views.OpenDialog.txtEncoding": "Codificare", "Common.Views.OpenDialog.txtIncorrectPwd": "Parolă incorectă", "Common.Views.OpenDialog.txtOpenFile": "Introduceți parola pentru deschidere fișier", @@ -619,6 +654,7 @@ "SSE.Controllers.Main.errorWrongOperator": "Eroare în formulă. Operator necorespunzător.
Corectați eroarea.", "SSE.Controllers.Main.errRemDuplicates": "Valori dublate au fost identificate și eliminate: {0}, valorile unice rămase: {1}.", "SSE.Controllers.Main.leavePageText": "Nu ați salvat modificările din foaia de calcul. Faceți clic pe Rămâi în pagină și apoi pe Salvare dacă doriți să le salvați. Faceți clic pe Părăsește aceasta pagina ca să renunțați la toate modificările nesalvate.", + "SSE.Controllers.Main.leavePageTextOnClose": "Toate modificările nesalvate din foaia de calcul vor fi pierdute.
Pentru a le salva, faceți clic pe Revocare și apoi pe Salvare. Apăsați OK dacă doriți să renunțați la modificările nesalvate.", "SSE.Controllers.Main.loadFontsTextText": "Încărcarea datelor...", "SSE.Controllers.Main.loadFontsTitleText": "Încărcarea datelor", "SSE.Controllers.Main.loadFontTextText": "Încărcarea datelor...", @@ -954,9 +990,11 @@ "SSE.Controllers.Toolbar.errorStockChart": "Sortarea rândurilor în ordinea incorectă. Pentru crearea unei diagrame de stoc, datele în foaie trebuie sortate în ordinea următoare:
prețul de deschidere, prețul maxim, prețul minim, prețul de închidere.", "SSE.Controllers.Toolbar.textAccent": "Accente", "SSE.Controllers.Toolbar.textBracket": "Paranteze", + "SSE.Controllers.Toolbar.textDirectional": "Direcțional", "SSE.Controllers.Toolbar.textFontSizeErr": "Valoarea introdusă nu este corectă.
Selectați valoarea cuprinsă înte 1 și 409.", "SSE.Controllers.Toolbar.textFraction": "Fracții", "SSE.Controllers.Toolbar.textFunction": "Funcții", + "SSE.Controllers.Toolbar.textIndicator": "Indicatorii", "SSE.Controllers.Toolbar.textInsert": "Inserare", "SSE.Controllers.Toolbar.textIntegral": "Integrale", "SSE.Controllers.Toolbar.textLargeOperator": "Operatori mari", @@ -1360,8 +1398,12 @@ "SSE.Views.CellSettings.textBackground": "Culoare de fundal", "SSE.Views.CellSettings.textBorderColor": "Culoare", "SSE.Views.CellSettings.textBorders": "Stil borduri", + "SSE.Views.CellSettings.textClearRule": "Golire reguli", "SSE.Views.CellSettings.textColor": "Culoare de umplere", + "SSE.Views.CellSettings.textColorScales": "Scale de culori", + "SSE.Views.CellSettings.textCondFormat": "Formatarea condiționată", "SSE.Views.CellSettings.textControl": "Control de text", + "SSE.Views.CellSettings.textDataBars": "Bare de date", "SSE.Views.CellSettings.textDirection": "Orientare", "SSE.Views.CellSettings.textFill": "Umplere", "SSE.Views.CellSettings.textForeground": "Culoarea de prim plan", @@ -1377,6 +1419,10 @@ "SSE.Views.CellSettings.textPosition": "Poziție", "SSE.Views.CellSettings.textRadial": "Radială", "SSE.Views.CellSettings.textSelectBorders": "Selectați borduri pe care doriți să le modificați prin aplicarea stilului selectat", + "SSE.Views.CellSettings.textSelection": "Din selecția curentă", + "SSE.Views.CellSettings.textThisPivot": "Din acest tabel pivot", + "SSE.Views.CellSettings.textThisSheet": "Din această foaie de calcul", + "SSE.Views.CellSettings.textThisTable": "Din acest tabel", "SSE.Views.CellSettings.tipAddGradientPoint": "Adăugare stop gradient", "SSE.Views.CellSettings.tipAll": "Adăugare bordură exterioară și toate borduri interioare", "SSE.Views.CellSettings.tipBottom": "Adăugare numai bordură exterioară de jos", @@ -1586,14 +1632,19 @@ "SSE.Views.CreatePivotDialog.textInvalidRange": "Zonă de celule nu este validă", "SSE.Views.CreatePivotDialog.textNew": "Foaie de calcul nouă", "SSE.Views.CreatePivotDialog.textSelectData": "Selectare date", - "SSE.Views.CreatePivotDialog.textTitle": "Creare tabelă Pivot", + "SSE.Views.CreatePivotDialog.textTitle": "Creare tabel Pivot", "SSE.Views.CreatePivotDialog.txtEmpty": "Câmp obligatoriu", + "SSE.Views.CreateSparklineDialog.textDestination": "Alegeți locul unde se va plasa diagrama sparkline", + "SSE.Views.CreateSparklineDialog.textTitle": "Creare diagrame sparkline", "SSE.Views.DataTab.capBtnGroup": "Grupare", "SSE.Views.DataTab.capBtnTextCustomSort": "Sortare particularizată", "SSE.Views.DataTab.capBtnTextDataValidation": "Validarea datelor", "SSE.Views.DataTab.capBtnTextRemDuplicates": "Eliminare dubluri", "SSE.Views.DataTab.capBtnTextToCol": "Text în coloane", "SSE.Views.DataTab.capBtnUngroup": "Anularea grupării", + "SSE.Views.DataTab.capDataFromText": "Din text/CSV", + "SSE.Views.DataTab.mniFromFile": "Colectare date din fișier", + "SSE.Views.DataTab.mniFromUrl": "Colectare date prin URL", "SSE.Views.DataTab.textBelow": "Rânduri rezumative sub detalii", "SSE.Views.DataTab.textClear": "Golire schiță", "SSE.Views.DataTab.textColumns": "Anularea grupării coloanelor", @@ -1602,6 +1653,7 @@ "SSE.Views.DataTab.textRightOf": "Rezumat coloane la dreapta detaliilor", "SSE.Views.DataTab.textRows": "Anularea grupării rândurilor", "SSE.Views.DataTab.tipCustomSort": "Sortare particularizată", + "SSE.Views.DataTab.tipDataFromText": "Colectare date din fișierul text/CSV", "SSE.Views.DataTab.tipDataValidation": "Validarea datelor", "SSE.Views.DataTab.tipGroup": "Grupare zonă de celule", "SSE.Views.DataTab.tipRemDuplicates": "Eliminarea rândurilor dublate dintr-o foaie", @@ -1725,6 +1777,7 @@ "SSE.Views.DocumentHolder.textArrangeForward": "Aducere în plan apropiat", "SSE.Views.DocumentHolder.textArrangeFront": "Aducere în prim plan", "SSE.Views.DocumentHolder.textAverage": "Medie", + "SSE.Views.DocumentHolder.textBullets": "Marcatori", "SSE.Views.DocumentHolder.textCount": "Contorizare", "SSE.Views.DocumentHolder.textCrop": "Trunchiere", "SSE.Views.DocumentHolder.textCropFill": "Umplere", @@ -1737,6 +1790,7 @@ "SSE.Views.DocumentHolder.textFromStorage": "Din serviciul stocare", "SSE.Views.DocumentHolder.textFromUrl": "Prin URL-ul", "SSE.Views.DocumentHolder.textListSettings": "Setări lista", + "SSE.Views.DocumentHolder.textMacro": "Asocierea macrocomenzii", "SSE.Views.DocumentHolder.textMax": "Max", "SSE.Views.DocumentHolder.textMin": "Min", "SSE.Views.DocumentHolder.textMore": "Mai multe funcții", @@ -1818,7 +1872,7 @@ "SSE.Views.DocumentHolder.txtSortFontColor": "Culoarea fontului selectat în partea de sus", "SSE.Views.DocumentHolder.txtSparklines": "Diagrame sparkline", "SSE.Views.DocumentHolder.txtText": "Text", - "SSE.Views.DocumentHolder.txtTextAdvanced": "Setări avansate text", + "SSE.Views.DocumentHolder.txtTextAdvanced": "Setări avansate paragraf ", "SSE.Views.DocumentHolder.txtTime": "Oră", "SSE.Views.DocumentHolder.txtUngroup": "Anularea grupării", "SSE.Views.DocumentHolder.txtWidth": "Lățime", @@ -1926,17 +1980,27 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Salvare pe server", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "La fiecare minută", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Stil referință", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBe": "Belarusă", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBg": "Bulgară", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCa": "Catalană", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCacheMode": "Mod implicit memoria Cache", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCm": "Centimetru", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtCs": "Cehă", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDa": "Daneză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtDe": "Germană", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEl": "Greacă", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEn": "Engleză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtEs": "Spaniolă", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtFi": "Finlandeză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtFr": "Franceză", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtHu": "Maghiară", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtId": "Indoneziană", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtInch": "Inch", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtIt": "Italiană", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtLiveComment": "Afișare comentarii", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtMac": "ca OS X", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNative": "Sursă", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtNl": "Neerlandeză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPl": "Poloneză", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punct", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Rusă", @@ -1947,6 +2011,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Afișare notificări", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Se dezactivează toate macrocomenzile, cu notificare ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "ca Windows", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtZh": "Chineză", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.okButtonText": "Aplicare", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Limbă de dicționar", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "Ignoră cuvintele cu MAJUSCULE", @@ -1967,6 +2032,77 @@ "SSE.Views.FileMenuPanels.Settings.txtGeneral": "General", "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Setare pagină", "SSE.Views.FileMenuPanels.Settings.txtSpellChecking": "Verificarea ortografică", + "SSE.Views.FormatRulesEditDlg.fillColor": "Culoare de fundal", + "SSE.Views.FormatRulesEditDlg.text2Scales": "Scară cu două culori", + "SSE.Views.FormatRulesEditDlg.text3Scales": "Scară cu trei culori", + "SSE.Views.FormatRulesEditDlg.textAllBorders": "Toate borduri", + "SSE.Views.FormatRulesEditDlg.textAppearance": "Aspect bară", + "SSE.Views.FormatRulesEditDlg.textApply": "Se aplică la zonă", + "SSE.Views.FormatRulesEditDlg.textAutomatic": "Automat", + "SSE.Views.FormatRulesEditDlg.textAxis": "Axă", + "SSE.Views.FormatRulesEditDlg.textBarDirection": "Direcția barei", + "SSE.Views.FormatRulesEditDlg.textBold": "Aldin", + "SSE.Views.FormatRulesEditDlg.textBorder": "Bordura", + "SSE.Views.FormatRulesEditDlg.textBordersColor": "Culoare borduri", + "SSE.Views.FormatRulesEditDlg.textBordersStyle": "Stil bordură", + "SSE.Views.FormatRulesEditDlg.textBottomBorders": "Bordurile în partea de jos", + "SSE.Views.FormatRulesEditDlg.textCannotAddCF": "Formatarea condiționată nu poate fi ajutată.", + "SSE.Views.FormatRulesEditDlg.textCellMidpoint": "Punctul central al celulei", + "SSE.Views.FormatRulesEditDlg.textCenterBorders": "Bordurile verticale în interiorul ", + "SSE.Views.FormatRulesEditDlg.textClear": "Golire", + "SSE.Views.FormatRulesEditDlg.textContext": "Context", + "SSE.Views.FormatRulesEditDlg.textCustom": "Particularizat", + "SSE.Views.FormatRulesEditDlg.textDiagDownBorder": "Bordură diagonală descendentă", + "SSE.Views.FormatRulesEditDlg.textDiagUpBorder": "Bordură diagonală ascendentă", + "SSE.Views.FormatRulesEditDlg.textEmptyFormula": "Introduceți o formulă valabilă.", + "SSE.Views.FormatRulesEditDlg.textEmptyText": "Introduceți o valoare.", + "SSE.Views.FormatRulesEditDlg.textErrorTop10Between": "Introduceți cifra între {0} și {1}.", + "SSE.Views.FormatRulesEditDlg.textFill": "Umplere", + "SSE.Views.FormatRulesEditDlg.textFormat": "Formatare", + "SSE.Views.FormatRulesEditDlg.textFormula": "Formula", + "SSE.Views.FormatRulesEditDlg.textGradient": "Gradient", + "SSE.Views.FormatRulesEditDlg.textIconStyle": "Stil icoană", + "SSE.Views.FormatRulesEditDlg.textInsideBorders": "Borduri în interiorul ", + "SSE.Views.FormatRulesEditDlg.textInvalidRange": "EROARE! Zonă de celule nu este validă", + "SSE.Views.FormatRulesEditDlg.textMiddleBorders": "Bordurile orizontale în interiorul ", + "SSE.Views.FormatRulesEditDlg.textNewColor": "Adăugarea unei culori particularizate noi", + "SSE.Views.FormatRulesEditDlg.tipBorders": "Borduri", + "SSE.Views.FormatRulesEditDlg.txtAccounting": "Contabilitate", + "SSE.Views.FormatRulesEditDlg.txtCurrency": "Monedă", + "SSE.Views.FormatRulesEditDlg.txtDate": "Dată", + "SSE.Views.FormatRulesEditDlg.txtFraction": "Fracție", + "SSE.Views.FormatRulesEditDlg.txtGeneral": "General", + "SSE.Views.FormatRulesEditDlg.txtTitleEdit": "Editare regulă de formatare", + "SSE.Views.FormatRulesManagerDlg.guestText": "Invitat", + "SSE.Views.FormatRulesManagerDlg.text1Above": "1 abatere standard deasupra medie", + "SSE.Views.FormatRulesManagerDlg.text1Below": "1 abatere standard sub medie", + "SSE.Views.FormatRulesManagerDlg.text2Above": "2 abateri standard deasupra medie", + "SSE.Views.FormatRulesManagerDlg.text2Below": "2 abateri standard sub medie", + "SSE.Views.FormatRulesManagerDlg.text3Above": "3 abateri standard deasupra medie", + "SSE.Views.FormatRulesManagerDlg.text3Below": "3 abateri standard sub medie", + "SSE.Views.FormatRulesManagerDlg.textAbove": "Deasupra medie", + "SSE.Views.FormatRulesManagerDlg.textApply": "Se aplică la", + "SSE.Views.FormatRulesManagerDlg.textBeginsWith": "Valoarea din celulă se începe cu", + "SSE.Views.FormatRulesManagerDlg.textBelow": "Sub medie", + "SSE.Views.FormatRulesManagerDlg.textCellValue": "Valoarea din celulă", + "SSE.Views.FormatRulesManagerDlg.textColorScale": "Scală de culoare cu gradare ", + "SSE.Views.FormatRulesManagerDlg.textContains": "Valoarea din celulă conține", + "SSE.Views.FormatRulesManagerDlg.textContainsBlank": "Celula canține o valorae goală", + "SSE.Views.FormatRulesManagerDlg.textContainsError": "Celula conține o eroare", + "SSE.Views.FormatRulesManagerDlg.textDelete": "Ștergere", + "SSE.Views.FormatRulesManagerDlg.textDuplicate": "Valori duble", + "SSE.Views.FormatRulesManagerDlg.textEdit": "Editare", + "SSE.Views.FormatRulesManagerDlg.textEnds": "Valoarea din celulă se termină cu", + "SSE.Views.FormatRulesManagerDlg.textEqAbove": "Egal cu sau deasupra medie", + "SSE.Views.FormatRulesManagerDlg.textEqBelow": "Egal cu sau sub medie", + "SSE.Views.FormatRulesManagerDlg.textFormat": "Formatare", + "SSE.Views.FormatRulesManagerDlg.textIconSet": "Ansamblul de icoane", + "SSE.Views.FormatRulesManagerDlg.textNotContains": "Valoarea din celulă nu conține", + "SSE.Views.FormatRulesManagerDlg.textNotContainsBlank": "Celula nu conține nicio valoare goală", + "SSE.Views.FormatRulesManagerDlg.textNotContainsError": "Celula nu conține nicio eroare", + "SSE.Views.FormatRulesManagerDlg.textSelection": "Selecția curentă", + "SSE.Views.FormatRulesManagerDlg.textThisTable": "Acest tabel", + "SSE.Views.FormatRulesManagerDlg.txtTitle": "Formatarea condiționată", "SSE.Views.FormatSettingsDialog.textCategory": "Categorie", "SSE.Views.FormatSettingsDialog.textDecimal": "Zecimal", "SSE.Views.FormatSettingsDialog.textFormat": "Formatare", @@ -2131,6 +2267,7 @@ "SSE.Views.LeftMenu.txtLimit": "Limitare acces", "SSE.Views.LeftMenu.txtTrial": "PERIOADĂ DE PROBĂ", "SSE.Views.LeftMenu.txtTrialDev": "Mod dezvoltator de încercare", + "SSE.Views.MacroDialog.textTitle": "Asocierea macrocomenzii", "SSE.Views.MainSettingsPrint.okButtonText": "Salvează", "SSE.Views.MainSettingsPrint.strBottom": "Jos", "SSE.Views.MainSettingsPrint.strLandscape": "Vedere", @@ -2347,7 +2484,7 @@ "SSE.Views.PivotTable.textColHeader": "Anteturi coloană", "SSE.Views.PivotTable.textRowBanded": "Rânduri alternante", "SSE.Views.PivotTable.textRowHeader": "Anteturi rând", - "SSE.Views.PivotTable.tipCreatePivot": "Inserare tabelă Pivot", + "SSE.Views.PivotTable.tipCreatePivot": "Inserare tabel Pivot", "SSE.Views.PivotTable.tipGrandTotals": "Afișare sau ascundere totaluri generale", "SSE.Views.PivotTable.tipRefresh": "Actualizarea sursei de informație", "SSE.Views.PivotTable.tipSelect": "Selectați tabel Pivot întreg", @@ -2415,7 +2552,7 @@ "SSE.Views.RightMenu.txtCellSettings": "Setări celula", "SSE.Views.RightMenu.txtChartSettings": "Setări diagramă", "SSE.Views.RightMenu.txtImageSettings": "Setări imagine", - "SSE.Views.RightMenu.txtParagraphSettings": "Setări text", + "SSE.Views.RightMenu.txtParagraphSettings": "Setări paragraf", "SSE.Views.RightMenu.txtPivotSettings": "Setări tabelă Pivot", "SSE.Views.RightMenu.txtSettings": "Setări comune", "SSE.Views.RightMenu.txtShapeSettings": "Setări forma", @@ -2832,6 +2969,7 @@ "SSE.Views.TextArtSettings.txtPapyrus": "Papirus", "SSE.Views.TextArtSettings.txtWood": "Lemn", "SSE.Views.Toolbar.capBtnAddComment": "Adaugă comentariu", + "SSE.Views.Toolbar.capBtnColorSchemas": "Schemă de culori", "SSE.Views.Toolbar.capBtnComment": "Comentariu", "SSE.Views.Toolbar.capBtnInsHeader": "Antet/Subsol", "SSE.Views.Toolbar.capBtnInsSlicer": "Slicer", @@ -2874,8 +3012,11 @@ "SSE.Views.Toolbar.textBottomBorders": "bordurile în partea de jos", "SSE.Views.Toolbar.textCenterBorders": "Bordurile verticale în interiorul ", "SSE.Views.Toolbar.textClearPrintArea": "Golire zonă de imprimare", + "SSE.Views.Toolbar.textClearRule": "Golire reguli", "SSE.Views.Toolbar.textClockwise": "Unghi de rotație în sens orar", + "SSE.Views.Toolbar.textColorScales": "Scale de culori", "SSE.Views.Toolbar.textCounterCw": "Unghi de rotație în sens antiorar", + "SSE.Views.Toolbar.textDataBars": "Bare de date", "SSE.Views.Toolbar.textDelLeft": "Deplasare celule la stânga", "SSE.Views.Toolbar.textDelUp": "Deplasare celule în sus", "SSE.Views.Toolbar.textDiagDownBorder": "Bordură diagonală descendentă", @@ -2914,6 +3055,7 @@ "SSE.Views.Toolbar.textRotateUp": "Rotirea textului în sus", "SSE.Views.Toolbar.textScale": "Scară", "SSE.Views.Toolbar.textScaleCustom": "Particularizat", + "SSE.Views.Toolbar.textSelection": "Din selecția curentă", "SSE.Views.Toolbar.textSetPrintArea": "Setare zonă de imprimare", "SSE.Views.Toolbar.textStrikeout": "Tăiere cu o linie", "SSE.Views.Toolbar.textSubscript": "Indice", @@ -2928,6 +3070,9 @@ "SSE.Views.Toolbar.textTabLayout": "Aspect", "SSE.Views.Toolbar.textTabProtect": "Protejare", "SSE.Views.Toolbar.textTabView": "Vizualizare", + "SSE.Views.Toolbar.textThisPivot": "Din acest tabel pivot", + "SSE.Views.Toolbar.textThisSheet": "Din această foaie de calcul", + "SSE.Views.Toolbar.textThisTable": "Din acest tabel", "SSE.Views.Toolbar.textTop": "Sus:", "SSE.Views.Toolbar.textTopBorders": "Borduri de sus", "SSE.Views.Toolbar.textUnderline": "Subliniat", @@ -2948,6 +3093,7 @@ "SSE.Views.Toolbar.tipChangeChart": "Modificare tip diagramă", "SSE.Views.Toolbar.tipClearStyle": "Golire", "SSE.Views.Toolbar.tipColorSchemas": "Modificare schemă de culori", + "SSE.Views.Toolbar.tipCondFormat": "Formatarea condiționată", "SSE.Views.Toolbar.tipCopy": "Copiere", "SSE.Views.Toolbar.tipCopyStyle": "Copiere stil", "SSE.Views.Toolbar.tipDecDecimal": "Micșorare zecimală", @@ -2975,6 +3121,7 @@ "SSE.Views.Toolbar.tipInsertOpt": "Inserare celule", "SSE.Views.Toolbar.tipInsertShape": "Inserare formă automată", "SSE.Views.Toolbar.tipInsertSlicer": "Inserare slicer", + "SSE.Views.Toolbar.tipInsertSpark": "Inserare diagramă sparkline", "SSE.Views.Toolbar.tipInsertSymbol": "Inserare simbol", "SSE.Views.Toolbar.tipInsertTable": "Inserare tabel", "SSE.Views.Toolbar.tipInsertText": "Inserare casetă text", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 324806a0b..50946ceb9 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -127,7 +127,7 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", - "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeClassicLight": "Классическая светлая", "Common.UI.Themes.txtThemeDark": "Темная", "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", @@ -1994,7 +1994,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strDecimalSeparator": "Десятичный разделитель", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFast": "Быстрый", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFontRender": "Хинтинг шрифтов", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Всегда сохранять на сервере (в противном случае сохранять на сервере при закрытии документа)", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strForcesave": "Добавлять версию в хранилище после нажатия кнопки Сохранить или Ctrl+S", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocale": "Язык формул", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "Пример: СУММ; МИН; МАКС; СЧЁТ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "Включить отображение комментариев в тексте", @@ -2019,7 +2019,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoRecover": "Автовосстановление", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textAutoSave": "Автосохранение", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textDisabled": "Отключено", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Сохранять на сервере", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.textForceSave": "Сохранение промежуточных версий", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textMinute": "Каждую минуту", "SSE.Views.FileMenuPanels.MainSettingsGeneral.textRefStyle": "Стиль ссылок", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtBe": "Белорусский", diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index 7c4d7ebc4..bed415854 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -831,7 +831,7 @@ "SSE.Controllers.Main.txtValues": "值", "SSE.Controllers.Main.txtXAxis": "X轴", "SSE.Controllers.Main.txtYAxis": "Y轴", - "SSE.Controllers.Main.unknownErrorText": "示知错误", + "SSE.Controllers.Main.unknownErrorText": "未知错误", "SSE.Controllers.Main.unsupportedBrowserErrorText": "你的浏览器不支持", "SSE.Controllers.Main.uploadImageExtMessage": "未知图像格式", "SSE.Controllers.Main.uploadImageFileCountMessage": "没有图片上传", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 7921455e0..02681d4f8 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -193,7 +193,7 @@ }, "Toolbar": { "dlgLeaveTitleText": "You leave the application", - "dlgLeaveMsgText": "You have unsaved changes in this document. Click \\'Stay on this Page\\' to await the autosave of the document. Click \\'Leave this Page\\' to discard all the unsaved changes.", + "dlgLeaveMsgText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "leaveButtonText": "Leave this Page", "stayButtonText": "Stay on this Page" }, diff --git a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx index 3a8742057..6e8b153e8 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/FilterOptions.jsx @@ -51,7 +51,7 @@ const FilterOptionsController = () => { const onSort = (type) => { const api = Common.EditorApi.get(); - api.asc_sortColFilter(type == 'sortdown' ? Asc.c_oAscSortOptions.Ascending : Asc.c_oAscSortOptions.Descending, configFilter.asc_getCellId(), configFilter.asc_getDisplayName(), undefined, true); + api.asc_sortColFilter(type == 'sortdown' ? Asc.c_oAscSortOptions.Ascending : Asc.c_oAscSortOptions.Descending, configFilter.asc_getCellId(), configFilter.asc_getDisplayName()); f7.sheet.close('.picker__sheet'); f7.popover.close('#picker-popover'); }; diff --git a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx index ade8d976a..8db15a70a 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from 'react'; -import { inject } from 'mobx-react'; +import { inject, observer } from 'mobx-react'; import { f7 } from 'framework7-react'; import { useTranslation } from 'react-i18next'; import ToolbarView from "../view/Toolbar"; -const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetInfo')(props => { +const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetInfo')(observer(props => { const {t} = useTranslation(); const _t = t("Toolbar", { returnObjects: true }); @@ -24,9 +24,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn api.asc_registerCallback('asc_onWorkbookLocked', onApiSelectionChanged); api.asc_registerCallback('asc_onWorksheetLocked', onApiSelectionChanged); api.asc_registerCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); - api.asc_registerCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); - Common.Notifications.on('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.on('toolbar:activatecontrols', activateControls); Common.Notifications.on('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.on('goback', goBack); @@ -39,9 +37,14 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn onDocumentReady(); } + if (isDisconnected) { + f7.popover.close(); + f7.sheet.close(); + f7.popup.close(); + } + return () => { Common.Notifications.off('document:ready', onDocumentReady); - Common.Notifications.off('api:disconnect', onCoAuthoringDisconnect); Common.Notifications.off('toolbar:activatecontrols', activateControls); Common.Notifications.off('toolbar:deactivateeditcontrols', deactivateEditControls); Common.Notifications.off('goback', goBack); @@ -54,7 +57,6 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn api.asc_unregisterCallback('asc_onWorkbookLocked', onApiSelectionChanged); api.asc_unregisterCallback('asc_onWorksheetLocked', onApiSelectionChanged); api.asc_unregisterCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); - api.asc_unregisterCallback('asc_onCoAuthoringDisconnect', onCoAuthoringDisconnect); } }); @@ -179,15 +181,6 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn setDisabledControls(false); }; - const onCoAuthoringDisconnect = (enableDownload) => { - deactivateEditControls(enableDownload); - setCanUndo(false); - setCanRedo(false); - f7.popover.close(); - f7.sheet.close(); - f7.popup.close(); - }; - const onEditDocument = () => { Common.Gateway.requestEditRights(); }; @@ -208,8 +201,9 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn displayCollaboration={displayCollaboration} showEditDocument={showEditDocument} onEditDocument={onEditDocument} + isDisconnected={isDisconnected} /> ) -}); +})); export {ToolbarController as Toolbar}; \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx index 46220d98d..5c6a4a525 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddFunction.jsx @@ -12,8 +12,8 @@ class _FunctionGroups extends Component { super(props); } componentDidMount() { - Common.Notifications.on('engineCreated', api => { - this.api = api; + Common.Notifications.on('document:ready', () => { + this.api = Common.EditorApi.get(); this.init(); }); } diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditImage.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditImage.jsx index 446dc647d..d882773b1 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditImage.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditImage.jsx @@ -51,6 +51,7 @@ class EditImageController extends Component { properties.put_Width(imgsize.get_ImageWidth()); properties.put_Height(imgsize.get_ImageHeight()); properties.put_ResetCrop(true); + properties.put_Rot(0); api.asc_setGraphicObjectProps(properties); } diff --git a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx index 24dc66428..6e1ed4b25 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/settings/Download.jsx @@ -94,7 +94,8 @@ const onAdvancedOptions = (type, advOptions, mode, formatOptions, _t, isDocReady '' + '
' + '', - buttons: buttons + buttons: buttons, + cssClass: 'dlg-adv-options' }).open(); const recommendedSettings = advOptions.asc_getRecommendedSettings(); diff --git a/apps/spreadsheeteditor/mobile/src/store/functions.js b/apps/spreadsheeteditor/mobile/src/store/functions.js index 7c5b90a6d..c73acc728 100644 --- a/apps/spreadsheeteditor/mobile/src/store/functions.js +++ b/apps/spreadsheeteditor/mobile/src/store/functions.js @@ -1,21 +1,20 @@ -import {action, computed, makeObservable} from 'mobx'; +import {action, observable, makeObservable} from 'mobx'; export class storeFunctions { constructor() { makeObservable(this, { initFunctions: action, - functions: computed + functions: observable }); } + functions = {}; + initFunctions (groups, data) { - this.groups = groups; - this.data = data; + this.functions = this.getFunctions(groups, data); } - get functions () { - const groups = this.groups; - const data = this.data; + getFunctions (groups, data) { const functions = {}; for (let g in groups) { const group = groups[g]; diff --git a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx index 93c1c7740..0cf7909be 100644 --- a/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/Toolbar.jsx @@ -4,9 +4,10 @@ import { Device } from '../../../../common/mobile/utils/device'; import EditorUIController from '../lib/patch' const ToolbarView = props => { + const isDisconnected = props.isDisconnected; const undo_box = props.isEdit && EditorUIController.toolbarOptions ? EditorUIController.toolbarOptions.getUndoRedo({ - disabledUndo: !props.isCanUndo, - disabledRedo: !props.isCanRedo, + disabledUndo: !props.isCanUndo || isDisconnected, + disabledRedo: !props.isCanRedo || isDisconnected, onUndoClick: props.onUndo, onRedoClick: props.onRedo }) : null; @@ -23,7 +24,7 @@ const ToolbarView = props => { } {props.isEdit && EditorUIController.toolbarOptions && EditorUIController.toolbarOptions.getEditOptions({ - disabled: props.disabledEditControls || props.disabledControls, + disabled: props.disabledEditControls || props.disabledControls || isDisconnected, onEditClick: () => props.openOptions('edit'), onAddClick: () => props.openOptions('add') })} diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx index 3df3425df..2115c773d 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/Edit.jsx @@ -296,7 +296,7 @@ const EditLayoutNavbar = ({ editors, inPopover }) => { editors.length > 1 ?
{editors.map((item, index) => {item.caption})} - {isAndroid && } + {isAndroid && }
: { editors[0].caption } } diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx index 7662e68fa..66e0d6e43 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditChart.jsx @@ -147,6 +147,7 @@ const PageBorderColor = props => { const PageStyle = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); + const isAndroid = Device.android; const storeChartSettings = props.storeChartSettings; const storeFocusObjects = props.storeFocusObjects; const chartProperties = storeFocusObjects.chartObject && storeFocusObjects.chartObject.get_ChartProperties(); @@ -195,6 +196,7 @@ const PageStyle = props => { {chartStyles ? {_t.textStyle} : null} {_t.textFill} {_t.textBorder} + {isAndroid && } {Device.phone && diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx index dd3eeb6e5..ef6ffd9d7 100644 --- a/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditShape.jsx @@ -83,6 +83,7 @@ const PaletteFill = inject("storeFocusObjects", "storeShapeSettings", "storePale const PageStyle = props => { const { t } = useTranslation(); const _t = t('View.Edit', {returnObjects: true}); + const isAndroid = Device.android; const storeShapeSettings = props.storeShapeSettings; const storeFocusObjects = props.storeFocusObjects; const shapeObject = storeFocusObjects.shapeObject.get_ShapeProperties(); @@ -121,6 +122,7 @@ const PageStyle = props => { {_t.textFill} {_t.textBorder} {_t.textEffects} + {isAndroid && } {Device.phone && diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx index 9039e0cda..d2738b577 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/ApplicationSettings.jsx @@ -27,14 +27,14 @@ const PageApplicationSettings = props => { }; // set mode - // const appOptions = props.storeAppOptions; - // const _isEdit = appOptions.isEdit; + const appOptions = props.storeAppOptions; + const _isEdit = appOptions.isEdit; // const _isShowMacros = (!appOptions.isDisconnected && appOptions.customization) ? appOptions.customization.macros !== false : true; return ( - {/* {_isEdit && */} + {_isEdit && {_t.textUnitOfMeasurement} @@ -59,39 +59,40 @@ const PageApplicationSettings = props => { onRegSettings: props.onRegSettings }}> - {_t.textCommentingDisplay} - - - {_t.textComments} - { - storeApplicationSettings.changeDisplayComments(!isComments); - props.onChangeDisplayComments(!isComments); - }} - /> - - - {_t.textResolvedComments} - { - storeApplicationSettings.changeDisplayResolved(!isResolvedComments); - props.onChangeDisplayResolved(!isResolvedComments); - }} - /> - - - - - {_t.textR1C1Style} - { - storeApplicationSettings.changeRefStyle(!isRefStyle); - props.clickR1C1Style(!isRefStyle); - }} - /> - - + } + {_t.textCommentingDisplay} + + + {_t.textComments} + { + storeApplicationSettings.changeDisplayComments(!isComments); + props.onChangeDisplayComments(!isComments); + }} + /> + + + {_t.textResolvedComments} + { + storeApplicationSettings.changeDisplayResolved(!isResolvedComments); + props.onChangeDisplayResolved(!isResolvedComments); + }} + /> + + + + + {_t.textR1C1Style} + { + storeApplicationSettings.changeRefStyle(!isRefStyle); + props.clickR1C1Style(!isRefStyle); + }} + /> + + {/* } */} {/* {_isShowMacros && */} diff --git a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx index 6d3793350..ac8caca6e 100644 --- a/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx @@ -138,9 +138,11 @@ const SettingsList = inject("storeAppOptions")(observer(props => { : null} - - - + {_isEdit && + + + + } diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 3261b2c18..58af0a5c9 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -99,7 +99,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-htmlmin'); grunt.loadNpmTasks('grunt-json-minify'); grunt.loadNpmTasks('grunt-text-replace'); - grunt.loadNpmTasks('grunt-mocha'); + // grunt.loadNpmTasks('grunt-mocha'); grunt.loadNpmTasks('grunt-inline'); grunt.loadNpmTasks('grunt-svgmin'); grunt.loadNpmTasks('grunt-exec'); @@ -524,7 +524,7 @@ module.exports = function(grunt) { options: { cwd: '../vendor/framework7-react', }, - cmd: 'npm i', + cmd: 'npm i --include=dev', }, } }); diff --git a/build/documenteditor.json b/build/documenteditor.json index a1d168912..a220200a8 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -355,7 +355,8 @@ } ], "index-page": { - "../deploy/web-apps/apps/documenteditor/mobile/index.html": "../apps/documenteditor/mobile/index.html" + "../deploy/web-apps/apps/documenteditor/mobile/index.html": "../apps/documenteditor/mobile/index.html", + "../deploy/web-apps/apps/documenteditor/mobile/index_loader.html": "../apps/documenteditor/mobile/index.html" }, "localization": [ { diff --git a/build/package.json b/build/package.json index 0ffe7ce6c..f16bcf600 100644 --- a/build/package.json +++ b/build/package.json @@ -23,11 +23,11 @@ "iconv-lite": "^0.5.1", "less-plugin-clean-css": "1.5.0", "lodash": "^4.17.20", + "grunt-exec": "^3.0.0", "vinyl-fs": "^3.0.3" }, "devDependencies": { "chai": "1.9.1", - "grunt-exec": "^3.0.0", "mocha": "^6.2.2", "grunt-mocha": "^1.0.0" } diff --git a/build/presentationeditor.json b/build/presentationeditor.json index f5954e7f7..ccddf34cd 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -371,7 +371,8 @@ } ], "index-page": { - "../deploy/web-apps/apps/presentationeditor/mobile/index.html": "../apps/presentationeditor/mobile/index.html" + "../deploy/web-apps/apps/presentationeditor/mobile/index.html": "../apps/presentationeditor/mobile/index.html", + "../deploy/web-apps/apps/presentationeditor/mobile/index_loader.html": "../apps/presentationeditor/mobile/index.html" }, "localization": [ { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index d4270756a..8d3be3fb9 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -372,13 +372,14 @@ } ], "index-page": { - "../deploy/web-apps/apps/spreadsheeteditor/mobile/index.html": "../apps/spreadsheeteditor/mobile/index.html" + "../deploy/web-apps/apps/spreadsheeteditor/mobile/index.html": "../apps/spreadsheeteditor/mobile/index.html", + "../deploy/web-apps/apps/spreadsheeteditor/mobile/index_loader.html": "../apps/spreadsheeteditor/mobile/index.html" }, "localization": [ { "expand": true, "cwd": "../apps/spreadsheeteditor/mobile/locale/", - "src": "*", + "src": "**/*", "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/locale/" }, { diff --git a/vendor/framework7-react/build/webpack.config.js b/vendor/framework7-react/build/webpack.config.js index e9a53c7dc..ba15ce0d7 100644 --- a/vendor/framework7-react/build/webpack.config.js +++ b/vendor/framework7-react/build/webpack.config.js @@ -50,7 +50,7 @@ module.exports = { jquery: 'jQuery' }, - devtool: env === 'production' ? false : 'source-map', + devtool: env === 'production' ? /*false*/'source-map' : 'source-map', // TODO: turn off debugger source map before release optimization: { minimizer: [new TerserPlugin({ })],