diff --git a/.gitignore b/.gitignore index d3dd6ed5d..9319f27ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,14 @@ .idea Thumbs.db .DS_Store -deploy +/deploy build/node_modules apps/documenteditor/embed/resources/less/node_modules apps/presentationeditor/embed/resources/less/node_modules apps/spreadsheeteditor/embed/resources/less/node_modules apps/documenteditor/mobile/resources/sass/.sass-cache apps/spreadsheeteditor/mobile/resources/sass/.sass-cache -apps/presentationeditor/mobile/resources/sass/.sass-cache +apps/presentationeditor/mobile/resources/sass/.sass-cache # test documents @@ -18,8 +18,8 @@ apps/presentationeditor/mobile/document apps/spreadsheeteditor/embed/offlinedocs apps/spreadsheeteditor/main/offlinedocs apps/spreadsheeteditor/mobile/offlinedocs - -# tests -selenium-debug.log -**/test/bin + +# tests +selenium-debug.log +**/test/bin **/test/reports \ No newline at end of file diff --git a/apps/common/main/lib/view/About.js b/apps/common/main/lib/view/About.js index d40c8610f..c252cc06d 100644 --- a/apps/common/main/lib/view/About.js +++ b/apps/common/main/lib/view/About.js @@ -61,7 +61,7 @@ define([ this.template = _.template([ '', '', - '', + '', '', '', '', diff --git a/apps/common/main/resources/img/about/OnlyOffice.png b/apps/common/main/resources/img/about/logo.png similarity index 100% rename from apps/common/main/resources/img/about/OnlyOffice.png rename to apps/common/main/resources/img/about/logo.png diff --git a/apps/common/main/resources/img/about/OnlyOffice@2x.png b/apps/common/main/resources/img/about/logo@2x.png similarity index 100% rename from apps/common/main/resources/img/about/OnlyOffice@2x.png rename to apps/common/main/resources/img/about/logo@2x.png diff --git a/apps/common/main/resources/less/about.less b/apps/common/main/resources/less/about.less index 758f4032e..c0ec153b8 100644 --- a/apps/common/main/resources/less/about.less +++ b/apps/common/main/resources/less/about.less @@ -1,11 +1,15 @@ .about-dlg { .asc-about-office { background-repeat: no-repeat; - .background-ximage('@{common-image-path}/about/OnlyOffice.png', '@{common-image-path}/about/OnlyOffice@2x.png', 340px); - - width: 340px; - height: 55px; margin-bottom: 5px; + content: data-uri('@{common-image-path}/about/logo.png'); + + @media + only screen and (-webkit-min-device-pixel-ratio: 2), + only screen and (min-resolution: 2dppx), + only screen and (min-resolution: 192dpi) { + content: data-uri('@{common-image-path}/about/logo@2x.png'); + } } .asc-about-header { diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index bb79cb55f..0ff8adb81 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -360,6 +360,16 @@ var ApplicationController = new(function(){ } function onError(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + $('#id-critical-error-title').text(me.criticalErrorTitle); + $('#id-critical-error-message').text(me.scriptLoadError); + $('#id-critical-error-close').off().on('click', function(){ + window.location.reload(); + }); + $('#id-critical-error-dialog').css('z-index', 20002).modal('show'); + return; + } + hidePreloader(); var message; @@ -382,6 +392,10 @@ var ApplicationController = new(function(){ message = me.downloadErrorText; break; + case Asc.c_oAscError.ID.ConvertationPassword: + message = me.errorFilePassProtect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -525,6 +539,8 @@ var ApplicationController = new(function(){ convertationErrorText : 'Convertation failed.', downloadErrorText : 'Download failed.', criticalErrorTitle : 'Error', - notcriticalErrorTitle : 'Warning' + notcriticalErrorTitle : 'Warning', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', + errorFilePassProtect: 'The file is password protected and cannot be opened.' } })(); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 5f8b32a23..0fa76faae 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -126,7 +126,7 @@ define([ shortcuts: { 'command+shift+s,ctrl+shift+s': _.bind(this.onShortcut, this, 'save'), 'command+f,ctrl+f': _.bind(this.onShortcut, this, 'search'), - 'command+h,ctrl+h': _.bind(this.onShortcut, this, 'replace'), + 'ctrl+h': _.bind(this.onShortcut, this, 'replace'), 'alt+f': _.bind(this.onShortcut, this, 'file'), 'esc': _.bind(this.onShortcut, this, 'escape'), /** coauthoring begin **/ diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 0ba21dfb3..cca280fcf 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1289,6 +1289,12 @@ define([ }, onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + this.showTips([this.scriptLoadError]); + this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); + return; + } + this.hidePreloader(); this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); @@ -2309,6 +2315,7 @@ define([ textClose: 'Close', textPaidFeature: 'Paid feature', textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', errorEditingSaveas: 'An error occurred during the work with the document.
Use the \'Save as...\' option to save the file backup copy to your computer hard drive.', errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 64283e121..fb6a2c204 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -934,7 +934,7 @@ define([ var toolbar = this.toolbar; if (this.api) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); + var isSyncButton = toolbar.btnCollabChanges && toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); if (!isModified && !isSyncButton && !toolbar.mode.forcesave) return; diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 230fc5f51..b19eebeb4 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -189,7 +189,7 @@ "Common.Views.OpenDialog.cancelButtonText": "Abbrechen", "Common.Views.OpenDialog.closeButtonText": "Datei schließen", "Common.Views.OpenDialog.okButtonText": "OK", - "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung ", + "Common.Views.OpenDialog.txtEncoding": "Zeichenkodierung", "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.", "Common.Views.OpenDialog.txtPassword": "Kennwort", "Common.Views.OpenDialog.txtPreview": "Vorschau", @@ -381,6 +381,7 @@ "DE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...", "DE.Controllers.Main.saveTextText": "Dokument wird gespeichert...", "DE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...", + "DE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", "DE.Controllers.Main.sendMergeText": "Merge wird versandt...", "DE.Controllers.Main.sendMergeTitle": "Merge-Vesand", "DE.Controllers.Main.splitDividerErrorText": "Die Zeilenanzahl muss ein Divisor von %1 sein.", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 6b5313fe8..407085b9e 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -388,6 +388,7 @@ "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "DE.Controllers.Main.saveTextText": "Saving document...", "DE.Controllers.Main.saveTitleText": "Saving Document", + "DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "DE.Controllers.Main.sendMergeText": "Sending Merge...", "DE.Controllers.Main.sendMergeTitle": "Sending Merge", "DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index ffcccee3d..fea6c1f88 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -381,6 +381,7 @@ "DE.Controllers.Main.savePreparingTitle": "Preparando para guardar.Espere por favor...", "DE.Controllers.Main.saveTextText": "Guardando documento...", "DE.Controllers.Main.saveTitleText": "Guardando documento", + "DE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "DE.Controllers.Main.sendMergeText": "Envío de fusión...", "DE.Controllers.Main.sendMergeTitle": "Envío de fusión", "DE.Controllers.Main.splitDividerErrorText": "El número de filas debe ser un divisor de %1.", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 36eca8dfe..3c7b2bf4c 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -381,6 +381,7 @@ "DE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...", "DE.Controllers.Main.saveTextText": "Enregistrement du document...", "DE.Controllers.Main.saveTitleText": "Enregistrement du document", + "DE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", "DE.Controllers.Main.sendMergeText": "Envoie du résultat de la fusion...", "DE.Controllers.Main.sendMergeTitle": "Envoie du résultat de la fusion", "DE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1.", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 06d040896..b3a9fea0a 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -40,7 +40,7 @@ "Common.Controllers.ReviewChanges.textLeft": "Align left", "Common.Controllers.ReviewChanges.textLineSpacing": "Line Spacing: ", "Common.Controllers.ReviewChanges.textMultiple": "multiple", - "Common.Controllers.ReviewChanges.textNoBreakBefore": "No page break before", + "Common.Controllers.ReviewChanges.textNoBreakBefore": "Nessuna interruzione di pagina prima", "Common.Controllers.ReviewChanges.textNoContextual": "Aggiungi intervallo tra paragrafi dello stesso stile", "Common.Controllers.ReviewChanges.textNoKeepLines": "Don't keep lines together", "Common.Controllers.ReviewChanges.textNoKeepNext": "Don't keep with next", @@ -168,6 +168,7 @@ "Common.Views.History.textRestore": "Ripristina", "Common.Views.History.textShow": "Espandi", "Common.Views.History.textShowAll": "Mostra modifiche dettagliate", + "Common.Views.History.textVer": "ver.", "Common.Views.ImageFromUrlDialog.cancelButtonText": "Annulla", "Common.Views.ImageFromUrlDialog.okButtonText": "OK", "Common.Views.ImageFromUrlDialog.textUrl": "Incolla URL immagine:", @@ -388,10 +389,13 @@ "DE.Controllers.Main.textAnonymous": "Anonimo", "DE.Controllers.Main.textBuyNow": "Visita il sito web", "DE.Controllers.Main.textChangesSaved": "Tutte le modifiche sono state salvate", + "DE.Controllers.Main.textClose": "Chiudi", "DE.Controllers.Main.textCloseTip": "Clicca per chiudere il consiglio", "DE.Controllers.Main.textContactUs": "Contatta il team di vendite", + "DE.Controllers.Main.textLicencePaidFeature": "La funzione che si sta tentando di utilizzare è disponibile con la licenza estesa.
Se necessario, contattare l'ufficio vendite", "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento", "DE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "DE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "DE.Controllers.Main.textShape": "Forma", "DE.Controllers.Main.textStrict": "Modalità Rigorosa", "DE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.
Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.", @@ -614,11 +618,11 @@ "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Wedge", "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Wedge", "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Wedge", - "DE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-Product", - "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-Product", - "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-Product", - "DE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-Product", - "DE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-Product", + "DE.Controllers.Toolbar.txtLargeOperator_CoProd": "Co-Prodotto", + "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Co-Prodotto", + "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Co-Prodotto", + "DE.Controllers.Toolbar.txtLargeOperator_CoProd_Sub": "Co-Prodotto", + "DE.Controllers.Toolbar.txtLargeOperator_CoProd_SubSup": "Co-Prodotto", "DE.Controllers.Toolbar.txtLargeOperator_Custom_1": "Summation", "DE.Controllers.Toolbar.txtLargeOperator_Custom_2": "Summation", "DE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Summation", @@ -728,12 +732,12 @@ "DE.Controllers.Toolbar.txtSymbol_cap": "Intersezione", "DE.Controllers.Toolbar.txtSymbol_cbrt": "Cube Root", "DE.Controllers.Toolbar.txtSymbol_cdots": "Ellissi orizzontale di linea media", - "DE.Controllers.Toolbar.txtSymbol_celsius": "Degrees Celsius", + "DE.Controllers.Toolbar.txtSymbol_celsius": "Gradi Celsius", "DE.Controllers.Toolbar.txtSymbol_chi": "Chi", "DE.Controllers.Toolbar.txtSymbol_cong": "Approssimativamente uguale a", "DE.Controllers.Toolbar.txtSymbol_cup": "Union", "DE.Controllers.Toolbar.txtSymbol_ddots": "Down Right Diagonal Ellipsis", - "DE.Controllers.Toolbar.txtSymbol_degree": "Degrees", + "DE.Controllers.Toolbar.txtSymbol_degree": "Gradi", "DE.Controllers.Toolbar.txtSymbol_delta": "Delta", "DE.Controllers.Toolbar.txtSymbol_div": "Division Sign", "DE.Controllers.Toolbar.txtSymbol_downarrow": "Down Arrow", @@ -744,7 +748,7 @@ "DE.Controllers.Toolbar.txtSymbol_eta": "Eta", "DE.Controllers.Toolbar.txtSymbol_exists": "There Exist", "DE.Controllers.Toolbar.txtSymbol_factorial": "Factorial", - "DE.Controllers.Toolbar.txtSymbol_fahrenheit": "Degrees Fahrenheit", + "DE.Controllers.Toolbar.txtSymbol_fahrenheit": "Gradi Fahrenheit", "DE.Controllers.Toolbar.txtSymbol_forall": "For All", "DE.Controllers.Toolbar.txtSymbol_gamma": "Gamma", "DE.Controllers.Toolbar.txtSymbol_geq": "Greater Than or Equal To", @@ -814,6 +818,7 @@ "DE.Views.BookmarksDialog.textName": "Nome", "DE.Views.BookmarksDialog.textSort": "Ordina per", "DE.Views.BookmarksDialog.textTitle": "Segnalibri", + "DE.Views.BookmarksDialog.txtInvalidName": "il nome del Segnalibro può contenere solo lettere, numeri e underscore, e dovrebbe iniziare con la lettera", "DE.Views.ChartSettings.textAdvanced": "Mostra impostazioni avanzate", "DE.Views.ChartSettings.textArea": "Aerogramma", "DE.Views.ChartSettings.textBar": "A barre", @@ -842,8 +847,15 @@ "DE.Views.ChartSettings.txtTopAndBottom": "Sopra e sotto", "DE.Views.ControlSettingsDialog.cancelButtonText": "Annulla", "DE.Views.ControlSettingsDialog.okButtonText": "OK", + "DE.Views.ControlSettingsDialog.textAppearance": "Aspetto", + "DE.Views.ControlSettingsDialog.textApplyAll": "Applica a tutti", + "DE.Views.ControlSettingsDialog.textBox": "Rettangolo di selezione", + "DE.Views.ControlSettingsDialog.textColor": "Colore", "DE.Views.ControlSettingsDialog.textLock": "Blocca", "DE.Views.ControlSettingsDialog.textName": "Titolo", + "DE.Views.ControlSettingsDialog.textNewColor": "Aggiungi un nuovo colore personalizzato", + "DE.Views.ControlSettingsDialog.textNone": "Nessuno", + "DE.Views.ControlSettingsDialog.textShowAs": "Mostra come", "DE.Views.ControlSettingsDialog.textTag": "Etichetta", "DE.Views.ControlSettingsDialog.textTitle": "Impostazioni di controllo del contenuto", "DE.Views.ControlSettingsDialog.txtLockDelete": "Il controllo del contenuto non può essere eliminato", @@ -979,7 +991,7 @@ "DE.Views.DocumentHolder.txtBorderProps": "Border properties", "DE.Views.DocumentHolder.txtBottom": "In basso", "DE.Views.DocumentHolder.txtColumnAlign": "Column alignment", - "DE.Views.DocumentHolder.txtDecreaseArg": "Decrease argument size", + "DE.Views.DocumentHolder.txtDecreaseArg": "Diminuisci dimensione argomento", "DE.Views.DocumentHolder.txtDeleteArg": "Delete argument", "DE.Views.DocumentHolder.txtDeleteBreak": "Delete manual break", "DE.Views.DocumentHolder.txtDeleteChars": "Delete enclosing characters", @@ -1377,7 +1389,7 @@ "DE.Views.MailMergeSettings.textMergeTo": "Unisci a", "DE.Views.MailMergeSettings.textPdf": "PDF", "DE.Views.MailMergeSettings.textPortal": "Save", - "DE.Views.MailMergeSettings.textPreview": "Preview results", + "DE.Views.MailMergeSettings.textPreview": "Anteprima dei risultati", "DE.Views.MailMergeSettings.textReadMore": "Read more", "DE.Views.MailMergeSettings.textSendMsg": "Tutti i messaggi mail sono pronti e saranno spediti in poco tempo.
La velocità di invio dipende dal tuo servizio mail.
Puoi continuare a lavorare con il documento o chiuderlo. Ti verrà recapitata una notifica all'indirizzo email di registrazione al completamento dell'operazione.", "DE.Views.MailMergeSettings.textTo": "To", @@ -1739,7 +1751,7 @@ "DE.Views.TableSettingsAdvanced.txtPercent": "Percento", "DE.Views.TableSettingsAdvanced.txtPt": "Punto", "DE.Views.TextArtSettings.strColor": "Colore", - "DE.Views.TextArtSettings.strFill": "Fill", + "DE.Views.TextArtSettings.strFill": "Riempimento", "DE.Views.TextArtSettings.strSize": "Size", "DE.Views.TextArtSettings.strStroke": "Stroke", "DE.Views.TextArtSettings.strTransparency": "Opacity", @@ -1751,13 +1763,13 @@ "DE.Views.TextArtSettings.textGradientFill": "Gradient Fill", "DE.Views.TextArtSettings.textLinear": "Linear", "DE.Views.TextArtSettings.textNewColor": "Add New Custom Color", - "DE.Views.TextArtSettings.textNoFill": "No Fill", + "DE.Views.TextArtSettings.textNoFill": "Nessun riempimento", "DE.Views.TextArtSettings.textRadial": "Radial", "DE.Views.TextArtSettings.textSelectTexture": "Select", "DE.Views.TextArtSettings.textStyle": "Style", "DE.Views.TextArtSettings.textTemplate": "Template", "DE.Views.TextArtSettings.textTransform": "Transform", - "DE.Views.TextArtSettings.txtNoBorders": "No Line", + "DE.Views.TextArtSettings.txtNoBorders": "Nessuna linea", "DE.Views.Toolbar.capBtnColumns": "Colonne", "DE.Views.Toolbar.capBtnComment": "Commento", "DE.Views.Toolbar.capBtnInsChart": "Grafico", @@ -1786,6 +1798,7 @@ "DE.Views.Toolbar.mniEditHeader": "Modifica intestazione", "DE.Views.Toolbar.mniHiddenBorders": "Bordi tabella nascosti", "DE.Views.Toolbar.mniHiddenChars": "Caratteri non stampabili", + "DE.Views.Toolbar.mniHighlightControls": "selezionare impostazioni", "DE.Views.Toolbar.mniImageFromFile": "Immagine da file", "DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL", "DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento", @@ -1823,6 +1836,7 @@ "DE.Views.Toolbar.textMarginsWide": "Wide", "DE.Views.Toolbar.textNewColor": "Colore personalizzato", "DE.Views.Toolbar.textNextPage": "Pagina successiva", + "DE.Views.Toolbar.textNoHighlight": "Nessuna evidenziazione", "DE.Views.Toolbar.textNone": "Nessuno", "DE.Views.Toolbar.textOddPage": "Pagina dispari", "DE.Views.Toolbar.textPageMarginsCustom": "Custom margins", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 4e1d9a274..403ad9f14 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -381,6 +381,7 @@ "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "DE.Controllers.Main.saveTextText": "Сохранение документа...", "DE.Controllers.Main.saveTitleText": "Сохранение документа", + "DE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "DE.Controllers.Main.sendMergeText": "Отправка результатов слияния...", "DE.Controllers.Main.sendMergeTitle": "Отправка результатов слияния", "DE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1.", diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index b12f014c4..a0a9c853b 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -767,6 +767,14 @@ define([ }, onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + uiApp.addNotification({ + title: this.criticalErrorTitle, + message: this.scriptLoadError + }); + return; + } + this.hidePreloader(); this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); @@ -1347,7 +1355,8 @@ define([ warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.', - closeButtonText: 'Close File' + closeButtonText: 'Close File', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json index 696edd806..b9aeb1d09 100644 --- a/apps/documenteditor/mobile/locale/de.json +++ b/apps/documenteditor/mobile/locale/de.json @@ -96,6 +96,7 @@ "DE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...", "DE.Controllers.Main.saveTextText": "Dokument wird gespeichert...", "DE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...", + "DE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", "DE.Controllers.Main.sendMergeText": "Merge-Vesand...", "DE.Controllers.Main.sendMergeTitle": "Merge-Vesand", "DE.Controllers.Main.splitDividerErrorText": "Die Anzahl der Zeilen muss einen Divisor von %1 sein. ", diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 4b020176b..335c5e382 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -96,6 +96,7 @@ "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "DE.Controllers.Main.saveTextText": "Saving document...", "DE.Controllers.Main.saveTitleText": "Saving Document", + "DE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "DE.Controllers.Main.sendMergeText": "Sending Merge...", "DE.Controllers.Main.sendMergeTitle": "Sending Merge", "DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1", diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json index ba176c6f0..ee1546188 100644 --- a/apps/documenteditor/mobile/locale/es.json +++ b/apps/documenteditor/mobile/locale/es.json @@ -96,6 +96,7 @@ "DE.Controllers.Main.savePreparingTitle": "Preparando para guardar. Espere por favor...", "DE.Controllers.Main.saveTextText": "Guardando documento...", "DE.Controllers.Main.saveTitleText": "Guardando documento", + "DE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "DE.Controllers.Main.sendMergeText": "Envío de los resultados de fusión...", "DE.Controllers.Main.sendMergeTitle": "Envío de los resultados de fusión", "DE.Controllers.Main.splitDividerErrorText": "El número de filas debe ser un divisor de %1", diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json index 00dcc159a..bafbc74b2 100644 --- a/apps/documenteditor/mobile/locale/fr.json +++ b/apps/documenteditor/mobile/locale/fr.json @@ -96,6 +96,7 @@ "DE.Controllers.Main.savePreparingTitle": "Merci de patienter, la préparation de l'enregistrement est en cours...", "DE.Controllers.Main.saveTextText": "Enregistrement du document...", "DE.Controllers.Main.saveTitleText": "Enregistrement du document", + "DE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", "DE.Controllers.Main.sendMergeText": "Envoie du résultat de la fusion...", "DE.Controllers.Main.sendMergeTitle": "Envoie du résultat de la fusion", "DE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 47f57a70e..3eda56394 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -96,6 +96,7 @@ "DE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "DE.Controllers.Main.saveTextText": "Сохранение документа...", "DE.Controllers.Main.saveTitleText": "Сохранение документа", + "DE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "DE.Controllers.Main.sendMergeText": "Отправка результатов слияния...", "DE.Controllers.Main.sendMergeTitle": "Отправка результатов слияния", "DE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1", diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 0f33ee84b..8c43b731f 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -459,6 +459,16 @@ var ApplicationController = new(function(){ } function onError(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + $('#id-critical-error-title').text(me.criticalErrorTitle); + $('#id-critical-error-message').text(me.scriptLoadError); + $('#id-critical-error-close').off().on('click', function(){ + window.location.reload(); + }); + $('#id-critical-error-dialog').css('z-index', 20002).modal('show'); + return; + } + hidePreloader(); var message; @@ -481,6 +491,10 @@ var ApplicationController = new(function(){ message = me.downloadErrorText; break; + case Asc.c_oAscError.ID.ConvertationPassword: + message = me.errorFilePassProtect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -595,6 +609,8 @@ var ApplicationController = new(function(){ convertationErrorText : 'Convertation failed.', downloadErrorText : 'Download failed.', criticalErrorTitle : 'Error', - notcriticalErrorTitle : 'Warning' + notcriticalErrorTitle : 'Warning', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', + errorFilePassProtect: 'The file is password protected and cannot be opened.' } })(); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 5304e8ef5..6e6753df3 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1032,6 +1032,12 @@ define([ }, onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + this.showTips([this.scriptLoadError]); + this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); + return; + } + this.hidePreloader(); this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); @@ -2079,6 +2085,7 @@ define([ textClose: 'Close', textPaidFeature: 'Paid feature', textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', errorEditingSaveas: 'An error occurred during the work with the document.
Use the \'Save as...\' option to save the file backup copy to your computer hard drive.', errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 3e36b0338..d0e994dfd 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -891,7 +891,7 @@ define([ var toolbar = this.toolbar; if (this.api && this.api.asc_isDocumentCanSave) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); + var isSyncButton = this.toolbar.btnCollabChanges && this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave) return; diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index fdfa61261..38e610a4c 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -121,7 +121,7 @@ "Common.Views.OpenDialog.cancelButtonText": "Abbrechen", "Common.Views.OpenDialog.closeButtonText": "Datei schließen", "Common.Views.OpenDialog.okButtonText": "OK", - "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung", + "Common.Views.OpenDialog.txtEncoding": "Zeichenkodierung", "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.", "Common.Views.OpenDialog.txtPassword": "Kennwort", "Common.Views.OpenDialog.txtProtected": "Sobald Sie das Passwort eingegeben und die Datei geöffnet haben, wird das aktuelle Passwort für die Datei zurückgesetzt.", @@ -292,6 +292,7 @@ "PE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...", "PE.Controllers.Main.saveTextText": "Präsentation wird gespeichert...", "PE.Controllers.Main.saveTitleText": "Präsentation wird gespeichert", + "PE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", "PE.Controllers.Main.splitDividerErrorText": "Die Zeilenanzahl muss ein Divisor von %1 sein.", "PE.Controllers.Main.splitMaxColsErrorText": "Die Spaltenanzahl muss weniger sein als %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Die Zeilenanzahl muss weniger als %1 sein.", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 2c0498ef8..5721d5003 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -300,6 +300,7 @@ "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.saveTextText": "Saving presentation...", "PE.Controllers.Main.saveTitleText": "Saving Presentation", + "PE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.", "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1.", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index 5452b6312..1782784b0 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -292,6 +292,7 @@ "PE.Controllers.Main.savePreparingTitle": "Preparando para guardar. Espere por favor...", "PE.Controllers.Main.saveTextText": "Guardando presentación...", "PE.Controllers.Main.saveTitleText": "Guardando presentación", + "PE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "PE.Controllers.Main.splitDividerErrorText": "El número de filas debe ser un divisor de %1.", "PE.Controllers.Main.splitMaxColsErrorText": "El número de columnas debe ser menos que %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1.", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index c216a88f5..0f5fe2b23 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -292,6 +292,7 @@ "PE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...", "PE.Controllers.Main.saveTextText": "Enregistrement de la présentation...", "PE.Controllers.Main.saveTitleText": "Enregistrement de la présentation", + "PE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", "PE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1.", "PE.Controllers.Main.splitMaxColsErrorText": "Le nombre de colonnes doivent être inférieure à %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être inférieure à %1.", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index c9a8b9a32..820f1499a 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -298,10 +298,13 @@ "PE.Controllers.Main.textAnonymous": "Anonimo", "PE.Controllers.Main.textBuyNow": "Visita il sito web", "PE.Controllers.Main.textChangesSaved": "Tutte le modifiche sono state salvate", + "PE.Controllers.Main.textClose": "Chiudi", "PE.Controllers.Main.textCloseTip": "Clicca per chiudere il consiglio", "PE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", + "PE.Controllers.Main.textLicencePaidFeature": "La funzione che si sta tentando di utilizzare è disponibile con la licenza estesa.
Se necessario, contattare l'ufficio vendite", "PE.Controllers.Main.textLoadingDocument": "Caricamento della presentazione", "PE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "PE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "PE.Controllers.Main.textShape": "Forma", "PE.Controllers.Main.textStrict": "Modalità Rigorosa", "PE.Controllers.Main.textTryUndoRedo": "Le funzioni Annulla/Ripristina sono disabilitate per la Modalità di Co-editing Veloce.
Clicca il pulsante 'Modalità Rigorosa' per passare alla Modalità di Co-editing Rigorosa per poter modificare il file senza l'interferenza di altri utenti e inviare le modifiche solamente dopo averle salvate. Puoi passare da una modalità all'altra di co-editing utilizzando le Impostazioni avanzate dell'editor.", @@ -977,7 +980,7 @@ "PE.Views.FileMenuPanels.Settings.strAlignGuides": "Turn on alignment guides", "PE.Views.FileMenuPanels.Settings.strAutoRecover": "Attiva il ripristino automatico", "PE.Views.FileMenuPanels.Settings.strAutosave": "Attiva salvataggio automatico", - "PE.Views.FileMenuPanels.Settings.strCoAuthMode": "Co-editing mode", + "PE.Views.FileMenuPanels.Settings.strCoAuthMode": "Modalità di co-editing", "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescFast": "Other users will see your changes at once", "PE.Views.FileMenuPanels.Settings.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", "PE.Views.FileMenuPanels.Settings.strFast": "Fast", @@ -1293,6 +1296,9 @@ "PE.Views.SlideSizeSettings.txtWidescreen2": "Widescreen (16:10)", "PE.Views.Statusbar.goToPageText": "Va' alla diapositiva", "PE.Views.Statusbar.pageIndexText": "Diapositiva {0} di {1}", + "PE.Views.Statusbar.textShowBegin": "Mostra dall'inizio", + "PE.Views.Statusbar.textShowCurrent": "Mostra dalla diapositiva corrente", + "PE.Views.Statusbar.textShowPresenterView": "Mostra la visualizzazione del presenter", "PE.Views.Statusbar.tipAccessRights": "Manage document access rights", "PE.Views.Statusbar.tipFitPage": "Adatta alla diapositiva", "PE.Views.Statusbar.tipFitWidth": "Adatta alla larghezza", @@ -1366,8 +1372,8 @@ "PE.Views.TableSettingsAdvanced.textTop": "In alto", "PE.Views.TableSettingsAdvanced.textWidthSpaces": "Margini", "PE.Views.TextArtSettings.strBackground": "Background color", - "PE.Views.TextArtSettings.strColor": "Color", - "PE.Views.TextArtSettings.strFill": "Fill", + "PE.Views.TextArtSettings.strColor": "Colore", + "PE.Views.TextArtSettings.strFill": "Riempimento", "PE.Views.TextArtSettings.strForeground": "Colore primo piano", "PE.Views.TextArtSettings.strPattern": "Pattern", "PE.Views.TextArtSettings.strSize": "Size", @@ -1375,9 +1381,9 @@ "PE.Views.TextArtSettings.strTransparency": "Opacity", "PE.Views.TextArtSettings.strType": "Tipo", "PE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", - "PE.Views.TextArtSettings.textColor": "Color Fill", + "PE.Views.TextArtSettings.textColor": "Colore di riempimento", "PE.Views.TextArtSettings.textDirection": "Direction", - "PE.Views.TextArtSettings.textEmptyPattern": "No Pattern", + "PE.Views.TextArtSettings.textEmptyPattern": "Nessun modello", "PE.Views.TextArtSettings.textFromFile": "Da file", "PE.Views.TextArtSettings.textFromUrl": "Da URL", "PE.Views.TextArtSettings.textGradient": "Gradient", @@ -1385,7 +1391,7 @@ "PE.Views.TextArtSettings.textImageTexture": "Picture or Texture", "PE.Views.TextArtSettings.textLinear": "Linear", "PE.Views.TextArtSettings.textNewColor": "Add New Custom Color", - "PE.Views.TextArtSettings.textNoFill": "No Fill", + "PE.Views.TextArtSettings.textNoFill": "Nessun riempimento", "PE.Views.TextArtSettings.textPatternFill": "Pattern", "PE.Views.TextArtSettings.textRadial": "Radial", "PE.Views.TextArtSettings.textSelectTexture": "Select", @@ -1404,7 +1410,7 @@ "PE.Views.TextArtSettings.txtGreyPaper": "Gray Paper", "PE.Views.TextArtSettings.txtKnit": "Knit", "PE.Views.TextArtSettings.txtLeather": "Leather", - "PE.Views.TextArtSettings.txtNoBorders": "No Line", + "PE.Views.TextArtSettings.txtNoBorders": "Nessuna linea", "PE.Views.TextArtSettings.txtPapyrus": "Papyrus", "PE.Views.TextArtSettings.txtWood": "Wood", "PE.Views.Toolbar.capAddSlide": "Aggiungi diapositiva", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 71ec9cca3..de8f9ed0a 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -292,6 +292,7 @@ "PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "PE.Controllers.Main.saveTextText": "Сохранение презентации...", "PE.Controllers.Main.saveTitleText": "Сохранение презентации", + "PE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "PE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1.", "PE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1.", "PE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1.", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 4cc20fff8..5711d4b2d 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -725,6 +725,14 @@ define([ }, onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + uiApp.addNotification({ + title: this.criticalErrorTitle, + message: this.scriptLoadError + }); + return; + } + this.hidePreloader(); this.onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); @@ -1339,7 +1347,8 @@ define([ warnLicenseExceeded: 'The number of concurrent connections to the document server has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', warnLicenseUsersExceeded: 'The number of concurrent users has been exceeded and the document will be opened for viewing only.
Please contact your administrator for more information.', errorDataEncrypted: 'Encrypted changes have been received, they cannot be deciphered.', - closeButtonText: 'Close File' + closeButtonText: 'Close File', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/de.json b/apps/presentationeditor/mobile/locale/de.json index 988976100..a5fdc072c 100644 --- a/apps/presentationeditor/mobile/locale/de.json +++ b/apps/presentationeditor/mobile/locale/de.json @@ -112,6 +112,7 @@ "PE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...", "PE.Controllers.Main.saveTextText": "Dokument wird gespeichert...", "PE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...", + "PE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", "PE.Controllers.Main.splitDividerErrorText": "Die Anzahl der Zeilen muss einen Divisor von %1 sein. ", "PE.Controllers.Main.splitMaxColsErrorText": "Spaltenanzahl muss weniger als %1 sein", "PE.Controllers.Main.splitMaxRowsErrorText": "Die Anzahl der Zeilen muss weniger als %1 sein", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 2f24d5627..b7e512bed 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -112,6 +112,7 @@ "PE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "PE.Controllers.Main.saveTextText": "Saving document...", "PE.Controllers.Main.saveTitleText": "Saving Document", + "PE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "PE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1", "PE.Controllers.Main.splitMaxColsErrorText": "The number of columns must be less than %1", "PE.Controllers.Main.splitMaxRowsErrorText": "The number of rows must be less than %1", diff --git a/apps/presentationeditor/mobile/locale/es.json b/apps/presentationeditor/mobile/locale/es.json index 3f00a81ee..685d4e7de 100644 --- a/apps/presentationeditor/mobile/locale/es.json +++ b/apps/presentationeditor/mobile/locale/es.json @@ -112,6 +112,7 @@ "PE.Controllers.Main.savePreparingTitle": "Preparando para guardar. Espere, por favor...", "PE.Controllers.Main.saveTextText": "Guardando documento...", "PE.Controllers.Main.saveTitleText": "Guardando documento", + "PE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "PE.Controllers.Main.splitDividerErrorText": "El número de filas debe ser un divisor de %1", "PE.Controllers.Main.splitMaxColsErrorText": "El número de columnas debe ser menos que %1", "PE.Controllers.Main.splitMaxRowsErrorText": "El número de filas debe ser menos que %1", diff --git a/apps/presentationeditor/mobile/locale/fr.json b/apps/presentationeditor/mobile/locale/fr.json index 19e8c46bd..e9ab833d3 100644 --- a/apps/presentationeditor/mobile/locale/fr.json +++ b/apps/presentationeditor/mobile/locale/fr.json @@ -112,6 +112,7 @@ "PE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement est en cours. Veuillez patienter...", "PE.Controllers.Main.saveTextText": "Enregistrement du document...", "PE.Controllers.Main.saveTitleText": "Enregistrement du document", + "PE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", "PE.Controllers.Main.splitDividerErrorText": "Le nombre de lignes doit être un diviseur de %1", "PE.Controllers.Main.splitMaxColsErrorText": "Le nombre de colonnes doit être moins que %1", "PE.Controllers.Main.splitMaxRowsErrorText": "Le nombre de lignes doit être moins que %1", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index dd8beed57..45d9339ea 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -112,6 +112,7 @@ "PE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "PE.Controllers.Main.saveTextText": "Сохранение документа...", "PE.Controllers.Main.saveTitleText": "Сохранение документа", + "PE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "PE.Controllers.Main.splitDividerErrorText": "Число строк должно являться делителем для %1", "PE.Controllers.Main.splitMaxColsErrorText": "Число столбцов должно быть меньше, чем %1", "PE.Controllers.Main.splitMaxRowsErrorText": "Число строк должно быть меньше, чем %1", diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 118fcce0b..7f02ad1c9 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -367,6 +367,16 @@ var ApplicationController = new(function(){ } function onError(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + $('#id-critical-error-title').text(me.criticalErrorTitle); + $('#id-critical-error-message').text(me.scriptLoadError); + $('#id-critical-error-close').off().on('click', function(){ + window.location.reload(); + }); + $('#id-critical-error-dialog').css('z-index', 20002).modal('show'); + return; + } + hidePreloader(); var message; @@ -389,6 +399,10 @@ var ApplicationController = new(function(){ message = me.downloadErrorText; break; + case Asc.c_oAscError.ID.ConvertationPassword: + message = me.errorFilePassProtect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -542,6 +556,8 @@ var ApplicationController = new(function(){ convertationErrorText : 'Convertation failed.', downloadErrorText : 'Download failed.', criticalErrorTitle : 'Error', - notcriticalErrorTitle : 'Warning' + notcriticalErrorTitle : 'Warning', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', + errorFilePassProtect: 'The file is password protected and cannot be opened.' } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index e91d0a426..97863f743 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1484,8 +1484,10 @@ define([ var pluginGuid = (documentHolder.mnuImgAdvanced.imageInfo) ? documentHolder.mnuImgAdvanced.imageInfo.asc_getPluginGuid() : null; documentHolder.menuImgReplace.setVisible(isimageonly && (pluginGuid===null || pluginGuid===undefined)); documentHolder.menuImgReplace.setDisabled(isObjLocked || pluginGuid===null); - - + documentHolder.mnuBringToFront.setDisabled(isObjLocked); + documentHolder.mnuSendToBack.setDisabled(isObjLocked); + documentHolder.mnuBringForward.setDisabled(isObjLocked); + documentHolder.mnuSendBackward.setDisabled(isObjLocked); var isInSign = !!signGuid; documentHolder.menuSignatureEditSign.setVisible(isInSign); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 72fba4b8b..52092f2f8 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -108,7 +108,7 @@ define([ shortcuts: { 'command+shift+s,ctrl+shift+s': _.bind(this.onShortcut, this, 'save'), 'command+f,ctrl+f': _.bind(this.onShortcut, this, 'search'), - 'command+h,ctrl+h': _.bind(this.onShortcut, this, 'replace'), + 'ctrl+h': _.bind(this.onShortcut, this, 'replace'), 'alt+f': _.bind(this.onShortcut, this, 'file'), 'esc': _.bind(this.onShortcut, this, 'escape'), /** coauthoring begin **/ diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 1baebb3c2..f42209bff 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1093,6 +1093,12 @@ define([ }, onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + this.showTips([this.scriptLoadError]); + this.tooltip && this.tooltip.getBSTip().$tip.css('z-index', 10000); + return; + } + this.hidePreloader(); this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); @@ -2259,6 +2265,7 @@ define([ textClose: 'Close', textPaidFeature: 'Paid feature', textLicencePaidFeature: 'The feature you are trying to use is available for additional payment.
If you need it, please contact Sales Department', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.', errorEditingSaveas: 'An error occurred during the work with the document.
Use the \'Save as...\' option to save the file backup copy to your computer hard drive.', errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index 78826c4ac..b572a5cb5 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -366,6 +366,7 @@ define([ this.rightmenu.chartSettings.disableControls(disabled); this.rightmenu.tableSettings.disableControls(disabled); this.rightmenu.pivotSettings.disableControls(disabled); + this.rightmenu.cellSettings.disableControls(disabled); if (!allowSignature && this.rightmenu.signatureSettings) { this.rightmenu.btnSignature.setDisabled(disabled); @@ -383,6 +384,7 @@ define([ this.rightmenu.btnTextArt.setDisabled(disabled); this.rightmenu.btnChart.setDisabled(disabled); this.rightmenu.btnPivot.setDisabled(disabled); + this.rightmenu.btnCell.setDisabled(disabled); } else { this.onSelectionChanged(this.api.asc_getCellInfo()); } diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 0c0b25fcb..044fdbe37 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -412,7 +412,7 @@ define([ onSave: function(e) { if (this.api) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); + var isSyncButton = this.toolbar.btnCollabChanges && this.toolbar.btnCollabChanges.$icon.hasClass('btn-synch'); if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave) return; diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index f518b031e..4ca60400e 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -605,6 +605,30 @@ define([ }) }); + me.mnuBringToFront = new Common.UI.MenuItem({ + caption : this.textArrangeFront, + iconCls : 'mnu-arrange-front', + type : 'arrange', + value : Asc.c_oAscDrawingLayerType.BringToFront + }); + me.mnuSendToBack = new Common.UI.MenuItem({ + caption : this.textArrangeBack, + iconCls : 'mnu-arrange-back', + type : 'arrange', + value : Asc.c_oAscDrawingLayerType.SendToBack + }); + me.mnuBringForward = new Common.UI.MenuItem({ + caption : this.textArrangeForward, + iconCls : 'mnu-arrange-forward', + type : 'arrange', + value : Asc.c_oAscDrawingLayerType.BringForward + }); + me.mnuSendBackward = new Common.UI.MenuItem({ + caption: this.textArrangeBackward, + iconCls : 'mnu-arrange-backward', + type : 'arrange', + value : Asc.c_oAscDrawingLayerType.SendBackward + }); this.imgMenu = new Common.UI.Menu({ items: [ me.pmiImgCut, @@ -614,27 +638,10 @@ define([ me.menuSignatureEditSign, me.menuSignatureEditSetup, me.menuEditSignSeparator, - { - caption : this.textArrangeFront, - iconCls : 'mnu-arrange-front', - type : 'arrange', - value : Asc.c_oAscDrawingLayerType.BringToFront - },{ - caption : this.textArrangeBack, - iconCls : 'mnu-arrange-back', - type : 'arrange', - value : Asc.c_oAscDrawingLayerType.SendToBack - },{ - caption : this.textArrangeForward, - iconCls : 'mnu-arrange-forward', - type : 'arrange', - value : Asc.c_oAscDrawingLayerType.BringForward - },{ - caption: this.textArrangeBackward, - iconCls : 'mnu-arrange-backward', - type : 'arrange', - value : Asc.c_oAscDrawingLayerType.SendBackward - }, + me.mnuBringToFront, + me.mnuSendToBack, + me.mnuBringForward, + me.mnuSendBackward, {caption: '--'}, me.mnuGroupImg, me.mnuUnGroupImg, diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 31802ba09..f889538d6 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1442,7 +1442,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-align', caption: me.capImgAlign, - lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth], + lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText], menu: true }); @@ -1450,7 +1450,7 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-group', caption: me.capImgGroup, - lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth], + lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth, _set.coAuthText], menu: true }); me.btnImgForward = new Common.UI.Button({ @@ -1458,14 +1458,14 @@ define([ iconCls: 'btn-img-frwd', caption: me.capImgForward, split: true, - lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth], + lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText], menu: true }); me.btnImgBackward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-bkwd', caption: me.capImgBackward, - lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth], + lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText], split: true, menu: true }); diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 96d89f19f..99838f4e3 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -106,7 +106,7 @@ "Common.Views.OpenDialog.txtColon": "Doppelpunkt", "Common.Views.OpenDialog.txtComma": "Komma", "Common.Views.OpenDialog.txtDelimiter": "Trennzeichen", - "Common.Views.OpenDialog.txtEncoding": "Verschlüsselung", + "Common.Views.OpenDialog.txtEncoding": "Zeichenkodierung", "Common.Views.OpenDialog.txtIncorrectPwd": "Kennwort ist falsch.", "Common.Views.OpenDialog.txtOther": "Sonstige", "Common.Views.OpenDialog.txtPassword": "Kennwort", @@ -465,6 +465,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...", "SSE.Controllers.Main.saveTextText": "Kalkulationstabelle wird gespeichert...", "SSE.Controllers.Main.saveTitleText": "Speichern der Kalkulationstabelle", + "SSE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", "SSE.Controllers.Main.textAnonymous": "Anonym", "SSE.Controllers.Main.textBuyNow": "Webseite besuchen", "SSE.Controllers.Main.textClose": "Schließen", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 06633db0a..df12d9013 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -472,6 +472,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "SSE.Controllers.Main.saveTextText": "Saving spreadsheet...", "SSE.Controllers.Main.saveTitleText": "Saving Spreadsheet", + "SSE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "SSE.Controllers.Main.textAnonymous": "Anonymous", "SSE.Controllers.Main.textBuyNow": "Visit website", "SSE.Controllers.Main.textClose": "Close", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 9bdbc960b..2fba5441a 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -465,6 +465,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Preparando para guardar.Espere por favor...", "SSE.Controllers.Main.saveTextText": "Guardando hoja de cálculo...", "SSE.Controllers.Main.saveTitleText": "Guardando hoja de cálculo", + "SSE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "SSE.Controllers.Main.textAnonymous": "Anónimo", "SSE.Controllers.Main.textBuyNow": "Visitar sitio web", "SSE.Controllers.Main.textClose": "Cerrar", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 9f977d407..3fe2ac11d 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -465,6 +465,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...", "SSE.Controllers.Main.saveTextText": "Enregistrement de la feuille de calcul en cours ...", "SSE.Controllers.Main.saveTitleText": "Enregistrement de la feuille de calcul", + "SSE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", "SSE.Controllers.Main.textAnonymous": "Anonyme", "SSE.Controllers.Main.textBuyNow": "Visiter le site web", "SSE.Controllers.Main.textClose": "Fermer", diff --git a/apps/spreadsheeteditor/main/locale/it.json b/apps/spreadsheeteditor/main/locale/it.json index cb97e5a2e..99821d5f7 100644 --- a/apps/spreadsheeteditor/main/locale/it.json +++ b/apps/spreadsheeteditor/main/locale/it.json @@ -259,6 +259,7 @@ "SSE.Controllers.DocumentHolder.txtBlanks": "(Vuoto)", "SSE.Controllers.DocumentHolder.txtBorderProps": "Proprietà bordo", "SSE.Controllers.DocumentHolder.txtBottom": "In basso", + "SSE.Controllers.DocumentHolder.txtColumn": "Colonna", "SSE.Controllers.DocumentHolder.txtColumnAlign": "Allineamento Colonna", "SSE.Controllers.DocumentHolder.txtContains": "contiene", "SSE.Controllers.DocumentHolder.txtDecreaseArg": "Diminuisci dimensione argomento", @@ -466,12 +467,15 @@ "SSE.Controllers.Main.saveTitleText": "Salvataggio del foglio di calcolo", "SSE.Controllers.Main.textAnonymous": "Anonimo", "SSE.Controllers.Main.textBuyNow": "Visita il sito web", + "SSE.Controllers.Main.textClose": "Chiudi", "SSE.Controllers.Main.textCloseTip": "Clicca per chiudere il consiglio", "SSE.Controllers.Main.textConfirm": "Conferma", "SSE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", + "SSE.Controllers.Main.textLicencePaidFeature": "La funzione che si sta tentando di utilizzare è disponibile con la licenza estesa.
Se necessario, contattare l'ufficio vendite", "SSE.Controllers.Main.textLoadingDocument": "Caricamento del foglio di calcolo", "SSE.Controllers.Main.textNo": "No", "SSE.Controllers.Main.textNoLicenseTitle": "ONLYOFFICE® limite connessione", + "SSE.Controllers.Main.textPaidFeature": "Caratteristica a pagamento", "SSE.Controllers.Main.textPleaseWait": "L'operazione può richiedere più tempo. Per favore, attendi...", "SSE.Controllers.Main.textRecalcFormulas": "Calcolo delle formule in corso...", "SSE.Controllers.Main.textShape": "Forma", @@ -933,6 +937,23 @@ "SSE.Views.CellRangeDialog.txtEmpty": "Questo campo è richiesto", "SSE.Views.CellRangeDialog.txtInvalidRange": "ERRORE! Intervallo non valido", "SSE.Views.CellRangeDialog.txtTitle": "Seleziona intervallo dati", + "SSE.Views.CellSettings.textBackColor": "Colore sfondo", + "SSE.Views.CellSettings.textBorderColor": "Colore", + "SSE.Views.CellSettings.textBorders": "Stile bordo", + "SSE.Views.CellSettings.textNewColor": "Aggiungi un nuovo colore personalizzato", + "SSE.Views.CellSettings.textSelectBorders": "Seleziona i bordi che desideri modificare applicando lo stile scelto sopra", + "SSE.Views.CellSettings.tipAll": "Imposta bordo esterno e tutte le linee interne", + "SSE.Views.CellSettings.tipBottom": "Imposta solo bordo esterno inferiore", + "SSE.Views.CellSettings.tipDiagD": "Imposta il bordo diagonale in basso", + "SSE.Views.CellSettings.tipDiagU": "Imposta il bordo diagonale in alto", + "SSE.Views.CellSettings.tipInner": "Imposta solo linee interne", + "SSE.Views.CellSettings.tipInnerHor": "Imposta solo linee interne orizzontali", + "SSE.Views.CellSettings.tipInnerVert": "Imposta solo linee interne verticali", + "SSE.Views.CellSettings.tipLeft": "Imposta solo bordo esterno sinistro", + "SSE.Views.CellSettings.tipNone": "imposta senza bordi", + "SSE.Views.CellSettings.tipOuter": "Imposta solo bordi esterni", + "SSE.Views.CellSettings.tipRight": "Imposta solo bordo esterno destro", + "SSE.Views.CellSettings.tipTop": "Imposta solo bordo esterno superiore", "SSE.Views.ChartSettings.strLineWeight": "Lunghezza linea", "SSE.Views.ChartSettings.strSparkColor": "Colore", "SSE.Views.ChartSettings.strTemplate": "Modello", @@ -1180,7 +1201,7 @@ "SSE.Views.DocumentHolder.txtAutoRowHeight": "Adatta automaticamente l'altezza della riga", "SSE.Views.DocumentHolder.txtClear": "Svuota", "SSE.Views.DocumentHolder.txtClearAll": "All", - "SSE.Views.DocumentHolder.txtClearComments": "Comments", + "SSE.Views.DocumentHolder.txtClearComments": "Commenti", "SSE.Views.DocumentHolder.txtClearFormat": "Format", "SSE.Views.DocumentHolder.txtClearHyper": "Hyperlinks", "SSE.Views.DocumentHolder.txtClearSparklineGroups": "Cancella i Gruppi di Sparkline selezionati", @@ -1264,7 +1285,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.okButtonText": "Applica", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strAutoRecover": "Attiva il ripristino automatico", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strAutosave": "Attiva salvataggio automatico", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthMode": "Co-editing mode", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthMode": "Modalità di co-editing", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthModeDescFast": "Other users will see your changes at once", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strCoAuthModeDescStrict": "You will need to accept changes before you can see them", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFast": "Fast", @@ -1440,15 +1461,15 @@ "SSE.Views.NameManagerDlg.textDataRange": "Data Range", "SSE.Views.NameManagerDlg.textDelete": "Delete", "SSE.Views.NameManagerDlg.textEdit": "Edit", - "SSE.Views.NameManagerDlg.textEmpty": "No named ranges have been created yet.
Create at least one named range and it will appear in this field.", - "SSE.Views.NameManagerDlg.textFilter": "Filter", + "SSE.Views.NameManagerDlg.textEmpty": "Non sono ancora stati creati intervalli con nome.
Crea almeno un intervallo con nome e apparirà in questo campo.", + "SSE.Views.NameManagerDlg.textFilter": "Filtro", "SSE.Views.NameManagerDlg.textFilterAll": "All", "SSE.Views.NameManagerDlg.textFilterDefNames": "Defined names", "SSE.Views.NameManagerDlg.textFilterSheet": "Names Scoped to Sheet", "SSE.Views.NameManagerDlg.textFilterTableNames": "Table names", "SSE.Views.NameManagerDlg.textFilterWorkbook": "Names Scoped to Workbook", "SSE.Views.NameManagerDlg.textNew": "New", - "SSE.Views.NameManagerDlg.textnoNames": "No named ranges matching your filter could be found.", + "SSE.Views.NameManagerDlg.textnoNames": "Non è stato possibile trovare intervalli nominati corrispondenti al filtro.", "SSE.Views.NameManagerDlg.textRanges": "Named Ranges", "SSE.Views.NameManagerDlg.textScope": "Scope", "SSE.Views.NameManagerDlg.textWorkbook": "Workbook", @@ -1774,8 +1795,8 @@ "SSE.Views.TableSettingsAdvanced.textAltTitle": "Titolo", "SSE.Views.TableSettingsAdvanced.textTitle": "Tabella - Impostazioni avanzate", "SSE.Views.TextArtSettings.strBackground": "Background color", - "SSE.Views.TextArtSettings.strColor": "Color", - "SSE.Views.TextArtSettings.strFill": "Fill", + "SSE.Views.TextArtSettings.strColor": "Colore", + "SSE.Views.TextArtSettings.strFill": "Riempimento", "SSE.Views.TextArtSettings.strForeground": "Colore primo piano", "SSE.Views.TextArtSettings.strPattern": "Pattern", "SSE.Views.TextArtSettings.strSize": "Size", @@ -1783,9 +1804,9 @@ "SSE.Views.TextArtSettings.strTransparency": "Opacity", "SSE.Views.TextArtSettings.strType": "Tipo", "SSE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", - "SSE.Views.TextArtSettings.textColor": "Color Fill", + "SSE.Views.TextArtSettings.textColor": "Colore di riempimento", "SSE.Views.TextArtSettings.textDirection": "Direction", - "SSE.Views.TextArtSettings.textEmptyPattern": "No Pattern", + "SSE.Views.TextArtSettings.textEmptyPattern": "Nessun modello", "SSE.Views.TextArtSettings.textFromFile": "From File", "SSE.Views.TextArtSettings.textFromUrl": "Da URL", "SSE.Views.TextArtSettings.textGradient": "Gradient", @@ -1793,7 +1814,7 @@ "SSE.Views.TextArtSettings.textImageTexture": "Picture or Texture", "SSE.Views.TextArtSettings.textLinear": "Linear", "SSE.Views.TextArtSettings.textNewColor": "Add New Custom Color", - "SSE.Views.TextArtSettings.textNoFill": "No Fill", + "SSE.Views.TextArtSettings.textNoFill": "Nessun riempimento", "SSE.Views.TextArtSettings.textPatternFill": "Pattern", "SSE.Views.TextArtSettings.textRadial": "Radial", "SSE.Views.TextArtSettings.textSelectTexture": "Select", @@ -1812,7 +1833,7 @@ "SSE.Views.TextArtSettings.txtGreyPaper": "Gray Paper", "SSE.Views.TextArtSettings.txtKnit": "Knit", "SSE.Views.TextArtSettings.txtLeather": "Leather", - "SSE.Views.TextArtSettings.txtNoBorders": "No Line", + "SSE.Views.TextArtSettings.txtNoBorders": "Nessuna linea", "SSE.Views.TextArtSettings.txtPapyrus": "Papyrus", "SSE.Views.TextArtSettings.txtWood": "Wood", "SSE.Views.Toolbar.capBtnComment": "Commento", @@ -1968,7 +1989,7 @@ "SSE.Views.Toolbar.txtAdditional": "Più...", "SSE.Views.Toolbar.txtAscending": "Crescente", "SSE.Views.Toolbar.txtClearAll": "Tutto", - "SSE.Views.Toolbar.txtClearComments": "Comments", + "SSE.Views.Toolbar.txtClearComments": "Commenti", "SSE.Views.Toolbar.txtClearFilter": "Svuota filtro", "SSE.Views.Toolbar.txtClearFormat": "Formato", "SSE.Views.Toolbar.txtClearFormula": "Funzione", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 8b92dd7f6..70b46cc23 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -465,6 +465,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "SSE.Controllers.Main.saveTextText": "Сохранение электронной таблицы...", "SSE.Controllers.Main.saveTitleText": "Сохранение электронной таблицы", + "SSE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "SSE.Controllers.Main.textAnonymous": "Аноним", "SSE.Controllers.Main.textBuyNow": "Перейти на сайт", "SSE.Controllers.Main.textClose": "Закрыть", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 70a934b81..63d867455 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -735,6 +735,14 @@ define([ }, onError: function(id, level, errData) { + if (id == Asc.c_oAscError.ID.LoadingScriptError) { + uiApp.addNotification({ + title: this.criticalErrorTitle, + message: this.scriptLoadError + }); + return; + } + this.hidePreloader(); this.onLongActionEnd(Asc.c_oAscAsyncActionType.BlockInteraction, LoadingDocument); @@ -1522,7 +1530,8 @@ define([ errorFrmlWrongReferences: 'The function refers to a sheet that does not exist.
Please check the data and try again.', errorCopyMultiselectArea: 'This command cannot be used with multiple selections.
Select a single range and try again.', errorPrintMaxPagesCount: 'Unfortunately, it’s not possible to print more than 1500 pages at once in the current version of the program.
This restriction will be eliminated in upcoming releases.', - closeButtonText: 'Close File' + closeButtonText: 'Close File', + scriptLoadError: 'The connection is too slow, some of the components could not be loaded. Please reload the page.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index 26f2e5e0d..796e0dfb0 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -188,6 +188,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Speichervorbereitung. Bitte warten...", "SSE.Controllers.Main.saveTextText": "Dokument wird gespeichert...", "SSE.Controllers.Main.saveTitleText": "Dokument wird gespeichert...", + "SSE.Controllers.Main.scriptLoadError": "Die Verbindung ist zu langsam, einige der Komponenten konnten nicht geladen werden. Bitte laden Sie die Seite erneut.", "SSE.Controllers.Main.sendMergeText": "Merge-Vesand...", "SSE.Controllers.Main.sendMergeTitle": "Merge-Vesand", "SSE.Controllers.Main.textAnonymous": "Anonym", @@ -218,7 +219,7 @@ "SSE.Controllers.Main.txtDelimiter": "Trennzeichen", "SSE.Controllers.Main.txtDiagramTitle": "Diagrammtitel", "SSE.Controllers.Main.txtEditingMode": "Bearbeitungsmodus einschalten...", - "SSE.Controllers.Main.txtEncoding": "Verschlüsselung ", + "SSE.Controllers.Main.txtEncoding": "Zeichenkodierung", "SSE.Controllers.Main.txtErrorLoadHistory": "Laden der Historie ist fehlgeschlagen", "SSE.Controllers.Main.txtFiguredArrows": "Geformte Pfeile", "SSE.Controllers.Main.txtLines": "Linien", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 8fc602870..bc75acdab 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -188,6 +188,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", "SSE.Controllers.Main.saveTextText": "Saving document...", "SSE.Controllers.Main.saveTitleText": "Saving Document", + "SSE.Controllers.Main.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.", "SSE.Controllers.Main.sendMergeText": "Sending Merge...", "SSE.Controllers.Main.sendMergeTitle": "Sending Merge", "SSE.Controllers.Main.textAnonymous": "Anonymous", diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index 464e0ba9e..e2b7a93ec 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -188,6 +188,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Preparando para guardar. Espere, por favor...", "SSE.Controllers.Main.saveTextText": "Guardando documento...", "SSE.Controllers.Main.saveTitleText": "Guardando documento", + "SSE.Controllers.Main.scriptLoadError": "La conexión a Internet es demasiado lenta, no se podía cargar algunos componentes. Por favor, recargue la página.", "SSE.Controllers.Main.sendMergeText": "Envío de los resultados de fusión...", "SSE.Controllers.Main.sendMergeTitle": "Envío de los resultados de fusión", "SSE.Controllers.Main.textAnonymous": "Anónimo", diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index f25d37399..fde9c2c1c 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -188,6 +188,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Préparation à l'enregistrement en cours. Veuillez patienter...", "SSE.Controllers.Main.saveTextText": "Enregistrement du document...", "SSE.Controllers.Main.saveTitleText": "Enregistrement du document", + "SSE.Controllers.Main.scriptLoadError": "La connexion est trop lente, certains éléments ne peuvent pas être chargés. Veuillez recharger la page.", "SSE.Controllers.Main.sendMergeText": "Envoie du résultat de la fusion...", "SSE.Controllers.Main.sendMergeTitle": "Envoie du résultat de la fusion", "SSE.Controllers.Main.textAnonymous": "Anonyme", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index f1534e5b1..1d7acea98 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -188,6 +188,7 @@ "SSE.Controllers.Main.savePreparingTitle": "Подготовка к сохранению. Пожалуйста, подождите...", "SSE.Controllers.Main.saveTextText": "Сохранение документа...", "SSE.Controllers.Main.saveTitleText": "Сохранение документа", + "SSE.Controllers.Main.scriptLoadError": "Слишком медленное подключение, некоторые компоненты не удалось загрузить. Пожалуйста, обновите страницу.", "SSE.Controllers.Main.sendMergeText": "Отправка результатов слияния...", "SSE.Controllers.Main.sendMergeTitle": "Отправка результатов слияния", "SSE.Controllers.Main.textAnonymous": "Анонимный пользователь", diff --git a/build/Gruntfile.js b/build/Gruntfile.js index b1ab33aa0..ee1c4194c 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -3,8 +3,9 @@ module.exports = function(grunt) { defaultConfig, packageFile; + const copyrightHeader = 'Copyright (c) Ascensio System SIA <%= grunt.template.today("yyyy") %>. All rights reserved' var copyright = '/*\n' + - ' * Copyright (c) Ascensio System SIA <%= grunt.template.today("yyyy") %>. All rights reserved\n' + + ' * ' + (process.env['APP_COPYRIGHT'] || copyrightHeader) + '\n' + ' *\n' + ' * <%= pkg.homepage %> \n' + ' *\n' + @@ -416,6 +417,7 @@ module.exports = function(grunt) { grunt.registerTask('increment-build', function() { var pkg = grunt.file.readJSON(defaultConfig); pkg.build = parseInt(pkg.build) + 1; + packageFile.homepage = (process.env['PUBLISHER_URL'] || pkg.homepage); packageFile.version = (process.env['PRODUCT_VERSION'] || pkg.version); packageFile.build = (process.env['BUILD_NUMBER'] || pkg.build); grunt.file.write(defaultConfig, JSON.stringify(pkg, null, 4));