From d6ffb6006b527c1e52f3dd4dbe712471ef982cca Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 16 Apr 2021 15:59:52 +0300 Subject: [PATCH 01/88] Change isModal parameter for plugins config: show modal/non-modal dialog --- apps/common/main/lib/controller/Plugins.js | 6 ++++-- apps/common/main/lib/model/Plugin.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 2364269b4..7a733b0c3 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -382,7 +382,8 @@ define([ isCustomWindow = variation.get_CustomWindow(), arrBtns = variation.get_Buttons(), newBtns = [], - size = variation.get_Size(); + size = variation.get_Size(), + isModal = variation.get_Modal(); if (!size || size.length<2) size = [800, 600]; if (_.isArray(arrBtns)) { @@ -403,7 +404,8 @@ define([ frameId : frameId, buttons: isCustomWindow ? undefined : newBtns, toolcallback: _.bind(this.onToolClose, this), - help: !!help + help: !!help, + modal: isModal!==undefined ? isModal : true }); me.pluginDlg.on({ 'render:after': function(obj){ diff --git a/apps/common/main/lib/model/Plugin.js b/apps/common/main/lib/model/Plugin.js index 9de8d7ea8..3361e19c2 100644 --- a/apps/common/main/lib/model/Plugin.js +++ b/apps/common/main/lib/model/Plugin.js @@ -61,7 +61,7 @@ define([ EditorsSupport: ["word", "cell", "slide"], isVisual: false, isCustomWindow: false, - isModal: false, + isModal: true, isInsideMode: false, initDataType: 0, initData: "", From 94c9e77313978da2acf398d4ae5a489c80fecd98 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 16 Apr 2021 17:18:23 +0300 Subject: [PATCH 02/88] Update translation --- apps/documenteditor/main/locale/el.json | 18 +-- apps/documenteditor/main/locale/es.json | 2 +- apps/documenteditor/main/locale/fr.json | 7 +- apps/documenteditor/main/locale/sl.json | 151 +++++++++++++++++-- apps/presentationeditor/main/locale/el.json | 6 +- apps/presentationeditor/main/locale/fr.json | 1 + apps/spreadsheeteditor/main/locale/el.json | 12 +- apps/spreadsheeteditor/main/locale/fr.json | 1 + apps/spreadsheeteditor/mobile/locale/el.json | 2 +- 9 files changed, 166 insertions(+), 34 deletions(-) diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json index bad2b120c..bb4843a50 100644 --- a/apps/documenteditor/main/locale/el.json +++ b/apps/documenteditor/main/locale/el.json @@ -1287,7 +1287,7 @@ "DE.Views.CrossReferenceDialog.textBookmarkText": "Κείμενο σελιδοδείκτη", "DE.Views.CrossReferenceDialog.textCaption": "Ολόκληρη λεζάντα", "DE.Views.CrossReferenceDialog.textEmpty": "Η αναφορά του αιτήματος είναι κενή.", - "DE.Views.CrossReferenceDialog.textEndnote": "Σημείωση Τέλους", + "DE.Views.CrossReferenceDialog.textEndnote": "Σημείωση τέλους", "DE.Views.CrossReferenceDialog.textEndNoteNum": "Αριθμός σημείωσης τέλους", "DE.Views.CrossReferenceDialog.textEndNoteNumForm": "Αριθμός σημείωσης τέλους (μορφοποιημένος)", "DE.Views.CrossReferenceDialog.textEquation": "Εξίσωση", @@ -1775,7 +1775,7 @@ "DE.Views.FormsTab.tipRadioBox": "Εισαγωγή κουμπιού επιλογής", "DE.Views.FormsTab.tipSubmit": "Υποβολή φόρμας", "DE.Views.FormsTab.tipTextField": "Εισαγωγή πεδίου κειμένου", - "DE.Views.FormsTab.tipViewForm": "Κατάσταση συμπλήρωσης φόρμας", + "DE.Views.FormsTab.tipViewForm": "Προβολή φόρμας", "DE.Views.HeaderFooterSettings.textBottomCenter": "Κάτω κέντρο", "DE.Views.HeaderFooterSettings.textBottomLeft": "Κάτω αριστερά", "DE.Views.HeaderFooterSettings.textBottomPage": "Κάτω Μέρος της Σελίδας", @@ -2057,7 +2057,7 @@ "DE.Views.NoteSettingsDialog.textDocument": "Ολόκληρο το έγγραφο", "DE.Views.NoteSettingsDialog.textEachPage": "Επανεκκίνηση σε κάθε σελίδα", "DE.Views.NoteSettingsDialog.textEachSection": "Επανεκκίνηση σε κάθε τμήμα", - "DE.Views.NoteSettingsDialog.textEndnote": "Σημείωση Τέλους", + "DE.Views.NoteSettingsDialog.textEndnote": "Σημείωση τέλους", "DE.Views.NoteSettingsDialog.textFootnote": "Υποσημείωση", "DE.Views.NoteSettingsDialog.textFormat": "Μορφή", "DE.Views.NoteSettingsDialog.textInsert": "Εισαγωγή", @@ -2100,7 +2100,7 @@ "DE.Views.ParagraphSettings.strIndent": "Εσοχές", "DE.Views.ParagraphSettings.strIndentsLeftText": "Αριστερά", "DE.Views.ParagraphSettings.strIndentsRightText": "Δεξιά", - "DE.Views.ParagraphSettings.strIndentsSpecial": "Ειδικό", + "DE.Views.ParagraphSettings.strIndentsSpecial": "Ειδική", "DE.Views.ParagraphSettings.strLineHeight": "Διάστιχο", "DE.Views.ParagraphSettings.strParagraphSpacing": "Απόσταση Παραγράφων", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Να μην προστίθεται διάστημα μεταξύ παραγράφων της ίδιας τεχνοτροπίας", @@ -2113,7 +2113,7 @@ "DE.Views.ParagraphSettings.textBackColor": "Χρώμα παρασκηνίου", "DE.Views.ParagraphSettings.textExact": "Ακριβώς", "DE.Views.ParagraphSettings.textFirstLine": "Πρώτη γραμμή", - "DE.Views.ParagraphSettings.textHanging": "Κρέμεται", + "DE.Views.ParagraphSettings.textHanging": "Αρνητική", "DE.Views.ParagraphSettings.textNoneSpecial": "(κανένα)", "DE.Views.ParagraphSettings.txtAutoText": "Αυτόματα", "DE.Views.ParagraphSettingsAdvanced.noTabs": "Οι καθορισμένοι στηλοθέτες θα εμφανίζονται σε αυτό το πεδίο", @@ -2128,7 +2128,7 @@ "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Δεξιά", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Μετά", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Πριν", - "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Ειδικό", + "DE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Ειδική", "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Διατήρηση γραμμών μαζί", "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Διατήρηση με επόμενο", "DE.Views.ParagraphSettingsAdvanced.strMargins": "Γεμίσματα", @@ -2160,8 +2160,8 @@ "DE.Views.ParagraphSettingsAdvanced.textEffects": "Εφέ", "DE.Views.ParagraphSettingsAdvanced.textExact": "Ακριβώς", "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "Πρώτη γραμμή", - "DE.Views.ParagraphSettingsAdvanced.textHanging": "Κρέμεται", - "DE.Views.ParagraphSettingsAdvanced.textJustified": "Πλήρης Στοίχιση", + "DE.Views.ParagraphSettingsAdvanced.textHanging": "Αρνητική", + "DE.Views.ParagraphSettingsAdvanced.textJustified": "Πλήρης στοίχιση", "DE.Views.ParagraphSettingsAdvanced.textLeader": "Γέμισμα γραμμής", "DE.Views.ParagraphSettingsAdvanced.textLeft": "Αριστερά", "DE.Views.ParagraphSettingsAdvanced.textLevel": "Επίπεδο", @@ -2600,7 +2600,7 @@ "DE.Views.Toolbar.textTop": "Πάνω:", "DE.Views.Toolbar.textUnderline": "Υπογράμμιση", "DE.Views.Toolbar.tipAlignCenter": "Στοίχιση στο κέντρο", - "DE.Views.Toolbar.tipAlignJust": "Πλήρης Στοίχιση", + "DE.Views.Toolbar.tipAlignJust": "Πλήρης στοίχιση", "DE.Views.Toolbar.tipAlignLeft": "Στοίχιση αριστερά", "DE.Views.Toolbar.tipAlignRight": "Στοίχιση δεξιά", "DE.Views.Toolbar.tipBack": "Πίσω", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index e37d9be7f..99ed4400e 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -1775,7 +1775,7 @@ "DE.Views.FormsTab.tipRadioBox": "Insertar botón de opción", "DE.Views.FormsTab.tipSubmit": "Enviar formulario", "DE.Views.FormsTab.tipTextField": "Insertar campo de texto", - "DE.Views.FormsTab.tipViewForm": "Modo de rellenar formularios", + "DE.Views.FormsTab.tipViewForm": "Ver formulario", "DE.Views.HeaderFooterSettings.textBottomCenter": "Inferior centro", "DE.Views.HeaderFooterSettings.textBottomLeft": "Inferior izquierdo", "DE.Views.HeaderFooterSettings.textBottomPage": "Final de la página", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 2efbf05bf..4ba09b5d4 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -573,7 +573,7 @@ "DE.Controllers.Main.textLongName": "Entrez un nom inférieur à 128 caractères.", "DE.Controllers.Main.textNoLicenseTitle": "La limite de la licence est atteinte", "DE.Controllers.Main.textPaidFeature": "Fonction payée", - "DE.Controllers.Main.textRemember": "Se souvenir de mon choix", + "DE.Controllers.Main.textRemember": "Se souvenir de mon choix pour tous les fichiers", "DE.Controllers.Main.textRenameError": "Le nom d'utilisateur ne peut être vide.", "DE.Controllers.Main.textRenameLabel": "Entrez un nom à utiliser pour la collaboration", "DE.Controllers.Main.textShape": "Forme", @@ -591,6 +591,7 @@ "DE.Controllers.Main.txtCallouts": "Légendes", "DE.Controllers.Main.txtCharts": "Graphiques", "DE.Controllers.Main.txtChoose": "Choisir un élément", + "DE.Controllers.Main.txtClickToLoad": "Cliquez pour charger une image", "DE.Controllers.Main.txtCurrentDocument": "Document actuel", "DE.Controllers.Main.txtDiagramTitle": "Titre du graphique", "DE.Controllers.Main.txtEditingMode": "Définissez le mode d'édition...", @@ -856,6 +857,7 @@ "DE.Controllers.Toolbar.textFontSizeErr": "La valeur entrée est incorrecte.
Entrez une valeur numérique entre 1 et 300", "DE.Controllers.Toolbar.textFraction": "Fractions", "DE.Controllers.Toolbar.textFunction": "Fonctions", + "DE.Controllers.Toolbar.textGroup": "Groupe", "DE.Controllers.Toolbar.textInsert": "Insérer", "DE.Controllers.Toolbar.textIntegral": "Intégrales", "DE.Controllers.Toolbar.textLargeOperator": "Grands opérateurs", @@ -1773,7 +1775,7 @@ "DE.Views.FormsTab.tipRadioBox": "Insérer bouton radio", "DE.Views.FormsTab.tipSubmit": "Soumettre le formulaire ", "DE.Views.FormsTab.tipTextField": "Insérer un champ texte", - "DE.Views.FormsTab.tipViewForm": "Mode remplissage de formulaire", + "DE.Views.FormsTab.tipViewForm": "Voir le formulaire", "DE.Views.HeaderFooterSettings.textBottomCenter": "En bas au centre", "DE.Views.HeaderFooterSettings.textBottomLeft": "En bas à gauche", "DE.Views.HeaderFooterSettings.textBottomPage": "Bas de page", @@ -1806,6 +1808,7 @@ "DE.Views.HyperlinkSettingsDialog.txtEmpty": "Ce champ est obligatoire", "DE.Views.HyperlinkSettingsDialog.txtHeadings": "En-têtes", "DE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"", + "DE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Ce champ est limité à 2083 caractères.", "DE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés", "DE.Views.ImageSettings.textCrop": "Rogner", "DE.Views.ImageSettings.textCropFill": "Remplissage", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 189787828..8e1ad0fef 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -14,9 +14,10 @@ "Common.Controllers.ReviewChanges.textAuto": "auto", "Common.Controllers.ReviewChanges.textBaseline": "Baseline", "Common.Controllers.ReviewChanges.textBold": "Bold", - "Common.Controllers.ReviewChanges.textBreakBefore": "Page break before", + "Common.Controllers.ReviewChanges.textBreakBefore": "Vstavi prelom strani pred izbranim odstavkom.", "Common.Controllers.ReviewChanges.textCaps": "All caps", "Common.Controllers.ReviewChanges.textCenter": "Align center", + "Common.Controllers.ReviewChanges.textChar": "Raven znakov", "Common.Controllers.ReviewChanges.textChart": "Chart", "Common.Controllers.ReviewChanges.textColor": "Font color", "Common.Controllers.ReviewChanges.textContextual": "Don't add interval between paragraphs of the same style", @@ -34,18 +35,22 @@ "Common.Controllers.ReviewChanges.textInserted": "Inserted:", "Common.Controllers.ReviewChanges.textItalic": "Italic", "Common.Controllers.ReviewChanges.textJustify": "Align justify", - "Common.Controllers.ReviewChanges.textKeepLines": "Keep lines together", + "Common.Controllers.ReviewChanges.textKeepLines": "Obdrži vrstice skupaj", "Common.Controllers.ReviewChanges.textKeepNext": "Keep with next", "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": "Brez preloma strani spredaj", "Common.Controllers.ReviewChanges.textNoContextual": "Add interval between paragraphs of the same style", - "Common.Controllers.ReviewChanges.textNoKeepLines": "Don't keep lines together", + "Common.Controllers.ReviewChanges.textNoKeepLines": "Ne ohranjaj vrstic skupaj", "Common.Controllers.ReviewChanges.textNoKeepNext": "Don't keep with next", "Common.Controllers.ReviewChanges.textNot": "Not ", "Common.Controllers.ReviewChanges.textNoWidow": "No widow control", "Common.Controllers.ReviewChanges.textNum": "Change numbering", + "Common.Controllers.ReviewChanges.textOff": "{0} ne uporablja več sledenja spremembam.", + "Common.Controllers.ReviewChanges.textOffGlobal": "{0} je onemogočil(a) sledenje spremembam.", + "Common.Controllers.ReviewChanges.textOn": "{0} zdaj uporablja sledenje spremembam.", + "Common.Controllers.ReviewChanges.textOnGlobal": "{0} je omogočil(a) sledenje sporemembam.", "Common.Controllers.ReviewChanges.textParaDeleted": "Paragraph Deleted", "Common.Controllers.ReviewChanges.textParaFormatted": "Paragraph Formatted", "Common.Controllers.ReviewChanges.textParaInserted": "Paragraph Inserted", @@ -72,11 +77,25 @@ "Common.Controllers.ReviewChanges.textUrl": "Vnesite URL naslov dokumenta", "Common.Controllers.ReviewChanges.textWidow": "Widow control", "Common.define.chartData.textArea": "Ploščinski grafikon", + "Common.define.chartData.textAreaStackedPer": "100% sklad površine", "Common.define.chartData.textBar": "Stolpični grafikon", + "Common.define.chartData.textBarNormal3d": "3-D gručasti stolpci", + "Common.define.chartData.textBarNormal3dPerspective": "3-D stolpci", + "Common.define.chartData.textBarStacked3d": "3-D zloženi stolpci", + "Common.define.chartData.textBarStackedPer": "100% sklad stolpcev", + "Common.define.chartData.textBarStackedPer3d": "3-D 100% zloženi stolpci", "Common.define.chartData.textCharts": "Grafi", "Common.define.chartData.textColumn": "Stolpični grafikon", + "Common.define.chartData.textHBarNormal3d": "3-D gručasti trak", + "Common.define.chartData.textHBarStacked3d": "3-D zloženi trakovi", + "Common.define.chartData.textHBarStackedPer": "100% zloženi trak", + "Common.define.chartData.textHBarStackedPer3d": "3-D 100% palični sklad", "Common.define.chartData.textLine": "Vrstični grafikon", + "Common.define.chartData.textLine3d": "3-D črte", + "Common.define.chartData.textLineStackedPer": "100% črtni sklad", + "Common.define.chartData.textLineStackedPerMarker": "100% črtni sklad z oznakami", "Common.define.chartData.textPie": "Tortni grafikon", + "Common.define.chartData.textPie3d": "3-D pita", "Common.define.chartData.textPoint": "Točkovni grafikon", "Common.define.chartData.textStock": "Založni grafikon", "Common.Translation.warnFileLockedBtnEdit": "Ustvari kopijo", @@ -101,6 +120,7 @@ "Common.UI.Calendar.textShortMay": "Maj", "Common.UI.Calendar.textShortNovember": "Nov", "Common.UI.Calendar.textShortSeptember": "Sep", + "Common.UI.ColorButton.textAutoColor": "Samodejno", "Common.UI.ColorButton.textNewColor": "Dodaj novo barvo po meri", "Common.UI.ComboBorderSize.txtNoBorders": "Ni mej", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Ni mej", @@ -118,7 +138,8 @@ "Common.UI.SearchDialog.textTitle": "Najdi in zamenjaj", "Common.UI.SearchDialog.textTitle2": "Najdi", "Common.UI.SearchDialog.textWholeWords": "Le cele besede", - "Common.UI.SearchDialog.txtBtnReplace": "Zamenjaj", + "Common.UI.SearchDialog.txtBtnHideReplace": "Samo iskanje", + "Common.UI.SearchDialog.txtBtnReplace": "Najdi in zamenjaj", "Common.UI.SearchDialog.txtBtnReplaceAll": "Zamenjaj vse", "Common.UI.SynchronizeTip.textDontShow": "Tega sporočila ne prikaži več", "Common.UI.SynchronizeTip.textSynchronize": "Dokument je spremenil drug uporabnik.
Prosim pritisnite za shranjevanje svojih sprememb in osvežitev posodobitev.", @@ -142,9 +163,20 @@ "Common.Views.About.txtTel": "tel.: ", "Common.Views.About.txtVersion": "Različica", "Common.Views.AutoCorrectDialog.textAdd": "Dodaj", + "Common.Views.AutoCorrectDialog.textApplyText": "Uveljavi med tipkanjem", + "Common.Views.AutoCorrectDialog.textAutoFormat": "Samodejno oblikuj med tipkanjem", + "Common.Views.AutoCorrectDialog.textBulleted": "Samodejni seznami z oznakami", "Common.Views.AutoCorrectDialog.textBy": "Od", "Common.Views.AutoCorrectDialog.textDelete": "Izbriši", + "Common.Views.AutoCorrectDialog.textNumbered": "Samodejno oštevilčeni seznami", + "Common.Views.AutoCorrectDialog.textQuotes": "\"Ravne narekovaje\" s \"pametnimi narekovaji\"", "Common.Views.AutoCorrectDialog.textReplace": "Zamenjaj", + "Common.Views.AutoCorrectDialog.textReplaceText": "Zamenjaj med tipkanjem", + "Common.Views.AutoCorrectDialog.textReplaceType": "Zamenjave besedila med tipkanjem", + "Common.Views.AutoCorrectDialog.textTitle": "Samodejno popravljanje", + "Common.Views.AutoCorrectDialog.textWarnResetRec": "Vsi izrazi, ki ste jih dodali, bo odstranjeni. Tisti, ki ste jih odstranili pa bodo obnovljeni. Ali želite nadaljevati?", + "Common.Views.AutoCorrectDialog.warnReplace": "Vnos samodejnega popravka za %1 že obstaja. Ali ga želite zamenjati?", + "Common.Views.AutoCorrectDialog.warnReset": "Vsi samodejni popravke, ki ste jih dodali, bodo odstranjeni, spremenjeni pa obnovljeni na prvotne vrednosti. Ali želite nadaljevati?", "Common.Views.Chat.textSend": "Pošlji", "Common.Views.Comments.textAdd": "Dodaj", "Common.Views.Comments.textAddComment": "Dodaj", @@ -175,16 +207,24 @@ "Common.Views.ExternalMergeEditor.textClose": "Close", "Common.Views.ExternalMergeEditor.textSave": "Save & Exit", "Common.Views.ExternalMergeEditor.textTitle": "Mail Merge Recipients", + "Common.Views.Header.textAddFavorite": "Označi kot priljubljeno", "Common.Views.Header.textAdvSettings": "Dodatne nastavitve", "Common.Views.Header.textBack": "Pojdi v dokumente", + "Common.Views.Header.textCompactView": "Skrij orodno vrstico", + "Common.Views.Header.textHideLines": "Skrij ravnila", + "Common.Views.Header.textHideStatusBar": "Skrij statusno vrstico", + "Common.Views.Header.tipAccessRights": "Upravljanje pravic dostopa do dokumentov", "Common.Views.Header.tipDownload": "Prenesi datoteko", "Common.Views.Header.tipGoEdit": "Uredi trenutno datoteko", "Common.Views.Header.tipPrint": "Natisni datoteko", "Common.Views.Header.tipSave": "Shrani", "Common.Views.Header.tipUndo": "Razveljavi", + "Common.Views.Header.tipViewSettings": "Pregled nastavitev", + "Common.Views.Header.tipViewUsers": "Pregled uporabnikov in upravljanje pravic dostopa do dokumentov", "Common.Views.Header.txtAccessRights": "Spremeni pravice dostopa", "Common.Views.Header.txtRename": "Preimenuj", "Common.Views.History.textCloseHistory": "Zapri zgodovino", + "Common.Views.History.textHideAll": "Skrij podrobne spremembe", "Common.Views.History.textRestore": "Obnovi", "Common.Views.History.textShow": "Razširi", "Common.Views.ImageFromUrlDialog.textUrl": "Prilepi URL slike:", @@ -227,9 +267,11 @@ "Common.Views.RenameDialog.textName": "Ime datoteke", "Common.Views.ReviewChanges.mniSettings": "Nastavitve primerjave", "Common.Views.ReviewChanges.strFast": "Hitro", + "Common.Views.ReviewChanges.tipAcceptCurrent": "Sprejmi to spremembo", "Common.Views.ReviewChanges.tipCommentRem": "Odstrani komentarje", "Common.Views.ReviewChanges.tipCommentRemCurrent": "Odstrani trenutni komentar", "Common.Views.ReviewChanges.tipCompare": "Primerjaj trenutni dokument z drugim", + "Common.Views.ReviewChanges.tipSharing": "Upravljanje pravic dostopa do dokumentov", "Common.Views.ReviewChanges.txtAccept": "Accept", "Common.Views.ReviewChanges.txtAcceptAll": "Accept All Changes", "Common.Views.ReviewChanges.txtAcceptChanges": "Sprejmi spremembe", @@ -252,6 +294,7 @@ "Common.Views.ReviewChanges.txtView": "Način pogleda", "Common.Views.ReviewChangesDialog.txtAccept": "Sprejmi", "Common.Views.ReviewChangesDialog.txtAcceptAll": "Sprejmi vse spremembe", + "Common.Views.ReviewChangesDialog.txtAcceptCurrent": "Sprejmi to spremembo", "Common.Views.ReviewChangesDialog.txtReject": "Zavrni", "Common.Views.ReviewChangesDialog.txtRejectAll": "Zavrni vse spremembe", "Common.Views.ReviewPopover.textAdd": "Dodaj", @@ -275,12 +318,17 @@ "Common.Views.SignDialog.textValid": "Velja od% 1 do% 2", "Common.Views.SignDialog.tipFontName": "Ime pisave", "Common.Views.SignDialog.tipFontSize": "Velikost pisave", + "Common.Views.SignSettingsDialog.textAllowComment": "Dovoli podpisniku, da doda komentar v pogovornem oknu podpisa", "Common.Views.SignSettingsDialog.textInfoEmail": "Elektronski naslov", "Common.Views.SignSettingsDialog.textInfoName": "Ime", "Common.Views.SymbolTableDialog.textCharacter": "Znak", "Common.Views.SymbolTableDialog.textCopyright": "Znak za Copyright ©", "Common.Views.SymbolTableDialog.textFont": "Ime pisave", "Common.Views.SymbolTableDialog.textQEmSpace": "1/4 prostora", + "Common.Views.SymbolTableDialog.textRecent": "Nedavno uporabljeni simboli", + "Common.Views.SymbolTableDialog.textSymbols": "Simboli", + "Common.Views.SymbolTableDialog.textTitle": "Simbol", + "Common.Views.SymbolTableDialog.textTradeMark": "Simbol blagovne znamke", "DE.Controllers.LeftMenu.leavePageText": "All unsaved changes in this document will be lost.
Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.", "DE.Controllers.LeftMenu.newDocumentTitle": "Neimenovan dokument", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Warning", @@ -300,13 +348,17 @@ "DE.Controllers.Main.downloadMergeTitle": "Downloading", "DE.Controllers.Main.downloadTextText": "Prenašanje dokumenta...", "DE.Controllers.Main.downloadTitleText": "Prenašanje dokumenta", + "DE.Controllers.Main.errorAccessDeny": "Poskušate izvesti dejanje, za katerega nimate pravic.
Če želite pridobiti ustrezne pravice ali če menite, da gre za napako, se posvetujte s skrbnikom sistema.", "DE.Controllers.Main.errorBadImageUrl": "URL slike je nepravilen", "DE.Controllers.Main.errorCoAuthoringDisconnect": "Povezava s strežnikom izgubljena. Dokument v tem trenutku ne more biti urejen.", "DE.Controllers.Main.errorConnectToServer": "The document could not be saved. Please check connection settings or contact your administrator.
When you click the 'OK' button, you will be prompted to download the document.", "DE.Controllers.Main.errorDatabaseConnection": "Zunanja napaka.
Napaka povezave baze podatkov. V primeru, da napaka ni odpravljena, prosim kontaktirajte ekipo za pomoč.", "DE.Controllers.Main.errorDataRange": "Nepravilen obseg podatkov.", "DE.Controllers.Main.errorDefaultMessage": "Koda napake: %1", + "DE.Controllers.Main.errorEditingDownloadas": "Med delom z dokumentom je prišlo do napake.
S funkcijo »Prenesi kot ...« shranite varnostno kopijo datoteke na trdi disk računalnika.", + "DE.Controllers.Main.errorEditingSaveas": "Med delom z dokumentom je prišlo do napake.
S funkcijo »Shrani kot ...« shranite varnostno kopijo datoteke na trdi disk računalnika.", "DE.Controllers.Main.errorFilePassProtect": "Dokument je zaščiten z geslom in ga ni mogoče odpreti.", + "DE.Controllers.Main.errorForceSave": "Med shranjevanjem datoteke je prišlo do napake. Za shranjevanje datoteke na trdi disk računalnika uporabite možnost »Prenesi kot« ali poskusite znova pozneje.", "DE.Controllers.Main.errorKeyEncrypt": "Neznan ključni deskriptor", "DE.Controllers.Main.errorKeyExpire": "Ključni deskriptor je potekel", "DE.Controllers.Main.errorMailMergeLoadFile": "Loading failed", @@ -349,6 +401,7 @@ "DE.Controllers.Main.splitMaxColsErrorText": "Število stolpcev mora biti manj kot 1%.", "DE.Controllers.Main.splitMaxRowsErrorText": "Število vrstic mora biti manj kot %1.", "DE.Controllers.Main.textAnonymous": "Anonimno", + "DE.Controllers.Main.textApplyAll": "Uveljavi za vse enačbe", "DE.Controllers.Main.textChangesSaved": "Vse spremembe shranjene", "DE.Controllers.Main.textClose": "Zapri", "DE.Controllers.Main.textCloseTip": "Pritisni za zapiranje namiga", @@ -379,19 +432,29 @@ "DE.Controllers.Main.txtLines": "Vrste", "DE.Controllers.Main.txtMath": "Matematika", "DE.Controllers.Main.txtNeedSynchronize": "Imate posodobitve", + "DE.Controllers.Main.txtNoTableOfContents": "V dokumentu ni naslovov. Z uporabo slogov v besedilu določite naslove, tako se bodo prikazali v kazalu in navigaciji.", "DE.Controllers.Main.txtOddPage": "Liha stran", "DE.Controllers.Main.txtOnPage": "na strani", "DE.Controllers.Main.txtRectangles": "Pravokotniki", "DE.Controllers.Main.txtSeries": "Serije", + "DE.Controllers.Main.txtShape_actionButtonBackPrevious": "Gumb Nazaj ali Predhodno", + "DE.Controllers.Main.txtShape_actionButtonBeginning": "Gumb za začetek", "DE.Controllers.Main.txtShape_actionButtonBlank": "Prazen gumb", "DE.Controllers.Main.txtShape_actionButtonEnd": "Dodaj gumb", "DE.Controllers.Main.txtShape_actionButtonHelp": "Gumb za pomoč", "DE.Controllers.Main.txtShape_actionButtonHome": "Gumb Domov", "DE.Controllers.Main.txtShape_actionButtonMovie": "Gumb za film", + "DE.Controllers.Main.txtShape_arc": "Lok", + "DE.Controllers.Main.txtShape_bentArrow": "Ukrivljena puščica", + "DE.Controllers.Main.txtShape_bentUpArrow": "Navzgor ukrivljena puščica", + "DE.Controllers.Main.txtShape_bevel": "Poševni rob", + "DE.Controllers.Main.txtShape_blockArc": "Del kroga", + "DE.Controllers.Main.txtShape_can": "Valj", "DE.Controllers.Main.txtShape_cloud": "Oblak", "DE.Controllers.Main.txtShape_ellipse": "Elipsa", "DE.Controllers.Main.txtShape_heart": "Srce", "DE.Controllers.Main.txtShape_leftArrow": "Leva puščica", + "DE.Controllers.Main.txtShape_leftBrace": "Lefi oklepaj", "DE.Controllers.Main.txtShape_lineWithArrow": "Puščica", "DE.Controllers.Main.txtShape_mathEqual": "Enak", "DE.Controllers.Main.txtShape_mathMinus": "Minus", @@ -414,6 +477,7 @@ "DE.Controllers.Main.txtShape_textRect": "Polje z besedilom", "DE.Controllers.Main.txtShape_upArrow": "Puščica: gor", "DE.Controllers.Main.txtStarsRibbons": "Zvezde & Trakovi", + "DE.Controllers.Main.txtStyle_Caption": "Napis", "DE.Controllers.Main.txtStyle_footnote_text": "Besedilo sprotne opombe", "DE.Controllers.Main.txtStyle_Heading_1": "Naslov 1", "DE.Controllers.Main.txtStyle_Heading_2": "Naslov 2", @@ -791,9 +855,12 @@ "DE.Views.BookmarksDialog.textLocation": "Lokacija", "DE.Views.BookmarksDialog.textName": "Ime", "DE.Views.BookmarksDialog.textTitle": "Zaznamki", + "DE.Views.BookmarksDialog.txtInvalidName": "Ime zaznamka lahko vsebuje samo črke, števke in podčrtaje in se mora začeti s črko", "DE.Views.CaptionDialog.textAdd": "Dodaj oznako", "DE.Views.CaptionDialog.textAfter": "po", "DE.Views.CaptionDialog.textBefore": "Pred", + "DE.Views.CaptionDialog.textCaption": "Napis", + "DE.Views.CaptionDialog.textChapter": "Poglavje se začne s slogom", "DE.Views.CaptionDialog.textDelete": "Izbriši oznako", "DE.Views.CaptionDialog.textEquation": "Enačba", "DE.Views.CaptionDialog.textInsert": "Vstavi", @@ -802,6 +869,8 @@ "DE.Views.CaptionDialog.textTable": "Tabela", "DE.Views.CaptionDialog.textTitle": "Vstavi citat", "DE.Views.CellsAddDialog.textCol": "Stolpci", + "DE.Views.CellsAddDialog.textDown": "Pod kurzorjem", + "DE.Views.CellsAddDialog.textRight": "Na desno", "DE.Views.CellsAddDialog.textRow": "Vrstice", "DE.Views.CellsAddDialog.textUp": "Nad kazalcem", "DE.Views.ChartSettings.textAdvanced": "Prikaži napredne nastavitve", @@ -824,15 +893,21 @@ "DE.Views.ChartSettings.txtTopAndBottom": "Vrh in Dno", "DE.Views.ControlSettingsDialog.strGeneral": "Splošno", "DE.Views.ControlSettingsDialog.textAdd": "Dodaj", + "DE.Views.ControlSettingsDialog.textAppearance": "Videz", "DE.Views.ControlSettingsDialog.textApplyAll": "Uporabi za vse", + "DE.Views.ControlSettingsDialog.textBox": "Mejni okvir", "DE.Views.ControlSettingsDialog.textChange": "Uredi", + "DE.Views.ControlSettingsDialog.textCheckbox": "Potrditveno polje", + "DE.Views.ControlSettingsDialog.textChecked": "Označen simbol", "DE.Views.ControlSettingsDialog.textColor": "Barva", "DE.Views.ControlSettingsDialog.textDate": "Format datuma", "DE.Views.ControlSettingsDialog.textDelete": "Izbriši", "DE.Views.ControlSettingsDialog.textDisplayName": "Prikaz imena", "DE.Views.ControlSettingsDialog.textLang": "Jezik", "DE.Views.ControlSettingsDialog.textNone": "Nič", + "DE.Views.ControlSettingsDialog.textUnchecked": "Neoznačen simbol", "DE.Views.ControlSettingsDialog.tipChange": "Zamenjaj simbol", + "DE.Views.CrossReferenceDialog.textAboveBelow": "Zgoraj / spodaj", "DE.Views.CrossReferenceDialog.textBookmark": "Zaznamek", "DE.Views.CrossReferenceDialog.textBookmarkText": "Besedilo zaznamka", "DE.Views.CrossReferenceDialog.textEndnote": "Končna opomba", @@ -856,6 +931,7 @@ "DE.Views.DocumentHolder.alignmentText": "Poravnava", "DE.Views.DocumentHolder.belowText": "pod", "DE.Views.DocumentHolder.breakBeforeText": "Prelom strani pred", + "DE.Views.DocumentHolder.bulletsText": "Označevanje in oštevilčenje seznamov", "DE.Views.DocumentHolder.cellAlignText": "Vertikalna poravnava celic", "DE.Views.DocumentHolder.cellText": "Celica", "DE.Views.DocumentHolder.centerText": "Center", @@ -885,7 +961,7 @@ "DE.Views.DocumentHolder.insertRowBelowText": "Vrsta spodaj", "DE.Views.DocumentHolder.insertRowText": "Vstavi vrsto", "DE.Views.DocumentHolder.insertText": "Vstavi", - "DE.Views.DocumentHolder.keepLinesText": "Linije ohrani skupaj", + "DE.Views.DocumentHolder.keepLinesText": "Obdrži vrstice skupaj", "DE.Views.DocumentHolder.langText": "Izberi jezik", "DE.Views.DocumentHolder.leftText": "Levo", "DE.Views.DocumentHolder.loadSpellText": "Nalaganje variant...", @@ -897,7 +973,7 @@ "DE.Views.DocumentHolder.removeHyperlinkText": "Odstrani hiperpovezavo", "DE.Views.DocumentHolder.rightText": "Desno", "DE.Views.DocumentHolder.rowText": "Vrsta", - "DE.Views.DocumentHolder.saveStyleText": "Create new style", + "DE.Views.DocumentHolder.saveStyleText": "Ustvari nov slog", "DE.Views.DocumentHolder.selectCellText": "Izberi celico", "DE.Views.DocumentHolder.selectColumnText": "Izberi stolpec", "DE.Views.DocumentHolder.selectRowText": "Izberi vrstico", @@ -909,7 +985,7 @@ "DE.Views.DocumentHolder.splitCellTitleText": "Razdeli celico", "DE.Views.DocumentHolder.strDelete": "Odstrani podpis", "DE.Views.DocumentHolder.strSign": "Podpiši", - "DE.Views.DocumentHolder.styleText": "Formatting as Style", + "DE.Views.DocumentHolder.styleText": "Oblikovanje sloga", "DE.Views.DocumentHolder.tableText": "Tabela", "DE.Views.DocumentHolder.textAlign": "Poravnaj", "DE.Views.DocumentHolder.textArrange": "Razporedi", @@ -917,6 +993,7 @@ "DE.Views.DocumentHolder.textArrangeBackward": "Premakni nazaj", "DE.Views.DocumentHolder.textArrangeForward": "Premakni naprej", "DE.Views.DocumentHolder.textArrangeFront": "Premakni v ospredje", + "DE.Views.DocumentHolder.textCells": "Celice", "DE.Views.DocumentHolder.textCopy": "Kopiraj", "DE.Views.DocumentHolder.textCrop": "Odreži", "DE.Views.DocumentHolder.textCropFill": "Dopolni", @@ -1029,7 +1106,7 @@ "DE.Views.DocumentHolder.txtTopAndBottom": "Vrh in Dno", "DE.Views.DocumentHolder.txtUnderbar": "Bar under text", "DE.Views.DocumentHolder.txtUngroup": "Razdruži", - "DE.Views.DocumentHolder.updateStyleText": "Update %1 style", + "DE.Views.DocumentHolder.updateStyleText": "Pododobi slog: %1", "DE.Views.DocumentHolder.vertAlignText": "Vertikalna poravnava", "DE.Views.DropcapSettingsAdvanced.strBorders": "Obrobe & Zapolnitev", "DE.Views.DropcapSettingsAdvanced.strDropcap": "Spustni pokrovček", @@ -1073,6 +1150,7 @@ "DE.Views.DropcapSettingsAdvanced.tipFontName": "Pisava", "DE.Views.DropcapSettingsAdvanced.txtNoBorders": "Ni mej", "DE.Views.EditListItemDialog.textDisplayName": "Prikaz imena", + "DE.Views.EditListItemDialog.textValueError": "Element z enako vrednostjo že obstaja.", "DE.Views.FileMenu.btnBackCaption": "Pojdi v dokumente", "DE.Views.FileMenu.btnCloseMenuCaption": "Zapri meni", "DE.Views.FileMenu.btnCreateNewCaption": "Ustvari nov", @@ -1133,6 +1211,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": "Namigovanje pisave", + "DE.Views.FileMenuPanels.Settings.strForcesave": "Vedno shrani na strežnik (sicer shrani na strežnik ob zapiranju dokumenta)", "DE.Views.FileMenuPanels.Settings.strInputMode": "Vključi hieroglife", "DE.Views.FileMenuPanels.Settings.strLiveComment": "Vključi možnost živega komentiranja", "DE.Views.FileMenuPanels.Settings.strPaste": "Izreži, kopiraj in prilepi", @@ -1146,11 +1225,13 @@ "DE.Views.FileMenuPanels.Settings.text5Minutes": "Vsakih 5 minut", "DE.Views.FileMenuPanels.Settings.text60Minutes": "Vsako uro", "DE.Views.FileMenuPanels.Settings.textAlignGuides": "Navodila poravnave", + "DE.Views.FileMenuPanels.Settings.textAutoRecover": "Samodejno obnavljanje", "DE.Views.FileMenuPanels.Settings.textAutoSave": "Samodejno shranjevanje", "DE.Views.FileMenuPanels.Settings.textDisabled": "Onemogočeno", "DE.Views.FileMenuPanels.Settings.textForceSave": "Shrani na strežnik", "DE.Views.FileMenuPanels.Settings.textMinute": "Vsako minuto", "DE.Views.FileMenuPanels.Settings.txtAll": "Poglej vse", + "DE.Views.FileMenuPanels.Settings.txtAutoCorrect": "Možnosti za samodejno popravljanje ...", "DE.Views.FileMenuPanels.Settings.txtCm": "Centimeter", "DE.Views.FileMenuPanels.Settings.txtInch": "Palec", "DE.Views.FileMenuPanels.Settings.txtInput": "Nadomestni vhod", @@ -1169,8 +1250,10 @@ "DE.Views.FormSettings.textDelete": "Izbriši", "DE.Views.FormSettings.textFromUrl": "z URL naslova", "DE.Views.FormSettings.textTipAdd": "Dodaj novo vrednost", + "DE.Views.FormSettings.textWidth": "Širina celice", "DE.Views.FormsTab.capBtnCheckBox": "Potrditveno polje", "DE.Views.FormsTab.textClearFields": "Počisti vsa polja", + "DE.Views.FormsTab.textNewColor": "Dodaj novo barvo po meri", "DE.Views.HeaderFooterSettings.textBottomCenter": "Središče dna", "DE.Views.HeaderFooterSettings.textBottomLeft": "Spodaj levo", "DE.Views.HeaderFooterSettings.textBottomPage": "Konec strani", @@ -1223,7 +1306,9 @@ "DE.Views.ImageSettingsAdvanced.textAlignment": "Poravnava", "DE.Views.ImageSettingsAdvanced.textAlt": "Nadomestno besedilo", "DE.Views.ImageSettingsAdvanced.textAltDescription": "Opis", + "DE.Views.ImageSettingsAdvanced.textAngle": "Kot", "DE.Views.ImageSettingsAdvanced.textArrows": "Puščice", + "DE.Views.ImageSettingsAdvanced.textAutofit": "Samodejno prilagodi", "DE.Views.ImageSettingsAdvanced.textBeginSize": "Začetna velikost", "DE.Views.ImageSettingsAdvanced.textBeginStyle": "Začetni stil", "DE.Views.ImageSettingsAdvanced.textBelow": "pod", @@ -1289,9 +1374,14 @@ "DE.Views.LeftMenu.tipSupport": "Povratne informacije & Pomoč", "DE.Views.LeftMenu.tipTitles": "Naslovi", "DE.Views.LeftMenu.txtDeveloper": "RAZVIJALSKI NAČIN", + "DE.Views.LineNumbersDialog.textAddLineNumbering": "Dodaj številčenje vrstic", + "DE.Views.LineNumbersDialog.textApplyTo": "Uveljavi spremembe za", + "DE.Views.LineNumbersDialog.txtAutoText": "Samodejno", "DE.Views.Links.capBtnBookmarks": "Zaznamek", + "DE.Views.Links.capBtnCaption": "Napis", "DE.Views.Links.capBtnInsFootnote": "Sprotna opomba", "DE.Views.Links.capBtnInsLink": "Hiperpovezava", + "DE.Views.Links.confirmReplaceTOF": "Ali želite zamenjati izbrano kazalo slik?", "DE.Views.Links.mniConvertNote": "Pretvori vse opombe", "DE.Views.Links.textContentsRemove": "Odstrani kazalo", "DE.Views.Links.textContentsSettings": "Nastavitve", @@ -1306,9 +1396,12 @@ "DE.Views.ListSettingsDialog.textPreview": "Predogled", "DE.Views.ListSettingsDialog.textRight": "Desno", "DE.Views.ListSettingsDialog.txtAlign": "Poravnava", + "DE.Views.ListSettingsDialog.txtBullet": "Znak", "DE.Views.ListSettingsDialog.txtColor": "Barva", + "DE.Views.ListSettingsDialog.txtFont": "Pisava in simbol", "DE.Views.ListSettingsDialog.txtNone": "Nič", "DE.Views.ListSettingsDialog.txtSize": "Velikost", + "DE.Views.ListSettingsDialog.txtSymbol": "Simbol", "DE.Views.ListSettingsDialog.txtType": "Tip", "DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF", "DE.Views.MailMergeEmailDlg.okButtonText": "Send", @@ -1357,7 +1450,9 @@ "DE.Views.MailMergeSettings.txtPrev": "To previous record", "DE.Views.MailMergeSettings.txtUntitled": "Untitled", "DE.Views.MailMergeSettings.warnProcessMailMerge": "Starting merge failed", + "DE.Views.Navigation.txtEmpty": "V dokumentu ni naslovov.
Z uporabo slogov v besedilu določite naslove, tako se bodo prikazali v kazalu in navigaciji.", "DE.Views.NoteSettingsDialog.textApply": "Uporabi", + "DE.Views.NoteSettingsDialog.textApplyTo": "Uveljavi spremembe za", "DE.Views.NoteSettingsDialog.textEndnote": "Končna opomba", "DE.Views.NoteSettingsDialog.textFootnote": "Sprotna opomba", "DE.Views.NoteSettingsDialog.textFormat": "Format", @@ -1383,6 +1478,9 @@ "DE.Views.PageSizeDialog.textTitle": "Page Size", "DE.Views.PageSizeDialog.textWidth": "Width", "DE.Views.PageSizeDialog.txtCustom": "Po meri", + "DE.Views.ParagraphSettings.strIndent": "Zamiki", + "DE.Views.ParagraphSettings.strIndentsLeftText": "Levo", + "DE.Views.ParagraphSettings.strIndentsRightText": "Desno", "DE.Views.ParagraphSettings.strLineHeight": "Razmik med vrsticami", "DE.Views.ParagraphSettings.strParagraphSpacing": "Razmik", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Med odstavke enakega sloga ne dodaj intervalov", @@ -1394,22 +1492,25 @@ "DE.Views.ParagraphSettings.textAuto": "Večkratno", "DE.Views.ParagraphSettings.textBackColor": "Barva ozadja", "DE.Views.ParagraphSettings.textExact": "Točno", + "DE.Views.ParagraphSettings.textNoneSpecial": "(brez)", "DE.Views.ParagraphSettings.txtAutoText": "Samodejno", "DE.Views.ParagraphSettingsAdvanced.noTabs": "Določeni zavihki se bodo pojavili v tem polju", "DE.Views.ParagraphSettingsAdvanced.strAllCaps": "Vse z veliko", "DE.Views.ParagraphSettingsAdvanced.strBorders": "Obrobe & Zapolnitev", "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Prelom strani pred", "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Dvojno prečrtanje", + "DE.Views.ParagraphSettingsAdvanced.strIndent": "Zamiki", "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Levo", "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Desno", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "po", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Pred", - "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Linije ohrani skupaj", + "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Obdrži vrstice skupaj", "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Ohrani z naslednjim", "DE.Views.ParagraphSettingsAdvanced.strMargins": "Blazinice", "DE.Views.ParagraphSettingsAdvanced.strOrphan": "Nadzor sirot", "DE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Pisava", - "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Zamiki & Postavitev", + "DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Zamiki & razmiki", + "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Prelomi vrstic & strani", "DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Postavitev", "DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "mali pokrovčki", "DE.Views.ParagraphSettingsAdvanced.strStrike": "Prečrtano", @@ -1417,12 +1518,15 @@ "DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Nadpis", "DE.Views.ParagraphSettingsAdvanced.strTabs": "Zavihek", "DE.Views.ParagraphSettingsAdvanced.textAlign": "Poravnava", + "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Najmanj", "DE.Views.ParagraphSettingsAdvanced.textAuto": "Večkratno", "DE.Views.ParagraphSettingsAdvanced.textBackColor": "Barva ozadja", + "DE.Views.ParagraphSettingsAdvanced.textBodyText": "Osnovno besedilo", "DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Barva obrobe", "DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Pritisni na diagram, ali pa uporabi gumbe za izbiro mej in potrditev njihovega izbranega stila", "DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Velikost obrobe", "DE.Views.ParagraphSettingsAdvanced.textBottom": "Dno", + "DE.Views.ParagraphSettingsAdvanced.textCentered": "Središčno", "DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Razmak znaka", "DE.Views.ParagraphSettingsAdvanced.textDefault": "Prevzeti zavihek", "DE.Views.ParagraphSettingsAdvanced.textEffects": "Učinki", @@ -1472,6 +1576,7 @@ "DE.Views.ShapeSettings.strTransparency": "Motnost", "DE.Views.ShapeSettings.strType": "Tip", "DE.Views.ShapeSettings.textAdvanced": "Prikaži napredne nastavitve", + "DE.Views.ShapeSettings.textAngle": "Kot", "DE.Views.ShapeSettings.textBorderSizeErr": "Vnesena vrednost je nepravilna.
Prosim vnesite vrednost med 0 pt in 1584 pt.", "DE.Views.ShapeSettings.textColor": "Barvna izpolnitev", "DE.Views.ShapeSettings.textDirection": "Smer", @@ -1495,6 +1600,7 @@ "DE.Views.ShapeSettings.textTexture": "Z teksture", "DE.Views.ShapeSettings.textTile": "Ploščica", "DE.Views.ShapeSettings.textWrap": "Slog zavijanja", + "DE.Views.ShapeSettings.tipAddGradientPoint": "Dodajte točko gradienta", "DE.Views.ShapeSettings.txtBehind": "Za", "DE.Views.ShapeSettings.txtBrownPaper": "Rjav papir", "DE.Views.ShapeSettings.txtCanvas": "Platno", @@ -1529,7 +1635,7 @@ "DE.Views.Statusbar.tipZoomIn": "Povečaj", "DE.Views.Statusbar.tipZoomOut": "Pomanjšaj", "DE.Views.Statusbar.txtPageNumInvalid": "številka strani nepravilna", - "DE.Views.StyleTitleDialog.textHeader": "Create New Style", + "DE.Views.StyleTitleDialog.textHeader": "Ustvarjanje novega sloga", "DE.Views.StyleTitleDialog.textNextStyle": "Next paragraph style", "DE.Views.StyleTitleDialog.textTitle": "Title", "DE.Views.StyleTitleDialog.txtEmpty": "This field is required", @@ -1539,9 +1645,13 @@ "DE.Views.TableFormulaDialog.textFormula": "Formula", "DE.Views.TableFormulaDialog.textInsertFunction": "Prilepi funkcijo", "DE.Views.TableFormulaDialog.textTitle": "Nastavitve formule", + "DE.Views.TableOfContentsSettings.textBuildTable": "Sestavi kazalo iz", + "DE.Views.TableOfContentsSettings.textBuildTableOF": "Sestavi tabelo slik iz", "DE.Views.TableOfContentsSettings.textEquation": "Enačba", "DE.Views.TableOfContentsSettings.textNone": "Nič", + "DE.Views.TableOfContentsSettings.textRadioCaption": "Napis", "DE.Views.TableOfContentsSettings.textStyle": "Slog", + "DE.Views.TableOfContentsSettings.txtCentered": "Poravnano na sredino", "DE.Views.TableOfContentsSettings.txtClassic": "Klasično", "DE.Views.TableOfContentsSettings.txtOnline": "Vpisan", "DE.Views.TableOfContentsSettings.txtSimple": "Preprosto", @@ -1606,7 +1716,9 @@ "DE.Views.TableSettingsAdvanced.textBordersBackgroung": "Obrobe & Ozadje", "DE.Views.TableSettingsAdvanced.textBorderWidth": "Velikost obrobe", "DE.Views.TableSettingsAdvanced.textBottom": "Dno", + "DE.Views.TableSettingsAdvanced.textCellOptions": "Možnosti celic", "DE.Views.TableSettingsAdvanced.textCellProps": "Lastnosti celice", + "DE.Views.TableSettingsAdvanced.textCellSize": "Velikost celice", "DE.Views.TableSettingsAdvanced.textCenter": "Center", "DE.Views.TableSettingsAdvanced.textCenterTooltip": "Center", "DE.Views.TableSettingsAdvanced.textCheckMargins": "Uporabi privzete meje", @@ -1660,6 +1772,7 @@ "DE.Views.TextArtSettings.strStroke": "Stroke", "DE.Views.TextArtSettings.strTransparency": "Opacity", "DE.Views.TextArtSettings.strType": "Tip", + "DE.Views.TextArtSettings.textAngle": "Kot", "DE.Views.TextArtSettings.textBorderSizeErr": "The entered value is incorrect.
Please enter a value between 0 pt and 1584 pt.", "DE.Views.TextArtSettings.textColor": "Color Fill", "DE.Views.TextArtSettings.textDirection": "Direction", @@ -1672,6 +1785,7 @@ "DE.Views.TextArtSettings.textStyle": "Style", "DE.Views.TextArtSettings.textTemplate": "Template", "DE.Views.TextArtSettings.textTransform": "Transform", + "DE.Views.TextArtSettings.tipAddGradientPoint": "Dodajte točko gradienta", "DE.Views.TextArtSettings.txtNoBorders": "No Line", "DE.Views.Toolbar.capBtnAddComment": "Dodaj komentar", "DE.Views.Toolbar.capBtnBlankPage": "Prazna stran", @@ -1680,8 +1794,10 @@ "DE.Views.Toolbar.capBtnDateTime": "Datum & Ura", "DE.Views.Toolbar.capBtnInsChart": "Graf", "DE.Views.Toolbar.capBtnInsEquation": "Enačba", + "DE.Views.Toolbar.capBtnInsHeader": "Glava/noga", "DE.Views.Toolbar.capBtnInsImage": "Slika", "DE.Views.Toolbar.capBtnInsPagebreak": "Prelomi", + "DE.Views.Toolbar.capBtnInsSymbol": "Simbol", "DE.Views.Toolbar.capBtnInsTable": "Tabela", "DE.Views.Toolbar.capBtnInsTextbox": "Polje z besedilom", "DE.Views.Toolbar.capBtnMargins": "Robovi", @@ -1690,7 +1806,9 @@ "DE.Views.Toolbar.capBtnWatermark": "Vodni žig", "DE.Views.Toolbar.capImgAlign": "Poravnava", "DE.Views.Toolbar.capImgBackward": "Premakni v ozadje", + "DE.Views.Toolbar.capImgForward": "Premakni v ospredje", "DE.Views.Toolbar.capImgGroup": "Skupina", + "DE.Views.Toolbar.mniCapitalizeWords": "Zapiši vsako besedo z veliko začetnico", "DE.Views.Toolbar.mniCustomTable": "Vstavi tabelo po more", "DE.Views.Toolbar.mniEditDropCap": "Nastavitve spustnega pokrovčka", "DE.Views.Toolbar.mniEditFooter": "Uredi nogo", @@ -1704,6 +1822,8 @@ "DE.Views.Toolbar.textAutoColor": "Samodejen", "DE.Views.Toolbar.textBold": "Krepko", "DE.Views.Toolbar.textBottom": "Bottom: ", + "DE.Views.Toolbar.textChangeLevel": "Spremeni raven seznama", + "DE.Views.Toolbar.textCheckboxControl": "Potrditveno polje", "DE.Views.Toolbar.textColumnsLeft": "Left", "DE.Views.Toolbar.textColumnsOne": "One", "DE.Views.Toolbar.textColumnsRight": "Right", @@ -1715,6 +1835,7 @@ "DE.Views.Toolbar.textEvenPage": "Tudi stran", "DE.Views.Toolbar.textInMargin": "v Meji", "DE.Views.Toolbar.textInsColumnBreak": "Insert Column Break", + "DE.Views.Toolbar.textInsertPageCount": "Vstavi število strani", "DE.Views.Toolbar.textInsertPageNumber": "Vstavi številko strani", "DE.Views.Toolbar.textInsPageBreak": "Vstavi prelom strani", "DE.Views.Toolbar.textInsSectionBreak": "Vstavi prelom oddelka", @@ -1764,6 +1885,7 @@ "DE.Views.Toolbar.tipAlignRight": "Poravnaj desno", "DE.Views.Toolbar.tipBack": "Nazaj", "DE.Views.Toolbar.tipBlankPage": "Vstavi prazno stran", + "DE.Views.Toolbar.tipChangeCase:": "Zamenjaj velikost črk", "DE.Views.Toolbar.tipChangeChart": "Spremeni vrsto razpredelnice", "DE.Views.Toolbar.tipClearStyle": "Počisti stil", "DE.Views.Toolbar.tipColorSchemas": "Spremeni barvno shemo", @@ -1778,6 +1900,7 @@ "DE.Views.Toolbar.tipFontName": "Pisava", "DE.Views.Toolbar.tipFontSize": "Velikost pisave", "DE.Views.Toolbar.tipHighlightColor": "Označi barvo", + "DE.Views.Toolbar.tipImgAlign": "Poravnaj predmete", "DE.Views.Toolbar.tipIncFont": "Prirastek velikosti pisave", "DE.Views.Toolbar.tipIncPrLeft": "Povečajte zamik", "DE.Views.Toolbar.tipInsertChart": "Vstavi grafikon", @@ -1805,10 +1928,14 @@ "DE.Views.Toolbar.tipSave": "Shrani", "DE.Views.Toolbar.tipSaveCoauth": "Shranite svoje spremembe, da jih drugi uporabniki lahko vidijo.", "DE.Views.Toolbar.tipSendBackward": "Premakni v ozadje", + "DE.Views.Toolbar.tipSendForward": "Prestavi v ospredje", "DE.Views.Toolbar.tipShowHiddenChars": "Nenatisljivi znaki", "DE.Views.Toolbar.tipSynchronize": "Dokument je spremenil drug uporabnik. Prosim pritisnite za shranjevanje svojih sprememb in osvežitev posodobitev.", "DE.Views.Toolbar.tipUndo": "Razveljavi", "DE.Views.Toolbar.tipWatermark": "Uredi vodni žig", + "DE.Views.Toolbar.txtMarginAlign": "Poravnaj na rob", + "DE.Views.Toolbar.txtObjectsAlign": "Poravnaj označene predmete", + "DE.Views.Toolbar.txtPageAlign": "Poravnaj na stran", "DE.Views.Toolbar.txtScheme1": "Pisarna", "DE.Views.Toolbar.txtScheme10": "Mediana", "DE.Views.Toolbar.txtScheme11": "Metro", diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index 30a2ce125..4fa91e514 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -1460,7 +1460,7 @@ "PE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Δεξιά", "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Μετά", "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Πριν", - "PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Ειδικό", + "PE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Ειδική", "PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Γραμματοσειρά", "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Εσοχές & Αποστάσεις", "PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Μικρά κεφαλαία", @@ -1476,8 +1476,8 @@ "PE.Views.ParagraphSettingsAdvanced.textEffects": "Εφέ", "PE.Views.ParagraphSettingsAdvanced.textExact": "Ακριβώς", "PE.Views.ParagraphSettingsAdvanced.textFirstLine": "Πρώτη γραμμή", - "PE.Views.ParagraphSettingsAdvanced.textHanging": "Κρέμεται", - "PE.Views.ParagraphSettingsAdvanced.textJustified": "Πλήρης Στοίχιση", + "PE.Views.ParagraphSettingsAdvanced.textHanging": "Αρνητική", + "PE.Views.ParagraphSettingsAdvanced.textJustified": "Πλήρης στοίχιση", "PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(κανένα)", "PE.Views.ParagraphSettingsAdvanced.textRemove": "Αφαίρεση", "PE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Αφαίρεση Όλων", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index c0466c9f1..48b5fd557 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -1388,6 +1388,7 @@ "PE.Views.HyperlinkSettingsDialog.txtNext": "Diapositive suivante", "PE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit être une URL au format \"http://www.example.com\"", "PE.Views.HyperlinkSettingsDialog.txtPrev": "Diapositive précédente", + "PE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Ce champ est limité à 2083 caractères.", "PE.Views.HyperlinkSettingsDialog.txtSlide": "Diapositive", "PE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés", "PE.Views.ImageSettings.textCrop": "Rogner", diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index 326bd1856..677d5be68 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -2212,7 +2212,7 @@ "SSE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Δεξιά", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Μετά", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Πριν", - "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Ειδικό", + "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecial": "Ειδική", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "Από", "SSE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Γραμματοσειρά", "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Εσοχές & Αποστάσεις", @@ -2229,8 +2229,8 @@ "SSE.Views.ParagraphSettingsAdvanced.textEffects": "Εφέ", "SSE.Views.ParagraphSettingsAdvanced.textExact": "Ακριβώς", "SSE.Views.ParagraphSettingsAdvanced.textFirstLine": "Πρώτη γραμμή", - "SSE.Views.ParagraphSettingsAdvanced.textHanging": "Κρέμεται", - "SSE.Views.ParagraphSettingsAdvanced.textJustified": "Πλήρης Στοίχιση", + "SSE.Views.ParagraphSettingsAdvanced.textHanging": "Αρνητική", + "SSE.Views.ParagraphSettingsAdvanced.textJustified": "Πλήρης στοίχιση", "SSE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(κανένα)", "SSE.Views.ParagraphSettingsAdvanced.textRemove": "Αφαίρεση", "SSE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Αφαίρεση Όλων", @@ -2853,7 +2853,7 @@ "SSE.Views.Toolbar.textAddPrintArea": "Προσθήκη στην Περιοχή Εκτύπωσης", "SSE.Views.Toolbar.textAlignBottom": "Στοίχιση Κάτω", "SSE.Views.Toolbar.textAlignCenter": "Στοίχιση στο Κέντρο", - "SSE.Views.Toolbar.textAlignJust": "Πλήρης Στοίχιση", + "SSE.Views.Toolbar.textAlignJust": "Πλήρης στοίχιση", "SSE.Views.Toolbar.textAlignLeft": "Στοίχιση Αριστερά", "SSE.Views.Toolbar.textAlignMiddle": "Στοίχιση στη Μέση", "SSE.Views.Toolbar.textAlignRight": "Στοίχιση Δεξιά", @@ -2930,7 +2930,7 @@ "SSE.Views.Toolbar.textZoom": "Εστίαση", "SSE.Views.Toolbar.tipAlignBottom": "Στοίχιση κάτω", "SSE.Views.Toolbar.tipAlignCenter": "Στοίχιση στο κέντρο", - "SSE.Views.Toolbar.tipAlignJust": "Πλήρης Στοίχιση", + "SSE.Views.Toolbar.tipAlignJust": "Πλήρης στοίχιση", "SSE.Views.Toolbar.tipAlignLeft": "Στοίχιση αριστερά", "SSE.Views.Toolbar.tipAlignMiddle": "Στοίχιση στη μέση", "SSE.Views.Toolbar.tipAlignRight": "Στοίχιση δεξιά", @@ -3056,7 +3056,7 @@ "SSE.Views.Toolbar.txtSort": "Ταξινόμηση", "SSE.Views.Toolbar.txtSortAZ": "Ταξινόμηση με αύξουσα σειρά", "SSE.Views.Toolbar.txtSortZA": "Ταξινόμηση σε φθίνουσα σειρά", - "SSE.Views.Toolbar.txtSpecial": "Ειδικό", + "SSE.Views.Toolbar.txtSpecial": "Ειδική", "SSE.Views.Toolbar.txtTableTemplate": "Μορφοποίηση σύμφωνα με το πρότυπο πίνακα", "SSE.Views.Toolbar.txtText": "Κείμενο", "SSE.Views.Toolbar.txtTime": "Ώρα", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 507f13e6c..2e0e5de62 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -2076,6 +2076,7 @@ "SSE.Views.HyperlinkSettingsDialog.textTitle": "Paramètres du lien hypertexte", "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "Ce champ est obligatoire", "SSE.Views.HyperlinkSettingsDialog.txtNotUrl": "Ce champ doit contenir une URL au format \"http://www.example.com\"", + "SSE.Views.HyperlinkSettingsDialog.txtSizeLimit": "Ce champ est limité à 2083 caractères.", "SSE.Views.ImageSettings.textAdvanced": "Afficher les paramètres avancés", "SSE.Views.ImageSettings.textCrop": "Rogner", "SSE.Views.ImageSettings.textCropFill": "Remplissage", diff --git a/apps/spreadsheeteditor/mobile/locale/el.json b/apps/spreadsheeteditor/mobile/locale/el.json index d655b7b63..6aca112fc 100644 --- a/apps/spreadsheeteditor/mobile/locale/el.json +++ b/apps/spreadsheeteditor/mobile/locale/el.json @@ -436,7 +436,7 @@ "SSE.Views.EditCell.textInHorBorder": "Εσωτερικό οριζόντιο όριο", "SSE.Views.EditCell.textInteger": "Ακέραιος αριθμός", "SSE.Views.EditCell.textInVertBorder": "Εσωτερικό κάθετο όριο", - "SSE.Views.EditCell.textJustified": "Πλήρης Στοίχιση", + "SSE.Views.EditCell.textJustified": "Πλήρης στοίχιση", "SSE.Views.EditCell.textLeftBorder": "Αριστερό περίγραμμα", "SSE.Views.EditCell.textMedium": "Μεσαίο", "SSE.Views.EditCell.textNoBorder": "Χωρίς περίγραμμα", From 4d5880486d8f0461c92a00f71e7f539f0dd5a271 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 17 Apr 2021 16:08:04 +0300 Subject: [PATCH 03/88] [common] refactoring --- apps/common/main/lib/controller/Themes.js | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index c8c2e2427..e17a7eee7 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -126,34 +126,12 @@ define([ return out_object; } - var refresh_sdk_colors = function () { - if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) { - var style = getComputedStyle(document.body); - if ( !!window.DE ) { - var color_background_normal = style.getPropertyValue('--background-normal'); - this.api.asc_setSkin({ - "RulerOutline": style.getPropertyValue('--border-toolbar'), - "RulerMarkersFillColor": color_background_normal, - "RulerMarkersFillColorOld": color_background_normal, - "RulerTableColor1": color_background_normal, - "RulerLight": style.getPropertyValue("--canvas-ruler-background"), - "RulerDark": style.getPropertyValue("--canvas-ruler-margins-background"), - "RulerTextColor": style.getPropertyValue("--canvas-ruler-mark"), - "RulerTableColor2": style.getPropertyValue("--canvas-ruler-handle-border"), - "RulerTableColor2Old": style.getPropertyValue("--canvas-ruler-handle-border-disabled"), - "RulerTabsColor": style.getPropertyValue("--canvas-high-contrast"), - "RulerTabsColorOld": style.getPropertyValue("--canvas-high-contrast-disabled"), - }); - } - } - } return { THEME_LIGHT_ID: 'theme-light', THEME_DARK_ID: 'theme-dark', init: function (api) { var me = this; - refresh_sdk_colors = refresh_sdk_colors.bind(this); $(window).on('storage', function (e) { if ( e.key == 'ui-theme' ) { From 0cec65caae7c1286e5d4249ab36ab9d9dbc136e7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 17 Apr 2021 16:10:35 +0300 Subject: [PATCH 04/88] [themes] added new theme --- apps/common/main/lib/controller/Themes.js | 2 + apps/common/main/resources/less/buttons.less | 2 + .../resources/less/colors-table-classic.less | 121 ++++++++++++++++++ .../main/app/view/FileMenuPanels.js | 1 + .../main/resources/less/app.less | 1 + 5 files changed, 127 insertions(+) create mode 100644 apps/common/main/resources/less/colors-table-classic.less diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index e17a7eee7..7a70c233e 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -15,6 +15,7 @@ define([ var themes_map = { 'theme-light': 'light', + 'theme-classic-light': 'light', 'theme-dark': 'dark' } @@ -128,6 +129,7 @@ define([ return { THEME_LIGHT_ID: 'theme-light', + THEME_CLASSIC_LIGHT_ID: 'theme-classic-light', THEME_DARK_ID: 'theme-dark', init: function (api) { diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 1ae6fecb2..6c8db3dad 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -77,6 +77,8 @@ &.active:not(.disabled){ .caret { transform: rotate(45deg); + border-color: @icon-normal-pressed-ie; + border-color: @icon-normal-pressed; } } diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less new file mode 100644 index 000000000..53b8097b1 --- /dev/null +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -0,0 +1,121 @@ + +:root { + .theme-classic-light { + --toolbar-header-document: #446995; + --toolbar-header-spreadsheet: #40865c; + --toolbar-header-presentation: #aa5252; + + --background-normal: #fff; + --background-toolbar: #f1f1f1; + --background-toolbar-additional: #f1f1f1; + --background-primary-dialog-button: #7d858c; + --background-tab-underline: #444; + --background-notification-popover: #fcfed7; + --background-notification-badge: #ffd112; + --background-scrim: fade(#000, 20%); + --background-loader: fade(#000, 65%); + + --highlight-button-hover: #d8dadc; + --highlight-button-pressed: #7d858c; + --highlight-button-pressed-hover: #7d858c; + --highlight-primary-dialog-button-hover: #666d73; + --highlight-header-button-hover: fade(#fff, 20%); + --highlight-header-button-pressed: fade(#000, 20%); + --highlight-toolbar-tab-underline: #444; + --highlight-text-select: #3494fb; + + --border-toolbar: #cbcbcb; + --border-divider: #cbcbcb; + --border-regular-control: #cfcfcf; + --border-toolbar-button-hover: #d8dadc; + --border-preview-hover: #cfcfcf; + --border-preview-select: #848484; + --border-control-focus: #848484; + --border-color-shading: fade(#000, 20%); + --border-error: #d9534f; + + --text-normal: #444; + --text-normal-pressed: #444; + --text-secondary: #a5a5a5; + --text-tertiary: #a5a5a5; + --text-link: #acbfff; + --text-inverse: #333; + --text-toolbar-header: fade(#fff, 80%); + --text-contrast-background: #fff; + + --icon-normal: #444; + --icon-normal-pressed: #fff; + --icon-inverse: #444; + --icon-toolbar-header: fade(#fff, 80%); + --icon-notification-badge: #000; + --icon-contrast-popover: #fff; + --icon-success: #5b9f27; + + // Canvas colors + --canvas-background: #666666; + --canvas-content-background: #fff; + --canvas-page-border: #555; + + --canvas-ruler-background: #555; + --canvas-ruler-margins-background: #444; + --canvas-ruler-mark: #b2b2b2; + --canvas-ruler-handle-border: #b2b2b2; + --canvas-ruler-handle-border-disabled: #717171; + + --canvas-high-contrast: #fff; + --canvas-high-contrast-disabled: #888; + + --canvas-cell-border: fade(#000, 10%); + --canvas-cell-title-border: #757575; + --canvas-cell-title-border-hover: #858585; + --canvas-cell-title-border-selected: #9e9e9e; + --canvas-cell-title-hover: #787878; + --canvas-cell-title-selected: #939393; + + --canvas-dark-cell-title: #111; + --canvas-dark-cell-title-hover: #000; + --canvas-dark-cell-title-selected: #333; + --canvas-dark-cell-title-border: #282828; + --canvas-dark-cell-title-border-hover: #191919; + --canvas-dark-cell-title-border-selected: #474747; + + --canvas-scroll-thumb: #404040; + --canvas-scroll-thumb-hover: #999; + --canvas-scroll-thumb-pressed: #adadad; + --canvas-scroll-thumb-border: #2a2a2a; + --canvas-scroll-thumb-border-hover: #2a2a2a; + --canvas-scroll-thumb-border-pressed: #2a2a2a; + --canvas-scroll-arrow: #999; + --canvas-scroll-arrow-hover: #404040; + --canvas-scroll-arrow-pressed: #404040; + --canvas-scroll-thumb-target: #999; + --canvas-scroll-thumb-target-hover: #404040; + --canvas-scroll-thumb-target-pressed: #404040; + + // Others + + --button-small-normal-icon-offset-x: 0; + --button-small-active-icon-offset-x: -20px; + --button-large-normal-icon-offset-x: 0; + --button-large-active-icon-offset-x: -31px; + --button-huge-normal-icon-offset-x: 0; + --button-huge-active-icon-offset-x: -40px; + --button-xhuge-normal-icon-offset-x: 0; + --button-xhuge-active-icon-offset-x: -28px; + //--button-xhuge-normal-icon-offset-x: -37px; + //--button-xhuge-active-icon-offset-x: -37px; + + --modal-window-mask-opacity: 0.6; + --image-border-types-filter: invert(100%) brightness(4); + --image-border-types-filter-selected: invert(100%) brightness(4); + --component-normal-icon-filter: invert(100%); + + --component-normal-icon-opacity: .8; + --component-hover-icon-opacity: .8; + --component-active-icon-opacity: .8; + --component-active-hover-icon-opacity: .8; + --component-disabled-opacity: .3; + + --menu-icon-item-checked-offset-x: -20px; + } +} diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index ddd30ccbf..2ac8862ba 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -466,6 +466,7 @@ define([ cls : 'input-group-nr', data : [ { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, + { value: Common.UI.Themes.THEME_CLASSIC_LIGHT_ID, displayValue: "Classic light" }, { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } ] }); diff --git a/apps/documenteditor/main/resources/less/app.less b/apps/documenteditor/main/resources/less/app.less index 07982a8c8..7e9bf70d3 100644 --- a/apps/documenteditor/main/resources/less/app.less +++ b/apps/documenteditor/main/resources/less/app.less @@ -10,6 +10,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; @import "../../../../common/main/resources/less/colors-table.less"; +@import "../../../../common/main/resources/less/colors-table-classic.less"; @import "../../../../common/main/resources/less/colors-table-dark.less"; // From e7976831f29d7e820606074742ba705e191f65f3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sun, 18 Apr 2021 00:07:25 +0300 Subject: [PATCH 05/88] [common] fixed focused state for some controls --- apps/common/main/resources/less/chat.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/chat.less b/apps/common/main/resources/less/chat.less index e11419c95..47656839b 100644 --- a/apps/common/main/resources/less/chat.less +++ b/apps/common/main/resources/less/chat.less @@ -154,8 +154,8 @@ font-size: 12px; &:focus { - border-color: @border-preview-select-ie; - border-color: @border-preview-select; + border-color: @border-control-focus-ie; + border-color: @border-control-focus; } } } From 57c9c6268e7070917075e88ba5e39d47523c232a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sun, 18 Apr 2021 17:32:39 +0300 Subject: [PATCH 06/88] [common] extended theme's object --- apps/common/main/lib/controller/Themes.js | 85 ++++++++++--------- apps/common/main/lib/view/Header.js | 1 - .../main/app/view/FileMenuPanels.js | 19 +++-- apps/documenteditor/main/locale/en.json | 9 +- .../main/app/view/FileMenuPanels.js | 16 ++-- apps/presentationeditor/main/locale/en.json | 9 +- .../main/resources/less/app.less | 1 + .../main/app/view/FileMenuPanels.js | 16 ++-- apps/spreadsheeteditor/main/locale/en.json | 9 +- .../main/resources/less/app.less | 1 + 10 files changed, 93 insertions(+), 73 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 7a70c233e..d7e8cfdf6 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -7,24 +7,22 @@ define([ ], function () { 'use strict'; - Common.UI.Themes = new (function() { - var sdk_themes_alias = { - 'theme-light': 'flat', - 'theme-dark': 'flatDark' - }; - + Common.UI.Themes = new (function(locale) { + !locale && (locale = {}); + var id_default_theme = 'theme-classic-light'; var themes_map = { - 'theme-light': 'light', - 'theme-classic-light': 'light', - 'theme-dark': 'dark' - } - - sdk_themes_alias.contains = function (name) { - return !!this[name]; - } - - themes_map.contains = function (name) { - return !!this[name]; + 'theme-light': { + text: locale.txtThemeLight || 'Light', + type: 'light' + }, + 'theme-classic-light': { + text: locale.txtThemeClassicLight || 'Classic Light', + type: 'light' + }, + 'theme-dark': { + text: locale.txtThemeDark || 'Dark', + type: 'dark' + }, } var name_colors = [ @@ -128,10 +126,6 @@ define([ } return { - THEME_LIGHT_ID: 'theme-light', - THEME_CLASSIC_LIGHT_ID: 'theme-classic-light', - THEME_DARK_ID: 'theme-dark', - init: function (api) { var me = this; @@ -142,7 +136,7 @@ define([ }) this.api = api; - var theme_name = Common.localStorage.getItem('ui-theme', 'theme-light'); + var theme_name = Common.localStorage.getItem('ui-theme', id_default_theme); if ( !$('body').hasClass(theme_name) ) { $('body').addClass(theme_name); @@ -152,50 +146,57 @@ define([ obj.type = themes_map[theme_name]; obj.name = theme_name; api.asc_setSkin(obj); - - // app.eventbus.addListeners({ - // 'FileMenu': { - // 'settings:apply': function (menu) { - // } - // } - // }, {id: 'Themes'}); - - // getComputedStyle(document.documentElement).getPropertyValue('--background-normal'); }, available: function () { return !Common.Utils.isIE; }, - current: function () { - return Common.localStorage.getItem('ui-theme') || 'theme-light'; + map: function () { + return themes_map + }, + + get: function (id) { + return themes_map[id] + }, + + currentThemeId: function () { + return Common.localStorage.getItem('ui-theme') || id_default_theme; + }, + + defaultThemeId: function () { + return id_default_theme; + }, + + defaultTheme: function () { + return themes_map[id_default_theme] }, isDarkTheme: function () { return themes_map[this.current()] == 'dark'; }, - setTheme: function (name) { - if ( themes_map.contains(name) ) { + setTheme: function (id) { + if ( !!themes_map[id] ) { var classname = document.documentElement.className.replace(/theme-\w+\s?/, ''); document.body.className = classname; - $('body').addClass(name); + $('body').addClass(id); var obj = get_current_theme_colors(name_colors); - obj.type = themes_map[name]; - obj.name = name; + obj.type = themes_map[id].type; + obj.name = id; this.api.asc_setSkin(obj); - Common.localStorage.setItem('ui-theme', name); - Common.NotificationCenter.trigger('uitheme:changed', name); + Common.localStorage.setItem('ui-theme', id); + Common.NotificationCenter.trigger('uitheme:changed', id); } }, toggleTheme: function () { - this.setTheme(this.current() == 'theme-dark' ? 'theme-light' : 'theme-dark'); + this.setTheme(this.current() == 'theme-dark' ? id_default_theme : 'theme-dark'); } } - })(); + })(Common.UI.Themes); }); diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index cf2ef9395..60802aaae 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -782,7 +782,6 @@ define([ textAdvSettings: 'Advanced Settings', tipViewSettings: 'View Settings', textRemoveFavorite: 'Remove from Favorites', - textDarkTheme: 'Dark theme', textAddFavorite: 'Mark as favorite' } }(), Common.Views.Header || {})) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 2ac8862ba..f097325a7 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -464,11 +464,6 @@ define([ style : 'width: 160px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, - { value: Common.UI.Themes.THEME_CLASSIC_LIGHT_ID, displayValue: "Classic light" }, - { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } - ] }); $markup.find('.btn.primary').each(function(index, el){ @@ -601,8 +596,16 @@ define([ this.chPaste.setValue(Common.Utils.InternalSettings.get("de-settings-paste-button")); - item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.current()}); - this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.THEME_LIGHT_ID); + var data = []; + for (var t in Common.UI.Themes.map()) { + data.push({value: t, displayValue: Common.UI.Themes.get(t).text}); + } + + if ( data.length ) { + this.cmbTheme.setData(data); + item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); + this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); + } }, applySettings: function() { @@ -731,8 +734,6 @@ define([ strPasteButton: 'Show Paste Options button when content is pasted', txtProofing: 'Proofing', strTheme: 'Theme', - txtThemeLight: 'Light', - txtThemeDark: 'Dark', txtAutoCorrect: 'AutoCorrect options...' }, DE.Views.FileMenuPanels.Settings || {})); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d8a7e29a6..aa582576e 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -192,6 +192,9 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", @@ -260,7 +263,7 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "Common.Views.Header.textDarkTheme": "Dark theme", + "del_Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -1716,8 +1719,8 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Disable All", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without a notification", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", + "del_DE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", + "del_DE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 05fc32092..c775fee34 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -403,10 +403,6 @@ define([ style : 'width: 160px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, - { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } - ] }); $markup.find('.btn.primary').each(function(index, el){ @@ -529,8 +525,16 @@ define([ this.chPaste.setValue(Common.Utils.InternalSettings.get("pe-settings-paste-button")); - item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.current()}); - this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.THEME_LIGHT_ID); + var data = []; + for (var t in Common.UI.Themes.map()) { + data.push({value: t, displayValue: Common.UI.Themes.get(t).text}); + } + + if ( data.length ) { + this.cmbTheme.setData(data); + item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); + this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); + } }, applySettings: function() { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index f25eeddf0..d5e1ce708 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -83,6 +83,9 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", @@ -148,7 +151,7 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "Common.Views.Header.textDarkTheme": "Dark theme", + "del_Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -1352,8 +1355,8 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Disable All", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without a notification", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", + "del_PE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", + "del_PE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "PE.Views.FileMenuPanels.Settings.txtWin": "as Windows", diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 5f1c42b0c..cb08bdcb4 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -10,6 +10,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; @import "../../../../common/main/resources/less/colors-table.less"; +@import "../../../../common/main/resources/less/colors-table-classic.less"; @import "../../../../common/main/resources/less/colors-table-dark.less"; // diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index a78bb458c..ded4333a6 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1009,10 +1009,6 @@ define([ style : 'width: 160px;', editable : false, cls : 'input-group-nr', - data : [ - { value: Common.UI.Themes.THEME_LIGHT_ID, displayValue: this.txtThemeLight }, - { value: Common.UI.Themes.THEME_DARK_ID, displayValue: this.txtThemeDark } - ] }); $markup.find('.btn.primary').each(function(index, el){ @@ -1175,8 +1171,16 @@ define([ this.chPaste.setValue(Common.Utils.InternalSettings.get("sse-settings-paste-button")); - item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.current()}); - this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.THEME_LIGHT_ID); + var data = []; + for (var t in Common.UI.Themes.map()) { + data.push({value: t, displayValue: Common.UI.Themes.get(t).text}); + } + + if ( data.length ) { + this.cmbTheme.setData(data); + item = this.cmbTheme.store.findWhere({value: Common.UI.Themes.currentThemeId()}); + this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId()); + } }, applySettings: function() { diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index c8483be4b..32c9f8fdf 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -84,6 +84,9 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", @@ -144,7 +147,7 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "Common.Views.Header.textDarkTheme": "Dark theme", + "del_Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -1938,8 +1941,8 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Enable all macros without a notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Disable All", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Disable all macros without a notification", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Dark", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Light", + "del_SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Dark", + "del_SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Light", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Show Notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Disable all macros with a notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index fed2e5b4c..d0cd39be2 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -10,6 +10,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; @import "../../../../common/main/resources/less/colors-table.less"; +@import "../../../../common/main/resources/less/colors-table-classic.less"; @import "../../../../common/main/resources/less/colors-table-dark.less"; // From 7ad8ccd16a8c4f741a442a40be1baa143f49b527 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sun, 18 Apr 2021 17:33:13 +0300 Subject: [PATCH 07/88] [common] changed theme's color --- apps/common/main/resources/less/colors-table-classic.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index 53b8097b1..cc04526bd 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -39,7 +39,7 @@ --text-secondary: #a5a5a5; --text-tertiary: #a5a5a5; --text-link: #acbfff; - --text-inverse: #333; + --text-inverse: #fff; --text-toolbar-header: fade(#fff, 80%); --text-contrast-background: #fff; From 978d892456edbd474b38a5428c2a837866d9e25c Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sun, 18 Apr 2021 18:09:49 +0300 Subject: [PATCH 08/88] [all] fix bug 49398 --- apps/common/main/resources/less/combo-dataview.less | 2 +- apps/spreadsheeteditor/main/resources/less/toolbar.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 4b286b563..6ddfd4173 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -103,7 +103,7 @@ margin: 0 @minus-px-ie @minus-px-ie 0; margin: 0 @minus-px @minus-px 0; height: @combo-dataview-height; - + background-color: @canvas-content-background; &:hover { .box-inner-shadow(0 0 0 2px @border-preview-hover-ie); diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 8c3e2c899..9dde1679f 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -144,6 +144,5 @@ .combo-styles { .view, .dropdown-menu { - background-color: @canvas-content-background; } } \ No newline at end of file From 062a890b20309eb42758b7d5ada4305e1c0101de Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 15:34:00 +0300 Subject: [PATCH 09/88] Fix Bug 49705 --- apps/common/main/lib/view/ListSettingsDialog.js | 2 +- apps/documenteditor/main/app/view/ListSettingsDialog.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index 7ba0754a4..54a13d0b2 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -187,7 +187,7 @@ define([ '
', '
', '
', - '', + '', '', '
' diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 298881567..c35ab4b31 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -195,7 +195,7 @@ define([ '
', '
', '
', - '', + '', '', '
' From 98cb25211255bec74cdf09b0106fdb24ed1f1573 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 15:48:26 +0300 Subject: [PATCH 10/88] Fix combobox styles --- apps/common/main/resources/less/combobox.less | 27 ++++++++++++++++--- .../main/app/view/ChartTypeDialog.js | 4 +-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index c2a7c5a8a..e44ea1f4d 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -68,16 +68,19 @@ } } - &.input-group-nr.open:not(.no-highlighted) { + &.input-group-nr.open { & > .form-control, & > .btn { - border-color: @border-control-focus-ie; - border-color: @border-control-focus; - .caret { transform: rotate(45deg); } } + + &:not(.no-highlighted) > .form-control, + &:not(.no-highlighted) > .btn { + border-color: @border-control-focus-ie; + border-color: @border-control-focus; + } } &.input-group-nr:not(.no-highlighted) > .form-control { @@ -87,6 +90,13 @@ border-color: @border-control-focus; } } + &.input-group-nr.no-highlighted > .form-control { + &:focus, + &:focus ~ button.dropdown-toggle { + border-color: @border-regular-control-ie; + border-color: @border-regular-control; + } + } li { a { @@ -173,4 +183,13 @@ border-color: @border-control-focus; } } + + &.input-group-nr { + & > .form-control, + & > .btn { + .caret { + transform: rotate(45deg); + } + } + } } diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 0fdeeef17..300bce505 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -193,7 +193,7 @@ define([ '
', '
', '
<%= value %>
', - '
', + '
', '
', '
' ].join('')) @@ -388,7 +388,7 @@ define([ template: _.template([ '', '', - '', + '', '' ].join('')) }); From 16cfc2cad13196a35548a803eb6e9cc57cff619e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 15:53:49 +0300 Subject: [PATCH 11/88] [DE] Fix Bug 49701 --- apps/documenteditor/main/app/view/ParagraphSettings.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index dcb530521..025dfbe4b 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -247,7 +247,9 @@ define([ this.numIndentsRight.on('change', this.onNumIndentsRightChange.bind(this)); this.numSpecialBy.on('change', this.onFirstLineChange.bind(this)); this.cmbSpecial.on('selected', _.bind(this.onSpecialSelect, this)); - + this.numIndentsLeft.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); + this.numIndentsRight.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); + this.numSpecialBy.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); this.linkAdvanced = $markup.findById('#paragraph-advanced-link'); this.linkAdvanced.toggleClass('disabled', this._locked); @@ -379,7 +381,6 @@ define([ props.get_Ind().put_FirstLine(specialBy); if (this.api) this.api.paraApply(props); - this.fireEvent('editcomplete', this); }, onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){ @@ -392,7 +393,6 @@ define([ props.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(left)); if (this.api) this.api.paraApply(props); - this.fireEvent('editcomplete', this); }, onNumIndentsRightChange: function(field, newValue, oldValue, eOpts){ @@ -401,7 +401,6 @@ define([ props.get_Ind().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); if (this.api) this.api.paraApply(props); - this.fireEvent('editcomplete', this); }, ChangeSettings: function(prop) { From 974873a8ed1e280c2b6ddf0cdfd45a8057404531 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 17:01:48 +0300 Subject: [PATCH 12/88] [DE] Fix Bug 49732 --- apps/documenteditor/main/app/controller/Main.js | 6 ++++-- apps/documenteditor/main/locale/en.json | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c4d1c8a01..96f6202c9 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -141,7 +141,8 @@ define([ "Choose an item": this.txtChoose, "Enter a date": this.txtEnterDate, "Type equation here": this.txtTypeEquation, - "Click to load image": this.txtClickToLoad + "Click to load image": this.txtClickToLoad, + "No table of figures entries found.": this.txtNoTableOfFigures }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; @@ -2836,7 +2837,8 @@ define([ textLongName: 'Enter a name that is less than 128 characters.', textGuest: 'Guest', errorSubmit: 'Submit failed.', - txtClickToLoad: 'Click to load image' + txtClickToLoad: 'Click to load image', + txtNoTableOfFigures: "No table of figures entries found." } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d8a7e29a6..48c156baf 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -613,6 +613,7 @@ "DE.Controllers.Main.txtMissOperator": "Missing Operator", "DE.Controllers.Main.txtNeedSynchronize": "You have updates", "DE.Controllers.Main.txtNoTableOfContents": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.", + "DE.Controllers.Main.txtNoTableOfFigures": "No table of figures entries found.", "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.", "DE.Controllers.Main.txtNotInTable": "Is Not In Table", "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.", From 784909d517e17b483db8f06e6f8d6005bd1adc13 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 19:05:34 +0300 Subject: [PATCH 13/88] [DE] Fix Bug 49695, Fix Bug 49694 --- .../main/app/view/ParagraphSettings.js | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index 025dfbe4b..56dbef023 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -365,6 +365,13 @@ define([ var props = new Asc.asc_CParagraphProperty(); props.put_Ind(new Asc.asc_CParagraphInd()); props.get_Ind().put_FirstLine(specialBy); + if (specialBy<0 || this._state.FirstLine<0) { + var left = this._state.LeftIndent; + if (left !== undefined && left !== null) { + props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left); + } + } + if (this.api) this.api.paraApply(props); this.fireEvent('editcomplete', this); @@ -379,18 +386,25 @@ define([ var props = new Asc.asc_CParagraphProperty(); props.put_Ind(new Asc.asc_CParagraphInd()); props.get_Ind().put_FirstLine(specialBy); + if (specialBy<0 || this._state.FirstLine<0) { + var left = this._state.LeftIndent; + if (left !== undefined && left !== null) { + props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left); + } + } + if (this.api) this.api.paraApply(props); }, onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){ - var left = field.getNumberValue(); + var left = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); if (this._state.FirstLine<0) { left = left-this._state.FirstLine; } var props = new Asc.asc_CParagraphProperty(); props.put_Ind(new Asc.asc_CParagraphInd()); - props.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(left)); + props.get_Ind().put_Left(left); if (this.api) this.api.paraApply(props); }, @@ -538,7 +552,10 @@ define([ for (var i=0; i Date: Mon, 19 Apr 2021 20:11:09 +0300 Subject: [PATCH 14/88] [SSE mobile] Fix Bug 49728 --- apps/spreadsheeteditor/mobile/app/controller/Main.js | 8 +++++++- apps/spreadsheeteditor/mobile/locale/en.json | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 1c6d2d289..07f75cbf8 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1147,6 +1147,10 @@ define([ config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate; break; + case Asc.c_oAscError.ID.LockedCellPivot: + config.msg = this.errorLockedCellPivot; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1188,6 +1192,7 @@ define([ config.buttons = [{ text: 'OK' }, { text: this.textCancel, onClick: config.callback }]; } else { config.buttons = [{ text: 'OK', onClick: config.callback }]; + $('#ce-cell-content').blur(); } uiApp.modal({ title : config.title, @@ -1789,7 +1794,8 @@ define([ warnLicenseLimitedRenewed: 'License needs to be renewed.
You have a limited access to document editing functionality.
Please contact your administrator to get full access', warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.', textGuest: 'Guest', - errorDataValidate: 'The value you entered is not valid.
A user has restricted values that can be entered into this cell.' + errorDataValidate: 'The value you entered is not valid.
A user has restricted values that can be entered into this cell.', + errorLockedCellPivot: 'You cannot change data inside a pivot table.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index fe0e79487..3371d3249 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -214,6 +214,8 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download it until the connection is restored and page is reloaded.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", + "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
A user has restricted values that can be entered into this cell.", + "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.leavePageText": "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.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data", From 79605f1871902d0e48598eb4d1db70b6c1811a85 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 22:40:42 +0300 Subject: [PATCH 15/88] [DE] Fix Bug 49734 --- apps/documenteditor/main/app/controller/Main.js | 11 ++++++++--- apps/documenteditor/main/locale/en.json | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 96f6202c9..1fcd28c04 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -102,7 +102,7 @@ define([ var me = this, styleNames = ['Normal', 'No Spacing', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Title', 'Subtitle', 'Quote', 'Intense Quote', 'List Paragraph', 'footnote text', - 'Caption'], + 'Caption', 'endnote text'], translate = { 'Series': this.txtSeries, 'Diagram Title': this.txtDiagramTitle, @@ -142,7 +142,9 @@ define([ "Enter a date": this.txtEnterDate, "Type equation here": this.txtTypeEquation, "Click to load image": this.txtClickToLoad, - "No table of figures entries found.": this.txtNoTableOfFigures + "No table of figures entries found.": this.txtNoTableOfFigures, + "table of figures": this.txtTableOfFigures, + "TOC Heading": this.txtTOCHeading }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; @@ -2838,7 +2840,10 @@ define([ textGuest: 'Guest', errorSubmit: 'Submit failed.', txtClickToLoad: 'Click to load image', - txtNoTableOfFigures: "No table of figures entries found." + txtNoTableOfFigures: "No table of figures entries found.", + txtTableOfFigures: 'Table of figures', + txtStyle_endnote_text: 'Endnote Text', + txtTOCHeading: 'TOC Heading' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 48c156baf..82d98cfe0 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -843,6 +843,9 @@ "DE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.", "DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.txtTableOfFigures": "Table of figures", + "DE.Controllers.Main.txtStyle_endnote_text": "Endnote Text", + "DE.Controllers.Main.txtTOCHeading": "TOC Heading", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", From ba31d2f163a86e449d0eba64962f5e49f4ba8381 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 19 Apr 2021 23:57:54 +0300 Subject: [PATCH 16/88] [common] fix bug 49731 --- .../resources/less/combo-border-size.less | 21 ++++++------------- .../main/resources/less/rightmenu.less | 21 ++++++------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index 380c542e3..1668f92e3 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -33,23 +33,14 @@ img, .image { background: ~"url(@{common-image-const-path}/combo-border-size/BorderSize.png) no-repeat 0 0"; + background-size: 60px auto; - @media only screen { - //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), - // (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), - // (min-resolution: 144dpi) and (max-resolution: 191dpi) - //{ - // background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)"; - // background-size: 60px auto; - //} + .pixel-ratio__1_5 & { + background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)"; + } - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 2dppx), - (min-resolution: 192dpi) - { - background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)"; - background-size: 60px auto; - } + .pixel-ratio__2 & { + background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)"; } } } diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index ebb997c02..f211f3567 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -208,23 +208,14 @@ .combo-border-size.cell-border-type { img, .image { background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize.png)"; + background-size: 60px auto; - @media only screen { - //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), - // (min-resolution: 1.5dppx) and (max-resolution: 1.9dppx), - // (min-resolution: 144dpi) and (max-resolution: 191dpi) - //{ - // background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@1.5x.png)"; - // background-size: 60px auto; - //} + .pixel-ratio__1_5 & { + background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@1.5x.png)"; + } - @media (-webkit-min-device-pixel-ratio: 2), - (min-resolution: 2dppx), - (min-resolution: 192dpi) - { - background-image: ~"url(@{app-image-const-path}/toolbar/BorderSize@2x.png)"; - background-size: 60px auto; - } + .pixel-ratio__2 & { + background-image: ~"url(@{common-image-const-path}/combo-border-size/BorderSize@2x.png)"; } } } From 21ae480d3ed255d998f39effd071b84629a3f0fd Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 19 Apr 2021 23:58:59 +0300 Subject: [PATCH 17/88] [common] refactoring --- apps/common/main/resources/less/toolbar.less | 1 + apps/spreadsheeteditor/main/resources/less/toolbar.less | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index d0d3137e8..02bf64d63 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -560,6 +560,7 @@ .equation-icon { .background-ximage-v2('toolbar/math.png', 1500px, @commonimage: true); + opacity: @component-normal-icon-opacity; .theme-dark & { -webkit-filter: @img-equition-filter; diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 9dde1679f..9ab9acdea 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -144,5 +144,6 @@ .combo-styles { .view, .dropdown-menu { + //background-color: @canvas-content-background; } } \ No newline at end of file From d376e2a04efa322cb6f8a085ffdf724cb7b443bf Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 19 Apr 2021 23:59:26 +0300 Subject: [PATCH 18/88] [common] fix bug 49719 --- apps/common/main/resources/less/dropdown-menu.less | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 7a1b1e15a..81447d241 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -153,4 +153,16 @@ background-color: @border-divider-ie; background-color: @border-divider; } + + .dataview { + .item { + .options__icon { + opacity: @component-normal-icon-opacity; + } + + .options__icon-huge { + background-position-x: var(--button-huge-normal-icon-offset-x, 0); + } + } + } } \ No newline at end of file From 5b2ab0ca0e1c4c5db8437fcda7d257ac5ead6ed0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Apr 2021 15:29:32 +0300 Subject: [PATCH 19/88] Fix Bug 49762 (Revert rev. 6014823eb31ec39cf5d4a75bb2fac5e54be3d34f) --- apps/common/main/lib/component/ComboBoxFonts.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 2f47283a6..87f2b272b 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -356,19 +356,20 @@ define([ var me = this; var name = (_.isFunction(font.get_Name) ? font.get_Name() : font.asc_getFontName()); if (this.__name !== name) { + this.__name = name; if (!this.__nameId) { this.__nameId = setTimeout(function () { - me.onApiChangeFontInternal(name); + me.onApiChangeFontInternal(me.__name); me.__nameId = null; }, 100); } + } }, onApiChangeFontInternal: function(name) { if (this.inFormControl) return; - this.__name = name; if (this.getRawValue() !== name) { var record = this.store.findWhere({ name: name From 38cc5ee7fa9937fe8624ccb63f33428bed30f194 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Apr 2021 16:37:09 +0300 Subject: [PATCH 20/88] [common] fix bug 49741 --- apps/common/main/resources/less/toolbar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 02bf64d63..75befbd5c 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -523,7 +523,7 @@ box-shadow: inset 0 0 0 @scaled-one-px-value @border-regular-control; } - &, .icon { + & { width: 21px; height: 21px; } From f3b6156ec801b9692bb8a4252496f939d414a4c8 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Apr 2021 16:37:46 +0300 Subject: [PATCH 21/88] [DE] fix bug 49706 --- apps/documenteditor/main/app/view/ListSettingsDialog.js | 2 +- .../main/resources/less/advanced-settings.less | 9 ++++++++- apps/documenteditor/main/resources/less/toolbar.less | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index c35ab4b31..310ecda94 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -131,7 +131,7 @@ define([ '', '', '', - '
', + '
', '', '', '', diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less index 31a68d081..94b2a2c09 100644 --- a/apps/documenteditor/main/resources/less/advanced-settings.less +++ b/apps/documenteditor/main/resources/less/advanced-settings.less @@ -61,4 +61,11 @@ background-color: #fff; } - +#bulleted-list-preview { + margin-top: 2px; + height:208px; + width: 100%; + border: @scaled-one-px-value-ie solid @border-regular-control-ie; + border: @scaled-one-px-value solid @border-regular-control; + background-color: @canvas-content-background; +} diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 6500e36ce..c0e2b6dcd 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -214,6 +214,8 @@ .menu-list-preview { .box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie); .box-shadow(0 0 0 @scaled-one-px-value @border-regular-control); + + background-color: @canvas-content-background; } a:hover { From 67499c5d2131b02043cb4bc868ef5a69c885b3b1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Apr 2021 18:46:41 +0300 Subject: [PATCH 22/88] Fix Bug 34613, Fix Bug 16000 --- apps/documenteditor/embed/js/ApplicationController.js | 6 +++--- apps/documenteditor/main/app/controller/LeftMenu.js | 2 +- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/documenteditor/main/app/controller/Toolbar.js | 2 +- apps/documenteditor/main/app/view/DocumentHolder.js | 2 +- apps/presentationeditor/embed/js/ApplicationController.js | 6 +++--- apps/presentationeditor/main/app/controller/LeftMenu.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Toolbar.js | 2 +- apps/presentationeditor/main/app/view/DocumentHolder.js | 4 ++-- apps/spreadsheeteditor/embed/js/ApplicationController.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Print.js | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 3bf2092be..f976ab047 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -213,7 +213,7 @@ DE.ApplicationController = new(function(){ function onPrint() { if ( permissions.print!==false ) - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } function onPrintUrl(url) { @@ -277,7 +277,7 @@ DE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (api && permissions.print!==false){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } Common.Analytics.trackEvent('Save'); @@ -285,7 +285,7 @@ DE.ApplicationController = new(function(){ DE.ApplicationView.tools.get('#idt-print') .on('click', function(){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); Common.Analytics.trackEvent('Print'); }); diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 5d3238ab0..31cf04e15 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -236,7 +236,7 @@ define([ if ( isopts ) close_menu = false; else this.clickSaveCopyAsFormat(undefined); break; - case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break; + case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 1fcd28c04..e7d706b03 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2278,7 +2278,7 @@ define([ if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return; if (this.api) - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.component.Analytics.trackEvent('Print'); }, diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index de48b4ce3..77806961a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1055,7 +1055,7 @@ define([ onPrint: function(e) { if (this.api) - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.NotificationCenter.trigger('edit:complete', this.toolbar); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index db0d192d8..a5ac92070 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -1857,7 +1857,7 @@ define([ if (this.api){ var printopt = new Asc.asc_CAdjustPrint(); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event opts.asc_setAdvancedOptions(printopt); this.api.asc_Print(opts); this.fireEvent('editcomplete', this); diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index c251151be..204f5f4be 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -210,7 +210,7 @@ PE.ApplicationController = new(function(){ function onPrint() { if (permissions.print!==false) - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } function onPrintUrl(url) { @@ -285,7 +285,7 @@ PE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (api && permissions.print!==false){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } Common.Analytics.trackEvent('Save'); @@ -293,7 +293,7 @@ PE.ApplicationController = new(function(){ PE.ApplicationView.tools.get('#idt-print') .on('click', function(){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); Common.Analytics.trackEvent('Print'); }); diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index fa1432ed7..ca7289762 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -214,7 +214,7 @@ define([ case 'back': break; case 'save': this.api.asc_Save(); break; case 'save-desktop': this.api.asc_DownloadAs(); break; - case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); break; + case 'print': this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': this.getApplication().getController('Statusbar').setStatusCaption(this.requestEditRightsText); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 1cbf1b50e..c2fcc6337 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1918,7 +1918,7 @@ define([ if (!this.appOptions.canPrint || Common.Utils.ModalWindow.isVisible()) return; if (this.api) - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.component.Analytics.trackEvent('Print'); }, diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 518a6fc28..0b103cbf9 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -953,7 +953,7 @@ define([ onPrint: function(e) { if (this.api) - this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + this.api.asc_Print(new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86)); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event Common.NotificationCenter.trigger('edit:complete', this.toolbar); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 9feafa084..b22837c01 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1856,7 +1856,7 @@ define([ if (me.api){ var printopt = new Asc.asc_CAdjustPrint(); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event opts.asc_setAdvancedOptions(printopt); me.api.asc_Print(opts); me.fireEvent('editcomplete', me); @@ -1962,7 +1962,7 @@ define([ if (me.api){ var printopt = new Asc.asc_CAdjustPrint(); printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event opts.asc_setAdvancedOptions(printopt); me.api.asc_Print(opts); me.fireEvent('editcomplete', me); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index ca30a2365..cf35fd854 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -165,7 +165,7 @@ SSE.ApplicationController = new(function(){ function onPrint() { if ( permissions.print!==false ) - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } function onPrintUrl(url) { @@ -222,7 +222,7 @@ SSE.ApplicationController = new(function(){ common.utils.openLink(embedConfig.saveUrl); } else if (permissions.print!==false){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); } Common.Analytics.trackEvent('Save'); @@ -230,7 +230,7 @@ SSE.ApplicationController = new(function(){ SSE.ApplicationView.tools.get('#idt-print') .on('click', function(){ - api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera)); + api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86)); Common.Analytics.trackEvent('Print'); }); diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index db4168a58..6f22a4959 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -310,7 +310,7 @@ define([ Common.localStorage.setItem("sse-print-settings-range", printtype); if ( this.printSettingsDlg.type=='print' ) { - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera); + var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); opts.asc_setAdvancedOptions(this.adjPrintParams); this.api.asc_Print(opts); } else { From f08f424b1951ae8b5eac7292b890ed60f914ed41 Mon Sep 17 00:00:00 2001 From: evgenykatyshev Date: Wed, 21 Apr 2021 12:33:47 +0300 Subject: [PATCH 23/88] fix bug 49722 --- .../img/toolbar/1.5x/huge/btn-drop-one.png | Bin 225 -> 0 bytes ...rap-topanddown.png => btn-wrap-topbottom.png} | Bin .../img/toolbar/1.5x/huge/btn-wrap-topdown.png | Bin 1297 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-drop-one.png rename apps/documenteditor/main/resources/img/toolbar/1.5x/huge/{btn-wrap-topanddown.png => btn-wrap-topbottom.png} (100%) delete mode 100644 apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topdown.png diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-drop-one.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-drop-one.png deleted file mode 100644 index d34c7c1e984ae9603ea6e8d8f6e8a0c31ab9e464..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^6+mpm!3HGPuB}@Eq&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+SD4s% zbUG$}KUX~S_If6usvn)nsV2uPvYCs|Ew%SQ7oGcHhbY4bPbF=ENCt=LC%9b17%r%8 sVw%XxP|~@^A%&447Pk}w!-3m+MHf7{-q|oT0L^CbboFyt=akR{0M+_KA^-pY diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topanddown.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topbottom.png similarity index 100% rename from apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topanddown.png rename to apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topbottom.png diff --git a/apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topdown.png b/apps/documenteditor/main/resources/img/toolbar/1.5x/huge/btn-wrap-topdown.png deleted file mode 100644 index 8018364d9a656077fc9819d01bc08b9e82ec6907..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1297 zcmV+s1@8KZP)Y$#MvMlM4h1VzaSqdJwek6s&3%l`D)*@u8k{8 z;?ZIxxwr=)qKF^Xt0Q?N&oGf;7=~dOhG7_nvBaP%V|RD=7i}=t*VluP^1lFWFatn_ zVHn0HVLn(eA8Z(gVYE!+d3$efZwKz{7?-b*ZgD-kxw$!~h9pVyYB(Hz!sT0}9cljv zzV(zk1p4?{{^~`V!TmMXi*~ua6}@P?k>17z#$xQ7JkWEagF%KgxxBpmOlyEP6a4u? zxyWVaFz{>Y5Ex=bFUXK4(7cvjw3$$aUbNXr?-n(uD3%|1^z`(U!cY?mMCyE{Rk2iY zuWfcp?v0RA=$=p@Qs>3=#xU@_Chs`J$Wr#0*88lssMQ-{WGVZidSe(k^W>|H%)XrJ z#WJ_lJ((w8W#lDaUPoiSjSUPRp?Qd7@vEiqf{Jn<NvVEm7o zHc-w{_o(zzZom~?(vekqfun{rHt@s41NSoRRPw1fiXR^zeSYXK_xJbOm-~_g=`9(> zYQ3cIOqE1ApoV|tWqzV8&ilnF(wnWVtrr;lK=P7wA9ViOX zzXebeC>bg`fA)i)C3AbNhu$>QT0ZdqW{2qTJnok3E&w3vw`Ncr!!;(N6}09 z3=my!R0Ctnb4LE2d|Po{MzX)Z|DO6wbiL>_QT0YMupD3{ilT1mI`b9AR_c&?h^(X& zMNzkOohiy6QbeNcgBJ}Ahdaumi<2O{pt*9TsBO1xg7iwt6y>Apjb>miFzQe2X-^Pf zSbR-Y@om+nigtMn^uia_g%JN2B%Hd?8*thejc7g?Q*@>% z=9d3a1}gfxP0AEyT;c!L^+q%B#l=NNo`)-*C(9n!x3cu*cY>@Re8xx%bz0XOb(=(< zhlB5(mE1n125okX@7X%n8{5FHDuYLF*?BUiX?_Xwb=vF!t|l+7*d?^8H}*ltv?`BR z&Sm#yny%{AbLjwmWm=P0s#m7zO1)G*>enW!fnhA3UR+7mX1_xdcFDTWQ%a2SOrzIuory`!b6OJcy@dOe^RHq5AE^cMI> zZ$P~uq8pg^xiInv8Ieu`_1<17^~PL}6C1owG2kj>6n~)HK#uZ2y;rZ)8%sS-?_$M( z4Z|>ujlh1RL$KfIFbu;mTE={^U_RI|48t%C!!QiPFgBmx#d;5;T+Uf?00000NkvXX Hu0mjfgQjdD From 30148bbd6d01f89fed9b7927bab3df2cc961f0ec Mon Sep 17 00:00:00 2001 From: evgenykatyshev Date: Wed, 21 Apr 2021 16:04:51 +0300 Subject: [PATCH 24/88] Fix colors --- apps/common/main/resources/less/colors-table-classic.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index cc04526bd..40c7d2067 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -35,12 +35,12 @@ --border-error: #d9534f; --text-normal: #444; - --text-normal-pressed: #444; + --text-normal-pressed: #fff; --text-secondary: #a5a5a5; --text-tertiary: #a5a5a5; --text-link: #acbfff; --text-inverse: #fff; - --text-toolbar-header: fade(#fff, 80%); + --text-toolbar-header: #fff; --text-contrast-background: #fff; --icon-normal: #444; @@ -52,7 +52,7 @@ --icon-success: #5b9f27; // Canvas colors - --canvas-background: #666666; + --canvas-background: #e2e2e2; --canvas-content-background: #fff; --canvas-page-border: #555; From ba5c1ba4ab161b9aa21a897507e5d690ca33ef27 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 21 Apr 2021 17:09:22 +0300 Subject: [PATCH 25/88] [themes] fixed some colors for "classic" theme --- apps/common/main/resources/less/buttons.less | 4 ++-- apps/common/main/resources/less/dropdown-menu.less | 4 ++-- apps/common/main/resources/less/treeview.less | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 6c8db3dad..8a3b7218f 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -358,8 +358,8 @@ &:active:not(.disabled), &.active:not(.disabled) { - color: @text-normal-ie; - color: @text-normal; + color: @text-normal-pressed-ie; + color: @text-normal-pressed; background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; } diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index 7a1b1e15a..ece39d03f 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -46,8 +46,8 @@ } &:hover { - color: @text-normal-pressed-ie; - color: @text-normal-pressed; + color: @text-normal-ie; + color: @text-normal; background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } diff --git a/apps/common/main/resources/less/treeview.less b/apps/common/main/resources/less/treeview.less index cd7e0e002..6a14d2827 100644 --- a/apps/common/main/resources/less/treeview.less +++ b/apps/common/main/resources/less/treeview.less @@ -40,6 +40,8 @@ &.selected { background-color: @highlight-button-pressed-ie; background-color: @highlight-button-pressed; + color: @text-normal-pressed-ie; + color: @text-normal-pressed; } &.selected .empty { From 1e841f0032ce76ac162ab45a69fc1867480e6978 Mon Sep 17 00:00:00 2001 From: evgenykatyshev Date: Wed, 21 Apr 2021 17:59:59 +0300 Subject: [PATCH 26/88] Align border preview by left side --- .../img/combo-border-size/BorderSize.png | Bin 208 -> 201 bytes .../img/combo-border-size/BorderSize@1.5x.png | Bin 231 -> 228 bytes .../img/combo-border-size/BorderSize@2x.png | Bin 694 -> 223 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize.png b/apps/common/main/resources/img/combo-border-size/BorderSize.png index 97152b1494b803abace283663bb3cf337c487bf1..37da5da483f208deec1a6aa2ab173d7e59a9c2db 100644 GIT binary patch delta 185 zcmcb>c#?5~L_G%!0|SF;h{QD@HNn%xF{I+w+glqM9T)_d9WLLhZ@$jVa6*=039kvm z@2&j23=E#H7BVtCD6*QqiJf7Eos~Gl2T!Z%2@DQj1=qY`{NTE(KjB~#Bg5Bk{}>rA z?97Yd=V4=5@vq?PzXJ&j4X^ma<-r0U6JMQqT+RWMGurn_`*-MbHa2Dk=@&7_*PR23 k^Onl8$-FQ4EdEI8q_`CVF-?V>kd@P|XoVb6x#jcGr9-N3f ns&=>2ZPV|2`+lFjfB%o(V_RGHYT+PRki$G({an^LB{Ts5G!;nz diff --git a/apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png b/apps/common/main/resources/img/combo-border-size/BorderSize@1.5x.png index 293c5ab092a0a38236ea46701efe4aa689a81038..603c64c53f48fa95fcea5ae54b2fd154eb0ca6f5 100644 GIT binary patch delta 165 zcmV;W09ya&0ptOYM}LS(L_t(|+U?f?2E#xU2I1cVa+I8=(EH>l3s`f?f|l}tmUwHv z2uT2pUpD%$XXz2CBT6&UMm>+zMx@T&_U~DCyJ6?DTl<%N{{CI^zgnWY+*LIN6u0}V zo`5R@NDf%Z3DbR6QvgZ$dTh|M>=u#}fGfui=RVo?FXeWyxA({y)xOu{729D zlK_PGT0b=tP?4XS1a#DM=(!NkPq!hUUbh`~4!Wg((C6##0p`^}RDs0000kP5Mt`0Lp1gD%_)77xMm?2jB{1eFp*ZWsIZdHHc*>H91RuKQ__q3}&zy3Sv7XFEc yXH9(AKDP4=zhhT_kMyu|fd%W(_(aPi{FSjXy-0A7+=d#Wzp$P!1B~`Wn literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^6$}ha5gcql*2-|Dvp|Zoz$3Dlfk8|agc&`9R6YO& z8HhvRkn&JB$4xmp%7C9|LLyg9m$K>g?|~uUXFs6M@qOUf1WY$(@j@&J7oWF)TE# zBMZwmJ!0t-mVk*t>4aHR=UPb17BU^@lu<93a{x`6;qsf5qc>l42wV6)uxNY?G{C|y z0Yy!Nh_-d%J9emcxH%Ap0kTr|jhlp@=LO9|@^+eV(8C@_)i&Wmw3dIqrdPjCf>U+|-+&rR5%ew>!Z5AA0~YFf?RtH=D0z9WsB{ w{;%(4@Hy~J%3AAmQR~S0F3{M3+d1tQqyAGZk$vA*#)AUT)78&qol`;+0Ny&e`~Uy| From 0cff183c316b40633891c25da31460bd58e7d8ce Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Apr 2021 22:09:36 +0300 Subject: [PATCH 27/88] Fix Bug 49783 --- apps/common/main/lib/view/PasswordDialog.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js index c552b5801..605591a61 100644 --- a/apps/common/main/lib/view/PasswordDialog.js +++ b/apps/common/main/lib/view/PasswordDialog.js @@ -99,6 +99,7 @@ define([ type: 'password', allowBlank : false, style : 'width: 100%;', + maxLength: 255, validateOnBlur: false }); this.repeatPwd = new Common.UI.InputField({ @@ -106,6 +107,7 @@ define([ type: 'password', allowBlank : false, style : 'width: 100%;', + maxLength: 255, validateOnBlur: false, validation : function(value) { return me.txtIncorrectPwd; From 6f853a7c1feba09abfea11a6d91bcc04d1760e2a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Apr 2021 23:27:37 +0300 Subject: [PATCH 28/88] [SSE] Fix Bug 49805 --- .../main/app/view/PivotGroupDialog.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js b/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js index 03c42c8d3..71dbafac8 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js +++ b/apps/spreadsheeteditor/main/app/view/PivotGroupDialog.js @@ -242,9 +242,11 @@ define([ if (rangePr) { this.chStart.setValue(rangePr.asc_getAutoStart(), true); this.chEnd.setValue(rangePr.asc_getAutoEnd(), true); - this.inputStart.setValue((dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum()) || ''); - this.inputEnd.setValue((dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum()) || ''); - !dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval() || ''); + var value = dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum(); + this.inputStart.setValue(value!==null && value!==undefined ? value : ''); + value = dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum(); + this.inputEnd.setValue(value!==null && value!==undefined ? value : ''); + !dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval()); this.rangePr = rangePr; if (defRangePr) { this.defRangePr = {start: dateTypes ? defRangePr.asc_getStartDateText() : defRangePr.asc_getStartNum(), end: dateTypes ? defRangePr.asc_getEndDateText() : defRangePr.asc_getEndNum()}; @@ -259,7 +261,7 @@ define([ if (item == Asc.c_oAscGroupBy.Days) isDays = true; }); - this.spnDays.setValue(rangePr.asc_getGroupInterval() || ''); + this.spnDays.setValue(rangePr.asc_getGroupInterval()); this.spnDays.setDisabled(!isDays || dateTypes.length>1); this.btnOk.setDisabled(dateTypes.length<1); this.dateTypes = dateTypes; From 76107bbc34d5a6cfe66f6a9f6593a4ab7d4cfb2d Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 21 Apr 2021 23:50:50 +0300 Subject: [PATCH 29/88] [themes] fixed style for border's combobox --- apps/common/main/resources/less/colors-table-classic.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index 40c7d2067..c92beb202 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -106,7 +106,7 @@ //--button-xhuge-active-icon-offset-x: -37px; --modal-window-mask-opacity: 0.6; - --image-border-types-filter: invert(100%) brightness(4); + --image-border-types-filter: none; --image-border-types-filter-selected: invert(100%) brightness(4); --component-normal-icon-filter: invert(100%); From 1ab9d096753253b3622a22516aa80bc86affc9a0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 12:13:54 +0300 Subject: [PATCH 30/88] [DE] Add changing level to multilevel list menu --- .../main/app/controller/Toolbar.js | 7 +++++- apps/documenteditor/main/app/view/Toolbar.js | 24 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 77806961a..32922483c 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -301,6 +301,9 @@ define([ toolbar.mnuNumberChangeLevel && toolbar.mnuNumberChangeLevel.menu && toolbar.mnuNumberChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 1)); toolbar.mnuNumberChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 1)); + toolbar.mnuMultiChangeLevel && toolbar.mnuMultiChangeLevel.menu && + toolbar.mnuMultiChangeLevel.menu.on('show:after', _.bind(this.onChangeLevelShowAfter, this, 2)); + toolbar.mnuMultiChangeLevel.menu.on('item:click', _.bind(this.onChangeLevelClick, this, 2)); toolbar.btnHighlightColor.on('click', _.bind(this.onBtnHighlightColor, this)); toolbar.btnFontColor.on('click', _.bind(this.onBtnFontColor, this)); toolbar.btnParagraphColor.on('click', _.bind(this.onBtnParagraphColor, this)); @@ -526,6 +529,7 @@ define([ this.toolbar.mnuMarkerSettings && this.toolbar.mnuMarkerSettings.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(this._state.bullets.subtype<0); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(this._state.bullets.subtype<0); + this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(this._state.bullets.subtype<0); break; case 1: var idx; @@ -561,6 +565,7 @@ define([ this.toolbar.mnuNumberSettings && this.toolbar.mnuNumberSettings.setDisabled(idx==0); this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(idx==0); this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(idx==0); + this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(idx==0); break; case 2: this.toolbar.btnMultilevels.toggle(true, true); @@ -1409,7 +1414,6 @@ define([ onChangeLevelShowAfter: function(type, menu) { var me = this; var listId = me.api.asc_GetCurrentNumberingId(), - level = me.api.asc_GetCurrentNumberingLvl(), props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null; if (props) { this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props); @@ -2387,6 +2391,7 @@ define([ this.toolbar.mnuMultilevelSettings && this.toolbar.mnuMultilevelSettings.setDisabled(true); this.toolbar.mnuMarkerChangeLevel && this.toolbar.mnuMarkerChangeLevel.setDisabled(true); this.toolbar.mnuNumberChangeLevel && this.toolbar.mnuNumberChangeLevel.setDisabled(true); + this.toolbar.mnuMultiChangeLevel && this.toolbar.mnuMultiChangeLevel.setDisabled(true); }, _getApiTextSize: function () { diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 329ad4379..b73c4c089 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1707,6 +1707,7 @@ define([ style: 'min-width: 139px', items: [ {template: _.template('')}, + {caption: '--'}, this.mnuMarkerChangeLevel = new Common.UI.MenuItem({ caption: this.textChangeLevel, style: 'padding-right:20px;', @@ -1727,7 +1728,7 @@ define([ }) ); - items = [], ids = []; + items = []; ids = []; for (var i=0; i<9; i++) { ids.push('id-toolbar-menu-numbering-level-' + i); items.push({template: levelTemplate, previewId: ids[i], level: i }); @@ -1737,6 +1738,7 @@ define([ cls: 'shifted-left', items: [ {template: _.template('')}, + {caption: '--'}, this.mnuNumberChangeLevel = new Common.UI.MenuItem({ caption: this.textChangeLevel, style: 'padding-right:20px;', @@ -1756,13 +1758,29 @@ define([ ] }) ); - + items = []; ids = []; + for (var i=0; i<9; i++) { + ids.push('id-toolbar-menu-multilevels-level-' + i); + items.push({template: levelTemplate, previewId: ids[i], level: i }); + } this.btnMultilevels.setMenu( new Common.UI.Menu({ cls: 'shifted-left', style: 'min-width: 90px', items: [ - {template: _.template('')}, + {template: _.template('')}, + {caption: '--'}, + this.mnuMultiChangeLevel = new Common.UI.MenuItem({ + caption: this.textChangeLevel, + style: 'padding-right:20px;', + disabled: (this.mnuMultilevelPicker.conf.index || 0)==0, + menu: new Common.UI.Menu({ + cls: 'list-settings-level', + menuAlign: 'tl-tr', + items: items, + previewIds: ids + }) + }), this.mnuMultilevelSettings = new Common.UI.MenuItem({ caption: this.textListSettings, disabled: (this.mnuMultilevelPicker.conf.index || 0)==0, From 7d8787b46f678ab18bb8b2ca232555d2559d7ef9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 22 Apr 2021 12:47:36 +0300 Subject: [PATCH 31/88] [themes] added options to load single theme --- apps/common/main/lib/controller/Themes.js | 71 +++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index d7e8cfdf6..40adbf364 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -125,6 +125,75 @@ define([ return out_object; } + var create_colors_css = function (id, colors) { + if ( !!colors && !!id ) { + var _css_array = [':root .', id, '{']; + for (var c in colors) { + _css_array.push('--', c, ':', colors[c], ';'); + } + + _css_array.push('}'); + return _css_array.join(''); + } + } + + var write_theme_css = function (css) { + if ( !!css ) { + var style = document.createElement('style'); + style.type = 'text/css'; + style.innerHTML = css; + document.getElementsByTagName('head')[0].appendChild(style); + } + } + + var parse_themes_object = function (obj) { + if ( !!obj.themes && obj.themes instanceof Array ) { + obj.themes.forEach(function (item) { + if ( !!item.id ) { + themes_map[item.id] = {text: item.name, type: item.type}; + write_theme_css(create_colors_css(item.id, item.colors)); + } else + if ( typeof item == 'string' ) { + get_themes_config(item) + } + }); + } else + if ( obj.id ) { + themes_map[obj.id] = {text: obj.name, type: obj.type}; + write_theme_css( create_colors_css(obj.id, obj.colors) ); + } + } + + var get_themes_config = function (url) { + fetch(url, { + method: 'get', + headers: { + 'Accept': 'application/json', + }, + }).then(function(response) { + if (!response.ok) { + throw new Error('server error'); + } + return response.json(); + }).then(function(response) { + if ( response.then ) { + // return response.json(); + } else { + parse_themes_object(response); + + /* to break promises chain */ + throw new Error('loaded'); + } + }).catch(function(e) { + if ( e.message == 'loaded' ) { + } else console.log('fetch error: ' + e); + }); + } + + var on_document_ready = function (el) { + // get_themes_config('../../common/main/resources/themes/themes.json') + } + return { init: function (api) { var me = this; @@ -146,6 +215,8 @@ define([ obj.type = themes_map[theme_name]; obj.name = theme_name; api.asc_setSkin(obj); + + Common.NotificationCenter.on('document:ready', on_document_ready.bind(this)); }, available: function () { From ffa9af53207c97e6fe8ad416d57e8cd741c859af Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 15:17:43 +0300 Subject: [PATCH 32/88] [DE] Fix Bug 49727 --- apps/documenteditor/main/app/view/FormSettings.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 57d504f9b..c5da9f278 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -389,7 +389,6 @@ define([ formTextPr.put_MaxCharacters(checked ? (field.getNumberValue() || 10) : checked); props.put_TextFormPr(formTextPr); this.api.asc_SetContentControlProperties(props, this.internalId); - this.fireEvent('editcomplete', this); } }, @@ -408,7 +407,7 @@ define([ formTextPr.put_MaxCharacters(this.spnMaxChars.getNumberValue() || 10); if (this.spnWidth.getValue()) { var value = this.spnWidth.getNumberValue(); - formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.1)); + formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.5)); } else formTextPr.put_Width(0); } @@ -424,13 +423,12 @@ define([ var formTextPr = this._originalTextFormProps || new AscCommon.CSdtTextFormPr(); if (this.spnWidth.getValue()) { var value = this.spnWidth.getNumberValue(); - formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.1)); + formTextPr.put_Width(value<=0 ? 0 : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4 + 0.5)); } else formTextPr.put_Width(0); props.put_TextFormPr(formTextPr); this.api.asc_SetContentControlProperties(props, this.internalId); - this.fireEvent('editcomplete', this); } }, @@ -727,7 +725,7 @@ define([ val = this.api.asc_GetTextFormAutoWidth(); if ( (this._state.WidthPlaceholder!==val) || Math.abs(this._state.WidthPlaceholder-val)>0.01) { - this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM(val) : this.spnWidth.options.minValue); + this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM((val+1) * 25.4 / 20 / 72.0) : this.spnWidth.options.minValue); this._state.WidthPlaceholder=val; } From 49000398bd507c9147a0ddb01a1606ac00938be8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 16:31:23 +0300 Subject: [PATCH 33/88] [DE] Change preview size for list levels --- apps/documenteditor/main/app/view/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index b73c4c089..176df8653 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1695,7 +1695,7 @@ define([ // set menus var me = this; - var levelTemplate = _.template(''); + var levelTemplate = _.template(''); var items = [], ids = []; for (var i=0; i<9; i++) { ids.push('id-toolbar-menu-markers-level-' + i); From 28447731e62dab95f874611dbaf4ea73592ccd18 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 16:38:58 +0300 Subject: [PATCH 34/88] Fix Bug 49733 --- .../main/app/view/TextArtSettings.js | 37 +++++++++++-------- .../main/app/view/TextArtSettings.js | 36 ++++++++++-------- .../main/app/view/TextArtSettings.js | 36 ++++++++++-------- 3 files changed, 61 insertions(+), 48 deletions(-) diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 868ebc5a9..58beba4ab 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -89,7 +89,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -121,6 +122,8 @@ define([ this.FillColorContainer = $('#textart-panel-color-fill'); this.FillGradientContainer = $('#textart-panel-gradient-fill'); this.TransparencyContainer = $('#textart-panel-transparent-fill'); + + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -1126,22 +1129,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1294,6 +1292,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index cc71d911c..5abd60a1a 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -93,7 +93,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -134,6 +135,7 @@ define([ el.html(this.template({ scope: this })); + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -1538,22 +1540,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1727,6 +1724,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index b0b4b315c..31d6dd13b 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -94,7 +94,8 @@ define([ GradColor: '000000', GradFillType: Asc.c_oAscFillGradType.GRAD_LINEAR, FormId: null, - DisabledControls: false + DisabledControls: false, + applicationPixelRatio: Common.Utils.applicationPixelRatio() }; this.lockedControls = []; this._locked = false; @@ -135,6 +136,7 @@ define([ el.html(this.template({ scope: this })); + $(window).on('resize', _.bind(this.onWindowResize, this)); }, setApi: function(api) { @@ -1543,22 +1545,17 @@ define([ }, fillTransform: function(transforms) { - if (transforms && transforms.length>1 && transforms[1]){ - var me = this, - artStore = [], - arrTransforms = transforms[1]; - for (var i=0; i0) - _.each(arr, function(item){ - artStore.push({ - imageUrl: item.Image, - type : item.Type, - selected: false - }); - }); + if (transforms){ + var artStore = []; + for (var i=0; i 0) { this.cmbTransform.fillComboView(this.cmbTransform.menuPicker.store.at(0),true); } @@ -1730,6 +1727,13 @@ define([ } }, + onWindowResize: function() { + if (!this._initSettings && this._state.applicationPixelRatio !== Common.Utils.applicationPixelRatio()) + this.fillTransform(this.api.asc_getPropertyEditorTextArts()); + + this._state.applicationPixelRatio = Common.Utils.applicationPixelRatio(); + }, + txtNoBorders : 'No Line', strStroke : 'Stroke', strColor : 'Color', From fdc634330520b9714c1011d9866c4d9d99e6cedf Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Apr 2021 19:24:26 +0300 Subject: [PATCH 35/88] Fix bug --- apps/common/main/lib/view/Plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index d607a1fdf..509ba3819 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -284,7 +284,7 @@ define([ parseIcons: function(icons) { if (icons.length && typeof icons[0] !== 'string') { - var theme = Common.UI.Themes.current().toLowerCase(), + var theme = Common.UI.Themes.currentThemeId().toLowerCase(), style = Common.UI.Themes.isDarkTheme() ? 'dark' : 'light', idx = -1; for (var i=0; i Date: Thu, 22 Apr 2021 19:49:37 +0300 Subject: [PATCH 36/88] [themes] changed theme's current value --- apps/common/main/lib/controller/Themes.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 40adbf364..76376420a 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -9,7 +9,6 @@ define([ Common.UI.Themes = new (function(locale) { !locale && (locale = {}); - var id_default_theme = 'theme-classic-light'; var themes_map = { 'theme-light': { text: locale.txtThemeLight || 'Light', @@ -24,6 +23,8 @@ define([ type: 'dark' }, } + var id_default_light_theme = 'theme-classic-light', + id_default_dark_theme = 'theme-dark'; var name_colors = [ "background-normal", @@ -205,7 +206,7 @@ define([ }) this.api = api; - var theme_name = Common.localStorage.getItem('ui-theme', id_default_theme); + var theme_name = Common.localStorage.getItem('ui-theme', id_default_light_theme); if ( !$('body').hasClass(theme_name) ) { $('body').addClass(theme_name); @@ -232,19 +233,19 @@ define([ }, currentThemeId: function () { - return Common.localStorage.getItem('ui-theme') || id_default_theme; + return Common.localStorage.getItem('ui-theme') || id_default_light_theme; }, - defaultThemeId: function () { - return id_default_theme; + defaultThemeId: function (type) { + return type == 'dark' ? id_default_dark_theme : id_default_light_theme; }, - defaultTheme: function () { - return themes_map[id_default_theme] + defaultTheme: function (type) { + return themes_map[this.defaultThemeId(type)] }, isDarkTheme: function () { - return themes_map[this.current()] == 'dark'; + return themes_map[this.currentThemeId()].type == 'dark'; }, setTheme: function (id) { @@ -266,7 +267,7 @@ define([ }, toggleTheme: function () { - this.setTheme(this.current() == 'theme-dark' ? id_default_theme : 'theme-dark'); + this.setTheme( this.isDarkTheme() ? id_default_light_theme : id_default_dark_theme ); } } })(Common.UI.Themes); From 1d989777a71dfeefad03c820e740b91068f8ff04 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Fri, 23 Apr 2021 00:25:31 +0300 Subject: [PATCH 37/88] [themes] fix bug 49875 --- apps/common/main/lib/controller/Themes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 76376420a..eb08f5e3a 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -250,7 +250,7 @@ define([ setTheme: function (id) { if ( !!themes_map[id] ) { - var classname = document.documentElement.className.replace(/theme-\w+\s?/, ''); + var classname = document.body.className.replace(/theme-\w+\s?/, ''); document.body.className = classname; $('body').addClass(id); From a0f7048e16f0a89ded6050d49c8505d33d1e31a3 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Fri, 23 Apr 2021 15:39:46 +0300 Subject: [PATCH 38/88] Update Themes.js --- apps/common/main/lib/controller/Themes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index eb08f5e3a..0986d3bb7 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -213,7 +213,7 @@ define([ } var obj = get_current_theme_colors(name_colors); - obj.type = themes_map[theme_name]; + obj.type = themes_map[theme_name].type; obj.name = theme_name; api.asc_setSkin(obj); From be9918cfa341e1ff02481058aadf3bc48d131425 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Apr 2021 16:24:35 +0300 Subject: [PATCH 39/88] Update translation --- apps/documenteditor/main/locale/da.json | 3 - apps/documenteditor/main/locale/de.json | 7 +- apps/documenteditor/main/locale/el.json | 3 - apps/documenteditor/main/locale/en.json | 15 +- apps/documenteditor/main/locale/es.json | 7 +- apps/documenteditor/main/locale/fr.json | 11 +- apps/documenteditor/main/locale/hu.json | 3 - apps/documenteditor/main/locale/it.json | 7 + apps/documenteditor/main/locale/ja.json | 3 - apps/documenteditor/main/locale/nl.json | 3 - apps/documenteditor/main/locale/pl.json | 13 ++ apps/documenteditor/main/locale/pt.json | 1 - apps/documenteditor/main/locale/ro.json | 3 - apps/documenteditor/main/locale/ru.json | 30 ++-- apps/documenteditor/main/locale/sk.json | 3 - apps/documenteditor/main/locale/zh.json | 10 +- apps/documenteditor/mobile/locale/it.json | 1 + apps/presentationeditor/main/locale/da.json | 3 - apps/presentationeditor/main/locale/de.json | 3 - apps/presentationeditor/main/locale/el.json | 3 - apps/presentationeditor/main/locale/en.json | 9 +- apps/presentationeditor/main/locale/es.json | 3 - apps/presentationeditor/main/locale/fr.json | 3 - apps/presentationeditor/main/locale/hu.json | 3 - apps/presentationeditor/main/locale/it.json | 2 - apps/presentationeditor/main/locale/ja.json | 17 ++- apps/presentationeditor/main/locale/nl.json | 3 - apps/presentationeditor/main/locale/ro.json | 3 - apps/presentationeditor/main/locale/ru.json | 26 ++-- apps/presentationeditor/main/locale/sk.json | 2 - apps/presentationeditor/main/locale/zh.json | 4 +- apps/presentationeditor/mobile/locale/it.json | 1 + apps/spreadsheeteditor/main/locale/da.json | 3 - apps/spreadsheeteditor/main/locale/de.json | 5 +- apps/spreadsheeteditor/main/locale/el.json | 3 - apps/spreadsheeteditor/main/locale/en.json | 9 +- apps/spreadsheeteditor/main/locale/es.json | 5 +- apps/spreadsheeteditor/main/locale/fr.json | 7 +- apps/spreadsheeteditor/main/locale/hu.json | 3 - apps/spreadsheeteditor/main/locale/ja.json | 26 +++- apps/spreadsheeteditor/main/locale/nl.json | 3 - apps/spreadsheeteditor/main/locale/pl.json | 133 +++++++++++++++++- apps/spreadsheeteditor/main/locale/ro.json | 3 - apps/spreadsheeteditor/main/locale/ru.json | 28 ++-- apps/spreadsheeteditor/main/locale/zh.json | 10 +- apps/spreadsheeteditor/mobile/locale/de.json | 2 + apps/spreadsheeteditor/mobile/locale/en.json | 4 +- apps/spreadsheeteditor/mobile/locale/es.json | 2 + apps/spreadsheeteditor/mobile/locale/fr.json | 2 + apps/spreadsheeteditor/mobile/locale/ru.json | 2 + 50 files changed, 288 insertions(+), 170 deletions(-) diff --git a/apps/documenteditor/main/locale/da.json b/apps/documenteditor/main/locale/da.json index b260f12ba..827d3d06d 100644 --- a/apps/documenteditor/main/locale/da.json +++ b/apps/documenteditor/main/locale/da.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Skjul værktøjslinie", - "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", "Common.Views.Header.textHideStatusBar": "Skjul statuslinie", "Common.Views.Header.textRemoveFavorite": "Fjern fra Favoritter", @@ -1716,8 +1715,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Stavekontrol", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Deaktiver Alle", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Deaktivér alle makroer uden besked", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Mørk", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Lys", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Vis besked", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Deaktiver alle makroer med en besked", "DE.Views.FileMenuPanels.Settings.txtWin": "som Windows", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 5cd18887a..16ea6fa25 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Erweiterte Einstellungen", "Common.Views.Header.textBack": "Dateispeicherort öffnen", "Common.Views.Header.textCompactView": "Symbolleiste ausblenden", - "Common.Views.Header.textDarkTheme": "Dunkelmodus", "Common.Views.Header.textHideLines": "Lineale verbergen", "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen", "Common.Views.Header.textRemoveFavorite": "Aus Favoriten entfernen", @@ -613,6 +612,7 @@ "DE.Controllers.Main.txtMissOperator": "Fehlender Operator", "DE.Controllers.Main.txtNeedSynchronize": "Änderungen wurden vorgenommen", "DE.Controllers.Main.txtNoTableOfContents": "Dieses Dokument enthält keine Überschriften. Wenden Sie ein Überschriftenformat auf den Text an, damit es im Inhaltsverzeichnis angezeigt wird.", + "DE.Controllers.Main.txtNoTableOfFigures": "Es konnten keine Einträge für ein Abbildungsverzeichnis gefunden werden.", "DE.Controllers.Main.txtNoText": "Fehler! Im Dokument gibt es keinen Text des angegebenen Stils.", "DE.Controllers.Main.txtNotInTable": "Nicht in Tabelle", "DE.Controllers.Main.txtNotValidBookmark": "Fehler! Ungültiger Lesezeichen-Link.", @@ -795,6 +795,7 @@ "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Abgerundete rechteckige Legende", "DE.Controllers.Main.txtStarsRibbons": "Sterne und Bänder", "DE.Controllers.Main.txtStyle_Caption": "Beschriftung", + "DE.Controllers.Main.txtStyle_endnote_text": "Endnotentext", "DE.Controllers.Main.txtStyle_footnote_text": "Fußnotentext", "DE.Controllers.Main.txtStyle_Heading_1": "Überschrift 1", "DE.Controllers.Main.txtStyle_Heading_2": "Überschrift 2", @@ -815,6 +816,8 @@ "DE.Controllers.Main.txtSyntaxError": "Syntaxfehler", "DE.Controllers.Main.txtTableInd": "Tabellenindex darf nicht Null sein", "DE.Controllers.Main.txtTableOfContents": "Inhaltsverzeichnis", + "DE.Controllers.Main.txtTableOfFigures": "Abbildungsverzeichnis", + "DE.Controllers.Main.txtTOCHeading": "Inhaltsverzeichnisüberschrift", "DE.Controllers.Main.txtTooLarge": "Nummer zu groß zum Formatieren", "DE.Controllers.Main.txtTypeEquation": "Hier die Gleichung eingeben.", "DE.Controllers.Main.txtUndefBookmark": "Undefiniertes Lesezeichen", @@ -1716,8 +1719,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Rechtschreibprüfung", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Alle deaktivieren", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Alle Makros ohne Benachrichtigung deaktivieren", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Dunkel", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Hell", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Benachrichtigung anzeigen", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Alle Makros mit einer Benachrichtigung deaktivieren", "DE.Views.FileMenuPanels.Settings.txtWin": "wie Windows", diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json index bb4843a50..cfe8c2fb1 100644 --- a/apps/documenteditor/main/locale/el.json +++ b/apps/documenteditor/main/locale/el.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Προηγμένες ρυθμίσεις", "Common.Views.Header.textBack": "Άνοιγμα τοποθεσίας αρχείου", "Common.Views.Header.textCompactView": "Απόκρυψη Γραμμής Εργαλείων", - "Common.Views.Header.textDarkTheme": "Σκούρο θέμα", "Common.Views.Header.textHideLines": "Απόκρυψη Χαράκων", "Common.Views.Header.textHideStatusBar": "Απόκρυψη Γραμμής Κατάστασης", "Common.Views.Header.textRemoveFavorite": "Αφαίρεση από τα Αγαπημένα", @@ -1716,8 +1715,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Έλεγχος Ορθογραφίας", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Απενεργοποίηση Όλων", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Σκούρο", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Ανοιχτό", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Εμφάνιση Ειδοποίησης", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών με ειδοποίηση", "DE.Views.FileMenuPanels.Settings.txtWin": "ως Windows", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index e20b17446..bdee122a0 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -182,6 +182,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.
Please click to save your changes and reload the updates.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", "Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.noButtonText": "No", @@ -192,9 +195,6 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", - "Common.UI.Themes.txtThemeDark": "Dark", - "Common.UI.Themes.txtThemeLight": "Light", - "Common.UI.Themes.txtThemeClassicLight": "Classic Light", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", @@ -263,7 +263,6 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "del_Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -799,6 +798,7 @@ "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Rounded Rectangular Callout", "DE.Controllers.Main.txtStarsRibbons": "Stars & Ribbons", "DE.Controllers.Main.txtStyle_Caption": "Caption", + "DE.Controllers.Main.txtStyle_endnote_text": "Endnote Text", "DE.Controllers.Main.txtStyle_footnote_text": "Footnote Text", "DE.Controllers.Main.txtStyle_Heading_1": "Heading 1", "DE.Controllers.Main.txtStyle_Heading_2": "Heading 2", @@ -819,6 +819,8 @@ "DE.Controllers.Main.txtSyntaxError": "Syntax Error", "DE.Controllers.Main.txtTableInd": "Table Index Cannot be Zero", "DE.Controllers.Main.txtTableOfContents": "Table of Contents", + "DE.Controllers.Main.txtTableOfFigures": "Table of figures", + "DE.Controllers.Main.txtTOCHeading": "TOC Heading", "DE.Controllers.Main.txtTooLarge": "Number Too Large To Format", "DE.Controllers.Main.txtTypeEquation": "Type an equation here.", "DE.Controllers.Main.txtUndefBookmark": "Undefined Bookmark", @@ -846,9 +848,6 @@ "DE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.
Contact %1 sales team for personal upgrade terms.", "DE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", - "DE.Controllers.Main.txtTableOfFigures": "Table of figures", - "DE.Controllers.Main.txtStyle_endnote_text": "Endnote Text", - "DE.Controllers.Main.txtTOCHeading": "TOC Heading", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", @@ -1723,8 +1722,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Disable All", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without a notification", - "del_DE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", - "del_DE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "DE.Views.FileMenuPanels.Settings.txtWin": "as Windows", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index 99ed4400e..a9949d3b9 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Ajustes avanzados", "Common.Views.Header.textBack": "Abrir ubicación del archivo", "Common.Views.Header.textCompactView": "Esconder barra de herramientas", - "Common.Views.Header.textDarkTheme": "Tema oscuro", "Common.Views.Header.textHideLines": "Ocultar reglas", "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado", "Common.Views.Header.textRemoveFavorite": "Eliminar de Favoritos", @@ -613,6 +612,7 @@ "DE.Controllers.Main.txtMissOperator": "Falta operador", "DE.Controllers.Main.txtNeedSynchronize": "Usted tiene actualizaciones", "DE.Controllers.Main.txtNoTableOfContents": "No hay títulos en el documento. Aplique un estilo de título al texto para que aparezca en la tabla de contenido.", + "DE.Controllers.Main.txtNoTableOfFigures": "No se han encontrado los elementos de tabla de ilustraciones.", "DE.Controllers.Main.txtNoText": "¡Error! No hay texto del estilo especificado en el documento.", "DE.Controllers.Main.txtNotInTable": "No está en la tabla", "DE.Controllers.Main.txtNotValidBookmark": "¡Error! No es una auto-referencia de marcador válida.", @@ -795,6 +795,7 @@ "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Llamada rectangular redondeada", "DE.Controllers.Main.txtStarsRibbons": "Cintas y estrellas", "DE.Controllers.Main.txtStyle_Caption": "Leyenda", + "DE.Controllers.Main.txtStyle_endnote_text": "Texto de nota al final", "DE.Controllers.Main.txtStyle_footnote_text": "Texto a pie de página", "DE.Controllers.Main.txtStyle_Heading_1": "Título 1", "DE.Controllers.Main.txtStyle_Heading_2": "Título 2", @@ -815,6 +816,8 @@ "DE.Controllers.Main.txtSyntaxError": "Error de sintaxis", "DE.Controllers.Main.txtTableInd": "El índice de la tabla no puede ser cero", "DE.Controllers.Main.txtTableOfContents": "Tabla de contenidos", + "DE.Controllers.Main.txtTableOfFigures": "Tabla de ilustraciones", + "DE.Controllers.Main.txtTOCHeading": "Título TDC", "DE.Controllers.Main.txtTooLarge": "El número es demasiado grande para darle formato", "DE.Controllers.Main.txtTypeEquation": "Escribir una ecuación aquí.", "DE.Controllers.Main.txtUndefBookmark": "Marcador no definido", @@ -1716,8 +1719,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Сorrección ortográfica", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Deshabilitar todo", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Deshabilitar todas las macros sin notificación", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Oscuro", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Claro", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Mostrar notificación", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Deshabilitar todas las macros con notificación", "DE.Views.FileMenuPanels.Settings.txtWin": "como Windows", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 4ba09b5d4..8de06560c 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Paramètres avancés", "Common.Views.Header.textBack": "Ouvrir l'emplacement du fichier", "Common.Views.Header.textCompactView": "Masquer la barre d'outils", - "Common.Views.Header.textDarkTheme": "Thème sombre", "Common.Views.Header.textHideLines": "Masquer les règles", "Common.Views.Header.textHideStatusBar": "Masquer la barre d'état", "Common.Views.Header.textRemoveFavorite": "Enlever des favoris", @@ -613,6 +612,7 @@ "DE.Controllers.Main.txtMissOperator": "Operateur Manquant", "DE.Controllers.Main.txtNeedSynchronize": "Vous avez des mises à jour", "DE.Controllers.Main.txtNoTableOfContents": "Aucune entrée de table des matières trouvée. L'application d'un style de titre sur une sélection de texte permettra l'affichage dans la table des matières. ", + "DE.Controllers.Main.txtNoTableOfFigures": "Aucune entrée de table d'illustration n'a été trouvée.", "DE.Controllers.Main.txtNoText": "Erreur ! Il n'y a pas de texte répondant à ce style dans ce document.", "DE.Controllers.Main.txtNotInTable": "n'est pas dans le tableau", "DE.Controllers.Main.txtNotValidBookmark": "Erreur ! Référence non valide pour un signet.", @@ -795,6 +795,7 @@ "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Rectangle à coins arrondis", "DE.Controllers.Main.txtStarsRibbons": "Étoiles et rubans", "DE.Controllers.Main.txtStyle_Caption": "Légende", + "DE.Controllers.Main.txtStyle_endnote_text": "Texte de note de fin", "DE.Controllers.Main.txtStyle_footnote_text": "Texte de la note de bas de page", "DE.Controllers.Main.txtStyle_Heading_1": "Titre 1", "DE.Controllers.Main.txtStyle_Heading_2": "Titre 2", @@ -815,6 +816,8 @@ "DE.Controllers.Main.txtSyntaxError": "Erreur de Syntaxe", "DE.Controllers.Main.txtTableInd": "Index d'un Tableau Ne Peut Pas Être Zero", "DE.Controllers.Main.txtTableOfContents": "Table des matières", + "DE.Controllers.Main.txtTableOfFigures": "Table des figures", + "DE.Controllers.Main.txtTOCHeading": "En-tête de table des matières", "DE.Controllers.Main.txtTooLarge": "Nom Trop Grand Pour Formater", "DE.Controllers.Main.txtTypeEquation": "Saisissez une équation ici.", "DE.Controllers.Main.txtUndefBookmark": "Signet indéterminé ", @@ -1716,8 +1719,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Désactiver tout", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Désactiver toutes les macros sans notification", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Sombre", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Clair", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Montrer la notification", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Désactiver toutes les macros avec notification", "DE.Views.FileMenuPanels.Settings.txtWin": "comme Windows", @@ -2521,14 +2522,14 @@ "DE.Views.Toolbar.mniImageFromStorage": "Image de stockage", "DE.Views.Toolbar.mniImageFromUrl": "Image à partir d'une URL", "DE.Views.Toolbar.mniLowerCase": "minuscule", - "DE.Views.Toolbar.mniSentenceCase": "Cas de phrase", + "DE.Views.Toolbar.mniSentenceCase": "Majuscule en début de phrase.", "DE.Views.Toolbar.mniToggleCase": "Inverser la casse", "DE.Views.Toolbar.mniUpperCase": "Majuscules", "DE.Views.Toolbar.strMenuNoFill": "Pas de remplissage", "DE.Views.Toolbar.textAutoColor": "Automatique", "DE.Views.Toolbar.textBold": "Gras", "DE.Views.Toolbar.textBottom": "En bas: ", - "DE.Views.Toolbar.textChangeLevel": "Changer la liste de niveau", + "DE.Views.Toolbar.textChangeLevel": "Changer le niveau de liste", "DE.Views.Toolbar.textCheckboxControl": "Case à cocher", "DE.Views.Toolbar.textColumnsCustom": "Colonnes personnalisées", "DE.Views.Toolbar.textColumnsLeft": "A gauche", diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index 1341491d4..692fe8f06 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Haladó beállítások", "Common.Views.Header.textBack": "Fájl helyének megnyitása", "Common.Views.Header.textCompactView": "Eszköztár elrejtése", - "Common.Views.Header.textDarkTheme": "Sötét téma", "Common.Views.Header.textHideLines": "Vonalzók elrejtése", "Common.Views.Header.textHideStatusBar": "Állapotsor elrejtése", "Common.Views.Header.textRemoveFavorite": "Eltávolítás a kedvencekből", @@ -1714,8 +1713,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Helyesírás-ellenőrzés", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Összes letiltása", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Minden értesítés nélküli makró letiltása", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Sötét", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Világos", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Értesítés mutatása", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Minden értesítéssel rendelkező makró letiltása", "DE.Views.FileMenuPanels.Settings.txtWin": "Windows-ként", diff --git a/apps/documenteditor/main/locale/it.json b/apps/documenteditor/main/locale/it.json index 265f3cbf8..6d1e9340f 100644 --- a/apps/documenteditor/main/locale/it.json +++ b/apps/documenteditor/main/locale/it.json @@ -120,6 +120,7 @@ "Common.UI.Calendar.textShortTuesday": "Mar", "Common.UI.Calendar.textShortWednesday": "Mer", "Common.UI.Calendar.textYears": "Anni", + "Common.UI.ColorButton.textAutoColor": "Automatico", "Common.UI.ColorButton.textNewColor": "Aggiungi Colore personalizzato", "Common.UI.ComboBorderSize.txtNoBorders": "Nessun bordo", "Common.UI.ComboBorderSizeEditable.txtNoBorders": "Nessun bordo", @@ -285,6 +286,7 @@ "Common.Views.ReviewChanges.strFastDesc": "co-editing in teampo reale. Tutte le modifiche vengono salvate automaticamente.", "Common.Views.ReviewChanges.strStrict": "Rigorosa", "Common.Views.ReviewChanges.strStrictDesc": "Usa il pulsante 'Salva' per sincronizzare le tue modifiche con quelle effettuate da altri.", + "Common.Views.ReviewChanges.textEnable": "Attiva", "Common.Views.ReviewChanges.tipAcceptCurrent": "Accetta la modifica corrente", "Common.Views.ReviewChanges.tipCoAuthMode": "Imposta modalità co-editing", "Common.Views.ReviewChanges.tipCommentRem": "Rimuovi i commenti", @@ -403,6 +405,7 @@ "Common.Views.SymbolTableDialog.textSymbols": "Simboli", "Common.Views.SymbolTableDialog.textTitle": "Simbolo", "Common.Views.SymbolTableDialog.textTradeMark": "Simbolo del marchio", + "Common.Views.UserNameDialog.textLabel": "Etichetta:", "DE.Controllers.LeftMenu.leavePageText": "Tutte le modifiche non salvate nel documento verranno perse.
Clicca \"Annulla\" e poi \"Salva\" per salvarle. Clicca \"OK\" per annullare tutte le modifiche non salvate.", "DE.Controllers.LeftMenu.newDocumentTitle": "Documento senza nome", "DE.Controllers.LeftMenu.notcriticalErrorTitle": "Avviso", @@ -1597,6 +1600,7 @@ "DE.Views.FileMenuPanels.Settings.strShowChanges": "Evidenzia modifiche di collaborazione in tempo reale", "DE.Views.FileMenuPanels.Settings.strSpellCheckMode": "Attiva controllo ortografia", "DE.Views.FileMenuPanels.Settings.strStrict": "Rigorosa", + "DE.Views.FileMenuPanels.Settings.strTheme": "Tema", "DE.Views.FileMenuPanels.Settings.strUnit": "Unità di misura", "DE.Views.FileMenuPanels.Settings.strZoom": "Valore di zoom predefinito", "DE.Views.FileMenuPanels.Settings.text10Minutes": "Ogni 10 minuti", @@ -1661,6 +1665,7 @@ "DE.Views.FormsTab.capBtnCheckBox": "Casella di controllo", "DE.Views.FormsTab.capBtnComboBox": "Casella combinata", "DE.Views.FormsTab.capBtnImage": "Immagine", + "DE.Views.FormsTab.capBtnSubmit": "‎Invia‎", "DE.Views.FormsTab.capBtnText": "‎Campo di testo‎", "DE.Views.FormsTab.textClearFields": "‎Cancella tutti i campi‎", "DE.Views.FormsTab.textHighlight": "Impostazioni evidenziazione", @@ -1977,6 +1982,7 @@ "DE.Views.PageSizeDialog.textTitle": "Dimensione pagina", "DE.Views.PageSizeDialog.textWidth": "Larghezza", "DE.Views.PageSizeDialog.txtCustom": "Personalizzato", + "DE.Views.ParagraphSettings.strIndentsSpecial": "Speciale", "DE.Views.ParagraphSettings.strLineHeight": "Interlinea", "DE.Views.ParagraphSettings.strParagraphSpacing": "Spaziatura del paragrafo", "DE.Views.ParagraphSettings.strSomeParagraphSpace": "Non aggiungere intervallo tra paragrafi dello stesso stile", @@ -2388,6 +2394,7 @@ "DE.Views.Toolbar.mniImageFromFile": "Immagine da file", "DE.Views.Toolbar.mniImageFromStorage": "Immagine dallo spazio di archiviazione", "DE.Views.Toolbar.mniImageFromUrl": "Immagine da URL", + "DE.Views.Toolbar.mniUpperCase": "MAIUSCOLO", "DE.Views.Toolbar.strMenuNoFill": "Nessun riempimento", "DE.Views.Toolbar.textAutoColor": "Automatico", "DE.Views.Toolbar.textBold": "Grassetto", diff --git a/apps/documenteditor/main/locale/ja.json b/apps/documenteditor/main/locale/ja.json index b2a374258..5a4b0fa03 100644 --- a/apps/documenteditor/main/locale/ja.json +++ b/apps/documenteditor/main/locale/ja.json @@ -252,7 +252,6 @@ "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "ファイルのURLを開く", "Common.Views.Header.textCompactView": "ツールバーを隠す", - "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラを隠す", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", @@ -1699,8 +1698,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "スペル チェック", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "全てを無効にする", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "マクロを無効にして、通知しない", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "ダーク", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "ライト", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "通知を表示する", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "マクロを無効にして、通知する", "DE.Views.FileMenuPanels.Settings.txtWin": "Windowsのような", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 03e2b3e8e..5597f8850 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Geavanceerde instellingen", "Common.Views.Header.textBack": "Open bestandslocatie", "Common.Views.Header.textCompactView": "Werkbalk Verbergen", - "Common.Views.Header.textDarkTheme": "Donker thema ", "Common.Views.Header.textHideLines": "Linialen verbergen", "Common.Views.Header.textHideStatusBar": "Statusbalk verbergen", "Common.Views.Header.textRemoveFavorite": "Verwijder uit favorieten", @@ -1714,8 +1713,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spellingcontrole", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Alles uitschakelen", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Schakel alle macro's uit zonder melding", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Donker", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "licht", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Weergeef notificatie", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Schakel alle macro's uit met een melding", "DE.Views.FileMenuPanels.Settings.txtWin": "als Windows", diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index 1fe8f0319..e4bdcd4eb 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -121,6 +121,8 @@ "Common.Views.About.txtTel": "tel.:", "Common.Views.About.txtVersion": "Wersja", "Common.Views.AutoCorrectDialog.textAdd": "Dodaj", + "Common.Views.AutoCorrectDialog.textWarnResetRec": "Każde dodane wyrażenie zostanie usunięte, a usunięte zostaną przywrócone. Czy chcesz kontynuować?", + "Common.Views.AutoCorrectDialog.warnReset": "Wszelkie dodane autokorekty zostaną usunięte, a zmienione zostaną przywrócone oryginalne wartości. Czy chcesz kontynuować?", "Common.Views.Chat.textSend": "Wyślij", "Common.Views.Comments.textAdd": "Dodaj", "Common.Views.Comments.textAddComment": "Dodaj komentarz", @@ -154,6 +156,7 @@ "Common.Views.Header.labelCoUsersDescr": "Dokument jest obecnie edytowany przez kilku użytkowników.", "Common.Views.Header.textAdvSettings": "Ustawienia zaawansowane", "Common.Views.Header.textBack": "Idź do dokumentów", + "Common.Views.Header.textRemoveFavorite": "Usuń z ulubionych", "Common.Views.Header.textZoom": "Powiększenie", "Common.Views.Header.tipAccessRights": "Zarządzaj prawami dostępu do dokumentu", "Common.Views.Header.tipDownload": "Pobierz plik", @@ -210,6 +213,8 @@ "Common.Views.ReviewChanges.hintPrev": "Do poprzedniej zmiany", "Common.Views.ReviewChanges.strFast": "Szybki", "Common.Views.ReviewChanges.tipAcceptCurrent": "Zaakceptuj bieżącą zmianę", + "Common.Views.ReviewChanges.tipCommentRem": "Usuń komentarze", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Usuń aktualne komentarze", "Common.Views.ReviewChanges.tipHistory": "Pokaż historię wersji", "Common.Views.ReviewChanges.tipRejectCurrent": "Odrzuć bieżącą zmianę", "Common.Views.ReviewChanges.tipReview": "Śledzenie zmian", @@ -223,6 +228,10 @@ "Common.Views.ReviewChanges.txtChat": "Czat", "Common.Views.ReviewChanges.txtClose": "Zamknij", "Common.Views.ReviewChanges.txtCoAuthMode": "Tryb współtworzenia", + "Common.Views.ReviewChanges.txtCommentRemAll": "Usuń wszystkie komentarze", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Usuń aktualne komentarze", + "Common.Views.ReviewChanges.txtCommentRemMy": "Usuń moje komentarze", + "Common.Views.ReviewChanges.txtCommentRemove": "Usuń", "Common.Views.ReviewChanges.txtDocLang": "Język", "Common.Views.ReviewChanges.txtFinal": "Wszystkie zmiany zostały zaakceptowane (podgląd)", "Common.Views.ReviewChanges.txtHistory": "Historia wersji", @@ -902,8 +911,11 @@ "DE.Views.DocumentHolder.textPaste": "Wklej", "DE.Views.DocumentHolder.textPrevPage": "Poprzednia strona", "DE.Views.DocumentHolder.textRefreshField": "Odśwież pole", + "DE.Views.DocumentHolder.textRemCheckBox": "Usuń pole wyboru", + "DE.Views.DocumentHolder.textRemField": "Usuń pole tekstowe", "DE.Views.DocumentHolder.textRemove": "Usuń", "DE.Views.DocumentHolder.textRemoveControl": "Usuń kontrolę treści", + "DE.Views.DocumentHolder.textRemPicture": "Usuń obraz", "DE.Views.DocumentHolder.textSettings": "Ustawienia", "DE.Views.DocumentHolder.textShapeAlignBottom": "Wyrównaj do dołu", "DE.Views.DocumentHolder.textShapeAlignCenter": "Wyrównaj do środka", @@ -1497,6 +1509,7 @@ "DE.Views.SignatureSettings.strSignature": "Sygnatura", "DE.Views.SignatureSettings.txtContinueEditing": "Edytuj mimo wszystko", "DE.Views.SignatureSettings.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?", + "DE.Views.SignatureSettings.txtRemoveWarning": "Czy chcesz usunąć ten podpis?
Nie można tego cofnąć.", "DE.Views.SignatureSettings.txtRequestedSignatures": "Ten dokument musi zostać podpisany.", "DE.Views.Statusbar.goToPageText": "Idź do strony", "DE.Views.Statusbar.pageIndexText": "Strona {0} z {1}", diff --git a/apps/documenteditor/main/locale/pt.json b/apps/documenteditor/main/locale/pt.json index b38d548bb..8a66e8df3 100644 --- a/apps/documenteditor/main/locale/pt.json +++ b/apps/documenteditor/main/locale/pt.json @@ -236,7 +236,6 @@ "Common.Views.Header.textAdvSettings": "Configurações avançadas", "Common.Views.Header.textBack": "Local do arquivo aberto", "Common.Views.Header.textCompactView": "Ocultar Barra de Ferramentas", - "Common.Views.Header.textDarkTheme": "Tema Dark", "Common.Views.Header.textHideLines": "Ocultar Réguas", "Common.Views.Header.textHideStatusBar": "Ocultar Barra de Status", "Common.Views.Header.textZoom": "Zoom", diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json index 742bbe620..7b5dc2dc5 100644 --- a/apps/documenteditor/main/locale/ro.json +++ b/apps/documenteditor/main/locale/ro.json @@ -260,7 +260,6 @@ "Common.Views.Header.textAdvSettings": "Setări avansate", "Common.Views.Header.textBack": "Deschidere locația fișierului", "Common.Views.Header.textCompactView": "Ascundere bară de instrumente", - "Common.Views.Header.textDarkTheme": "Tema întunecată", "Common.Views.Header.textHideLines": "Ascundere rigle", "Common.Views.Header.textHideStatusBar": "Ascundere bară de stare", "Common.Views.Header.textRemoveFavorite": "Eliminare din Preferințe", @@ -1714,8 +1713,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Verificarea ortografică", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Se dezactivează toate", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Se dezactivează toate macrocomenzile, fără notificare", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Întunecat", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Luminozitate", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Afișare notificări", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Se dezactivează toate macrocomenzile, cu notificare ", "DE.Views.FileMenuPanels.Settings.txtWin": "ca Windows", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 27543a1c5..7275ecc3a 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -182,6 +182,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", + "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeDark": "Темная", + "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -260,7 +263,6 @@ "Common.Views.Header.textAdvSettings": "Дополнительные параметры", "Common.Views.Header.textBack": "Открыть расположение файла", "Common.Views.Header.textCompactView": "Скрыть панель инструментов", - "Common.Views.Header.textDarkTheme": "Темная тема", "Common.Views.Header.textHideLines": "Скрыть линейки", "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния", "Common.Views.Header.textRemoveFavorite": "Удалить из избранного", @@ -613,6 +615,7 @@ "DE.Controllers.Main.txtMissOperator": "Отсутствует оператор", "DE.Controllers.Main.txtNeedSynchronize": "Есть обновления", "DE.Controllers.Main.txtNoTableOfContents": "В документе нет заголовков. Примените стиль заголовка к тексту, чтобы он появился в оглавлении.", + "DE.Controllers.Main.txtNoTableOfFigures": "Элементы списка иллюстраций не найдены.", "DE.Controllers.Main.txtNoText": "Ошибка! В документе отсутствует текст указанного стиля.", "DE.Controllers.Main.txtNotInTable": "Не в таблице", "DE.Controllers.Main.txtNotValidBookmark": "Ошибка! Неверная ссылка закладки.", @@ -795,6 +798,7 @@ "DE.Controllers.Main.txtShape_wedgeRoundRectCallout": "Скругленная прямоугольная выноска", "DE.Controllers.Main.txtStarsRibbons": "Звезды и ленты", "DE.Controllers.Main.txtStyle_Caption": "Название", + "DE.Controllers.Main.txtStyle_endnote_text": "Текст концевой сноски", "DE.Controllers.Main.txtStyle_footnote_text": "Текст сноски", "DE.Controllers.Main.txtStyle_Heading_1": "Заголовок 1", "DE.Controllers.Main.txtStyle_Heading_2": "Заголовок 2", @@ -815,6 +819,8 @@ "DE.Controllers.Main.txtSyntaxError": "Синтаксическая ошибка", "DE.Controllers.Main.txtTableInd": "Индекс таблицы не может быть нулевым", "DE.Controllers.Main.txtTableOfContents": "Оглавление", + "DE.Controllers.Main.txtTableOfFigures": "Список иллюстраций", + "DE.Controllers.Main.txtTOCHeading": "Заголовок оглавления", "DE.Controllers.Main.txtTooLarge": "Число слишком большое для форматирования", "DE.Controllers.Main.txtTypeEquation": "Место для уравнения.", "DE.Controllers.Main.txtUndefBookmark": "Закладка не определена", @@ -994,11 +1000,11 @@ "DE.Controllers.Toolbar.txtIntegralTriple": "Тройной интеграл", "DE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Тройной интеграл", "DE.Controllers.Toolbar.txtIntegralTripleSubSup": "Тройной интеграл", - "DE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Клин", - "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Клин", - "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Клин", - "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Клин", - "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Клин", + "DE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Конъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Конъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Конъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Конъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Конъюнкция", "DE.Controllers.Toolbar.txtLargeOperator_CoProd": "Сопроизведение", "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Сопроизведение", "DE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Сопроизведение", @@ -1009,11 +1015,11 @@ "DE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Сумма", "DE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Произведение", "DE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Объединение", - "DE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Буква V", - "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Буква V", - "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Буква V", - "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Буква V", - "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Буква V", + "DE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Дизъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Дизъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Дизъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Дизъюнкция", + "DE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Дизъюнкция", "DE.Controllers.Toolbar.txtLargeOperator_Intersection": "Пересечение", "DE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Пересечение", "DE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Пересечение", @@ -1716,8 +1722,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Отключить все", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Отключить все макросы без уведомления", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Темная", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Светлая", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Показывать уведомление", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Отключить все макросы с уведомлением", "DE.Views.FileMenuPanels.Settings.txtWin": "как Windows", diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index bd0d69238..3f820502a 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -240,7 +240,6 @@ "Common.Views.Header.textAdvSettings": "Pokročilé nastavenia", "Common.Views.Header.textBack": "Otvoriť umiestnenie súboru", "Common.Views.Header.textCompactView": "Skryť panel s nástrojmi", - "Common.Views.Header.textDarkTheme": "Tmavá téma", "Common.Views.Header.textHideLines": "Skryť pravítka", "Common.Views.Header.textHideStatusBar": "Schovať stavový riadok", "Common.Views.Header.textZoom": "Priblíženie", @@ -1587,8 +1586,6 @@ "DE.Views.FileMenuPanels.Settings.txtSpellCheck": "Kontrola pravopisu", "DE.Views.FileMenuPanels.Settings.txtStopMacros": "Zablokovať všetko", "DE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Zablokovať všetky makrá bez upozornenia", - "DE.Views.FileMenuPanels.Settings.txtThemeDark": "Tmavý", - "DE.Views.FileMenuPanels.Settings.txtThemeLight": "Svetlý", "DE.Views.FileMenuPanels.Settings.txtWarnMacros": "Ukázať oznámenie", "DE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Zablokovať všetky makrá s upozornením", "DE.Views.FileMenuPanels.Settings.txtWin": "ako Windows", diff --git a/apps/documenteditor/main/locale/zh.json b/apps/documenteditor/main/locale/zh.json index 41d255e35..a88cbe0cc 100644 --- a/apps/documenteditor/main/locale/zh.json +++ b/apps/documenteditor/main/locale/zh.json @@ -223,7 +223,7 @@ "Common.Views.Header.tipPrint": "打印文件", "Common.Views.Header.tipRedo": "重做", "Common.Views.Header.tipSave": "保存", - "Common.Views.Header.tipUndo": "复原", + "Common.Views.Header.tipUndo": "撤消", "Common.Views.Header.tipViewSettings": "视图设置", "Common.Views.Header.tipViewUsers": "查看用户和管理文档访问权限", "Common.Views.Header.txtAccessRights": "更改访问权限", @@ -1376,7 +1376,7 @@ "DE.Views.DocumentHolder.textTitleCellsRemove": "删除单元格", "DE.Views.DocumentHolder.textTOC": "目录", "DE.Views.DocumentHolder.textTOCSettings": "目录设置", - "DE.Views.DocumentHolder.textUndo": "复原", + "DE.Views.DocumentHolder.textUndo": "撤消", "DE.Views.DocumentHolder.textUpdateAll": "刷新整个表格", "DE.Views.DocumentHolder.textUpdatePages": "仅刷新页码", "DE.Views.DocumentHolder.textUpdateTOC": "刷新目录", @@ -1591,7 +1591,7 @@ "DE.Views.FileMenuPanels.Settings.strInputMode": "显示象形文字", "DE.Views.FileMenuPanels.Settings.strLiveComment": "显示批注", "DE.Views.FileMenuPanels.Settings.strMacrosSettings": "宏设置", - "DE.Views.FileMenuPanels.Settings.strPaste": "剪切、拷贝、黏贴", + "DE.Views.FileMenuPanels.Settings.strPaste": "剪切、复制、黏贴", "DE.Views.FileMenuPanels.Settings.strPasteButton": "在执行粘贴操作后显示“粘贴选项”按钮", "DE.Views.FileMenuPanels.Settings.strResolvedComment": "显示已解决批注", "DE.Views.FileMenuPanels.Settings.strShowChanges": "实时协作变更", @@ -1624,7 +1624,7 @@ "DE.Views.FileMenuPanels.Settings.txtMac": "仿照 OS X", "DE.Views.FileMenuPanels.Settings.txtNative": "本机系统原生", "DE.Views.FileMenuPanels.Settings.txtNone": "无查看", - "DE.Views.FileMenuPanels.Settings.txtProofing": "审校", + "DE.Views.FileMenuPanels.Settings.txtProofing": "校对", "DE.Views.FileMenuPanels.Settings.txtPt": "点", "DE.Views.FileMenuPanels.Settings.txtRunMacros": "启动所有项目", "DE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "启动所有不带通知的宏", @@ -2524,7 +2524,7 @@ "DE.Views.Toolbar.tipSendForward": "向前移动", "DE.Views.Toolbar.tipShowHiddenChars": "不打印字符", "DE.Views.Toolbar.tipSynchronize": "该文档已被其他用户更改。请点击保存更改和重新加载更新。", - "DE.Views.Toolbar.tipUndo": "复原", + "DE.Views.Toolbar.tipUndo": "撤消", "DE.Views.Toolbar.tipWatermark": "编辑水印", "DE.Views.Toolbar.txtDistribHor": "水平分布", "DE.Views.Toolbar.txtDistribVert": "垂直分布", diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json index b07e889f4..c38a88fb5 100644 --- a/apps/documenteditor/mobile/locale/it.json +++ b/apps/documenteditor/mobile/locale/it.json @@ -241,6 +241,7 @@ "DE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", "DE.Controllers.Main.textCustomLoader": "Si prega di notare che, in base ai termini della licenza, non si ha il diritto di modificare il caricatore.
Si prega di contattare il nostro reparto vendite per ottenere un preventivo.", "DE.Controllers.Main.textDone": "Fatto", + "DE.Controllers.Main.textGuest": "Ospite", "DE.Controllers.Main.textHasMacros": "Il file contiene delle macro automatiche.
Vuoi eseguirle?", "DE.Controllers.Main.textLoadingDocument": "Caricamento del documento", "DE.Controllers.Main.textNo": "No", diff --git a/apps/presentationeditor/main/locale/da.json b/apps/presentationeditor/main/locale/da.json index 6609f5b40..58cfbe1a0 100644 --- a/apps/presentationeditor/main/locale/da.json +++ b/apps/presentationeditor/main/locale/da.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Vis kompakt værktøjslinie ", - "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", "Common.Views.Header.textHideStatusBar": "Skjul statuslinie", "Common.Views.Header.textRemoveFavorite": "Fjern fra Favoritter", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Stavekontrol", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Deaktiver Alle", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Deaktivér alle makroer uden besked", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Mørk", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Lys", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Vis besked", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Deaktiver alle makroer med en besked", "PE.Views.FileMenuPanels.Settings.txtWin": "som Windows", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index a90e64319..2aa98b85c 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Erweiterte Einstellungen", "Common.Views.Header.textBack": "Dateispeicherort öffnen", "Common.Views.Header.textCompactView": "Symbolleiste ausblenden", - "Common.Views.Header.textDarkTheme": "Dunkelmodus", "Common.Views.Header.textHideLines": "Lineale verbergen", "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen", "Common.Views.Header.textRemoveFavorite": "Aus Favoriten entfernen", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Rechtschreibprüfung", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Alle deaktivieren", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Alle Makros ohne Benachrichtigung deaktivieren", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Dunkel", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Hell", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Benachrichtigung anzeigen", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Alle Makros mit einer Benachrichtigung deaktivieren", "PE.Views.FileMenuPanels.Settings.txtWin": "wie Windows", diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index 4fa91e514..ecea761f6 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Προηγμένες ρυθμίσεις", "Common.Views.Header.textBack": "Άνοιγμα τοποθεσίας αρχείου", "Common.Views.Header.textCompactView": "Απόκρυψη Γραμμής Εργαλείων", - "Common.Views.Header.textDarkTheme": "Σκούρο Θέμα", "Common.Views.Header.textHideLines": "Απόκρυψη Χαράκων", "Common.Views.Header.textHideStatusBar": "Απόκρυψη Γραμμής Κατάστασης", "Common.Views.Header.textRemoveFavorite": "Αφαίρεση από τα Αγαπημένα", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Έλεγχος Ορθογραφίας", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Απενεργοποίηση Όλων", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Σκούρο", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Ανοιχτό", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Εμφάνιση Ειδοποίησης", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών με ειδοποίηση", "PE.Views.FileMenuPanels.Settings.txtWin": "ως Windows", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index d5e1ce708..e2ac94c43 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -73,6 +73,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.
Please click to save your changes and reload the updates.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", "Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.noButtonText": "No", @@ -83,9 +86,6 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", - "Common.UI.Themes.txtThemeDark": "Dark", - "Common.UI.Themes.txtThemeLight": "Light", - "Common.UI.Themes.txtThemeClassicLight": "Classic Light", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", @@ -151,7 +151,6 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "del_Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -1355,8 +1354,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spell Checking", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Disable All", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disable all macros without a notification", - "del_PE.Views.FileMenuPanels.Settings.txtThemeDark": "Dark", - "del_PE.Views.FileMenuPanels.Settings.txtThemeLight": "Light", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Show Notification", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disable all macros with a notification", "PE.Views.FileMenuPanels.Settings.txtWin": "as Windows", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index f1d351929..fc21b9d52 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Ajustes avanzados", "Common.Views.Header.textBack": "Abrir ubicación del archivo", "Common.Views.Header.textCompactView": "Esconder barra de herramientas", - "Common.Views.Header.textDarkTheme": "Tema oscuro", "Common.Views.Header.textHideLines": "Ocultar reglas", "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado", "Common.Views.Header.textRemoveFavorite": "Eliminar de Favoritos", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Сorrección ortográfica", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Deshabilitar todo", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Deshabilitar todas las macros sin notificación", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Oscuro", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Claro", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Mostrar notificación", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Deshabilitar todas las macros con notificación", "PE.Views.FileMenuPanels.Settings.txtWin": "como Windows", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 48b5fd557..34c178bf5 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Paramètres avancés", "Common.Views.Header.textBack": "Ouvrir l'emplacement du fichier", "Common.Views.Header.textCompactView": "Masquer la barre d'outils", - "Common.Views.Header.textDarkTheme": "Thème sombre", "Common.Views.Header.textHideLines": "Masquer les règles", "Common.Views.Header.textHideStatusBar": "Masquer la barre d'état", "Common.Views.Header.textRemoveFavorite": "Enlever des favoris", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Vérification de l'orthographe", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Désactiver tout", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Désactiver toutes les macros sans notification", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Sombre", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Clair", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Montrer la notification", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Désactiver toutes les macros avec notification", "PE.Views.FileMenuPanels.Settings.txtWin": "comme Windows", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index 17b5a8c30..a0731cd94 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Haladó beállítások", "Common.Views.Header.textBack": "Fájl helyének megnyitása", "Common.Views.Header.textCompactView": "Eszköztár elrejtése", - "Common.Views.Header.textDarkTheme": "Sötét téma", "Common.Views.Header.textHideLines": "Vonalzók elrejtése", "Common.Views.Header.textHideStatusBar": "Állapotsor elrejtése", "Common.Views.Header.textRemoveFavorite": "Eltávolítás a kedvencekből", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Helyesírás-ellenőrzés", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Összes letiltása", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Minden értesítés nélküli makró letiltása", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Sötét", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Világos", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Értesítés mutatása", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Minden értesítéssel rendelkező makró letiltása", "PE.Views.FileMenuPanels.Settings.txtWin": "Windows-ként", diff --git a/apps/presentationeditor/main/locale/it.json b/apps/presentationeditor/main/locale/it.json index 6310c12dc..4b1fc13f4 100644 --- a/apps/presentationeditor/main/locale/it.json +++ b/apps/presentationeditor/main/locale/it.json @@ -99,7 +99,6 @@ "Common.Views.Header.textAdvSettings": "Impostazioni avanzate", "Common.Views.Header.textBack": "Apri percorso file", "Common.Views.Header.textCompactView": "Nascondi barra degli strumenti", - "Common.Views.Header.textDarkTheme": "‎Tema scuro‎", "Common.Views.Header.textHideLines": "Nascondi righelli", "Common.Views.Header.textHideStatusBar": "Nascondi barra di stato", "Common.Views.Header.textSaveBegin": "Salvataggio in corso...", @@ -1290,7 +1289,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Controllo ortografia", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Disabilita tutto", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Disabilita tutte le macro senza notifica", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Scuro", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Mostra notifica", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Disabilita tutte le macro con notifica", "PE.Views.FileMenuPanels.Settings.txtWin": "come Windows", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index 3a98d4a41..16f957a88 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -22,6 +22,7 @@ "Common.define.chartData.textComboAreaBar": "積み上げ面 - 集合縦棒", "Common.define.chartData.textComboBarLine": "集合縦棒 - 線", "Common.define.chartData.textDoughnut": "ドーナツ", + "Common.define.chartData.textHBarNormal": "集合横棒", "Common.define.chartData.textHBarNormal3d": "3-D 集合横棒", "Common.define.chartData.textHBarStacked": "積み上げ横棒", "Common.define.chartData.textHBarStacked3d": "3-D 積み上げ横棒", @@ -145,7 +146,6 @@ "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "ドキュメントに移動", "Common.Views.Header.textCompactView": "ツールバーを表示しない", - "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラーを表示しない", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", @@ -1349,8 +1349,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "スペル・チェック", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "全てを無効にする", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "マクロを無効にして、通知しない", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "ダーク", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "ライト", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "通知を表示する", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "マクロを無効にして、通知する", "PE.Views.FileMenuPanels.Settings.txtWin": "Windowsのように", @@ -1599,6 +1597,7 @@ "PE.Views.SignatureSettings.strValid": "有効な署名", "PE.Views.SignatureSettings.txtContinueEditing": "無視して編集する", "PE.Views.SignatureSettings.txtEditWarning": "編集すると、プレゼンテーションから署名が削除されます。
続行しますか？", + "PE.Views.SignatureSettings.txtRemoveWarning": "この署名を削除しますか？
この操作は元に戻せません。", "PE.Views.SignatureSettings.txtSigned": "有効な署名がプレゼンテーションに追加されました。 プレゼンテーションは編集から保護されています。", "PE.Views.SignatureSettings.txtSignedInvalid": "プレゼンテーションのデジタル署名の一部が無効であるか、検証できませんでした。 プレゼンテーションは編集から保護されています。", "PE.Views.SlideSettings.strBackground": "背景色", @@ -1612,6 +1611,7 @@ "PE.Views.SlideSettings.strPattern": "パターン", "PE.Views.SlideSettings.strSlideNum": "スライド番号を表示", "PE.Views.SlideSettings.strStartOnClick": "クリック時", + "PE.Views.SlideSettings.strTransparency": "不透明度", "PE.Views.SlideSettings.textAdvanced": "詳細設定の表示", "PE.Views.SlideSettings.textAngle": "角", "PE.Views.SlideSettings.textApplyAll": "すべてのスライドに適用", @@ -1700,6 +1700,7 @@ "PE.Views.SlideSizeSettings.txtLetter": "レター サイズ 8.5x11 インチ", "PE.Views.SlideSizeSettings.txtOverhead": "オーバーヘッド", "PE.Views.SlideSizeSettings.txtStandard": "標準(4:3)", + "PE.Views.SlideSizeSettings.txtWidescreen": "ワイドスクリーン", "PE.Views.Statusbar.goToPageText": "スライドへジャンプ", "PE.Views.Statusbar.pageIndexText": "スライド{0}から{1}", "PE.Views.Statusbar.textShowBegin": "最初から", @@ -1844,13 +1845,17 @@ "PE.Views.Toolbar.capTabFile": "ファイル", "PE.Views.Toolbar.capTabHome": "ホーム", "PE.Views.Toolbar.capTabInsert": "挿入", + "PE.Views.Toolbar.mniCapitalizeWords": "各単語を大文字にする", "PE.Views.Toolbar.mniCustomTable": "ユーザー設定​​の表の挿入", "PE.Views.Toolbar.mniImageFromFile": "ファイルからの画像", "PE.Views.Toolbar.mniImageFromStorage": "ストレージから画像を読み込む", "PE.Views.Toolbar.mniImageFromUrl": "ファイルからのURL", + "PE.Views.Toolbar.mniLowerCase": "小文字", "PE.Views.Toolbar.mniSlideAdvanced": "詳細設定", "PE.Views.Toolbar.mniSlideStandard": "標準(4:3)", "PE.Views.Toolbar.mniSlideWide": "ワイド画面(16:9)", + "PE.Views.Toolbar.mniToggleCase": "大文字小文字を変更", + "PE.Views.Toolbar.mniUpperCase": "大文字", "PE.Views.Toolbar.strMenuNoFill": "塗りつぶしなし", "PE.Views.Toolbar.textAlignBottom": "テキストの下揃え", "PE.Views.Toolbar.textAlignCenter": "テキストを中央に揃える", @@ -1865,6 +1870,9 @@ "PE.Views.Toolbar.textArrangeFront": "前景に移動", "PE.Views.Toolbar.textBold": "太字", "PE.Views.Toolbar.textColumnsCustom": "ユーザー設定の列", + "PE.Views.Toolbar.textColumnsOne": "1列", + "PE.Views.Toolbar.textColumnsThree": "3列", + "PE.Views.Toolbar.textColumnsTwo": "2列", "PE.Views.Toolbar.textItalic": "斜体", "PE.Views.Toolbar.textListSettings": "リストの設定", "PE.Views.Toolbar.textNewColor": "ユーザー設定の色", @@ -1890,6 +1898,7 @@ "PE.Views.Toolbar.textUnderline": "下線", "PE.Views.Toolbar.tipAddSlide": "スライドの追加", "PE.Views.Toolbar.tipBack": "戻る", + "PE.Views.Toolbar.tipChangeCase:": "大文字小文字を変更", "PE.Views.Toolbar.tipChangeChart": "グラフの種類を変更", "PE.Views.Toolbar.tipChangeSlide": "レイアウトスライドの変更", "PE.Views.Toolbar.tipClearStyle": "スタイルのクリア", @@ -1898,6 +1907,7 @@ "PE.Views.Toolbar.tipCopy": "コピー", "PE.Views.Toolbar.tipCopyStyle": "スタイルのコピー", "PE.Views.Toolbar.tipDateTime": " 現在の日付と時刻を挿入", + "PE.Views.Toolbar.tipDecFont": "フォントのサイズ縮小", "PE.Views.Toolbar.tipDecPrLeft": "インデントを減らす", "PE.Views.Toolbar.tipEditHeader": "フッターの編集", "PE.Views.Toolbar.tipFontColor": "フォントの色", @@ -1905,6 +1915,7 @@ "PE.Views.Toolbar.tipFontSize": "フォントのサイズ", "PE.Views.Toolbar.tipHAligh": "左右の整列", "PE.Views.Toolbar.tipHighlightColor": "強調表示の色", + "PE.Views.Toolbar.tipIncFont": "フォントのサイズ拡大", "PE.Views.Toolbar.tipIncPrLeft": "インデントを増やす", "PE.Views.Toolbar.tipInsertAudio": "オーディオの挿入", "PE.Views.Toolbar.tipInsertChart": "グラフの挿入", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index c7517b446..7f3815496 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Geavanceerde instellingen", "Common.Views.Header.textBack": "Naar documenten", "Common.Views.Header.textCompactView": "Werkbalk Verbergen", - "Common.Views.Header.textDarkTheme": "Donker thema ", "Common.Views.Header.textHideLines": "Linialen verbergen", "Common.Views.Header.textHideStatusBar": "Statusbalk verbergen", "Common.Views.Header.textRemoveFavorite": "Verwijder uit favorieten", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Spellingcontrole", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Alles uitschakelen", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Schakel alle macro's uit zonder melding", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Donker", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "licht", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Weergeef notificatie", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Schakel alle macro's uit met een melding", "PE.Views.FileMenuPanels.Settings.txtWin": "als Windows", diff --git a/apps/presentationeditor/main/locale/ro.json b/apps/presentationeditor/main/locale/ro.json index 371401c3d..999b92d32 100644 --- a/apps/presentationeditor/main/locale/ro.json +++ b/apps/presentationeditor/main/locale/ro.json @@ -148,7 +148,6 @@ "Common.Views.Header.textAdvSettings": "Setări avansate", "Common.Views.Header.textBack": "Deschidere locația fișierului", "Common.Views.Header.textCompactView": "Ascundere bară de instrumente", - "Common.Views.Header.textDarkTheme": "Tema întunecată", "Common.Views.Header.textHideLines": "Ascundere rigle", "Common.Views.Header.textHideStatusBar": "Ascundere bară de stare", "Common.Views.Header.textRemoveFavorite": "Eliminare din Preferințe", @@ -1352,8 +1351,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Verificarea ortografică", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Se dezactivează toate", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Se dezactivează toate macrocomenzile, fără notificare", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Întunecat", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Luminozitate", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Afișare notificări", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Se dezactivează toate macrocomenzile, cu notificare ", "PE.Views.FileMenuPanels.Settings.txtWin": "ca Windows", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 4fe4aa37d..0f6fdcb8f 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -73,6 +73,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", + "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeDark": "Темная", + "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -148,7 +151,6 @@ "Common.Views.Header.textAdvSettings": "Дополнительные параметры", "Common.Views.Header.textBack": "Открыть расположение файла", "Common.Views.Header.textCompactView": "Скрыть панель инструментов", - "Common.Views.Header.textDarkTheme": "Темная тема", "Common.Views.Header.textHideLines": "Скрыть линейки", "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния", "Common.Views.Header.textRemoveFavorite": "Удалить из избранного", @@ -852,11 +854,11 @@ "PE.Controllers.Toolbar.txtIntegralTriple": "Тройной интеграл", "PE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Тройной интеграл", "PE.Controllers.Toolbar.txtIntegralTripleSubSup": "Тройной интеграл", - "PE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Клин", - "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Клин", - "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Клин", - "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Клин", - "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Клин", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Конъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Конъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Конъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Конъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Конъюнкция", "PE.Controllers.Toolbar.txtLargeOperator_CoProd": "Сопроизведение", "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Сопроизведение", "PE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Сопроизведение", @@ -867,11 +869,11 @@ "PE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Сумма", "PE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Произведение", "PE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Объединение", - "PE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Буква V", - "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Буква V", - "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Буква V", - "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Буква V", - "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Буква V", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Дизъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Дизъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Дизъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Дизъюнкция", + "PE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Дизъюнкция", "PE.Controllers.Toolbar.txtLargeOperator_Intersection": "Пересечение", "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Пересечение", "PE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Пересечение", @@ -1352,8 +1354,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Проверка орфографии", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Отключить все", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Отключить все макросы без уведомления", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Темная", - "PE.Views.FileMenuPanels.Settings.txtThemeLight": "Светлая", "PE.Views.FileMenuPanels.Settings.txtWarnMacros": "Показывать уведомление", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Отключить все макросы с уведомлением", "PE.Views.FileMenuPanels.Settings.txtWin": "как Windows", diff --git a/apps/presentationeditor/main/locale/sk.json b/apps/presentationeditor/main/locale/sk.json index 53197aed7..4d80f2919 100644 --- a/apps/presentationeditor/main/locale/sk.json +++ b/apps/presentationeditor/main/locale/sk.json @@ -106,7 +106,6 @@ "Common.Views.Header.textAdvSettings": "Pokročilé nastavenia", "Common.Views.Header.textBack": "Prejsť do Dokumentov", "Common.Views.Header.textCompactView": "Skryť panel s nástrojmi", - "Common.Views.Header.textDarkTheme": "Tmavá téma", "Common.Views.Header.textHideLines": "Skryť pravítka", "Common.Views.Header.textHideStatusBar": "Schovať stavový riadok", "Common.Views.Header.textSaveBegin": "Ukladanie ...", @@ -1128,7 +1127,6 @@ "PE.Views.FileMenuPanels.Settings.txtSpellCheck": "Kontrola pravopisu", "PE.Views.FileMenuPanels.Settings.txtStopMacros": "Zablokovať všetko", "PE.Views.FileMenuPanels.Settings.txtStopMacrosDesc": "Zablokovať všetky makrá bez upozornenia", - "PE.Views.FileMenuPanels.Settings.txtThemeDark": "Tmavý", "PE.Views.FileMenuPanels.Settings.txtWarnMacrosDesc": "Zablokovať všetky makrá s upozornením", "PE.Views.FileMenuPanels.Settings.txtWin": "ako Windows", "PE.Views.HeaderFooterDialog.applyAllText": "Použiť na všetko", diff --git a/apps/presentationeditor/main/locale/zh.json b/apps/presentationeditor/main/locale/zh.json index 889012c91..ecbf2eec2 100644 --- a/apps/presentationeditor/main/locale/zh.json +++ b/apps/presentationeditor/main/locale/zh.json @@ -1263,7 +1263,7 @@ "PE.Views.FileMenuPanels.Settings.strForcesave": "始终保存到服务器（否则在文档关闭时保存到服务器）", "PE.Views.FileMenuPanels.Settings.strInputMode": "显示象形文字", "PE.Views.FileMenuPanels.Settings.strMacrosSettings": "宏设置", - "PE.Views.FileMenuPanels.Settings.strPaste": "剪切、拷贝、黏贴", + "PE.Views.FileMenuPanels.Settings.strPaste": "剪切、复制、黏贴", "PE.Views.FileMenuPanels.Settings.strPasteButton": "在执行粘贴操作后显示“粘贴选项”按钮", "PE.Views.FileMenuPanels.Settings.strShowChanges": "实时协作变更", "PE.Views.FileMenuPanels.Settings.strSpellCheckMode": "显示拼写检查选项", @@ -1291,7 +1291,7 @@ "PE.Views.FileMenuPanels.Settings.txtLast": "最后查看", "PE.Views.FileMenuPanels.Settings.txtMac": "仿照 OS X", "PE.Views.FileMenuPanels.Settings.txtNative": "本机系统原生", - "PE.Views.FileMenuPanels.Settings.txtProofing": "审校", + "PE.Views.FileMenuPanels.Settings.txtProofing": "校对", "PE.Views.FileMenuPanels.Settings.txtPt": "点", "PE.Views.FileMenuPanels.Settings.txtRunMacros": "启动所有项目", "PE.Views.FileMenuPanels.Settings.txtRunMacrosDesc": "启动所有不带通知的宏", diff --git a/apps/presentationeditor/mobile/locale/it.json b/apps/presentationeditor/mobile/locale/it.json index cdfa7f5a8..733bc58c0 100644 --- a/apps/presentationeditor/mobile/locale/it.json +++ b/apps/presentationeditor/mobile/locale/it.json @@ -170,6 +170,7 @@ "PE.Controllers.Main.textContactUs": "Contatta il reparto vendite.", "PE.Controllers.Main.textCustomLoader": "Si prega di notare che, in base ai termini della licenza, non si ha il diritto di modificare il caricatore.
Si prega di contattare il nostro reparto vendite per ottenere un preventivo.", "PE.Controllers.Main.textDone": "Fatto", + "PE.Controllers.Main.textGuest": "Ospite", "PE.Controllers.Main.textHasMacros": "Il file contiene delle macro automatiche.
Vuoi eseguirle?", "PE.Controllers.Main.textLoadingDocument": "Caricamento della presentazione", "PE.Controllers.Main.textNo": "No", diff --git a/apps/spreadsheeteditor/main/locale/da.json b/apps/spreadsheeteditor/main/locale/da.json index ac1b080ae..1bbb3e916 100644 --- a/apps/spreadsheeteditor/main/locale/da.json +++ b/apps/spreadsheeteditor/main/locale/da.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Avancerede indstillinger", "Common.Views.Header.textBack": "Gå til dokumentplacering", "Common.Views.Header.textCompactView": "Skjul værktøjslinie", - "Common.Views.Header.textDarkTheme": "Mørkt tema", "Common.Views.Header.textHideLines": "Skjul lineal", "Common.Views.Header.textHideStatusBar": "Skjul statuslinie", "Common.Views.Header.textRemoveFavorite": "Fjern fra Favoritter", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Aktivér alle makroer uden meddelelse", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Deaktivér alle", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Deaktivér alle makroer uden meddelelse", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Mørk", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Lys", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Vis besked", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Deaktivér alle makroer med", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "som Windows", diff --git a/apps/spreadsheeteditor/main/locale/de.json b/apps/spreadsheeteditor/main/locale/de.json index 9d8f8a84b..0d99f523c 100644 --- a/apps/spreadsheeteditor/main/locale/de.json +++ b/apps/spreadsheeteditor/main/locale/de.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Erweiterte Einstellungen", "Common.Views.Header.textBack": "Dateispeicherort öffnen", "Common.Views.Header.textCompactView": "Symbolleiste ausblenden", - "Common.Views.Header.textDarkTheme": "Dunkelmodus", "Common.Views.Header.textHideLines": "Lineale verbergen", "Common.Views.Header.textHideStatusBar": "Statusleiste verbergen", "Common.Views.Header.textRemoveFavorite": "Aus Favoriten entfernen", @@ -590,9 +589,11 @@ "SSE.Controllers.Main.errorOpenWarning": "Die Länge einer der Formeln in der Datei hat
die zugelassene Anzahl von Zeichen überschritten und sie wurde entfernt.", "SSE.Controllers.Main.errorOperandExpected": "Die Syntax der eingegeben Funktion ist nicht korrekt. Bitte überprüfen Sie, ob eine der Klammern - '(' oder ')' fehlt.", "SSE.Controllers.Main.errorPasteMaxRange": "Zeilen Kopieren und Einfügen stimmen nicht überein.
Bitte wählen Sie einen Bereich der gleichen Größe oder klicken auf die erste Zelle der Zeile, um die kopierten Zellen einzufügen.", + "SSE.Controllers.Main.errorPasteMultiSelect": "Dies kann nicht mit einer Mehrfachauswahl ausgeführt werden.
Wählen Sie nur einen einzelnen Bereich aus und versuchen Sie es noch mal.", "SSE.Controllers.Main.errorPasteSlicerError": "Datenschnitte können aus einer Arbeitsmappe in die andere nicht verschoben werden.", "SSE.Controllers.Main.errorPivotGroup": "Die markierten Objekte können nicht gruppiert werden.", "SSE.Controllers.Main.errorPivotOverlap": "ein Pivot Tabellenbericht kann nicht", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "Der Bericht einer Pivot-Tabelle wurde ohne die zugrunde liegenden Daten gespeichert.
Klicken Sie auf 'Aktualisieren', um den Bericht zu aktualisieren.", "SSE.Controllers.Main.errorPrintMaxPagesCount": "Leider kann man in der aktuellen Programmversion nicht mehr als 1500 Seiten gleichzeitig drucken.
Diese Einschränkung wird in den kommenden Versionen entfernt.", "SSE.Controllers.Main.errorProcessSaveResult": "Speichern ist fehlgeschlagen", "SSE.Controllers.Main.errorServerVersion": "Editor-Version wurde aktualisiert. Die Seite wird neu geladen, um die Änderungen zu übernehmen.", @@ -1936,8 +1937,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Aktivieren aller Makros ohne Benachrichtigung", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Alle deaktivieren.", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Alle Makros ohne Benachrichtigung deaktivieren", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Dunkel", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Hell", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Benachrichtigungen anzeigen", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Alle Makros mit einer Benachrichtigung deaktivieren", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "wie Windows", diff --git a/apps/spreadsheeteditor/main/locale/el.json b/apps/spreadsheeteditor/main/locale/el.json index 677d5be68..34db83037 100644 --- a/apps/spreadsheeteditor/main/locale/el.json +++ b/apps/spreadsheeteditor/main/locale/el.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Προηγμένες ρυθμίσεις", "Common.Views.Header.textBack": "Άνοιγμα τοποθεσίας αρχείου", "Common.Views.Header.textCompactView": "Απόκρυψη Γραμμής Εργαλείων", - "Common.Views.Header.textDarkTheme": "Σκούρο θέμα", "Common.Views.Header.textHideLines": "Απόκρυψη Χαράκων", "Common.Views.Header.textHideStatusBar": "Απόκρυψη Γραμμής Κατάστασης", "Common.Views.Header.textRemoveFavorite": "Αφαίρεση από τα Αγαπημένα", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Ενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Απενεργοποίηση όλων", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών χωρίς ειδοποίηση", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Σκούρο", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Ανοιχτό", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Εμφάνιση Ειδοποίησης", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Απενεργοποίηση όλων των μακροεντολών με μια ειδοποίηση", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "ως Windows", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 32c9f8fdf..822b6570f 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -74,6 +74,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "The document has been changed by another user.
Please click to save your changes and reload the updates.", "Common.UI.ThemeColorPalette.textStandartColors": "Standard Colors", "Common.UI.ThemeColorPalette.textThemeColors": "Theme Colors", + "Common.UI.Themes.txtThemeClassicLight": "Classic Light", + "Common.UI.Themes.txtThemeDark": "Dark", + "Common.UI.Themes.txtThemeLight": "Light", "Common.UI.Window.cancelButtonText": "Cancel", "Common.UI.Window.closeButtonText": "Close", "Common.UI.Window.noButtonText": "No", @@ -84,9 +87,6 @@ "Common.UI.Window.textInformation": "Information", "Common.UI.Window.textWarning": "Warning", "Common.UI.Window.yesButtonText": "Yes", - "Common.UI.Themes.txtThemeDark": "Dark", - "Common.UI.Themes.txtThemeLight": "Light", - "Common.UI.Themes.txtThemeClassicLight": "Classic Light", "Common.Utils.Metric.txtCm": "cm", "Common.Utils.Metric.txtPt": "pt", "Common.Views.About.txtAddress": "address: ", @@ -147,7 +147,6 @@ "Common.Views.Header.textAdvSettings": "Advanced settings", "Common.Views.Header.textBack": "Open file location", "Common.Views.Header.textCompactView": "Hide Toolbar", - "del_Common.Views.Header.textDarkTheme": "Dark theme", "Common.Views.Header.textHideLines": "Hide Rulers", "Common.Views.Header.textHideStatusBar": "Hide Status Bar", "Common.Views.Header.textRemoveFavorite": "Remove from Favorites", @@ -1941,8 +1940,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Enable all macros without a notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Disable All", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Disable all macros without a notification", - "del_SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Dark", - "del_SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Light", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Show Notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Disable all macros with a notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "as Windows", diff --git a/apps/spreadsheeteditor/main/locale/es.json b/apps/spreadsheeteditor/main/locale/es.json index 8b9232005..6591d6e05 100644 --- a/apps/spreadsheeteditor/main/locale/es.json +++ b/apps/spreadsheeteditor/main/locale/es.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Ajustes avanzados", "Common.Views.Header.textBack": "Abrir ubicación del archivo", "Common.Views.Header.textCompactView": "Esconder barra de herramientas", - "Common.Views.Header.textDarkTheme": "Tema oscuro", "Common.Views.Header.textHideLines": "Ocultar reglas", "Common.Views.Header.textHideStatusBar": "Ocultar barra de estado", "Common.Views.Header.textRemoveFavorite": "Eliminar de Favoritos", @@ -590,9 +589,11 @@ "SSE.Controllers.Main.errorOpenWarning": "Una de las fórmulas del archivo excede el límite de 8192 caracteres.
La fórmula fue eliminada.", "SSE.Controllers.Main.errorOperandExpected": "La función de sintaxis introducida no es correcta. Le recomendamos verificar si no le hace falta uno del paréntesis - '(' o ')'", "SSE.Controllers.Main.errorPasteMaxRange": "El área de copiar no coincide con el área de pegar.
Para pegar las celdas copiadas, por favor, seleccione una zona con el mismo tamaño o haga clic en la primera celda de una fila.", + "SSE.Controllers.Main.errorPasteMultiSelect": "Esta acción no se puede realizar en un rango de selecciones múltiples.
Seleccione un solo rango y vuelva a intentarlo.", "SSE.Controllers.Main.errorPasteSlicerError": "Las segmentaciones de tabla no pueden ser copiadas de un libro a otro.", "SSE.Controllers.Main.errorPivotGroup": "No se puede agrupar esta selección.", "SSE.Controllers.Main.errorPivotOverlap": "El informe de la tabla dinámica no puede superponerse a la tabla.", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "El informe de la tabla dinámica se ha guardado sin los datos subyacentes.
Utilice el botón 'Actualizar' para actualizar el informe.", "SSE.Controllers.Main.errorPrintMaxPagesCount": "Lamentablemente, no es posible imprimir más de 1500 páginas a la vez en la versión actual del programa.
Esta restricción será eliminada en próximos lanzamientos.", "SSE.Controllers.Main.errorProcessSaveResult": "Problemas al guardar", "SSE.Controllers.Main.errorServerVersion": "La versión del editor ha sido actualizada. La página será recargada para aplicar los cambios.", @@ -1936,8 +1937,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Habilitar todas las macros sin notificación ", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Deshabilitar todo", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Deshabilitar todas las macros sin notificación", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Oscuro", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Claro", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Mostrar notificación", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Deshabilitar todas las macros con notificación", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "como Windows", diff --git a/apps/spreadsheeteditor/main/locale/fr.json b/apps/spreadsheeteditor/main/locale/fr.json index 2e0e5de62..0d220bae8 100644 --- a/apps/spreadsheeteditor/main/locale/fr.json +++ b/apps/spreadsheeteditor/main/locale/fr.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Paramètres avancés", "Common.Views.Header.textBack": "Ouvrir l'emplacement du fichier", "Common.Views.Header.textCompactView": "Masquer la barre d'outils", - "Common.Views.Header.textDarkTheme": "Thème sombre", "Common.Views.Header.textHideLines": "Masquer les règles", "Common.Views.Header.textHideStatusBar": "Masquer la barre d'état", "Common.Views.Header.textRemoveFavorite": "Enlever des favoris", @@ -590,9 +589,11 @@ "SSE.Controllers.Main.errorOpenWarning": "La longueur de l'une des formules dans le fichier a dépassé le nombre de caractères autorisé (8192).
La formule a été supprimée.", "SSE.Controllers.Main.errorOperandExpected": "La syntaxe de la saisie est incorrecte. Veuillez vérifier si l'une des parenthèses - '(' ou ')' est manquante.", "SSE.Controllers.Main.errorPasteMaxRange": "La zone de copie ne correspond pas à la zone de collage.
Sélectionnez une zone avec la même taille ou cliquez sur la première cellule d'une ligne pour coller les cellules sélectionnées.", + "SSE.Controllers.Main.errorPasteMultiSelect": "Cette action ne peut pas être accomplie sur une sélection de plusieurs plages.
électionnez une seule plage, puis réessayez.", "SSE.Controllers.Main.errorPasteSlicerError": "Segments de tableau ne peuvent pas être copiés depuis un tableur vers un autre.", "SSE.Controllers.Main.errorPivotGroup": "Impossible de grouper cette sélection.", "SSE.Controllers.Main.errorPivotOverlap": "Report du tableau croise dynamique ne peut pas chevaucher un autre tableau.", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "Le rapport de tableau croisé dynamique a été enregistré sans ses données sous-jacentes.
Utilisez la commande « Actualiser » pour mettre à jour le rapport.", "SSE.Controllers.Main.errorPrintMaxPagesCount": "Malheureusement, il n’est pas possible d’imprimer plus de 1500 pages à la fois en utilisant avec la version actuelle.
Cette restriction sera supprimée dans une version future.", "SSE.Controllers.Main.errorProcessSaveResult": "Échec de l'enregistrement", "SSE.Controllers.Main.errorServerVersion": "La version de l'éditeur a été mise à jour. La page sera rechargée pour appliquer les modifications.", @@ -1891,7 +1892,7 @@ "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.strFuncLocale": "La formule de langue", + "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", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strMacrosSettings": "Réglages macros", @@ -1936,8 +1937,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Activer tous les macros sans notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Désactiver tout", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Désactiver tous les macros sans notification", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Sombre", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Clair", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Montrer la notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Désactiver tous les macros avec notification", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "comme Windows", diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index 98d7fe71a..53513adbe 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Haladó beállítások", "Common.Views.Header.textBack": "Fájl helyének megnyitása", "Common.Views.Header.textCompactView": "Eszköztár elrejtése", - "Common.Views.Header.textDarkTheme": "Sötét téma", "Common.Views.Header.textHideLines": "Vonalzók elrejtése", "Common.Views.Header.textHideStatusBar": "Állapotsor elrejtése", "Common.Views.Header.textRemoveFavorite": "Eltávolítás a kedvencekből", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Minden értesítés nélküli makró engedélyezése", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Összes letiltása", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Minden értesítés nélküli makró letiltása", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Sötét", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Világos", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Értesítés mutatása", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Minden értesítéssel rendelkező makró letiltása", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windows-ként", diff --git a/apps/spreadsheeteditor/main/locale/ja.json b/apps/spreadsheeteditor/main/locale/ja.json index 2bf306619..f595967cc 100644 --- a/apps/spreadsheeteditor/main/locale/ja.json +++ b/apps/spreadsheeteditor/main/locale/ja.json @@ -142,9 +142,9 @@ "Common.Views.Header.textAdvSettings": "詳細設定", "Common.Views.Header.textBack": "文書URLを開く", "Common.Views.Header.textCompactView": "ツールバーを表示しない", - "Common.Views.Header.textDarkTheme": "ダークテーマ", "Common.Views.Header.textHideLines": "ルーラーを表示しない", "Common.Views.Header.textHideStatusBar": "ステータスバーを表示しない", + "Common.Views.Header.textRemoveFavorite": "お気に入りから削除", "Common.Views.Header.textSaveBegin": "保存中...", "Common.Views.Header.textSaveChanged": "更新された", "Common.Views.Header.textSaveEnd": "すべての変更が保存されました", @@ -340,7 +340,9 @@ "SSE.Controllers.DataTab.txtDataValidation": "データ検証", "SSE.Controllers.DataTab.txtExpand": "拡張する", "SSE.Controllers.DataTab.txtExpandRemDuplicates": "選択範囲の横のデータは削除されません。選択範囲を拡大して隣接するデータを含めるか、現在選択されているセルのみを続行しますか？", + "SSE.Controllers.DataTab.txtExtendDataValidation": "選択範囲には、データバリデーション設定のないセルがいくつか含まれています。
データバリデーションをこれらのセルに拡張しますか？", "SSE.Controllers.DataTab.txtRemDuplicates": "重複データを削除", + "SSE.Controllers.DataTab.txtRemoveDataValidation": "選択には複数のタイプのバリデーションが含まれます。
現在の設定を消去して続行しますか？", "SSE.Controllers.DataTab.txtRemSelected": "選択した範囲で削除する", "SSE.Controllers.DocumentHolder.alignmentText": "配置", "SSE.Controllers.DocumentHolder.centerText": "中央揃え", @@ -585,9 +587,11 @@ "SSE.Controllers.Main.errorOpenWarning": "数式に許される長さを超過しています。超過分の文字を削除しました。", "SSE.Controllers.Main.errorOperandExpected": "入力した関数の構文が正しくありません。かっこ「（」または「）」のいずれかが欠落していないかどうかをご確認ください。", "SSE.Controllers.Main.errorPasteMaxRange": "コピーと貼り付けエリアが一致していません。
同じサイズの領域を選択するか、またはコピーしたセルを貼り付けるために行の最初のセルをクリックしてください。", + "SSE.Controllers.Main.errorPasteMultiSelect": "この操作は、複数の範囲を選択した場合には実行できません。
単一の範囲を選択して、再試行してください。", "SSE.Controllers.Main.errorPasteSlicerError": "テーブルスライサーは、あるブックから別のブックにコピーすることはできません。", "SSE.Controllers.Main.errorPivotGroup": "その選択をグループ化できません。", "SSE.Controllers.Main.errorPivotOverlap": "ピボットテーブルレポートはテーブルを重ねることができません。", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "ピボットテーブルのレポートが、基礎となるデータなしで保存されました。
[更新]ボタンを使用して、レポートを更新します。", "SSE.Controllers.Main.errorPrintMaxPagesCount": "残念ながら、現在のプログラムバージョンでは一度に1500ページを超える印刷はできません。
この制限は今後のリリースで削除される予定です。", "SSE.Controllers.Main.errorProcessSaveResult": "保存に失敗しました。", "SSE.Controllers.Main.errorServerVersion": "エディターのバージョンが更新されました。 変更を適用するために、ページが再読み込みされます。", @@ -1560,6 +1564,7 @@ "SSE.Views.ChartSettingsDlg.textZero": "ゼロ", "SSE.Views.ChartSettingsDlg.txtEmpty": "このフィールドは必須項目です", "SSE.Views.ChartTypeDialog.errorComboSeries": "組み合わせグラフを作成するには、最低2つのデータを選択します。", + "SSE.Views.ChartTypeDialog.errorSecondaryAxis": "選択したチャートタイプでは、既存のチャートが使用している2次軸が必要です。他のチャートタイプを選択してください。", "SSE.Views.ChartTypeDialog.textSecondary": "二次軸", "SSE.Views.ChartTypeDialog.textSeries": "系列", "SSE.Views.ChartTypeDialog.textStyle": "スタイル", @@ -1593,7 +1598,16 @@ "SSE.Views.DataTab.tipToColumns": "セルテキストを列に分割する", "SSE.Views.DataTab.tipUngroup": "セルの範囲をグループ解除する", "SSE.Views.DataValidationDialog.errorFormula": "現在、値がエラーと評価されています。続けますか？", + "SSE.Views.DataValidationDialog.errorInvalid": "フィールド \"{0}\"に入力した値が無効です。", + "SSE.Views.DataValidationDialog.errorInvalidDate": "フィールド \"{0}\"に入力した日付が無効です。", + "SSE.Views.DataValidationDialog.errorInvalidList": "リストソースは、区切られたリスト、または単一の行または列への参照である必要があります。", + "SSE.Views.DataValidationDialog.errorInvalidTime": "フィールド \"{0}\"に入力した時刻が無効です。", + "SSE.Views.DataValidationDialog.errorMinGreaterMax": "\"{1}\"フィールドは\"{0}\" フィールド以上である必要があります。", + "SSE.Views.DataValidationDialog.errorMustEnterBothValues": "フィールド \"{0}\"とフィールド \"{1}\"の両方に値を入力する必要があります。", + "SSE.Views.DataValidationDialog.errorMustEnterValue": "フィールド \"{0}\"に値を入力する必要があります。", + "SSE.Views.DataValidationDialog.errorNamedRange": "指定した名前付き範囲が見つかりません。", "SSE.Views.DataValidationDialog.errorNegativeTextLength": "条件 \"{0}\"では負の値を使用できません。", + "SSE.Views.DataValidationDialog.errorNotNumeric": "フィールド \"{0}\"は、数値または数式であるか、数値を含むセルを参照している必要があります。", "SSE.Views.DataValidationDialog.strError": "エラー警告", "SSE.Views.DataValidationDialog.strInput": "メッセージ入力", "SSE.Views.DataValidationDialog.strSettings": "設定", @@ -1621,11 +1635,16 @@ "SSE.Views.DataValidationDialog.textStyle": "スタイル", "SSE.Views.DataValidationDialog.textTitle": "タイトル", "SSE.Views.DataValidationDialog.textUserEnters": "ユーザーが無効なデータを入力した場合、このエラーアラートを表示します", + "SSE.Views.DataValidationDialog.txtAny": "任意の値", "SSE.Views.DataValidationDialog.txtDate": "日付", "SSE.Views.DataValidationDialog.txtElTime": "経過時間", "SSE.Views.DataValidationDialog.txtEndDate": "終了日", "SSE.Views.DataValidationDialog.txtEndTime": "終了時間", + "SSE.Views.DataValidationDialog.txtGreaterThan": "より大きい", + "SSE.Views.DataValidationDialog.txtGreaterThanOrEqual": "次の値以上", "SSE.Views.DataValidationDialog.txtLength": "長さ", + "SSE.Views.DataValidationDialog.txtLessThan": "より小さい", + "SSE.Views.DataValidationDialog.txtLessThanOrEqual": "次の値以下", "SSE.Views.DataValidationDialog.txtList": "リスト", "SSE.Views.DataValidationDialog.txtOther": "その他", "SSE.Views.DataValidationDialog.txtStartDate": "開始日", @@ -1908,8 +1927,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "マクロを有効にして、通知しない", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "全てを無効にする", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "マクロを無効にして、通知しない", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "ダーク", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "ライト", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "通知を表示する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "マクロを無効にして、通知する", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "Windowsのような", @@ -1948,6 +1965,7 @@ "SSE.Views.FormatSettingsDialog.txtAs8": "分母を8に設定 (4/8)", "SSE.Views.FormatSettingsDialog.txtCurrency": "通貨", "SSE.Views.FormatSettingsDialog.txtCustom": "カスタム", + "SSE.Views.FormatSettingsDialog.txtCustomWarning": "カスタム番号の形式を慎重に入力してください。 Spreadsheet Editorは、xlsxファイルに影響を与える可能性のあるエラーについてカスタム形式をチェックしません。", "SSE.Views.FormatSettingsDialog.txtDate": "日付", "SSE.Views.FormatSettingsDialog.txtFraction": "分数", "SSE.Views.FormatSettingsDialog.txtGeneral": "標準", @@ -2157,6 +2175,7 @@ "SSE.Views.NameManagerDlg.textWorkbook": "ブック", "SSE.Views.NameManagerDlg.tipIsLocked": "この要素が別のユーザーによって編集されています。", "SSE.Views.NameManagerDlg.txtTitle": "名前の管理", + "SSE.Views.NameManagerDlg.warnDelete": "名前{0}を削除してもよろしいですか？", "SSE.Views.PageMarginsDialog.textBottom": "低", "SSE.Views.PageMarginsDialog.textLeft": "左", "SSE.Views.PageMarginsDialog.textRight": "右", @@ -2234,6 +2253,7 @@ "SSE.Views.PivotGroupDialog.textAuto": "自動", "SSE.Views.PivotGroupDialog.textDays": "日", "SSE.Views.PivotGroupDialog.textError": "このフィールドは数値である必要があります", + "SSE.Views.PivotGroupDialog.textGreaterError": "終了番号は開始番号より大きくなければなりません", "SSE.Views.PivotGroupDialog.textHour": "時間", "SSE.Views.PivotGroupDialog.textMin": "分", "SSE.Views.PivotGroupDialog.textMonth": "月", diff --git a/apps/spreadsheeteditor/main/locale/nl.json b/apps/spreadsheeteditor/main/locale/nl.json index 65626a0d3..e7672af67 100644 --- a/apps/spreadsheeteditor/main/locale/nl.json +++ b/apps/spreadsheeteditor/main/locale/nl.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Geavanceerde instellingen", "Common.Views.Header.textBack": "Open bestandlocatie", "Common.Views.Header.textCompactView": "Werkbalk Verbergen", - "Common.Views.Header.textDarkTheme": "Donker thema ", "Common.Views.Header.textHideLines": "Linialen verbergen", "Common.Views.Header.textHideStatusBar": "Statusbalk verbergen", "Common.Views.Header.textRemoveFavorite": "Verwijder uit favorieten", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Schakel alle macro's in zonder een notificatie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Alles uitschakelen", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Schakel alle macro's uit zonder melding", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Donker", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "licht", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Weergeef notificatie", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Schakel alle macro's uit met een melding", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "als Windows", diff --git a/apps/spreadsheeteditor/main/locale/pl.json b/apps/spreadsheeteditor/main/locale/pl.json index 4c29eb1c8..35f4d226f 100644 --- a/apps/spreadsheeteditor/main/locale/pl.json +++ b/apps/spreadsheeteditor/main/locale/pl.json @@ -58,6 +58,8 @@ "Common.Views.About.txtTel": "tel.:", "Common.Views.About.txtVersion": "Wersja", "Common.Views.AutoCorrectDialog.textAdd": "Dodaj", + "Common.Views.AutoCorrectDialog.textWarnResetRec": "Każde dodane wyrażenie zostanie usunięte, a usunięte zostaną przywrócone. Czy chcesz kontynuować?", + "Common.Views.AutoCorrectDialog.warnReset": "Wszelkie dodane autokorekty zostaną usunięte, a zmienione zostaną przywrócone oryginalne wartości. Czy chcesz kontynuować?", "Common.Views.Chat.textSend": "Wyślij", "Common.Views.Comments.textAdd": "Dodaj", "Common.Views.Comments.textAddComment": "Dodaj komentarz", @@ -85,6 +87,7 @@ "Common.Views.Header.labelCoUsersDescr": "Użytkownicy aktualnie edytujący plik:", "Common.Views.Header.textAdvSettings": "Zaawansowane ustawienia", "Common.Views.Header.textBack": "Otwórz lokalizację pliku", + "Common.Views.Header.textRemoveFavorite": "Usuń z ulubionych", "Common.Views.Header.textSaveBegin": "Zapisywanie ...", "Common.Views.Header.textSaveChanged": "Zmodyfikowano", "Common.Views.Header.textSaveEnd": "Wszystkie zmiany zapisane", @@ -100,17 +103,25 @@ "Common.Views.ImageFromUrlDialog.textUrl": "Wklej link URL do obrazu:", "Common.Views.ImageFromUrlDialog.txtEmpty": "To pole jest wymagane", "Common.Views.ImageFromUrlDialog.txtNotUrl": "To pole powinno być adresem URL w formacie \"http://www.example.com\"", + "Common.Views.ListSettingsDialog.textNumbering": "Numerowane", "Common.Views.ListSettingsDialog.txtOfText": "% tekstu", + "Common.Views.OpenDialog.txtAdvanced": "Zaawansowane", "Common.Views.OpenDialog.txtDelimiter": "Separator", "Common.Views.OpenDialog.txtEncoding": "Kodowanie", "Common.Views.OpenDialog.txtIncorrectPwd": "Hasło jest nieprawidłowe.", "Common.Views.OpenDialog.txtOpenFile": "Wprowadź hasło, aby otworzyć plik", "Common.Views.OpenDialog.txtOther": "Inny", "Common.Views.OpenDialog.txtPassword": "Hasło", + "Common.Views.OpenDialog.txtProtected": "Po wprowadzeniu hasła i otwarciu pliku bieżące hasło do pliku zostanie zresetowane", "Common.Views.OpenDialog.txtSpace": "Odstęp", "Common.Views.OpenDialog.txtTab": "Karta", "Common.Views.OpenDialog.txtTitle": "Wybierz %1 opcji", "Common.Views.OpenDialog.txtTitleProtected": "Plik chroniony", + "Common.Views.PasswordDialog.txtDescription": "Ustaw hasło aby zabezpieczyć ten dokument", + "Common.Views.PasswordDialog.txtIncorrectPwd": "Hasła nie są takie same", + "Common.Views.PasswordDialog.txtPassword": "Hasło", + "Common.Views.PasswordDialog.txtRepeat": "Powtórz hasło", + "Common.Views.PasswordDialog.txtTitle": "Ustaw hasło", "Common.Views.PasswordDialog.txtWarning": "Uwaga: Jeśli zapomnisz lub zgubisz hasło, nie będzie możliwości odzyskania go. Zapisz go i nikomu nie udostępniaj.", "Common.Views.PluginDlg.textLoading": "Ładowanie", "Common.Views.Plugins.groupCaption": "Wtyczki", @@ -118,22 +129,42 @@ "Common.Views.Plugins.textLoading": "Ładowanie", "Common.Views.Plugins.textStart": "Start", "Common.Views.Plugins.textStop": "Zatrzymać", + "Common.Views.Protection.hintAddPwd": "Szyfruj hasłem", + "Common.Views.Protection.hintPwd": "Zmień lub usuń hasło", "Common.Views.Protection.hintSignature": "Dodaj podpis cyfrowy lub wiersz do podpisu", "Common.Views.Protection.txtAddPwd": "Dodaj hasło", + "Common.Views.Protection.txtChangePwd": "Zmień hasło", + "Common.Views.Protection.txtDeletePwd": "Usuń hasło", "Common.Views.Protection.txtInvisibleSignature": "Dodaj podpis cyfrowy", "Common.Views.Protection.txtSignatureLine": "Dodaj wiersz do podpisu", "Common.Views.RenameDialog.textName": "Nazwa pliku", "Common.Views.RenameDialog.txtInvalidName": "Nazwa pliku nie może zawierać żadnego z następujących znaków:", "Common.Views.ReviewChanges.tipAcceptCurrent": "Zaakceptuj bieżącą zmianę", + "Common.Views.ReviewChanges.tipCommentRem": "Usuń komentarze", + "Common.Views.ReviewChanges.tipCommentRemCurrent": "Usuń aktualne komentarze", + "Common.Views.ReviewChanges.tipSetSpelling": "Sprawdzanie pisowni", "Common.Views.ReviewChanges.txtAccept": "Zaakceptuj", "Common.Views.ReviewChanges.txtAcceptAll": "Zaakceptuj wszystkie zmiany", "Common.Views.ReviewChanges.txtAcceptChanges": "Zaakceptuj zmiany", "Common.Views.ReviewChanges.txtAcceptCurrent": "Zaakceptuj bieżącą zmianę", + "Common.Views.ReviewChanges.txtCommentRemAll": "Usuń wszystkie komentarze", + "Common.Views.ReviewChanges.txtCommentRemCurrent": "Usuń aktualne komentarze", + "Common.Views.ReviewChanges.txtCommentRemMy": "Usuń moje komentarze", + "Common.Views.ReviewChanges.txtCommentRemove": "Usuń", + "Common.Views.ReviewChanges.txtFinal": "Wszystkie zmiany zostały zaakceptowane (podgląd)", + "Common.Views.ReviewChanges.txtMarkup": "Wszystkie zmiany (edycja)", + "Common.Views.ReviewChanges.txtOriginal": "Wszystkie zmiany zostały odrzucone (podgląd)", + "Common.Views.ReviewChanges.txtSpelling": "Sprawdzanie pisowni", "Common.Views.ReviewPopover.textAdd": "Dodaj", "Common.Views.ReviewPopover.textAddReply": "Dodaj odpowiedź", "Common.Views.ReviewPopover.textMention": "+wzmianka zapewni użytkownikowi dostęp do pliku i wyśle e-maila", "Common.Views.ReviewPopover.textMentionNotify": "+wzmianka powiadomi użytkownika e-mailem", + "Common.Views.SignDialog.tipFontSize": "Rozmiar czcionki", + "Common.Views.SignSettingsDialog.textAllowComment": "Zezwól podpisującemu na dodawanie komentarza w oknie podpisu", "Common.Views.SymbolTableDialog.textQEmSpace": "Ćwierć spacja", + "SSE.Controllers.DataTab.txtExpandRemDuplicates": "Dane obok zaznaczenia nie zostaną usunięte. Czy chcesz rozszerzyć zaznaczenie, aby obejmowało sąsiednie dane, czy kontynuować tylko z aktualnie wybranymi komórkami?", + "SSE.Controllers.DataTab.txtRemDuplicates": "Usuń duplikaty", + "SSE.Controllers.DataTab.txtRemSelected": "Usuń w zaznaczonych", "SSE.Controllers.DocumentHolder.alignmentText": "Wyrównanie", "SSE.Controllers.DocumentHolder.centerText": "Środek", "SSE.Controllers.DocumentHolder.deleteColumnText": "Usuń kolumnę", @@ -168,6 +199,7 @@ "SSE.Controllers.DocumentHolder.txtAddVer": "Dodaj pionowy wiersz", "SSE.Controllers.DocumentHolder.txtAlignToChar": "Wyrównaj do znaku", "SSE.Controllers.DocumentHolder.txtAll": "(wszystko)", + "SSE.Controllers.DocumentHolder.txtAnd": "I", "SSE.Controllers.DocumentHolder.txtBlanks": "(Puste)", "SSE.Controllers.DocumentHolder.txtBorderProps": "Ustawienia obramowania", "SSE.Controllers.DocumentHolder.txtBottom": "Dół", @@ -307,8 +339,10 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Błąd zewnętrzny.
Błąd połączenia z bazą danych. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.", "SSE.Controllers.Main.errorDataRange": "Błędny zakres danych.", "SSE.Controllers.Main.errorDefaultMessage": "Kod błędu: %1", + "SSE.Controllers.Main.errorEditView": "Nie można edytować istniejące widoku arkusza, ani w tej chwili nie można utworzyć nowych, ponieważ niektóre z nich są w trakcie edycji.", "SSE.Controllers.Main.errorFilePassProtect": "Plik jest chroniony hasłem, bez którego nie może być otwarty.", "SSE.Controllers.Main.errorFileRequest": "Błąd zewnętrzny.
Błąd zgłoszenia pliku. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.", + "SSE.Controllers.Main.errorFileSizeExceed": "Rozmiar pliku przekracza ustalony limit dla twojego serwera.
Proszę skontaktować z administratorem twojego Serwera Dokumentów w celu uzyskania szczegółowych informacji.", "SSE.Controllers.Main.errorFileVKey": "Błąd zewnętrzny.
Niewłaściwy klucz bezpieczeństwa. W przypadku wystąpienia błędu należy skontaktować się z pomocą techniczną.", "SSE.Controllers.Main.errorFillRange": "Nie można wypełnić zaznaczonego zakresu komórek.
Wszystkie scalone komórki muszą mieć ten sam rozmiar.", "SSE.Controllers.Main.errorFormulaName": "Wprowadzona formuła jest błędna.
Użyto niepoprawnej nazwy formuły.", @@ -320,6 +354,7 @@ "SSE.Controllers.Main.errorLockedAll": "Operacja nie mogła zostać wykonana, gdy arkusz został zablokowany przez innego użytkownika.", "SSE.Controllers.Main.errorLockedCellPivot": "Nie można zmienić dane w tabeli przestawnej.", "SSE.Controllers.Main.errorLockedWorksheetRename": "Nie można zmienić nazwy arkusza, gdy zmieniana jest ona przez innego użytkownika", + "SSE.Controllers.Main.errorMaxPoints": "Maksymalna liczba punktów w serii na wykres to 4096.", "SSE.Controllers.Main.errorMoveRange": "Nie można zmienić części scalonej komórki", "SSE.Controllers.Main.errorOpenWarning": "Długość jednej z formuł w pliku przekroczyła limit 8192 znaków.
Formuła została usunięta.", "SSE.Controllers.Main.errorOperandExpected": "Wprowadzona składnia funkcji jest nieprawidłowa. Sprawdź, czy nie brakuje jednego z nawiasów - '(' lub ')'.", @@ -330,6 +365,7 @@ "SSE.Controllers.Main.errorSessionAbsolute": "Sesja edycji dokumentu wygasła. Proszę ponownie załadować stronę.", "SSE.Controllers.Main.errorSessionIdle": "Dokument nie był edytowany przez długi czas. Proszę ponownie załadować stronę.", "SSE.Controllers.Main.errorSessionToken": "Połączenie z serwerem zostało przerwane. Proszę ponownie załadować stronę.", + "SSE.Controllers.Main.errorSetPassword": "Nie można ustawić hasła", "SSE.Controllers.Main.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", "SSE.Controllers.Main.errorToken": "Token bezpieczeństwa dokumentu jest nieprawidłowo uformowany.
Prosimy o kontakt z administratorem serwera dokumentów.", "SSE.Controllers.Main.errorTokenExpire": "Token zabezpieczeń dokumentu wygasł.
Prosimy o kontakt z administratorem serwera dokumentów.", @@ -398,6 +434,7 @@ "SSE.Controllers.Main.txtMath": "Matematyczne", "SSE.Controllers.Main.txtRectangles": "Prostokąty", "SSE.Controllers.Main.txtSeries": "Serie", + "SSE.Controllers.Main.txtShape_arc": "Łuk", "SSE.Controllers.Main.txtShape_noSmoking": "Symbol \"nie\"", "SSE.Controllers.Main.txtShape_star10": "10-Ramienna Gwiazda", "SSE.Controllers.Main.txtShape_star12": "12-Ramienna Gwiazda", @@ -431,6 +468,7 @@ "SSE.Controllers.Main.txtStyle_Title": "Tytuł", "SSE.Controllers.Main.txtStyle_Total": "Wszystkie", "SSE.Controllers.Main.txtStyle_Warning_Text": "Tekst ostrzegawczy", + "SSE.Controllers.Main.txtTable": "Tabela", "SSE.Controllers.Main.txtXAxis": "Oś X", "SSE.Controllers.Main.txtYAxis": "Oś Y", "SSE.Controllers.Main.unknownErrorText": "Nieznany błąd.", @@ -839,8 +877,17 @@ "SSE.Views.CellRangeDialog.txtEmpty": "To pole jest wymagane", "SSE.Views.CellRangeDialog.txtInvalidRange": "BŁĄD! Niepoprawny zakres komórek", "SSE.Views.CellRangeDialog.txtTitle": "Wybierz zakres danych", + "SSE.Views.CellSettings.textAngle": "Kąt", + "SSE.Views.CellSettings.textOrientation": "Orientacja tekstu", "SSE.Views.CellSettings.tipAddGradientPoint": "Dodaj punkt gradientu", + "SSE.Views.ChartDataDialog.errorMaxPoints": "Maksymalna liczba punktów w serii na wykres to 4096.", + "SSE.Views.ChartDataDialog.errorMaxRows": "Maksymalna liczba serii danych na wykres to 255.", + "SSE.Views.ChartDataDialog.errorNoSingleRowCol": "Odniesienie jest nieprawidłowe. Odniesienia do tytułów, wartości, rozmiarów lub etykiet danych muszą obejmować pojedynczą komórkę, wiersz lub kolumnę.", "SSE.Views.ChartDataDialog.textAdd": "Dodaj", + "SSE.Views.ChartDataDialog.textDelete": "Usuń", + "SSE.Views.ChartDataRangeDialog.errorMaxPoints": "Maksymalna liczba punktów w serii na wykres to 4096.", + "SSE.Views.ChartDataRangeDialog.errorMaxRows": "Maksymalna liczba serii danych na wykres to 255.", + "SSE.Views.ChartDataRangeDialog.errorNoSingleRowCol": "Odniesienie jest nieprawidłowe. Odniesienia do tytułów, wartości, rozmiarów lub etykiet danych muszą obejmować pojedynczą komórkę, wiersz lub kolumnę.", "SSE.Views.ChartSettings.strLineWeight": "Waga linii", "SSE.Views.ChartSettings.strSparkColor": "Kolor", "SSE.Views.ChartSettings.strTemplate": "Szablon", @@ -863,8 +910,10 @@ "SSE.Views.ChartSettings.textStyle": "Styl", "SSE.Views.ChartSettings.textType": "Typ", "SSE.Views.ChartSettings.textWidth": "Szerokość", + "SSE.Views.ChartSettingsDlg.errorMaxPoints": "BŁĄD! Maksymalna liczba punktów w serii na wykres to 4096.", "SSE.Views.ChartSettingsDlg.errorMaxRows": "BŁĄD! Maksymalna liczba serii danych na wykresie wynosi 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Nieprawidłowa kolejność wierszy. Aby zbudować wykres akcji, umieść dane na arkuszu w następującej kolejności:
cena otwarcia, cena maksymalna, cena minimalna, cena zamknięcia.", + "SSE.Views.ChartSettingsDlg.textAbsolute": "Nie przesuwaj lub nie zmieniaj rozmiaru z komórkami", "SSE.Views.ChartSettingsDlg.textAlt": "Tekst alternatywny", "SSE.Views.ChartSettingsDlg.textAltDescription": "Opis", "SSE.Views.ChartSettingsDlg.textAltTip": "Alternatywna, tekstowa prezentacja wizualnych informacji o obiektach, która będzie czytana osobom z wadami wzroku lub zmysłu poznawczego, aby pomóc im lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształcie, wykresie lub tabeli.", @@ -935,6 +984,7 @@ "SSE.Views.ChartSettingsDlg.textNextToAxis": "Obok osi", "SSE.Views.ChartSettingsDlg.textNone": "Żaden", "SSE.Views.ChartSettingsDlg.textNoOverlay": "Brak pokrycia", + "SSE.Views.ChartSettingsDlg.textOneCell": "Przesuń, ale nie zmieniaj rozmiaru komórek", "SSE.Views.ChartSettingsDlg.textOnTickMarks": "Podział", "SSE.Views.ChartSettingsDlg.textOut": "Wyjście", "SSE.Views.ChartSettingsDlg.textOuterTop": "Wierzchołek zewnętrzny", @@ -967,6 +1017,7 @@ "SSE.Views.ChartSettingsDlg.textTitleSparkline": "Sparkline - Ustawienia zaawansowane", "SSE.Views.ChartSettingsDlg.textTop": "Góra", "SSE.Views.ChartSettingsDlg.textTrillions": "Tryliony", + "SSE.Views.ChartSettingsDlg.textTwoCell": "Przenieś i zmień rozmiar komórek", "SSE.Views.ChartSettingsDlg.textType": "Typ", "SSE.Views.ChartSettingsDlg.textTypeData": "Typ i data", "SSE.Views.ChartSettingsDlg.textUnits": "Pokaż jednostki", @@ -976,10 +1027,15 @@ "SSE.Views.ChartSettingsDlg.textYAxisTitle": "Tytuł osi Y", "SSE.Views.ChartSettingsDlg.textZero": "Zero", "SSE.Views.ChartSettingsDlg.txtEmpty": "To pole jest wymagane", + "SSE.Views.CreatePivotDialog.textNew": "Nowy arkusz", + "SSE.Views.DataTab.capBtnTextRemDuplicates": "Usuń duplikaty", + "SSE.Views.DataTab.tipRemDuplicates": "Usuń zduplikowane wiersze z arkusza", "SSE.Views.DataValidationDialog.strError": "Komunikat błędu", "SSE.Views.DataValidationDialog.textAlert": "Ostrzeżenie", + "SSE.Views.DataValidationDialog.textAllow": "Zezwól", "SSE.Views.DataValidationDialog.textShowError": "Pokaż komunikat błędu po wprowadzeniu nieprawidłowych danych", "SSE.Views.DataValidationDialog.textUserEnters": "Pokaż ten komunikat błędu, gdy użytkownik wprowadzi nieprawidłowe dane", + "SSE.Views.DataValidationDialog.txtWhole": "Cały numer", "SSE.Views.DigitalFilterDialog.capAnd": "I", "SSE.Views.DigitalFilterDialog.capCondition1": "równa się", "SSE.Views.DigitalFilterDialog.capCondition10": "nie kończy się z", @@ -1024,6 +1080,7 @@ "SSE.Views.DocumentHolder.selectDataText": "Dane kolumny", "SSE.Views.DocumentHolder.selectRowText": "Wiersz", "SSE.Views.DocumentHolder.selectTableText": "Tabela", + "SSE.Views.DocumentHolder.strDelete": "Usuń podpis", "SSE.Views.DocumentHolder.textAlign": "Wyrównaj", "SSE.Views.DocumentHolder.textArrangeBack": "Wyślij do tła", "SSE.Views.DocumentHolder.textArrangeBackward": "Przenieś do tyłu", @@ -1074,6 +1131,8 @@ "SSE.Views.DocumentHolder.txtHide": "Ukryj", "SSE.Views.DocumentHolder.txtInsert": "Wstaw", "SSE.Views.DocumentHolder.txtInsHyperlink": "Hiperlink", + "SSE.Views.DocumentHolder.txtNumber": "Numer", + "SSE.Views.DocumentHolder.txtNumFormat": "Format liczbowy", "SSE.Views.DocumentHolder.txtPaste": "Wklej", "SSE.Views.DocumentHolder.txtReapply": "Ponownie zastosuj", "SSE.Views.DocumentHolder.txtRow": "Cały wiersz", @@ -1093,6 +1152,7 @@ "SSE.Views.DocumentHolder.txtUngroup": "Rozgrupuj", "SSE.Views.DocumentHolder.txtWidth": "Szerokość", "SSE.Views.DocumentHolder.vertAlignText": "Wyrównaj wertykalnie", + "SSE.Views.FieldSettingsDialog.txtCountNums": "Odliczać cyfry", "SSE.Views.FileMenu.btnBackCaption": "Otwórz lokalizację pliku", "SSE.Views.FileMenu.btnCloseMenuCaption": "Zamknij menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Utwórz nowy", @@ -1100,6 +1160,7 @@ "SSE.Views.FileMenu.btnHelpCaption": "Pomoc...", "SSE.Views.FileMenu.btnInfoCaption": "Informacje o arkuszu kalkulacyjnym...", "SSE.Views.FileMenu.btnPrintCaption": "Drukuj", + "SSE.Views.FileMenu.btnProtectCaption": "Chroń skoroszyt", "SSE.Views.FileMenu.btnRecentFilesCaption": "Otwórz ostatnie...", "SSE.Views.FileMenu.btnRenameCaption": "Zmień nazwę...", "SSE.Views.FileMenu.btnReturnCaption": "Powrót do arkusza", @@ -1159,8 +1220,17 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtPt": "Punkt", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRu": "Rosyjski", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "jak Windows", + "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strDictionaryLanguage": "Język słownika", + "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "z hasłem", + "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "\nChroń arkusz kalkulacyjny", + "SSE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edytuj arkusz kalkulacyjny", + "SSE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Edycja spowoduje usunięcie podpisów z arkusza kalkulacyjnego.
Kontynuować?", + "SSE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Ten arkusz kalkulacyjny został zabezpieczony hasłem", + "SSE.Views.FileMenuPanels.ProtectDoc.txtSigned": "Prawidłowe podpisy zostały dodane do arkusza kalkulacyjnego. Arkusz kalkulacyjny jest chroniony przed edycją.", + "SSE.Views.FileMenuPanels.ProtectDoc.txtSignedInvalid": "Niektóre podpisy cyfrowe w arkuszu kalkulacyjnym są nieprawidłowe lub nie można ich zweryfikować. Arkusz kalkulacyjny jest chroniony przed edycją", "SSE.Views.FileMenuPanels.Settings.txtGeneral": "Ogólne", "SSE.Views.FileMenuPanels.Settings.txtPageSettings": "Ustawienia strony", + "SSE.Views.FileMenuPanels.Settings.txtSpellChecking": "Sprawdzanie pisowni", "SSE.Views.FormatSettingsDialog.textCategory": "Kategoria", "SSE.Views.FormatSettingsDialog.textDecimal": "Dziesiętny", "SSE.Views.FormatSettingsDialog.textFormat": "Formatowanie", @@ -1192,8 +1262,13 @@ "SSE.Views.FormulaDialog.textGroupDescription": "Wybierz grupę funkcji", "SSE.Views.FormulaDialog.textListDescription": "Wybierz funkcję", "SSE.Views.FormulaDialog.txtTitle": "Wstaw funkcję", + "SSE.Views.FormulaWizard.textNumber": "Numer", "SSE.Views.HeaderFooterDialog.textAlign": "Wyrównaj do marginesów strony", + "SSE.Views.HeaderFooterDialog.textAll": "Wszystkie strony", "SSE.Views.HeaderFooterDialog.textNewColor": "Dodaj nowy niestandardowy kolor", + "SSE.Views.HeaderFooterDialog.textPageNum": "Numer strony", + "SSE.Views.HeaderFooterDialog.textSheet": "Nazwa arkusza", + "SSE.Views.HeaderFooterDialog.tipFontSize": "Rozmiar czcionki", "SSE.Views.HyperlinkSettingsDialog.strDisplay": "Pokaż", "SSE.Views.HyperlinkSettingsDialog.strLinkTo": "Link do", "SSE.Views.HyperlinkSettingsDialog.strRange": "Zakres", @@ -1205,6 +1280,7 @@ "SSE.Views.HyperlinkSettingsDialog.textExternalLink": "Link zewnętrzny", "SSE.Views.HyperlinkSettingsDialog.textInternalLink": "Wewnętrzny zakres danych", "SSE.Views.HyperlinkSettingsDialog.textInvalidRange": "BŁĄD! Niepoprawny zakres komórek", + "SSE.Views.HyperlinkSettingsDialog.textSheets": "Arkusze", "SSE.Views.HyperlinkSettingsDialog.textTipText": "Tekst wskazówki na ekranie", "SSE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia hiperlinku", "SSE.Views.HyperlinkSettingsDialog.txtEmpty": "To pole jest wymagane", @@ -1220,25 +1296,30 @@ "SSE.Views.ImageSettings.textOriginalSize": "Rzeczywisty rozmiar", "SSE.Views.ImageSettings.textSize": "Rozmiar", "SSE.Views.ImageSettings.textWidth": "Szerokość", + "SSE.Views.ImageSettingsAdvanced.textAbsolute": "Nie przesuwaj lub nie zmieniaj rozmiaru z komórkami", "SSE.Views.ImageSettingsAdvanced.textAlt": "Tekst alternatywny", "SSE.Views.ImageSettingsAdvanced.textAltDescription": "Opis", "SSE.Views.ImageSettingsAdvanced.textAltTip": "Alternatywna, tekstowa prezentacja wizualnych informacji o obiektach, która będzie czytana osobom z wadami wzroku lub zmysłu poznawczego, aby pomóc im lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształcie, wykresie lub tabeli.", "SSE.Views.ImageSettingsAdvanced.textAltTitle": "Tytuł", + "SSE.Views.ImageSettingsAdvanced.textAngle": "Kąt", + "SSE.Views.ImageSettingsAdvanced.textOneCell": "Przesuń, ale nie zmieniaj rozmiaru komórek", "SSE.Views.ImageSettingsAdvanced.textTitle": "Obraz - zaawansowane ustawienia", + "SSE.Views.ImageSettingsAdvanced.textTwoCell": "Przenieś i zmień rozmiar komórek", "SSE.Views.LeftMenu.tipAbout": "O programie", "SSE.Views.LeftMenu.tipChat": "Czat", "SSE.Views.LeftMenu.tipComments": "Komentarze", "SSE.Views.LeftMenu.tipFile": "Plik", "SSE.Views.LeftMenu.tipPlugins": "Wtyczki", "SSE.Views.LeftMenu.tipSearch": "Szukaj", + "SSE.Views.LeftMenu.tipSpellcheck": "Sprawdzanie pisowni", "SSE.Views.LeftMenu.tipSupport": "Opinie i wsparcie", "SSE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA", "SSE.Views.MainSettingsPrint.okButtonText": "Zapisz", "SSE.Views.MainSettingsPrint.strBottom": "Dół", - "SSE.Views.MainSettingsPrint.strLandscape": "Krajobraz", + "SSE.Views.MainSettingsPrint.strLandscape": "Pozioma", "SSE.Views.MainSettingsPrint.strLeft": "Lewy", "SSE.Views.MainSettingsPrint.strMargins": "Marginesy", - "SSE.Views.MainSettingsPrint.strPortrait": "Portret", + "SSE.Views.MainSettingsPrint.strPortrait": "Pionowa", "SSE.Views.MainSettingsPrint.strPrint": "Drukuj", "SSE.Views.MainSettingsPrint.strRight": "Prawy", "SSE.Views.MainSettingsPrint.strTop": "Góra", @@ -1289,6 +1370,7 @@ "SSE.Views.NameManagerDlg.textWorkbook": "Skoroszyt", "SSE.Views.NameManagerDlg.tipIsLocked": "Ten element jest właśnie edytowany przez innego użytkownika.", "SSE.Views.NameManagerDlg.txtTitle": "Menadżer zdefiniowanych zakresów", + "SSE.Views.PageMarginsDialog.textTitle": "Marginesy", "SSE.Views.ParagraphSettings.strLineHeight": "Rozstaw wierszy", "SSE.Views.ParagraphSettings.strParagraphSpacing": "Odstępy akapitu", "SSE.Views.ParagraphSettings.strSpacingAfter": "Po", @@ -1325,16 +1407,24 @@ "SSE.Views.ParagraphSettingsAdvanced.textTabPosition": "Pozycja karty", "SSE.Views.ParagraphSettingsAdvanced.textTabRight": "Prawy", "SSE.Views.ParagraphSettingsAdvanced.textTitle": "Akapit - Ustawienia zaawansowane", + "SSE.Views.PivotDigitalFilterDialog.txtAnd": "I", + "SSE.Views.PivotGroupDialog.textGreaterError": "Numer końcowy musi być większy niż numer początkowy", + "SSE.Views.PivotGroupDialog.textNumDays": "Liczba dni", "SSE.Views.PivotSettings.textAdvanced": "Pokaż ustawienia zaawansowane", + "SSE.Views.PivotSettings.txtRemove": "Usuń pole", + "SSE.Views.PivotSettingsAdvanced.textAlt": "Alternatywny tekst", "SSE.Views.PivotTable.capLayout": "Układ raportu", + "SSE.Views.PivotTable.mniRemoveBlankLine": "Usuń pustą linię po każdym elemencie", "SSE.Views.PivotTable.tipCreatePivot": "Wstaw tabelę przestawną", "SSE.Views.PivotTable.tipSelect": "Zaznacz całą tabelę przestawną", + "SSE.Views.PivotTable.txtCreate": "Wstaw tabelę", + "SSE.Views.PivotTable.txtPivotTable": "Tabela przestawna", "SSE.Views.PrintSettings.btnPrint": "Zapisz i drukuj", "SSE.Views.PrintSettings.strBottom": "Dół", - "SSE.Views.PrintSettings.strLandscape": "Krajobraz", + "SSE.Views.PrintSettings.strLandscape": "Pozioma", "SSE.Views.PrintSettings.strLeft": "Lewy", "SSE.Views.PrintSettings.strMargins": "Marginesy", - "SSE.Views.PrintSettings.strPortrait": "Portret", + "SSE.Views.PrintSettings.strPortrait": "Pionowa", "SSE.Views.PrintSettings.strPrint": "Drukuj", "SSE.Views.PrintSettings.strRight": "Prawy", "SSE.Views.PrintSettings.strTop": "Góra", @@ -1356,6 +1446,7 @@ "SSE.Views.PrintSettings.textSettings": "Ustawienia arkusza", "SSE.Views.PrintSettings.textShowDetails": "Pokaż szczegóły", "SSE.Views.PrintSettings.textTitle": "Ustawienia drukowania", + "SSE.Views.RemoveDuplicatesDialog.txtTitle": "Usuń duplikaty", "SSE.Views.RightMenu.txtChartSettings": "Ustawienia wykresu", "SSE.Views.RightMenu.txtImageSettings": "Ustawienia obrazu", "SSE.Views.RightMenu.txtParagraphSettings": "Ustawienia tekstu", @@ -1378,6 +1469,7 @@ "SSE.Views.ShapeSettings.strTransparency": "Nieprzezroczystość", "SSE.Views.ShapeSettings.strType": "Typ", "SSE.Views.ShapeSettings.textAdvanced": "Pokaż ustawienia zaawansowane", + "SSE.Views.ShapeSettings.textAngle": "Kąt", "SSE.Views.ShapeSettings.textBorderSizeErr": "Wprowadzona wartość jest nieprawidłowa.
Wprowadź wartość w zakresie od 0 do 1584 pt.", "SSE.Views.ShapeSettings.textColor": "Kolor wypełnienia", "SSE.Views.ShapeSettings.textDirection": "Kierunek", @@ -1412,10 +1504,12 @@ "SSE.Views.ShapeSettings.txtWood": "Drewno", "SSE.Views.ShapeSettingsAdvanced.strColumns": "Kolumny", "SSE.Views.ShapeSettingsAdvanced.strMargins": "Wypełnienie tekstem", + "SSE.Views.ShapeSettingsAdvanced.textAbsolute": "Nie przesuwaj lub nie zmieniaj rozmiaru z komórkami", "SSE.Views.ShapeSettingsAdvanced.textAlt": "Tekst alternatywny", "SSE.Views.ShapeSettingsAdvanced.textAltDescription": "Opis", "SSE.Views.ShapeSettingsAdvanced.textAltTip": "Alternatywna, tekstowa prezentacja wizualnych informacji o obiektach, która będzie czytana osobom z wadami wzroku lub zmysłu poznawczego, aby pomóc im lepiej zrozumieć, jakie informacje znajdują się na obrazie, kształcie, wykresie lub tabeli.", "SSE.Views.ShapeSettingsAdvanced.textAltTitle": "Tytuł", + "SSE.Views.ShapeSettingsAdvanced.textAngle": "Kąt", "SSE.Views.ShapeSettingsAdvanced.textArrows": "Strzałki", "SSE.Views.ShapeSettingsAdvanced.textBeginSize": "Początkowy rozmiar", "SSE.Views.ShapeSettingsAdvanced.textBeginStyle": "Styl początkowy", @@ -1432,6 +1526,7 @@ "SSE.Views.ShapeSettingsAdvanced.textLeft": "Lewy", "SSE.Views.ShapeSettingsAdvanced.textLineStyle": "Styl wierszy", "SSE.Views.ShapeSettingsAdvanced.textMiter": "prosty", + "SSE.Views.ShapeSettingsAdvanced.textOneCell": "Przesuń, ale nie zmieniaj rozmiaru komórek", "SSE.Views.ShapeSettingsAdvanced.textRight": "Prawy", "SSE.Views.ShapeSettingsAdvanced.textRound": "Zaokrąglij", "SSE.Views.ShapeSettingsAdvanced.textSize": "Rozmiar", @@ -1439,11 +1534,21 @@ "SSE.Views.ShapeSettingsAdvanced.textSquare": "Kwadratowy", "SSE.Views.ShapeSettingsAdvanced.textTitle": "Kształt - Zaawansowane ustawienia", "SSE.Views.ShapeSettingsAdvanced.textTop": "Góra", + "SSE.Views.ShapeSettingsAdvanced.textTwoCell": "Przenieś i zmień rozmiar komórek", "SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "Wagi i strzałki", "SSE.Views.ShapeSettingsAdvanced.textWidth": "Szerokość", + "SSE.Views.SignatureSettings.strDelete": "Usuń podpis", + "SSE.Views.SignatureSettings.txtEditWarning": "Edycja spowoduje usunięcie podpisów z arkusza kalkulacyjnego.
Kontynuować?", + "SSE.Views.SignatureSettings.txtRemoveWarning": "Czy chcesz usunąć ten podpis?
Nie można tego cofnąć.", + "SSE.Views.SignatureSettings.txtSigned": "Prawidłowe podpisy zostały dodane do arkusza kalkulacyjnego. Arkusz kalkulacyjny jest chroniony przed edycją.", + "SSE.Views.SignatureSettings.txtSignedInvalid": "Niektóre podpisy cyfrowe w arkuszu kalkulacyjnym są nieprawidłowe lub nie można ich zweryfikować. Arkusz kalkulacyjny jest chroniony przed edycją", "SSE.Views.SlicerSettings.textAZ": "A do Z", "SSE.Views.SlicerSettings.textZA": "Z do A", + "SSE.Views.SlicerSettingsAdvanced.textAbsolute": "Nie przesuwaj lub nie zmieniaj rozmiaru z komórkami", + "SSE.Views.SlicerSettingsAdvanced.textAlt": "Alternatywny tekst", "SSE.Views.SlicerSettingsAdvanced.textAZ": "A do Z", + "SSE.Views.SlicerSettingsAdvanced.textOneCell": "Przesuń, ale nie zmieniaj rozmiaru komórek", + "SSE.Views.SlicerSettingsAdvanced.textTwoCell": "Przenieś i zmień rozmiar komórek", "SSE.Views.SlicerSettingsAdvanced.textZA": "Z do A", "SSE.Views.SortDialog.errorSameColumnColor": "%1 jest sortowana więcej niż raz według tego samego koloru.
Usuń zduplikowane kryteria sortowania i spróbuj ponownie.", "SSE.Views.SortDialog.errorSameColumnValue": "%1 jest sortowana więcej niż raz według wartości.
Usuń zduplikowane warunki sortowania i spróbuj ponownie.", @@ -1451,8 +1556,15 @@ "SSE.Views.SortDialog.textMoreCols": "(Więcej kolumn...)", "SSE.Views.SortDialog.textMoreRows": "(Więcej wierszy...)", "SSE.Views.SortDialog.textZA": "Z do A", + "SSE.Views.SortOptionsDialog.textOrientation": "Orientacja", "SSE.Views.SpecialPasteDialog.textAdd": "Dodaj", + "SSE.Views.SpecialPasteDialog.textAll": "Wszystko", + "SSE.Views.SpecialPasteDialog.textVNFormat": "Wartości i formaty liczb", + "SSE.Views.Spellcheck.noSuggestions": "Brak sugestii dotyczących pisowni", "SSE.Views.Spellcheck.txtAddToDictionary": "Dodaj do słownika", + "SSE.Views.Spellcheck.txtComplete": "Sprawdzanie pisowni zostało zakończone", + "SSE.Views.Spellcheck.txtDictionaryLanguage": "Język słownika", + "SSE.Views.Spellcheck.txtSpelling": "Pisownia", "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(Kopiuj do końca)", "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Przenieś do końca)", "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Wklej przed arkuszem", @@ -1470,6 +1582,7 @@ "SSE.Views.Statusbar.RenameDialog.errNameExists": "Istnieje już arkusz roboczy o takiej samej nazwie.", "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Arkusz nie może zawierać znaków: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Nazwa arkusza", + "SSE.Views.Statusbar.selectAllSheets": "Zaznacz wszystkie arkusze", "SSE.Views.Statusbar.textAverage": "ŚREDNIA", "SSE.Views.Statusbar.textCount": "Licz", "SSE.Views.Statusbar.textNewColor": "Dodaj nowy niestandardowy kolor", @@ -1517,6 +1630,7 @@ "SSE.Views.TableSettings.textIsLocked": "Ten element jest właśnie edytowany przez innego użytkownika.", "SSE.Views.TableSettings.textLast": "Ostatni", "SSE.Views.TableSettings.textLongOperation": "Długa praca", + "SSE.Views.TableSettings.textRemDuplicates": "Usuń duplikaty", "SSE.Views.TableSettings.textReservedName": "Nazwa, którą próbujesz użyć, jest już wzmiankowana w formułach komórkowych. Proszę użyć innej nazwy.", "SSE.Views.TableSettings.textResize": "Zmień rozmiar tabeli", "SSE.Views.TableSettings.textRows": "Wiersze", @@ -1539,6 +1653,7 @@ "SSE.Views.TextArtSettings.strStroke": "Obrys", "SSE.Views.TextArtSettings.strTransparency": "Nieprzezroczystość", "SSE.Views.TextArtSettings.strType": "Typ", + "SSE.Views.TextArtSettings.textAngle": "Kąt", "SSE.Views.TextArtSettings.textBorderSizeErr": "Wprowadzona wartość jest nieprawidłowa.
Wprowadź wartość w zakresie od 0 do 1584 pt.", "SSE.Views.TextArtSettings.textColor": "Kolor wypełnienia", "SSE.Views.TextArtSettings.textDirection": "Kierunek", @@ -1574,6 +1689,8 @@ "SSE.Views.TextArtSettings.txtWood": "Drewno", "SSE.Views.Toolbar.capBtnAddComment": "Dodaj komentarz", "SSE.Views.Toolbar.capBtnComment": "Komentarz", + "SSE.Views.Toolbar.capBtnMargins": "Marginesy", + "SSE.Views.Toolbar.capBtnPageOrient": "Orientacja", "SSE.Views.Toolbar.capImgAlign": "Wyrównaj", "SSE.Views.Toolbar.capInsertChart": "Wykres", "SSE.Views.Toolbar.capInsertEquation": "Równanie", @@ -1610,12 +1727,15 @@ "SSE.Views.Toolbar.textInsideBorders": "Wewnątrz granic", "SSE.Views.Toolbar.textInsRight": "Przesuń komórki w prawo", "SSE.Views.Toolbar.textItalic": "Kursywa", + "SSE.Views.Toolbar.textLandscape": "Pozioma", "SSE.Views.Toolbar.textLeftBorders": "Lewe krawędzie", "SSE.Views.Toolbar.textMiddleBorders": "Wewnątrz poziomych granic", "SSE.Views.Toolbar.textMoreFormats": "Więcej formatów", "SSE.Views.Toolbar.textNewColor": "Dodaj nowy niestandardowy kolor", "SSE.Views.Toolbar.textNoBorders": "Bez krawędzi", "SSE.Views.Toolbar.textOutBorders": "Krawędzie zewnętrzne", + "SSE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy", + "SSE.Views.Toolbar.textPortrait": "Pionowa", "SSE.Views.Toolbar.textPrint": "Drukuj", "SSE.Views.Toolbar.textPrintOptions": "Ustawienia drukowania", "SSE.Views.Toolbar.textRightBorders": "Prawe krawędzie", @@ -1626,6 +1746,7 @@ "SSE.Views.Toolbar.textTabHome": "Narzędzia główne", "SSE.Views.Toolbar.textTabInsert": "Wstawianie", "SSE.Views.Toolbar.textTabLayout": "Układ", + "SSE.Views.Toolbar.textTabProtect": "Ochrona", "SSE.Views.Toolbar.textTopBorders": "Górne krawędzie", "SSE.Views.Toolbar.textUnderline": "Podkreśl", "SSE.Views.Toolbar.textZoom": "Powiększenie", @@ -1664,10 +1785,14 @@ "SSE.Views.Toolbar.tipInsertImage": "Wstaw obraz", "SSE.Views.Toolbar.tipInsertOpt": "Wstaw komórki", "SSE.Views.Toolbar.tipInsertShape": "Wstaw kształt", + "SSE.Views.Toolbar.tipInsertTable": "Wstaw tabelę", "SSE.Views.Toolbar.tipInsertText": "Wstaw pole tekstowe", "SSE.Views.Toolbar.tipInsertTextart": "Wstaw tekst", "SSE.Views.Toolbar.tipMerge": "Scal i wyśrodkuj", "SSE.Views.Toolbar.tipNumFormat": "Format numeru", + "SSE.Views.Toolbar.tipPageMargins": "Marginesy strony", + "SSE.Views.Toolbar.tipPageOrient": "Orientacja strony", + "SSE.Views.Toolbar.tipPageSize": "Rozmiar strony", "SSE.Views.Toolbar.tipPaste": "Wklej", "SSE.Views.Toolbar.tipPrColor": "Kolor tła", "SSE.Views.Toolbar.tipPrint": "Drukuj", diff --git a/apps/spreadsheeteditor/main/locale/ro.json b/apps/spreadsheeteditor/main/locale/ro.json index f082b1383..7ad964997 100644 --- a/apps/spreadsheeteditor/main/locale/ro.json +++ b/apps/spreadsheeteditor/main/locale/ro.json @@ -144,7 +144,6 @@ "Common.Views.Header.textAdvSettings": "Setări avansate", "Common.Views.Header.textBack": "Deschidere locația fișierului", "Common.Views.Header.textCompactView": "Ascundere bară de instrumente", - "Common.Views.Header.textDarkTheme": "Tema întunecată", "Common.Views.Header.textHideLines": "Ascundere rigle", "Common.Views.Header.textHideStatusBar": "Ascundere bară de stare", "Common.Views.Header.textRemoveFavorite": "Eliminare din Preferințe", @@ -1936,8 +1935,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Se activează toate macrocomenzile, fără notificare", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Se dezactivează toate", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Se dezactivează toate macrocomenzile, fără notificare", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Întunecat", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Luminozitate", "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", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 147fd9b54..1e48fb2a4 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -74,6 +74,9 @@ "Common.UI.SynchronizeTip.textSynchronize": "Документ изменен другим пользователем.
Нажмите, чтобы сохранить свои изменения и загрузить обновления.", "Common.UI.ThemeColorPalette.textStandartColors": "Стандартные цвета", "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", + "Common.UI.Themes.txtThemeClassicLight": "Светлая классическая", + "Common.UI.Themes.txtThemeDark": "Темная", + "Common.UI.Themes.txtThemeLight": "Светлая", "Common.UI.Window.cancelButtonText": "Отмена", "Common.UI.Window.closeButtonText": "Закрыть", "Common.UI.Window.noButtonText": "Нет", @@ -144,7 +147,6 @@ "Common.Views.Header.textAdvSettings": "Дополнительные параметры", "Common.Views.Header.textBack": "Открыть расположение файла", "Common.Views.Header.textCompactView": "Скрыть панель инструментов", - "Common.Views.Header.textDarkTheme": "Темная тема", "Common.Views.Header.textHideLines": "Скрыть линейки", "Common.Views.Header.textHideStatusBar": "Скрыть строку состояния", "Common.Views.Header.textRemoveFavorite": "Удалить из избранного", @@ -590,9 +592,11 @@ "SSE.Controllers.Main.errorOpenWarning": "Одна из формул в файле превышает ограничение в 8192 символа.
Формула была удалена.", "SSE.Controllers.Main.errorOperandExpected": "Синтаксис введенной функции некорректен. Проверьте, не пропущена ли одна из скобок - '(' или ')'.", "SSE.Controllers.Main.errorPasteMaxRange": "Область копирования не соответствует области вставки.
Для вставки скопированных ячеек выделите область такого же размера или щелкните по первой ячейке в строке.", + "SSE.Controllers.Main.errorPasteMultiSelect": "Данное действие неприменимо к нескольким выделенным диапазонам.
Выделите один диапазон и повторите попытку.", "SSE.Controllers.Main.errorPasteSlicerError": "Срезы таблиц нельзя копировать из одной рабочей книги в другую.", "SSE.Controllers.Main.errorPivotGroup": "Выделенные объекты нельзя объединить в группу.", "SSE.Controllers.Main.errorPivotOverlap": "Не допускается перекрытие отчета сводной таблицы и таблицы.", + "SSE.Controllers.Main.errorPivotWithoutUnderlying": "Отчет сводной таблицы был сохранен без данных.
Для обновления отчета используйте кнопку 'Обновить'.", "SSE.Controllers.Main.errorPrintMaxPagesCount": "К сожалению, в текущей версии программы нельзя напечатать более 1500 страниц за один раз.
Это ограничение будет устранено в последующих версиях.", "SSE.Controllers.Main.errorProcessSaveResult": "Сбой при сохранении", "SSE.Controllers.Main.errorServerVersion": "Версия редактора была обновлена. Страница будет перезагружена, чтобы применить изменения.", @@ -1091,11 +1095,11 @@ "SSE.Controllers.Toolbar.txtIntegralTripleCenterSubSup": "Тройной интеграл", "SSE.Controllers.Toolbar.txtIntegralTripleSubSup": "Тройной интеграл", "SSE.Controllers.Toolbar.txtInvalidRange": "ОШИБКА! Недопустимый диапазон ячеек", - "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Клин", - "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Клин", - "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Клин", - "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Клин", - "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Клин", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction": "Конъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSub": "Конъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_CenterSubSup": "Конъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_Sub": "Конъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Conjunction_SubSup": "Конъюнкция", "SSE.Controllers.Toolbar.txtLargeOperator_CoProd": "Сопроизведение", "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSub": "Сопроизведение", "SSE.Controllers.Toolbar.txtLargeOperator_CoProd_CenterSubSup": "Сопроизведение", @@ -1106,11 +1110,11 @@ "SSE.Controllers.Toolbar.txtLargeOperator_Custom_3": "Сумма", "SSE.Controllers.Toolbar.txtLargeOperator_Custom_4": "Произведение", "SSE.Controllers.Toolbar.txtLargeOperator_Custom_5": "Объединение", - "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Буква V", - "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Буква V", - "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Буква V", - "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Буква V", - "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Буква V", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction": "Дизъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSub": "Дизъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_CenterSubSup": "Дизъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_Sub": "Дизъюнкция", + "SSE.Controllers.Toolbar.txtLargeOperator_Disjunction_SubSup": "Дизъюнкция", "SSE.Controllers.Toolbar.txtLargeOperator_Intersection": "Пересечение", "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSub": "Пересечение", "SSE.Controllers.Toolbar.txtLargeOperator_Intersection_CenterSubSup": "Пересечение", @@ -1936,8 +1940,6 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtRunMacrosDesc": "Включить все макросы без уведомления", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacros": "Отключить все", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtStopMacrosDesc": "Отключить все макросы без уведомления", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeDark": "Темная", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtThemeLight": "Светлая", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacros": "Показывать уведомление", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWarnMacrosDesc": "Отключить все макросы с уведомлением", "SSE.Views.FileMenuPanels.MainSettingsGeneral.txtWin": "как Windows", diff --git a/apps/spreadsheeteditor/main/locale/zh.json b/apps/spreadsheeteditor/main/locale/zh.json index 24bc5dfb3..7c4d7ebc4 100644 --- a/apps/spreadsheeteditor/main/locale/zh.json +++ b/apps/spreadsheeteditor/main/locale/zh.json @@ -1222,7 +1222,7 @@ "SSE.Views.AdvancedSeparatorDialog.strThousandsSeparator": "千位分隔符", "SSE.Views.AdvancedSeparatorDialog.textLabel": "用于识别数值数据的设置", "SSE.Views.AdvancedSeparatorDialog.textTitle": "进阶设置", - "SSE.Views.AutoFilterDialog.btnCustomFilter": "自定义过滤器", + "SSE.Views.AutoFilterDialog.btnCustomFilter": "自定义筛选器", "SSE.Views.AutoFilterDialog.textAddSelection": "添加最新的选择到筛选依据中", "SSE.Views.AutoFilterDialog.textEmptyItem": "空白", "SSE.Views.AutoFilterDialog.textSelectAll": "全选", @@ -1524,7 +1524,7 @@ "SSE.Views.DigitalFilterDialog.textShowRows": "显示行在哪里", "SSE.Views.DigitalFilterDialog.textUse1": "使用 ？呈现任何单个字符", "SSE.Views.DigitalFilterDialog.textUse2": "使用*来呈现任何一系列的角色", - "SSE.Views.DigitalFilterDialog.txtTitle": "自定义过滤器", + "SSE.Views.DigitalFilterDialog.txtTitle": "自定义筛选器", "SSE.Views.DocumentHolder.advancedImgText": "高级图像设置", "SSE.Views.DocumentHolder.advancedShapeText": "形状高级设置", "SSE.Views.DocumentHolder.bottomCellText": "底部对齐", @@ -1730,7 +1730,7 @@ "SSE.Views.FileMenuPanels.MainSettingsGeneral.strFuncLocaleEx": "例：SUM; MIN; MAX; COUNT", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strLiveComment": "显示批注", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strMacrosSettings": "宏设置", - "SSE.Views.FileMenuPanels.MainSettingsGeneral.strPaste": "剪切、拷贝、黏贴", + "SSE.Views.FileMenuPanels.MainSettingsGeneral.strPaste": "剪切、复制、黏贴", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strR1C1": "打开R1C1风格", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strRegSettings": "区域设置", "SSE.Views.FileMenuPanels.MainSettingsGeneral.strRegSettingsEx": "例： ", @@ -1776,7 +1776,7 @@ "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsInUPPERCASE": "忽略大写单词", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.strIgnoreWordsWithNumbers": "忽略带数字的单词", "SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtAutoCorrect": "自动修正选项...", - "SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtProofing": "审校", + "SSE.Views.FileMenuPanels.MainSpellCheckSettings.txtProofing": "校对", "SSE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "警告", "SSE.Views.FileMenuPanels.ProtectDoc.strEncrypt": "使用密码", "SSE.Views.FileMenuPanels.ProtectDoc.strProtect": "保护电子表格", @@ -2368,7 +2368,7 @@ "SSE.Views.SlicerSettingsAdvanced.strColumns": "列", "SSE.Views.SlicerSettingsAdvanced.strHeight": "高度", "SSE.Views.SlicerSettingsAdvanced.strHideNoData": "隐藏没有数据的项目", - "SSE.Views.SlicerSettingsAdvanced.strReferences": "参考", + "SSE.Views.SlicerSettingsAdvanced.strReferences": "引用", "SSE.Views.SlicerSettingsAdvanced.strShowHeader": "显示题头", "SSE.Views.SlicerSettingsAdvanced.strSize": "大小", "SSE.Views.SlicerSettingsAdvanced.strSorting": "排序和筛选", diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json index 3079822e1..3d7b14a19 100644 --- a/apps/spreadsheeteditor/mobile/locale/de.json +++ b/apps/spreadsheeteditor/mobile/locale/de.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Externer Fehler.
Datenbank-Verbindungsfehler. Wenden Sie sich an den Support.", "SSE.Controllers.Main.errorDataEncrypted": "Änderungen wurden verschlüsselt. Sie können nicht entschlüsselt werden.", "SSE.Controllers.Main.errorDataRange": "Falscher Datenbereich.", + "SSE.Controllers.Main.errorDataValidate": "Der eingegebene Wert ist ungültig.
Die Werte, die in diese Zelle eingegeben werden können, sind begrenzt.", "SSE.Controllers.Main.errorDefaultMessage": "Fehlercode: %1", "SSE.Controllers.Main.errorEditingDownloadas": "Bei der Arbeit mit dem Dokument ist ein Fehler aufgetreten.
Verwenden Sie die Option \"Herunterladen\", um die Sicherungskopie der Datei auf der Festplatte Ihres Computers zu speichern.", "SSE.Controllers.Main.errorFilePassProtect": "Das Dokument ist kennwortgeschützt und kann nicht geöffnet werden.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Unbekannter Schlüsseldeskriptor", "SSE.Controllers.Main.errorKeyExpire": "Der Schlüsseldeskriptor ist abgelaufen", "SSE.Controllers.Main.errorLockedAll": "Die Operation kann nicht durchgeführt werden, weil das Blatt von einem anderen Benutzer gesperrt ist.", + "SSE.Controllers.Main.errorLockedCellPivot": "Die Daten innerhalb einer Pivot-Tabelle können nicht geändert werden.", "SSE.Controllers.Main.errorLockedWorksheetRename": "Umbenennen des Sheets ist derzeit nicht möglich, denn es wird gleichzeitig von einem anderen Benutzer umbenannt.", "SSE.Controllers.Main.errorMailMergeLoadFile": "Fehler beim Laden des Dokuments. Bitte wählen Sie eine andere Datei.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Verbinden ist fehlgeschlagen.", diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 3371d3249..813663528 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "External error.
Database connection error. Please contact support in case the error persists.", "SSE.Controllers.Main.errorDataEncrypted": "Encrypted changes have been received, they cannot be deciphered.", "SSE.Controllers.Main.errorDataRange": "Incorrect data range.", + "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
A user has restricted values that can be entered into this cell.", "SSE.Controllers.Main.errorDefaultMessage": "Error code: %1", "SSE.Controllers.Main.errorEditingDownloadas": "An error occurred during the work with the document.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Main.errorFilePassProtect": "The file is password protected and cannot be opened.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Unknown key descriptor", "SSE.Controllers.Main.errorKeyExpire": "Key descriptor expired", "SSE.Controllers.Main.errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", + "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", "SSE.Controllers.Main.errorMailMergeLoadFile": "Loading the document failed. Please select a different file.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.", @@ -214,8 +216,6 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download it until the connection is restored and page is reloaded.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", - "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
A user has restricted values that can be entered into this cell.", - "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.leavePageText": "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.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data", diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json index f0384e412..b620b4fff 100644 --- a/apps/spreadsheeteditor/mobile/locale/es.json +++ b/apps/spreadsheeteditor/mobile/locale/es.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Error externo.
Error de conexión a la base de datos. Por favor, póngase en contacto con soporte si el error persiste.", "SSE.Controllers.Main.errorDataEncrypted": "Se han recibido cambios cifrados, ellos no pueden ser descifrados.", "SSE.Controllers.Main.errorDataRange": "Rango de datos incorrecto.", + "SSE.Controllers.Main.errorDataValidate": "El valor que ha introducido no es válido.
Un usuario ha restringido los valores que pueden ser introducidos en esta celda.", "SSE.Controllers.Main.errorDefaultMessage": "Código de error: %1", "SSE.Controllers.Main.errorEditingDownloadas": "Se produjo un error durante el trabajo con el documento.
Use la opción 'Descargar' para guardar la copia de seguridad de archivo en el disco duro de su computadora.", "SSE.Controllers.Main.errorFilePassProtect": "El archivo está protegido por una contraseña y no puede ser abierto.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Descriptor de clave desconocido", "SSE.Controllers.Main.errorKeyExpire": "Descriptor de clave ha expirado", "SSE.Controllers.Main.errorLockedAll": "No se puede realizar la operación porque la hoja ha sido bloqueado por otro usuario.", + "SSE.Controllers.Main.errorLockedCellPivot": "No puede modificar datos dentro de una tabla dinámica.", "SSE.Controllers.Main.errorLockedWorksheetRename": "No se puede cambiar el nombre de la hoja en este momento, porque se está cambiando el nombre por otro usuario", "SSE.Controllers.Main.errorMailMergeLoadFile": "Error al cargar el archivo. Por favor seleccione uno distinto.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Error de fusión.", diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index 2bc1bea56..011c6b08d 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Erreur externe.
Erreur de connexion base de données. Contactez l'assistance technique si le problême persiste.", "SSE.Controllers.Main.errorDataEncrypted": "Modifications encodées reçues, mais ne peuvent pas être déchiffrées.", "SSE.Controllers.Main.errorDataRange": "Plage de données incorrecte.", + "SSE.Controllers.Main.errorDataValidate": "La valeur saisie est incorrecte.
Un utilisateur a restreint les valeurs pouvant être saisies dans cette cellule.", "SSE.Controllers.Main.errorDefaultMessage": "Code d'erreur : %1", "SSE.Controllers.Main.errorEditingDownloadas": "Une erreure s'est produite lors du travail sur le document.
Utilisez l'option « Télécharger » pour enregistrer une copie de sauvegarde sur le disque dur de votre système.", "SSE.Controllers.Main.errorFilePassProtect": "Le fichier est protégé par le mot de passe et ne peut pas être ouvert.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Descripteur de clés inconnu", "SSE.Controllers.Main.errorKeyExpire": "Descripteur de clés expiré", "SSE.Controllers.Main.errorLockedAll": "L'opération ne peut pas être faite car la feuille a été verrouillée par un autre utilisateur.", + "SSE.Controllers.Main.errorLockedCellPivot": "Impossible de modifier les données d'un tableau croisé dynamique.", "SSE.Controllers.Main.errorLockedWorksheetRename": "La feuille ne peut pas être renommée pour l'instant puisque elle est renommée par un autre utilisateur", "SSE.Controllers.Main.errorMailMergeLoadFile": "Échec du chargement. Merci de choisir un autre fichier", "SSE.Controllers.Main.errorMailMergeSaveFile": "Fusion a échoué.", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 8f3cb4a36..05a06bf8b 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -170,6 +170,7 @@ "SSE.Controllers.Main.errorDatabaseConnection": "Внешняя ошибка.
Ошибка подключения к базе данных. Если ошибка повторяется, пожалуйста, обратитесь в службу поддержки.", "SSE.Controllers.Main.errorDataEncrypted": "Получены зашифрованные изменения, их нельзя расшифровать.", "SSE.Controllers.Main.errorDataRange": "Некорректный диапазон данных.", + "SSE.Controllers.Main.errorDataValidate": "Введенное значение недопустимо.
Значения, которые можно ввести в эту ячейку, ограничены.", "SSE.Controllers.Main.errorDefaultMessage": "Код ошибки: %1", "SSE.Controllers.Main.errorEditingDownloadas": "В ходе работы с документом произошла ошибка.
Используйте опцию 'Скачать', чтобы сохранить резервную копию файла на жестком диске компьютера.", "SSE.Controllers.Main.errorFilePassProtect": "Файл защищен паролем и не может быть открыт.", @@ -187,6 +188,7 @@ "SSE.Controllers.Main.errorKeyEncrypt": "Неизвестный дескриптор ключа", "SSE.Controllers.Main.errorKeyExpire": "Срок действия дескриптора ключа истек", "SSE.Controllers.Main.errorLockedAll": "Операция не может быть произведена, так как лист заблокирован другим пользователем.", + "SSE.Controllers.Main.errorLockedCellPivot": "Нельзя изменить данные в сводной таблице.", "SSE.Controllers.Main.errorLockedWorksheetRename": "В настоящее время лист нельзя переименовать, так как его переименовывает другой пользователь", "SSE.Controllers.Main.errorMailMergeLoadFile": "Загрузка документа не удалась. Выберите другой файл.", "SSE.Controllers.Main.errorMailMergeSaveFile": "Не удалось выполнить слияние.", From be2c67be38d58f8c8516806e1b968063593fa4be Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Apr 2021 16:57:44 +0300 Subject: [PATCH 40/88] Fix Bug 49872 --- .../main/app/view/ChartTypeDialog.js | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 300bce505..ba3f190ee 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -285,14 +285,19 @@ define([ return; } - this.btnChartType.setIconCls('svgicon ' + 'chart-' + rawData.iconCls); - this.currentChartType = rawData.type; - this.chartSettings.changeType(this.currentChartType); - this.ShowHideSettings(this.currentChartType); - if (isCombo) - this.updateSeriesList(this.chartSettings.getSeries()); - else - this.updateChartStyles(this.api.asc_getChartPreviews(this.currentChartType)); + var res = this.chartSettings.changeType(rawData.type); + if (res) { + this.btnChartType.setIconCls('svgicon ' + 'chart-' + rawData.iconCls); + this.currentChartType = rawData.type; + this.ShowHideSettings(this.currentChartType); + if (isCombo) + this.updateSeriesList(this.chartSettings.getSeries()); + else + this.updateChartStyles(this.api.asc_getChartPreviews(this.currentChartType)); + } else { + picker.selectRecord(picker.store.findWhere({type: this.currentChartType}), true); + } + }, updateChartStyles: function(styles) { From 235ee1140355871a266c232af56b9c8f065b2c7d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Apr 2021 16:58:50 +0300 Subject: [PATCH 41/88] [SSE] Fix styles --- apps/spreadsheeteditor/main/app/view/FormulaWizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js index 212f6eaf8..63dfe88be 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaWizard.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaWizard.js @@ -292,7 +292,7 @@ define([ var res = me.api.asc_insertArgumentsInFormula(me.getArgumentsValue(), index, arg.argType, this.funcprops ? this.funcprops.origin : undefined), argres = res ? res.asc_getArgumentsResult() : undefined; argres = argres ? argres[index] : undefined; - arg.lblValue.html('= '+ (argres!==null && argres !==undefined ? argres : '' + arg.argTypeName + '' )); + arg.lblValue.html('= '+ (argres!==null && argres !==undefined ? argres : '' + arg.argTypeName + '' )); var result = res ? res.asc_getFunctionResult() : undefined; me.lblFunctionResult.html('= ' + ((result!==undefined && result!==null)? result : '')); From f3150a5bfe0b5b8ca3d165ce7b378394ba7dac85 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Apr 2021 17:08:29 +0300 Subject: [PATCH 42/88] Fix Bug 49877 --- apps/common/main/lib/component/TableStyler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/TableStyler.js b/apps/common/main/lib/component/TableStyler.js index eb1108827..68e5fb58a 100644 --- a/apps/common/main/lib/component/TableStyler.js +++ b/apps/common/main/lib/component/TableStyler.js @@ -417,7 +417,7 @@ define([ '', '', - '
', + '
', '
', '
', '', @@ -430,7 +430,7 @@ define([ '
', '
', '
', - '
', + '
', '' ].join('')), From 5a0161b352fb6881fe530fb23c816b2e36d78f54 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Apr 2021 17:59:55 +0300 Subject: [PATCH 43/88] [DE] Show current level of list --- apps/documenteditor/main/app/controller/Toolbar.js | 4 ++++ apps/documenteditor/main/app/view/Toolbar.js | 6 +++--- apps/documenteditor/main/resources/less/toolbar.less | 7 ++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 32922483c..11ede557c 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -1414,7 +1414,11 @@ define([ onChangeLevelShowAfter: function(type, menu) { var me = this; var listId = me.api.asc_GetCurrentNumberingId(), + level = me.api.asc_GetCurrentNumberingLvl(), props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null; + var item = _.find(menu.items, function(item) { return item.options.level == level; }); + menu.clearAll(); + item && item.setChecked(true); if (props) { this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props); } diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 176df8653..130b772cb 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1699,7 +1699,7 @@ define([ var items = [], ids = []; for (var i=0; i<9; i++) { ids.push('id-toolbar-menu-markers-level-' + i); - items.push({template: levelTemplate, previewId: ids[i], level: i }); + items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true }); } this.btnMarkers.setMenu( new Common.UI.Menu({ @@ -1731,7 +1731,7 @@ define([ items = []; ids = []; for (var i=0; i<9; i++) { ids.push('id-toolbar-menu-numbering-level-' + i); - items.push({template: levelTemplate, previewId: ids[i], level: i }); + items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true }); } this.btnNumbers.setMenu( new Common.UI.Menu({ @@ -1761,7 +1761,7 @@ define([ items = []; ids = []; for (var i=0; i<9; i++) { ids.push('id-toolbar-menu-multilevels-level-' + i); - items.push({template: levelTemplate, previewId: ids[i], level: i }); + items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true }); } this.btnMultilevels.setMenu( new Common.UI.Menu({ diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index c0e2b6dcd..0cc0de25d 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -218,11 +218,16 @@ background-color: @canvas-content-background; } - a:hover { + a:hover, a:focus, a.checked { background-color: transparent; .menu-list-preview { .box-shadow(0 0 0 2px @border-control-focus-ie); .box-shadow(0 0 0 @scaled-two-px-value @border-control-focus); } } + a.checked { + &:before { + display: none !important; + } + } } From bc6653ef7f359e5dd9168094294779bca3763be3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 24 Apr 2021 01:30:36 +0300 Subject: [PATCH 44/88] [DE] Fix Bug 49928 --- apps/common/main/lib/controller/ReviewChanges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index a9227d93b..9902c0113 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -132,7 +132,7 @@ define([ this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); } - if (this.appConfig.canReview && !this.appConfig.isReviewOnly) + if (this.appConfig.canReview) this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this)); this.api.asc_registerCallback('asc_onAcceptChangesBeforeCompare',_.bind(this.onAcceptChangesBeforeCompare, this)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onCoAuthoringDisconnect, this)); From 386bf60f37be04c52e12c45c3ee01542ec4ef00e Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 19:42:14 +0300 Subject: [PATCH 45/88] [themes] debug themes --- apps/common/main/lib/controller/Themes.js | 2 +- apps/common/main/resources/less/colors-table-classic.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 0986d3bb7..48ea99edc 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -206,7 +206,7 @@ define([ }) this.api = api; - var theme_name = Common.localStorage.getItem('ui-theme', id_default_light_theme); + var theme_name = Common.localStorage.getItem('ui-theme') || id_default_light_theme; if ( !$('body').hasClass(theme_name) ) { $('body').addClass(theme_name); diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index c92beb202..f944eb714 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -54,7 +54,7 @@ // Canvas colors --canvas-background: #e2e2e2; --canvas-content-background: #fff; - --canvas-page-border: #555; + --canvas-page-border: #ccc; --canvas-ruler-background: #555; --canvas-ruler-margins-background: #444; From f0913f2c77d6319d133be4b0952d57428ab4e3c5 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 19:44:44 +0300 Subject: [PATCH 46/88] [themes] fix bug 49481 --- .../resources/less/colors-table-ie-fix.less | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less index 0dd726c2e..eaf133158 100644 --- a/apps/common/main/resources/less/colors-table-ie-fix.less +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -4,50 +4,50 @@ @toolbar-header-presentation-ie: #aa5252; @background-normal-ie: #fff; -@background-toolbar-ie: #f7f7f7; -@background-toolbar-additional-ie: #efefef; -@background-primary-dialog-button-ie: #444; +@background-toolbar-ie: #f1f1f1; +@background-toolbar-additional-ie: #f1f1f1; +@background-primary-dialog-button-ie: #7d858c; @background-tab-underline-ie: #444; @background-notification-popover-ie: #fcfed7; @background-notification-badge-ie: #ffd112; @background-scrim-ie: fade(#000, 20%); -@background-loader-ie: fade(#181818, 90%); +@background-loader-ie: fade(#000, 65%); -@highlight-button-hover-ie: #e0e0e0; -@highlight-button-pressed-ie: #ccc; -@highlight-button-pressed-hover-ie: #bababa; -@highlight-primary-dialog-button-hover-ie: #2b2b2b; +@highlight-button-hover-ie: #d8dadc; +@highlight-button-pressed-ie: #7d858c; +@highlight-button-pressed-hover-ie: #7d858c; +@highlight-primary-dialog-button-hover-ie: #666d73; @highlight-header-button-hover-ie: fade(#fff, 20%); -@highlight-header-button-pressed-ie: fade(#fff, 25%); +@highlight-header-button-pressed-ie: fade(#000, 20%); @highlight-toolbar-tab-underline-ie: #444; @highlight-text-select-ie: #3494fb; @border-toolbar-ie: #cbcbcb; -@border-divider-ie: #dfdfdf; -@border-regular-control-ie: #c0c0c0; -@border-toolbar-button-hover-ie: #e0e0e0; +@border-divider-ie: #cbcbcb; +@border-regular-control-ie: #cfcfcf; +@border-toolbar-button-hover-ie: #d8dadc; @border-preview-hover-ie: #cfcfcf; -@border-preview-select-ie: #aaa; +@border-preview-select-ie: #848484; @border-control-focus-ie: #848484; -@border-color-shading-ie: fade(#000, 10%); -@border-error-ie: #f62211; +@border-color-shading-ie: fade(#000, 20%); +@border-error-ie: #d9534f; -@text-normal-ie: fade(#000, 80%); -@text-normal-pressed-ie: fade(#000, 80%); -@text-secondary-ie: fade(#000, 60%); -@text-tertiary-ie: fade(#000, 40%); -@text-link-ie: #445799; +@text-normal-ie: #444; +@text-normal-pressed-ie: #fff; +@text-secondary-ie: #a5a5a5; +@text-tertiary-ie: #a5a5a5; +@text-link-ie: #acbfff; @text-inverse-ie: #fff; @text-toolbar-header-ie: #fff; @text-contrast-background-ie: #fff; @icon-normal-ie: #444; -@icon-normal-pressed-ie: #444; -@icon-inverse-ie: #fff; -@icon-toolbar-header-ie: #fff; +@icon-normal-pressed-ie: #fff; +@icon-inverse-ie: #444; +@icon-toolbar-header-ie: fade(#fff, 80%); @icon-notification-badge-ie: #000; @icon-contrast-popover-ie: #fff; -@icon-success-ie: #090; +@icon-success-ie: #5b9f27; @button-header-normal-icon-offset-x-ie: -20px; @button-header-active-icon-offset-x-ie: -20px; From 0aa4aa0c722da6c093c4b10c91ab0b761c7d47b0 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 19:49:01 +0300 Subject: [PATCH 47/88] [common] correct item position in combobox of border's size --- apps/common/main/resources/less/combo-border-size.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index 1668f92e3..2f4d863a0 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -28,7 +28,7 @@ height: 100%; display: inline-block; background-color: transparent; - margin: -1px 0 0 -3px; + margin: 0 0 0 -3px; } img, .image { From 941e32391c5dd6ddacdd577445972b48ee0587a9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 19:50:07 +0300 Subject: [PATCH 48/88] [common] fix bug 49927 --- apps/common/main/resources/less/multislider-gradient.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/common/main/resources/less/multislider-gradient.less b/apps/common/main/resources/less/multislider-gradient.less index c6c7fabf7..ec8b0d2ac 100644 --- a/apps/common/main/resources/less/multislider-gradient.less +++ b/apps/common/main/resources/less/multislider-gradient.less @@ -3,6 +3,8 @@ background-color: transparent; .thumb { + width: 13px; + height: 15px; top: 18px; background: none; From 4533ceafd721b66743e2e041a6ea5d28df4122c1 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 21:12:57 +0300 Subject: [PATCH 49/88] [all] fix bug 49741 --- apps/common/main/resources/less/toolbar.less | 5 +++++ apps/documenteditor/main/app/view/TableSettings.js | 2 +- apps/presentationeditor/main/app/view/TableSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/TableSettings.js | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 75befbd5c..62419ab15 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -527,6 +527,11 @@ width: 21px; height: 21px; } + + .icon { + width: 22px; + height: 22px; + } } } diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 6661e66e3..9a5928493 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -469,7 +469,7 @@ define([ this.mnuTableTemplatePicker.selectRecord(rec, true); this.btnTableTemplate.resumeEvents(); - this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'cover'}); + this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 50px'}); this._state.TemplateId = value; } diff --git a/apps/presentationeditor/main/app/view/TableSettings.js b/apps/presentationeditor/main/app/view/TableSettings.js index 72d1b50b4..b2b167674 100644 --- a/apps/presentationeditor/main/app/view/TableSettings.js +++ b/apps/presentationeditor/main/app/view/TableSettings.js @@ -437,7 +437,7 @@ define([ this.mnuTableTemplatePicker.selectRecord(rec, true); this.btnTableTemplate.resumeEvents(); - this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'cover'}); + this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '52px', 'width': '72px', 'background-position': 'center', 'background-size': 'auto 50px'}); this._state.TemplateId = value; } diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 12cae8351..53f4e456f 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -452,7 +452,7 @@ define([ this.mnuTableTemplatePicker.selectRecord(rec, true); this.btnTableTemplate.resumeEvents(); - this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'cover'}); + this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'auto 50px'}); this._state.TemplateName=value; } From c4b69233e5aa91500003d066c07c36e0bc9fd36f Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 21:23:24 +0300 Subject: [PATCH 50/88] [all] fix bug 49886 --- apps/documenteditor/main/index.html | 8 ++++++-- apps/documenteditor/main/index.html.deploy | 2 +- apps/presentationeditor/main/index.html | 8 ++++++-- apps/presentationeditor/main/index.html.deploy | 2 +- apps/spreadsheeteditor/main/index.html | 6 +++++- apps/spreadsheeteditor/main/index.html.deploy | 2 +- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 25689a90d..4b44c621a 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -14,12 +14,16 @@ --toolbar-header-document: #2a2a2a; --background-toolbar: #404040; --border-toolbar: #2a2a2a; - --highlight-button-pressed: #606060; + --highlight-button-hover: #e0e0e0; --canvas-background: #666666; /*--canvas-content-background: #fff;*/ --canvas-page-border: #555; } + .theme-classic-light { + --highlight-button-hover: #d8dadc; + } + .loadmask { left: 0; top: 0; @@ -91,7 +95,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index c69e97577..70a90f658 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -82,7 +82,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 9847f2341..cd541ff81 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -13,12 +13,16 @@ --toolbar-header-presentation: #2a2a2a; --background-toolbar: #404040; --border-toolbar: #2a2a2a; - --highlight-button-pressed: #606060; + --highlight-button-hover: #606060; --canvas-background: #666666; /*--canvas-content-background: #fff;*/ --canvas-page-border: #555; } + .theme-classic-light { + --highlight-button-hover: #d8dadc; + } + .loadmask { left: 0; top: 0; @@ -90,7 +94,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/presentationeditor/main/index.html.deploy b/apps/presentationeditor/main/index.html.deploy index b4e367fa3..b3daac5dc 100644 --- a/apps/presentationeditor/main/index.html.deploy +++ b/apps/presentationeditor/main/index.html.deploy @@ -82,7 +82,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index b1f98863c..69de345aa 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -13,12 +13,16 @@ --background-toolbar: #404040; --background-normal: #333; --border-toolbar: #2a2a2a; - --highlight-button-pressed: #606060; + --highlight-button-hover: #606060; --canvas-background: #666666; /*--canvas-content-background: #fff;*/ --canvas-page-border: #555; } + .theme-classic-light { + --highlight-button-hover: #d8dadc; + } + .loadmask { left: 0; top: 0; diff --git a/apps/spreadsheeteditor/main/index.html.deploy b/apps/spreadsheeteditor/main/index.html.deploy index c0b600f56..09545445e 100644 --- a/apps/spreadsheeteditor/main/index.html.deploy +++ b/apps/spreadsheeteditor/main/index.html.deploy @@ -79,7 +79,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; From 9795ebde576c8da6415622ca0ae1e683bf2c564b Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 23:20:55 +0300 Subject: [PATCH 51/88] [theme] added new theme's values --- apps/common/main/lib/controller/Themes.js | 3 +++ .../resources/less/colors-table-classic.less | 8 ++++++++ .../main/resources/less/colors-table-dark.less | 8 ++++++++ .../common/main/resources/less/colors-table.less | 16 ++++++++++++++++ apps/common/main/resources/less/header.less | 11 +++++++++++ .../main/resources/less/synchronize-tip.less | 10 ++++++++++ 6 files changed, 56 insertions(+) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 48ea99edc..0a5bc48e7 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -61,6 +61,9 @@ define([ "text-secondary", "text-tertiary", "text-link", + "text-link-hover", + "text-link-active", + "text-link-visited", "text-inverse", "text-toolbar-header", "text-contrast-background", diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index f944eb714..fcc28aefd 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -39,6 +39,9 @@ --text-secondary: #a5a5a5; --text-tertiary: #a5a5a5; --text-link: #acbfff; + --text-link-hover: #acbfff; + --text-link-active: #acbfff; + --text-link-visited: #acbfff; --text-inverse: #fff; --text-toolbar-header: #fff; --text-contrast-background: #fff; @@ -116,6 +119,11 @@ --component-active-hover-icon-opacity: .8; --component-disabled-opacity: .3; + --header-component-normal-icon-opacity: 1; + --header-component-hover-icon-opacity: 1; + --header-component-active-icon-opacity: 1; + --header-component-active-hover-icon-opacity: 1; + --menu-icon-item-checked-offset-x: -20px; } } diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index 28c206b53..8707a7755 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -39,6 +39,9 @@ --text-secondary: fade(#fff, 60%); --text-tertiary: fade(#fff, 40%); --text-link: #b5e4ff; + --text-link-hover: #b5e4ff; + --text-link-active: #b5e4ff; + --text-link-visited: #b5e4ff; --text-inverse: #333; --text-toolbar-header: fade(#fff, 80%); --text-contrast-background: #fff; @@ -116,6 +119,11 @@ --component-active-hover-icon-opacity: 1; --component-disabled-opacity: .3; + --header-component-normal-icon-opacity: .8; + --header-component-hover-icon-opacity: .8; + --header-component-active-icon-opacity: 1; + --header-component-active-hover-icon-opacity: 1; + --menu-icon-item-checked-offset-x: -20px; } } diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 7fc2a1a22..799715513 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -49,6 +49,9 @@ --text-secondary: fade(#000, 60%); --text-tertiary: fade(#000, 40%); --text-link: #445799; + --text-link-hover: #445799; + --text-link-active: #445799; + --text-link-visited: #445799; --text-inverse: #fff; --text-toolbar-header: #fff; --text-contrast-background: #fff; @@ -127,6 +130,11 @@ --component-active-icon-opacity: 1; --component-active-hover-icon-opacity: 1; --component-disabled-opacity: .4; + + --header-component-normal-icon-opacity: 1; + --header-component-hover-icon-opacity: 1; + --header-component-active-icon-opacity: 1; + --header-component-active-hover-icon-opacity: 1; //--button-icon-opacity: 1; } @@ -172,6 +180,9 @@ @text-secondary: var(--text-secondary); @text-tertiary: var(--text-tertiary); @text-link: var(--text-link); +@text-link-hover: var(--text-link-hover); +@text-link-active: var(--text-link-active); +@text-link-visited: var(--text-link-visited); @text-inverse: var(--text-inverse); @text-toolbar-header: var(--text-toolbar-header); @text-contrast-background: var(--text-contrast-background); @@ -207,6 +218,11 @@ @component-disabled-opacity: var(--component-disabled-opacity, .4); //@button-icon-opacity: var(--button-icon-opacity, 1); +@header-component-normal-icon-opacity: var(--header-component-normal-icon-opacity, 1); +@header-component-hover-icon-opacity: var(--header-component-hover-icon-opacity, 1); +@header-component-active-icon-opacity: var(--header-component-active-icon-opacity, 1); +@header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1); + @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); // Canvas diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 82a03b18e..9bed1c0f7 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -327,13 +327,24 @@ } .btn& { + &:not(:disabled) .icon { + opacity: @header-component-normal-icon-opacity; + } + &:active, &.active { .icon.toolbar__icon { &.icon--inverse { background-position-x: @button-header-active-icon-offset-x-ie; + opacity: @header-component-active-icon-opacity; } } } + + &:hover:not(:disabled) { + .icon { + opacity: @header-component-hover-icon-opacity; + } + } } svg.icon { diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index 64ebe4bc6..63cad1831 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -360,6 +360,16 @@ color: @text-link-ie; color: @text-link; cursor: pointer; + + &:hover:not(:disabled) { + color: @text-link-hover; + border-bottom-color: dotted @text-link-hover; + } + + &:active { + color: @text-link-active; + border-bottom-color: dotted @text-link-hover; + } } .asc-synchronizetip .close { From a1c9daae8e8bd1d88f39f1eeabd42d032e939eed Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sat, 24 Apr 2021 23:21:15 +0300 Subject: [PATCH 52/88] [common] debug --- apps/common/main/resources/less/combo-border-size.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/common/main/resources/less/combo-border-size.less b/apps/common/main/resources/less/combo-border-size.less index 2f4d863a0..5e24b4805 100644 --- a/apps/common/main/resources/less/combo-border-size.less +++ b/apps/common/main/resources/less/combo-border-size.less @@ -3,6 +3,13 @@ cursor: pointer; } + &.input-group-nr { + .form-control:not(input) { + padding-top: 0; + padding-bottom: 0; + } + } + li { a { white-space: normal; From 1449b92acc44e24986fbb627c9b26ad2cd0f7289 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 24 Apr 2021 23:39:27 +0300 Subject: [PATCH 53/88] Fix plugins --- apps/common/main/lib/controller/Plugins.js | 5 +++-- apps/common/main/lib/controller/ReviewChanges.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 7a733b0c3..b3efc39b1 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -167,8 +167,9 @@ define([ return this; }, - setMode: function(mode) { + setMode: function(mode, api) { this.appOptions = mode; + this.api = api; this.customPluginsComplete = !this.appOptions.canBrandingExt; if (this.appOptions.canBrandingExt) this.getAppCustomPlugins(this.configPlugins); @@ -514,7 +515,7 @@ define([ var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'), isEdit = me.appOptions.isEdit, editor = me.editor, - apiVersion = me.api.GetVersion(); + apiVersion = me.api ? me.api.GetVersion() : undefined; if ( pluginsdata instanceof Array ) { var arr = [], arrUI = [], lang = me.appOptions.lang.split(/[\-_]/)[0]; diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 9902c0113..c96aaeb42 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -562,6 +562,7 @@ define([ this.view.turnChanges(true); } else if ( this.appConfig.canReview ) { + state = (state=='off') ? false : state; // support of prev. version (on/off) if (!!global) { this.api.asc_SetLocalTrackRevisions(null); this.api.asc_SetGlobalTrackRevisions(!!state); From b634b638c50f97f8ba3841b1fe988ebf57a5950b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 24 Apr 2021 23:40:06 +0300 Subject: [PATCH 54/88] Fix interface plugins --- apps/documenteditor/main/app/controller/Main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index e7d706b03..44d97a700 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1340,7 +1340,7 @@ define([ this.appOptions.canRename && appHeader.setCanRename(true); this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object' || this.editorConfig.plugins); - this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions); + this.getApplication().getController('Common.Controllers.Plugins').setMode(this.appOptions, this.api); if (this.appOptions.canComments) Common.NotificationCenter.on('comments:cleardummy', _.bind(this.onClearDummyComment, this)); From b354296c71009088eb4c06b01e25014626ccf853 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sun, 25 Apr 2021 00:12:37 +0300 Subject: [PATCH 55/88] Fix Bug 49936 (fix rev.6d121415f237d096a3fe7354068c0d25f8622956) --- apps/common/main/lib/view/Comments.js | 12 ++---------- apps/common/main/lib/view/ReviewPopover.js | 13 +++---------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index bc5bc47f1..166ab0583 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -272,16 +272,8 @@ define([ me.fireEvent('comment:resolve', [commentId]); - readdresolves(); - } else if (btn.hasClass('btn-resolve-check', false)) { - var tip = btn.data('bs.tooltip'); - if (tip) tip.dontShow = true; - - me.fireEvent('comment:resolve', [commentId]); - readdresolves(); } else if (!btn.hasClass('msg-reply') && - !btn.hasClass('btn-resolve-check') && !btn.hasClass('btn-resolve')) { var isTextSelected = false; if (btn.hasClass('user-message')) { @@ -377,12 +369,12 @@ define([ } var arr = [], - btns = $(view.el).find('.btn-resolve'); + btns = $(view.el).find('.btn-resolve:not(.comment-resolved)'); btns.tooltip({title: me.textResolve, placement: 'cursor'}); btns.each(function(idx, item){ arr.push($(item).data('bs.tooltip').tip()); }); - btns = $(view.el).find('.btn-resolve-check'); + btns = $(view.el).find('.comment-resolved'); btns.tooltip({title: me.textOpenAgain, placement: 'cursor'}); btns.each(function(idx, item){ arr.push($(item).data('bs.tooltip').tip()); diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 723632817..6eda90bda 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -258,12 +258,12 @@ define([ } var arr = [], - btns = $(view.el).find('.btn-resolve'); + btns = $(view.el).find('.btn-resolve:not(.comment-resolved)'); btns.tooltip({title: me.textResolve, placement: 'cursor'}); btns.each(function (idx, item) { arr.push($(item).data('bs.tooltip').tip()); }); - btns = $(view.el).find('.btn-resolve-check'); + btns = $(view.el).find('.comment-resolved'); btns.tooltip({title: me.textOpenAgain, placement: 'cursor'}); btns.each(function (idx, item) { arr.push($(item).data('bs.tooltip').tip()); @@ -451,14 +451,7 @@ define([ readdresolves(); - } else if (btn.hasClass('btn-resolve', false)) { - var tip = btn.data('bs.tooltip'); - if (tip) tip.dontShow = true; - - me.fireEvent('comment:resolve', [commentId]); - - readdresolves(); - } else if (btn.hasClass('btn-resolve-check', false)) { + } else if (btn.hasClass('btn-resolve')) { var tip = btn.data('bs.tooltip'); if (tip) tip.dontShow = true; From 256b1f2abda2d8c669ef2acf8a6325f97cadbea9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Sun, 25 Apr 2021 22:17:34 +0300 Subject: [PATCH 56/88] [themes] changed calendar style --- apps/common/main/lib/component/Calendar.js | 22 ++--- apps/common/main/resources/less/calendar.less | 86 +++++++++++++------ 2 files changed, 73 insertions(+), 35 deletions(-) diff --git a/apps/common/main/lib/component/Calendar.js b/apps/common/main/lib/component/Calendar.js index 0ae99149c..51dd3315f 100644 --- a/apps/common/main/lib/component/Calendar.js +++ b/apps/common/main/lib/component/Calendar.js @@ -44,16 +44,15 @@ define([ template : _.template([ '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', - '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', + '
', '
' ].join('')), @@ -179,6 +178,7 @@ define([ year = _.isNumber(year) ? year : (me.currentDate ? me.currentDate.getFullYear() : new Date().getFullYear()); me._state = 2; + me.$el.removeClass('view-days view-months').addClass('view-years'); var firstYear = year, lastYear = year; @@ -248,6 +248,7 @@ define([ me._state = 1; me.currentDate = curDate; + me.$el.removeClass('view-years view-days').addClass('view-months'); // Number of year me.topTitle = _.template([ @@ -329,6 +330,7 @@ define([ curYear = curDate.getFullYear(); me.currentDate = curDate; + me.$el.removeClass('view-years view-months').addClass('view-days'); // Name month me.topTitle = _.template([ diff --git a/apps/common/main/resources/less/calendar.less b/apps/common/main/resources/less/calendar.less index b58b92c69..6926539d7 100644 --- a/apps/common/main/resources/less/calendar.less +++ b/apps/common/main/resources/less/calendar.less @@ -6,60 +6,89 @@ box-shadow: none; } .calendar-box { - width: 198px; - height: 220px; - border: 1px solid @calendar-bg-color; + width: 212px; + height: 244px; + box-shadow: 0px 2px 5px @background-scrim-ie; + box-shadow: 0px 2px 5px @background-scrim; + border-radius: 2px; + background-color: @background-normal-ie; + background-color: @background-normal; + .top-row { padding: 0 5px; } .btn { background-color: transparent; border: none; - height: 20px; - width: 20px; - margin-top: 4px; + height: 24px; + width: 24px; display: flex; justify-content: center; align-items: center; + .icon { width: 16px; height: 16px; display: block; position: relative; &.arrow-prev { - background-position: -55px -96px; + background-position: -38px -96px; } &.arrow-next { - background-position: -52px -112px; + background-position: -36px -112px; } } &:hover { - background-color: rgba(255,255,255,0.2); + background-color: @highlight-button-hover-ie; + background-color: @highlight-button-hover; cursor: pointer; } + + &:active { + background-color: @highlight-button-pressed-ie; + background-color: @highlight-button-pressed; + } } .calendar-header { - height: 50px; - background-color: @calendar-bg-color; - color: #FFFFFF; + height: 68px; + color: @text-normal-ie; + color: @text-normal; + padding: 8px; + padding-bottom: 0; + .top-row { display: flex; justify-content: space-between; + margin-bottom: 8px; } + .bottom-row { display: flex; justify-content: space-around; padding: 0; + height: 28px; + align-items: center; } + + .view-years &, + .view-months & { + height: 40px; + + .bottom-row { + display: none; + } + } + .title { width: 100%; margin: 4px 6px 3px 6px; text-align: center; - font-size: 13px; + font-size: 11px; + label { padding: 2px 10px 0; display: block; - font-weight: bold; + //font-weight: bold; &:not(:last-of-type) { margin-right: 6px; } @@ -68,7 +97,8 @@ height: 100%; width: 100%; &:hover { - background-color: rgba(255,255,255,0.2); + background-color: @highlight-button-hover-ie; + background-color: @highlight-button-hover; cursor: pointer; label { cursor: pointer; @@ -79,34 +109,40 @@ } } .calendar-content { + padding: 0 8px; + .item { margin: 0; padding: 0; height: auto; width: auto; box-shadow: none; - border: 1px solid #fff; + .name-month, .name-year { - height: 40px; - width: 47px; - background-color: #F1F1F1; + height: 49px; + width: 49px; + background-color: @background-normal; display: flex; justify-content: center; align-items: center; font-size: 13px; } + .number-day { - height: 26px; - width: 26px; - background-color: #F1F1F1; + height: 28px; + width: 28px; display: flex; justify-content: center; align-items: center; } + &.selected { .number-day, .name-month, .name-year { - color: #fff; - background-color: #7D858C; + color: @text-normal-pressed-ie; + color: @text-normal-pressed; + background-color: @highlight-button-pressed-ie; + background-color: @highlight-button-pressed; + border-radius: 2px; } } .weekend { @@ -118,7 +154,7 @@ &:not(.disabled):not(.selected) { .number-day, .name-month, .name-year { &:hover { - background-color: #D9D9D9; + background-color: @highlight-button-hover; } } } From 66dba701d81087f78d24493105106f103ec15b57 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 26 Apr 2021 10:53:52 +0300 Subject: [PATCH 57/88] [themes] refactoring --- apps/common/main/lib/controller/Themes.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 0a5bc48e7..f28783d6b 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -209,7 +209,9 @@ define([ }) this.api = api; - var theme_name = Common.localStorage.getItem('ui-theme') || id_default_light_theme; + var theme_name = Common.localStorage.getItem('ui-theme'); + if ( !!themes_map[theme_name] ) + theme_name = id_default_light_theme; if ( !$('body').hasClass(theme_name) ) { $('body').addClass(theme_name); From bcbaedf762836dda4f2a365f75ace103e525cc1b Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 26 Apr 2021 13:36:18 +0300 Subject: [PATCH 58/88] Update Themes.js --- apps/common/main/lib/controller/Themes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index f28783d6b..0e952e05d 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -210,7 +210,7 @@ define([ this.api = api; var theme_name = Common.localStorage.getItem('ui-theme'); - if ( !!themes_map[theme_name] ) + if ( !themes_map[theme_name] ) theme_name = id_default_light_theme; if ( !$('body').hasClass(theme_name) ) { From f57486d376b77b2b20e4772df34d5d5ceab180d3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 26 Apr 2021 14:31:58 +0300 Subject: [PATCH 59/88] [themes] fix bug 50002 --- apps/spreadsheeteditor/main/resources/less/toolbar.less | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 9ab9acdea..ba430eecf 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -80,6 +80,7 @@ width: 60px; height: 20px; margin: -3px 10px -2px; + filter: @component-normal-icon-filter; @media only screen { //@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9), From e6b8a379ba6939b4016b191fce916ebc68c5bc2c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Apr 2021 14:54:55 +0300 Subject: [PATCH 60/88] Fix vulnerability --- apps/common/main/lib/component/TreeView.js | 4 ++-- apps/documenteditor/main/app/view/BookmarksDialog.js | 2 +- apps/documenteditor/main/app/view/ControlSettingsDialog.js | 4 ++-- apps/documenteditor/main/app/view/CrossReferenceDialog.js | 2 +- apps/documenteditor/main/app/view/DocumentHolder.js | 7 ++++++- apps/documenteditor/main/app/view/FormSettings.js | 2 +- apps/spreadsheeteditor/main/app/controller/ViewTab.js | 7 ++++++- apps/spreadsheeteditor/main/app/view/NameManagerDlg.js | 2 +- apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js | 2 +- apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js | 2 +- 10 files changed, 22 insertions(+), 12 deletions(-) diff --git a/apps/common/main/lib/component/TreeView.js b/apps/common/main/lib/component/TreeView.js index b8016b431..84c3fe860 100644 --- a/apps/common/main/lib/component/TreeView.js +++ b/apps/common/main/lib/component/TreeView.js @@ -176,11 +176,11 @@ define([ '
', '<% } %>', '<% if (isNotHeader) { %>', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '<% } else if (isEmptyItem) { %>', '
' + options.emptyItemText + '
', '<% } else { %>', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '<% } %>', '' ].join('')); diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index d6d305194..b03ab95f8 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -174,7 +174,7 @@ define([ el: $('#bookmarks-list', this.$window), store: new Common.UI.DataViewStore(), tabindex: 1, - itemTemplate: _.template('
<%= value %>
') + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.bookmarksList.store.comparator = function(rec) { return (me.radioName.getValue() ? rec.get("value") : rec.get("location")); diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index b8c0b4b02..c921e816b 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -168,8 +168,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', template: _.template(['
'].join('')), itemTemplate: _.template([ '
', - '
<%= name %>
', - '
<%= value %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', + '
<%= Common.Utils.String.htmlEncode(value) %>
', '
' ].join('')), tabindex: 1 diff --git a/apps/documenteditor/main/app/view/CrossReferenceDialog.js b/apps/documenteditor/main/app/view/CrossReferenceDialog.js index f2a436813..e5934cf3b 100644 --- a/apps/documenteditor/main/app/view/CrossReferenceDialog.js +++ b/apps/documenteditor/main/app/view/CrossReferenceDialog.js @@ -183,7 +183,7 @@ define([ this.refList = new Common.UI.ListView({ el: $window.find('#id-dlg-cross-list'), store: new Common.UI.DataViewStore(), - itemTemplate: _.template('
<%= value %>
') + itemTemplate: _.template('
<%= Common.Utils.String.htmlEncode(value) %>
') }); this.refList.on('entervalue', _.bind(this.onPrimary, this)) .on('item:dblclick', _.bind(this.onPrimary, this)); diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index a5ac92070..68e9a89e2 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -4319,7 +4319,12 @@ define([ for (var i=0; i', + '<%= Common.Utils.String.htmlEncode(caption) %>', + '' + ].join('')) })); } if (!isForm && menu.items.length<1) { diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index c5da9f278..443f84bf2 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -224,7 +224,7 @@ define([ itemTemplate: _.template([ '
', // '
<%= name %>
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '
' ].join('')) }); diff --git a/apps/spreadsheeteditor/main/app/controller/ViewTab.js b/apps/spreadsheeteditor/main/app/controller/ViewTab.js index b4c07e636..80c9e29a4 100644 --- a/apps/spreadsheeteditor/main/app/controller/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/controller/ViewTab.js @@ -156,7 +156,12 @@ define([ caption : item.asc_getName(), checkable: true, allowDepress: false, - checked : item.asc_getIsActive() + checked : item.asc_getIsActive(), + template : _.template([ + '', + '<%= Common.Utils.String.htmlEncode(caption) %>', + '' + ].join('')) })); if (item.asc_getIsActive()) active = true; diff --git a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js index 9229ea8d9..e5989db39 100644 --- a/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NameManagerDlg.js @@ -123,7 +123,7 @@ define([ 'text!spreadsheeteditor/main/app/template/NameManagerDlg.template', itemTemplate: _.template([ '
', '
">
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '
<%= scopeName %>
', '
<%= range %>
', '<% if (lock) { %>', diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js index a977ac207..50fc84325 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangePasteDlg.js @@ -95,7 +95,7 @@ define([ '
', '
', '
">
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '
', '
' ].join('')) diff --git a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js index d41d1b08b..f606e72ec 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ViewManagerDlg.js @@ -118,7 +118,7 @@ define([ template: _.template(['
'].join('')), itemTemplate: _.template([ '
', - '
<%= name %>
', + '
<%= Common.Utils.String.htmlEncode(name) %>
', '<% if (lock) { %>', '
<%=lockuser%>
', '<% } %>', From 386d55d785e25134eadce19e6dfcaf048c4be1ed Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Apr 2021 17:05:45 +0300 Subject: [PATCH 61/88] Fix Bug 50014 --- .../main/app/view/ShapeSettings.js | 18 ++++++++++-------- .../main/app/view/TextArtSettings.js | 18 ++++++++++-------- .../main/app/view/ShapeSettings.js | 18 ++++++++++-------- .../main/app/view/TextArtSettings.js | 18 ++++++++++-------- .../main/app/view/ChartSettings.js | 18 ++++++++++-------- .../main/app/view/ShapeSettings.js | 18 ++++++++++-------- .../main/app/view/TextArtSettings.js | 18 ++++++++++-------- 7 files changed, 70 insertions(+), 56 deletions(-) diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index bce04d508..1f0788b83 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -607,14 +607,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/documenteditor/main/app/view/TextArtSettings.js b/apps/documenteditor/main/app/view/TextArtSettings.js index 58beba4ab..a375b7b6d 100644 --- a/apps/documenteditor/main/app/view/TextArtSettings.js +++ b/apps/documenteditor/main/app/view/TextArtSettings.js @@ -477,14 +477,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 9a7270677..b0cd3306c 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -587,14 +587,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/presentationeditor/main/app/view/TextArtSettings.js b/apps/presentationeditor/main/app/view/TextArtSettings.js index 5abd60a1a..bb159c568 100644 --- a/apps/presentationeditor/main/app/view/TextArtSettings.js +++ b/apps/presentationeditor/main/app/view/TextArtSettings.js @@ -596,14 +596,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - me.fireEvent('editcomplete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + me.fireEvent('editcomplete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index 7757c489d..a49e4dea6 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -1123,14 +1123,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0.01 || value>1584) { this._state.LineWeight = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 6fb27fc46..0b5a3b1b9 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -604,14 +604,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); diff --git a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js index 31d6dd13b..4ac500887 100644 --- a/apps/spreadsheeteditor/main/app/view/TextArtSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TextArtSettings.js @@ -597,14 +597,16 @@ define([ expr = new RegExp('^\\s*(\\d*(\\.|,)?\\d+)\\s*(' + me.txtPt + ')?\\s*$'); if (!(expr.exec(record.value)) || value<0 || value>1584) { this._state.StrokeType = this._state.StrokeWidth = -1; - Common.UI.error({ - msg: this.textBorderSizeErr, - callback: function() { - _.defer(function(btn) { - Common.NotificationCenter.trigger('edit:complete', me); - }) - } - }); + setTimeout( function() { + Common.UI.error({ + msg: me.textBorderSizeErr, + callback: function() { + _.defer(function(btn) { + Common.NotificationCenter.trigger('edit:complete', me); + }) + } + }); + }, 10); } } else this.applyBorderSize(record.value); From 62ddbf3229f590069bb86bf3c120d4d7dbe5e62a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Apr 2021 19:11:33 +0300 Subject: [PATCH 62/88] [SSE] Fix link to cell range --- apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 3cd375ee4..564b0f96a 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -504,6 +504,7 @@ define([ this.inputDisplay.setValue(name); } else { var val = this.inputRange.getValue(); + name = this.api.asc_getEscapeSheetName(name); name = (name + ((name!=='' && val!=='') ? '!' : '') + val); } name && Common.Gateway.requestMakeActionLink({ From e6c962daf89b6b5f28cc63bfd1f44b444951b295 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 26 Apr 2021 23:26:29 +0300 Subject: [PATCH 63/88] [common] fix bug 50016 --- apps/common/main/resources/less/combo-dataview.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 6ddfd4173..6e39cb83c 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -143,8 +143,8 @@ width: auto; position: relative; border: none; - .box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie); - .box-shadow(0 0 0 @scaled-one-px-value @background-normal); + //.box-shadow(0 0 0 @scaled-one-px-value-ie @background-normal-ie); + //.box-shadow(0 0 0 @scaled-one-px-value @background-normal); > div { background-repeat: no-repeat; From bf6cab4d4827f882a9fbc3874bda11ba94787679 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 26 Apr 2021 23:54:50 +0300 Subject: [PATCH 64/88] [PE] fix bug 49966 --- .../main/resources/less/document-preview.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/resources/less/document-preview.less b/apps/presentationeditor/main/resources/less/document-preview.less index 96bdb1379..97729c3db 100644 --- a/apps/presentationeditor/main/resources/less/document-preview.less +++ b/apps/presentationeditor/main/resources/less/document-preview.less @@ -20,7 +20,8 @@ #preview-label-slides { font: bold 11px Helvetica, Arial, Verdana, sans-serif; - color: #666666; + color: @text-normal-ie; + color: @text-normal; text-shadow: none; white-space: nowrap; cursor: pointer; From 2a75e05bfa27679ea4e80e17458ee08743b58674 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 00:04:44 +0300 Subject: [PATCH 65/88] [common] fix bug 50026 --- apps/common/main/resources/less/buttons.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index 8a3b7218f..de279182e 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -934,6 +934,12 @@ &.active { background-color: @background-normal-ie !important; background-color: @background-normal !important; + + &:not(:disabled) { + svg.icon { + opacity: inherit; + } + } } &:active:not(.disabled), From dce1a7a54c60921013b31448688b77250f7a5500 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Apr 2021 17:31:38 +0300 Subject: [PATCH 66/88] Fix Bug 50044 --- apps/documenteditor/mobile/app/controller/edit/EditChart.js | 2 +- apps/documenteditor/mobile/app/controller/edit/EditShape.js | 5 ++--- .../mobile/app/controller/edit/EditChart.js | 2 +- .../mobile/app/controller/edit/EditShape.js | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/edit/EditChart.js b/apps/documenteditor/mobile/app/controller/edit/EditChart.js index bf18a3fcc..90b5fddd2 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditChart.js @@ -489,7 +489,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderColor = color; diff --git a/apps/documenteditor/mobile/app/controller/edit/EditShape.js b/apps/documenteditor/mobile/app/controller/edit/EditShape.js index 171396166..996c13543 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditShape.js @@ -449,8 +449,7 @@ define([ }, onFillColor: function(palette, color) { - var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + var me = this; if (me.api) { var image = new Asc.asc_CImgProperty(), @@ -475,7 +474,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderColor = color; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js index 53872aa79..e81b34ca7 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js @@ -626,7 +626,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderInfo.color = color; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js index b60c14f71..83e225529 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js @@ -301,8 +301,7 @@ define([ }, onFillColor: function(palette, color) { - var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + var me = this; if (me.api) { var image = new Asc.asc_CImgProperty(), @@ -327,7 +326,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderInfo.color = color; From 89ba5e758f92b9cfefc545dd14719e959da0b0e9 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Tue, 27 Apr 2021 19:26:33 +0300 Subject: [PATCH 67/88] Refactoring skin for reporter --- apps/presentationeditor/main/app.reporter.js | 2 +- apps/presentationeditor/main/app_dev.reporter.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/app.reporter.js b/apps/presentationeditor/main/app.reporter.js index 0b0fcacf9..0c69433aa 100644 --- a/apps/presentationeditor/main/app.reporter.js +++ b/apps/presentationeditor/main/app.reporter.js @@ -93,7 +93,7 @@ require([ var api = new Asc.asc_docs_api({ 'id-view' : 'editor_sdk', using : 'reporter', - skin : (localStorage.getItem("ui-theme") == "theme-dark") ? "flatDark" : "flat" + skin : localStorage.getItem("ui-theme") }); var setDocumentTitle = function(title) { diff --git a/apps/presentationeditor/main/app_dev.reporter.js b/apps/presentationeditor/main/app_dev.reporter.js index e232230a8..77687a322 100644 --- a/apps/presentationeditor/main/app_dev.reporter.js +++ b/apps/presentationeditor/main/app_dev.reporter.js @@ -94,7 +94,7 @@ require([ var api = new Asc.asc_docs_api({ 'id-view' : 'editor_sdk', using : 'reporter', - skin : (localStorage.getItem("ui-theme") == "theme-dark") ? "flatDark" : "flat" + skin : localStorage.getItem("ui-theme") }); var setDocumentTitle = function(title) { From acaeec776f09a54b809685d80add1db4ad4d69c4 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 20:21:45 +0300 Subject: [PATCH 68/88] [SSE] fix bug 50024 --- .../main/app/controller/CellEditor.js | 8 ++++++- .../main/resources/less/celleditor.less | 22 ++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/CellEditor.js b/apps/spreadsheeteditor/main/app/controller/CellEditor.js index 085c417e0..8a9beecf1 100644 --- a/apps/spreadsheeteditor/main/app/controller/CellEditor.js +++ b/apps/spreadsheeteditor/main/app/controller/CellEditor.js @@ -190,11 +190,15 @@ define([ onLayoutResize: function(o, r) { if (r == 'cell:edit') { if (Math.floor(this.editor.$el.height()) > 19) { - if (!this.editor.$btnexpand.hasClass('btn-collapse')) + if (!this.editor.$btnexpand.hasClass('btn-collapse')) { + this.editor.$el.addClass('expanded'); this.editor.$btnexpand['addClass']('btn-collapse'); + } + o && Common.localStorage.setItem('sse-celleditor-height', this.editor.$el.height()); o && Common.localStorage.setBool('sse-celleditor-expand', true); } else { + this.editor.$el.removeClass('expanded'); this.editor.$btnexpand['removeClass']('btn-collapse'); o && Common.localStorage.setBool('sse-celleditor-expand', false); } @@ -232,10 +236,12 @@ define([ if ( Math.floor(this.editor.$el.height()) > 19) { this.editor.keep_height = this.editor.$el.height(); this.editor.$el.height(19); + this.editor.$el.removeClass('expanded'); this.editor.$btnexpand['removeClass']('btn-collapse'); Common.localStorage.setBool('sse-celleditor-expand', false); } else { this.editor.$el.height(this.editor.keep_height); + this.editor.$el.addClass('expanded'); this.editor.$btnexpand['addClass']('btn-collapse'); Common.localStorage.setBool('sse-celleditor-expand', true); } diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 1cf73a6e6..0ad230f18 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -4,14 +4,14 @@ border-left: solid @scaled-one-px-value-ie @border-toolbar-ie; border-left: solid @scaled-one-px-value @border-toolbar; min-height: 20px; - background-color: @background-normal-ie; - background-color: @background-normal; + background-color: @background-toolbar-ie; + background-color: @background-toolbar; .ce-group-name { float: left; height: 20px; - border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; - border-bottom: @scaled-one-px-value solid @border-toolbar; + //border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; + //border-bottom: @scaled-one-px-value solid @border-toolbar; background-color: @background-toolbar-ie; background-color: @background-toolbar; @@ -26,6 +26,8 @@ border-right: @scaled-one-px-value solid @border-toolbar; transition: none; -webkit-transition: none; + box-shadow: 0 @scaled-one-px-value-ie 0 0 @border-toolbar-ie; + box-shadow: 0 @scaled-one-px-value 0 0 @border-toolbar; &[disabled] { color: @border-preview-select-ie; @@ -75,9 +77,19 @@ } } + &:not(.expanded) { + #ce-func-label { + border-bottom: @scaled-one-px-value-ie solid @border-toolbar-ie; + border-bottom: @scaled-one-px-value solid @border-toolbar; + } + } + .ce-group-expand { float: right; - height: 20px; + //height: 20px; + height: 100%; + background-color: @background-normal-ie; + background-color: @background-normal; } .ce-group-content { From 461106210ff2fbe7d4bb366775c78c7f432fa998 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 20:22:21 +0300 Subject: [PATCH 69/88] [themes] changed skeleton's color --- apps/spreadsheeteditor/main/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index 69de345aa..8b959591b 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -92,7 +92,7 @@ .loadmask > .sktoolbar li { background: #ccc; - background: var(--highlight-button-pressed, #ccc); + background: var(--highlight-button-hover, #ccc); border-radius: 3px; width: 20px; height: 20px; From e39c23cc88f48ecdd7c9c17bc7966e768f1c3fc7 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 20:25:00 +0300 Subject: [PATCH 70/88] [common] changed active state for combobox button --- apps/common/main/resources/less/buttons.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index de279182e..a6e47428f 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -77,8 +77,8 @@ &.active:not(.disabled){ .caret { transform: rotate(45deg); - border-color: @icon-normal-pressed-ie; - border-color: @icon-normal-pressed; + //border-color: @icon-normal-pressed-ie; + //border-color: @icon-normal-pressed; } } From fc66f37f43c6b6cfdabb18a2c1e74f7442cff080 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Apr 2021 21:21:11 +0300 Subject: [PATCH 71/88] Change groups paddings --- apps/common/main/resources/less/toolbar.less | 8 +++++ .../main/app/template/Toolbar.template | 14 ++++---- apps/documenteditor/main/app/view/FormsTab.js | 2 +- .../main/app/template/Toolbar.template | 16 +++++----- .../main/app/template/Toolbar.template | 32 +++++++++---------- .../main/app/template/ToolbarAnother.template | 16 +++++----- .../main/app/view/PivotTable.js | 6 ++-- 7 files changed, 51 insertions(+), 43 deletions(-) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 62419ab15..ca1348f69 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -216,6 +216,14 @@ &:last-child { padding-right: 6px; } + + &.small { + padding-left: 10px; + + + .separator { + margin-left: 10px; + } + } } .elset { diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template index 1c6b32745..f58295e4f 100644 --- a/apps/documenteditor/main/app/template/Toolbar.template +++ b/apps/documenteditor/main/app/template/Toolbar.template @@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index f5ef8f2a2..fa93c0802 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -58,7 +58,7 @@ define([ '' + '
' + '' + - '
-
+
@@ -15,7 +15,7 @@
-
+
@@ -33,7 +33,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -62,7 +62,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -101,7 +101,7 @@
-
+
diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index 84494e2df..50b6fc5dd 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
@@ -48,7 +48,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
@@ -204,7 +204,7 @@
-
+
@@ -231,7 +231,7 @@
-
+
@@ -240,7 +240,7 @@
-
+
@@ -253,7 +253,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
diff --git a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template index 7bced25b7..cc642b5ad 100644 --- a/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template +++ b/apps/spreadsheeteditor/main/app/template/ToolbarAnother.template @@ -4,7 +4,7 @@
-
+
@@ -13,13 +13,13 @@
-
+
-
+
@@ -27,7 +27,7 @@
-
+
@@ -41,7 +41,7 @@
-
+
@@ -50,21 +50,21 @@
-
+
-
+
-
+
diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 0598af43e..0b6be6938 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -71,7 +71,7 @@ define([ '' + '
' + '
' + - '
' + + '
' + '
' + '' + '
' + @@ -79,7 +79,7 @@ define([ '' + '
' + '
' + - '
' + + '
' + '
' + '' + '
' + @@ -87,7 +87,7 @@ define([ '' + '
' + '
' + - '
' + + '
' + '
' + '
'; From cc4108081432770db54041cfe1e2dcab61a01701 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Apr 2021 22:27:47 +0300 Subject: [PATCH 72/88] Change paddings for huge buttons --- apps/common/main/resources/less/buttons.less | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index de279182e..976733499 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -229,7 +229,7 @@ .inner-box-caption { line-height: 18px; - padding: 0 4px; + padding: 0 2px; display: flex; align-items: center; @@ -303,6 +303,14 @@ } } +.icon-top.btn-group { + &.x-huge, .x-huge { + .inner-box-caption { + padding-right: 4px; + } + } +} + .icon-top { &.x-huge { .btn&, .btn-group& .btn-toolbar { From 59182cfd6bad9c66088c9cda66171159d41290a8 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 22:42:41 +0300 Subject: [PATCH 73/88] [common] changed combobox caret style --- apps/common/main/resources/less/buttons.less | 4 ++-- apps/common/main/resources/less/combobox.less | 10 ++++++++++ .../main/resources/less/celleditor.less | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index a6e47428f..de279182e 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -77,8 +77,8 @@ &.active:not(.disabled){ .caret { transform: rotate(45deg); - //border-color: @icon-normal-pressed-ie; - //border-color: @icon-normal-pressed; + border-color: @icon-normal-pressed-ie; + border-color: @icon-normal-pressed; } } diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index e44ea1f4d..5e81105ed 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -98,6 +98,16 @@ } } + &.input-group-nr { + .btn { + &:active { + .caret { + border-color: @icon-normal; + } + } + } + } + li { a { white-space: pre; diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 0ad230f18..937ce94ba 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -55,7 +55,7 @@ &:active:not(.disabled), &.active:not(.disabled){ .caret { - background-position: @arrow-small-offset-x @arrow-small-offset-y; + border-color: @icon-normal; } } } @@ -142,8 +142,8 @@ padding: 0 2px 0; .caret { - background-position: @arrow-small-offset-x @arrow-small-offset-y; transition: transform .2s; + border-color: @icon-normal; } &.btn-collapse { From 1e878cd085204f8735536288eb74674cf70f61e9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 22:44:01 +0300 Subject: [PATCH 74/88] [SSE] fixed cell editors style for 150% scaling --- apps/spreadsheeteditor/main/resources/less/celleditor.less | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 937ce94ba..90fb81afc 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -18,6 +18,7 @@ #ce-cell-name { width: 100px; height: 19px; + height: calc(19px + (1px - 1px/var(--pixel-ratio-factor,1))); padding: 0px 19px 0 4px; vertical-align: top; display: inline-block; From 50a97c9152ccf4ba7e1fd7049248a1c74872508a Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 23:36:29 +0300 Subject: [PATCH 75/88] [themes] fixed dropdown menu style --- apps/common/main/resources/less/dropdown-menu.less | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/common/main/resources/less/dropdown-menu.less b/apps/common/main/resources/less/dropdown-menu.less index fd66731ce..f0faa74bf 100644 --- a/apps/common/main/resources/less/dropdown-menu.less +++ b/apps/common/main/resources/less/dropdown-menu.less @@ -39,8 +39,8 @@ &:focus, &.focus { outline: 0; - color: @text-normal-pressed-ie; - color: @text-normal-pressed; + color: @text-normal-ie; + color: @text-normal; background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; } @@ -55,14 +55,14 @@ &.over > a { text-decoration: none; - color: @text-normal-pressed-ie; - color: @text-normal-pressed; + //color: @text-normal-pressed-ie; + //color: @text-normal-pressed; background-color: @highlight-button-hover-ie; background-color: @highlight-button-hover; &:after { - border-left-color: @icon-normal-pressed-ie; - border-left-color: @icon-normal-pressed; + border-left-color: @icon-normal-ie; + border-left-color: @icon-normal; } } From 64031048ce2a00be5107044d4156b78657ee5ca3 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 27 Apr 2021 23:38:17 +0300 Subject: [PATCH 76/88] [themes] changed component's state opacity --- apps/common/main/resources/less/colors-table-classic.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index fcc28aefd..006bee0a0 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -115,8 +115,8 @@ --component-normal-icon-opacity: .8; --component-hover-icon-opacity: .8; - --component-active-icon-opacity: .8; - --component-active-hover-icon-opacity: .8; + --component-active-icon-opacity: 1; + --component-active-hover-icon-opacity: 1; --component-disabled-opacity: .3; --header-component-normal-icon-opacity: 1; From 134001162c5a5a267ca68f847d3dcade42cf8c95 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 28 Apr 2021 14:10:39 +0300 Subject: [PATCH 77/88] [web-apps] fix bug 50030 --- .../main/resources/less/colors-table.less | 2 ++ apps/common/main/resources/less/combobox.less | 22 ++++++++-------- .../resources/img/toolbar/BorderSize@1.5x.png | Bin 0 -> 207 bytes .../main/resources/less/rightmenu.less | 4 +-- .../main/resources/less/toolbar.less | 24 ++++++------------ 5 files changed, 22 insertions(+), 30 deletions(-) create mode 100644 apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 799715513..573027e92 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -224,6 +224,8 @@ @header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1); @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); +@img-border-type-filter: var(--image-border-types-filter, none); +@img-border-type-filter-selected: var(--image-border-types-filter-selected, none); // Canvas // --------------------------- diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index 5e81105ed..166449139 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -1,5 +1,3 @@ -@img-borders-filter: var(--image-border-types-filter); -@img-borders-filter-selected: var(--image-border-types-filter-selected); .combobox { display: block; @@ -33,8 +31,8 @@ float: none; .image { - -webkit-filter: @img-borders-filter; - filter: @img-borders-filter; + -webkit-filter: @img-border-type-filter; + filter: @img-border-type-filter; } } @@ -136,22 +134,22 @@ // ------------------------ li { img { - -webkit-filter: @img-borders-filter; - filter: @img-borders-filter; + -webkit-filter: @img-border-type-filter; + filter: @img-border-type-filter; } canvas { - -webkit-filter: @img-borders-filter; - filter: @img-borders-filter; + -webkit-filter: @img-border-type-filter; + filter: @img-border-type-filter; } &.selected { img { - -webkit-filter: @img-borders-filter-selected; - filter: @img-borders-filter-selected; + -webkit-filter: @img-border-type-filter-selected; + filter: @img-border-type-filter-selected; } canvas { - -webkit-filter: @img-borders-filter-selected; - filter: @img-borders-filter-selected; + -webkit-filter: @img-border-type-filter-selected; + filter: @img-border-type-filter-selected; } } diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png b/apps/spreadsheeteditor/main/resources/img/toolbar/BorderSize@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..18d70bd1405976184115eaea0abac988ec7aea48 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^Q49=>UW`Bn!`7nG1|Y>$666=mz{oh|?>Zo_!_&nv zq~ccckA4RB84?o?C_GJQV*GSSqg_#iQHD)R%*|4b!ysX!!6`wf2FC8zKt6B#$CKSo zxBr=@Bh0oTPNJ99TSDqAck|+2lYq6$FGeKfC)geM(eRMjnRS-YucL=DbUqk Date: Wed, 28 Apr 2021 15:32:20 +0300 Subject: [PATCH 78/88] [common] fix bug 50025 --- .../resources/img/controls/Scroll_center@1.5x.png | Bin 0 -> 111 bytes apps/common/main/resources/less/scroller.less | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 apps/common/main/resources/img/controls/Scroll_center@1.5x.png diff --git a/apps/common/main/resources/img/controls/Scroll_center@1.5x.png b/apps/common/main/resources/img/controls/Scroll_center@1.5x.png new file mode 100644 index 0000000000000000000000000000000000000000..743ca5769a7ea2d635240b5be2322ffab79f2e6d GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^qChOn#0(^v6xK-qDb4_&5LY05{`~omA3uh!J)Z^S zFqQ=Q1v5B2yO9Ruh5Owfi1J?^34u;q2?1fMAT{i*c89ZJ6T-G@y GGywpy;2&H7 literal 0 HcmV?d00001 diff --git a/apps/common/main/resources/less/scroller.less b/apps/common/main/resources/less/scroller.less index 0929d2cf5..6d94e4a7f 100644 --- a/apps/common/main/resources/less/scroller.less +++ b/apps/common/main/resources/less/scroller.less @@ -90,6 +90,12 @@ .background-ximage('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAANCAQAAAAz1Zf0AAAAIUlEQVR42mNgAILz/0GQAQo+/gdBBqLAqE5ydH5k+sgEANHgUH2JtDRHAAAAAElFTkSuQmCC', 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaAgMAAADZOtQaAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABZJREFUeNpjYAgNYOBaxcDEgAsMLXkA/sUJfm1m4l8AAAAASUVORK5CYII=', 14px); + .pixel-ratio__1_5 & { + //background-image: ~"url(@{common-image-const-path}/controls/Scroll_center@1.5x.png)"; + background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAATAgMAAAACIK4YAAAACVBMVEUAAADPz8/x8fFVrc9qAAAAAXRSTlMAQObYZgAAABRJREFUeNpjYAxl4FrBwYAK6CwIAOsnB3Hkb0WyAAAAAElFTkSuQmCC'); + background-size: 14px auto; + } + background-repeat: no-repeat; background-position: 0 center; .border-radius(2px); From 3dfd82cd19909c0a583373f15317acdc4be582f5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 28 Apr 2021 20:00:45 +0300 Subject: [PATCH 79/88] [SSE] Fix Bug 50110 --- apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 8e8472f1f..aff7389e1 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -394,10 +394,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' var value; switch (record.value) { case Asc.c_oAscCrossesRule.minValue: - me.spnVAxisCrosses[i].setValue(me.spnMinValue.getNumberValue(), true); + me.spnVAxisCrosses[i].setValue(me.spnMinValue[i].getNumberValue(), true); break; case Asc.c_oAscCrossesRule.maxValue: - me.spnVAxisCrosses[i].setValue(me.spnMaxValue.getNumberValue(), true); + me.spnVAxisCrosses[i].setValue(me.spnMaxValue[i].getNumberValue(), true); break; case Asc.c_oAscCrossesRule.auto: me.spnVAxisCrosses[i].setValue(me._originalAxisVValues[i].crossesAuto, true); From 559b0292e93d2de3cc811e04eb56776b77ca8569 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 28 Apr 2021 22:56:59 +0300 Subject: [PATCH 80/88] [SSE PE] fix bug 49856 --- apps/presentationeditor/main/locale/en.json | 2 ++ apps/presentationeditor/main/locale/ru.json | 2 ++ apps/spreadsheeteditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/ru.json | 2 ++ 4 files changed, 8 insertions(+) diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index e2ac94c43..bd6bdbf80 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -48,6 +48,8 @@ "Common.define.chartData.textStock": "Stock", "Common.define.chartData.textSurface": "Surface", "Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", + "Common.Translation.warnFileLockedBtnEdit": "Create a copy", + "Common.Translation.warnFileLockedBtnView": "Open for viewing", "Common.UI.ColorButton.textAutoColor": "Automatic", "Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 0f6fdcb8f..a4f01e425 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -48,6 +48,8 @@ "Common.define.chartData.textStock": "Биржевая", "Common.define.chartData.textSurface": "Поверхность", "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", + "Common.Translation.warnFileLockedBtnEdit": "Создать копию", + "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", "Common.UI.ColorButton.textAutoColor": "Автоматический", "Common.UI.ColorButton.textNewColor": "Пользовательский цвет", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 822b6570f..66b2f5931 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -49,6 +49,8 @@ "Common.define.chartData.textSurface": "Surface", "Common.define.chartData.textWinLossSpark": "Win/Loss", "Common.Translation.warnFileLocked": "The file is being edited in another app. You can continue editing and save it as a copy.", + "Common.Translation.warnFileLockedBtnEdit": "Create a copy", + "Common.Translation.warnFileLockedBtnView": "Open for viewing", "Common.UI.ColorButton.textAutoColor": "Automatic", "Common.UI.ColorButton.textNewColor": "Add New Custom Color", "Common.UI.ComboBorderSize.txtNoBorders": "No borders", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 1e48fb2a4..808c3243e 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -49,6 +49,8 @@ "Common.define.chartData.textSurface": "Поверхность", "Common.define.chartData.textWinLossSpark": "Выигрыш/проигрыш", "Common.Translation.warnFileLocked": "Файл редактируется в другом приложении. Вы можете продолжить редактирование и сохранить его как копию.", + "Common.Translation.warnFileLockedBtnEdit": "Создать копию", + "Common.Translation.warnFileLockedBtnView": "Открыть на просмотр", "Common.UI.ColorButton.textAutoColor": "Автоматический", "Common.UI.ColorButton.textNewColor": "Пользовательский цвет", "Common.UI.ComboBorderSize.txtNoBorders": "Без границ", From 2e1fc1cfa69395885d52b29850d084bd1db7997e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 13:40:17 +0300 Subject: [PATCH 81/88] [DE] Bug 50113 --- .../documenteditor/main/app/view/ParagraphSettingsAdvanced.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 49d6fa879..88c1447ae 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -698,6 +698,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem break; case 3: me.numSpacing.focus(); + var properties = (me._originalProps) ? me._originalProps : new Asc.asc_CParagraphProperty(); + me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', properties); break; case 4: me.numDefaultTab.focus(); @@ -892,8 +894,6 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem this.numSpacing.setValue((props.get_TextSpacing() !== null && props.get_TextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_TextSpacing()) : '', true); this.numPosition.setValue((props.get_Position() !== null && props.get_Position() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Position()) : '', true); - this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps); - // Tabs this.numDefaultTab.setValue((props.get_DefaultTab() !== null && props.get_DefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.get_DefaultTab().toFixed(1))) : '', true); From a12aca655ebc19bdd9141ac8f1732c295d1b9f46 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 15:10:57 +0300 Subject: [PATCH 82/88] [DE] Fix Bug 50130 --- apps/documenteditor/main/app/controller/FormsTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 41bd29531..dddf680f1 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -212,7 +212,7 @@ define([ onNoControlsColor: function(item) { if (!item.isChecked()) - this.api.asc_SetSpecialFormsHighlightColor(255, 192, 0); + this.api.asc_SetSpecialFormsHighlightColor(201, 200, 255); else this.api.asc_SetSpecialFormsHighlightColor(); Common.NotificationCenter.trigger('edit:complete', this.toolbar); From 09a27c30b8286f2234fee5b621dcedfefdff63a6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 15:41:04 +0300 Subject: [PATCH 83/88] For Bug 50113 --- apps/common/main/lib/component/Window.js | 6 ++++++ apps/common/main/lib/view/AdvancedSettingsWindow.js | 6 ++++++ .../main/app/view/PageMarginsDialog.js | 12 ++++++++---- .../main/app/view/ParagraphSettingsAdvanced.js | 10 +++++++--- .../main/app/view/ParagraphSettingsAdvanced.js | 10 +++++++--- .../main/app/view/ParagraphSettingsAdvanced.js | 10 +++++++--- 6 files changed, 41 insertions(+), 13 deletions(-) diff --git a/apps/common/main/lib/component/Window.js b/apps/common/main/lib/component/Window.js index ec1175730..661424bc2 100644 --- a/apps/common/main/lib/component/Window.js +++ b/apps/common/main/lib/component/Window.js @@ -769,6 +769,9 @@ define([ '-o-transform': 'scale(1)', 'opacity': '1' }); + setTimeout(function () { + me.fireEvent('animate:after', me); + }, 210); }, 1); setTimeout(function () { @@ -779,6 +782,9 @@ define([ this.$window.css({opacity: 1}); this.$window.addClass('notransform'); this.fireEvent('show', this); + setTimeout(function () { + me.fireEvent('animate:after', me); + }, 10); } Common.NotificationCenter.trigger('window:show', this); diff --git a/apps/common/main/lib/view/AdvancedSettingsWindow.js b/apps/common/main/lib/view/AdvancedSettingsWindow.js index 108adb385..25221ec4d 100644 --- a/apps/common/main/lib/view/AdvancedSettingsWindow.js +++ b/apps/common/main/lib/view/AdvancedSettingsWindow.js @@ -86,6 +86,8 @@ define([ var $window = this.getChild(); $window.find('.dlg-btn').on('click', _.bind(this.onDlgBtnClick, this)); + this.on('animate:after', _.bind(this.onAnimateAfter, this)); + this.btnsCategory = []; _.each($window.find('.btn-category'), function(item, index) { var btnEl = $(item); @@ -173,6 +175,10 @@ define([ if (this.storageName) Common.localStorage.setItem(this.storageName, this.getActiveCategory()); Common.UI.Window.prototype.close.call(this, suppressevent); + }, + + onAnimateAfter: function() { + } }, Common.Views.AdvancedSettingsWindow || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index 9cacd6a63..cdb98130c 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -305,6 +305,8 @@ define([ this.window = this.getChild(); this.window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + this.on('animate:after', _.bind(this.onAnimateAfter, this)); + this.updateMetricUnit(); }, @@ -316,6 +318,12 @@ define([ return this.spnTop; }, + onAnimateAfter: function() { + if (this.api && this.properties) { + this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties); + } + }, + _handleInput: function(state) { if (this.options.handler) { if (state == 'ok') { @@ -374,10 +382,6 @@ define([ this.cmbGutterPosition.setValue(0); } this.cmbGutterPosition.setDisabled(mirrorMargins); - - if (this.api) { - this.api.SetDrawImagePreviewMargins('page-margins-preview', this.properties); - } } }, diff --git a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js index 88c1447ae..d9a3ea289 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -687,7 +687,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem ]; }, - onCategoryClick: function(btn, index) { + onCategoryClick: function(btn, index, cmp, e) { Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index); var me = this; @@ -698,8 +698,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem break; case 3: me.numSpacing.focus(); - var properties = (me._originalProps) ? me._originalProps : new Asc.asc_CParagraphProperty(); - me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', properties); + if (e && (e instanceof jQuery.Event)) + me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty()); break; case 4: me.numDefaultTab.focus(); @@ -711,6 +711,10 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem }, 10); }, + onAnimateAfter: function() { + (this.getActiveCategory()==3) && this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty()); + }, + getSettings: function() { if ( this.ChangedBorders === null ) { this._changedProps.put_Borders(this.Borders); diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js index bbd577d93..c7e40f81f 100644 --- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js @@ -414,7 +414,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced ]; }, - onCategoryClick: function(btn, index) { + onCategoryClick: function(btn, index, cmp, e) { Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index); var me = this; @@ -425,6 +425,8 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced break; case 1: me.numSpacing.focus(); + if (e && (e instanceof jQuery.Event)) + me.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty()); break; case 2: me.numDefaultTab.focus(); @@ -433,6 +435,10 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced }, 10); }, + onAnimateAfter: function() { + (this.getActiveCategory()==1) && this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty()); + }, + getSettings: function() { if ( this._tabListChanged ) { if (this._changedProps.get_Tabs()===null || this._changedProps.get_Tabs()===undefined) @@ -494,8 +500,6 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced this.numSpacing.setValue((props.get_TextSpacing() !== null && props.get_TextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.get_TextSpacing()) : '', true); - this.api.SetDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps); - // Tabs this.numDefaultTab.setValue((props.get_DefaultTab() !== null && props.get_DefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.get_DefaultTab().toFixed(1))) : '', true); diff --git a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js index dae5fa399..d9137d3aa 100644 --- a/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js @@ -412,7 +412,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. ]; }, - onCategoryClick: function(btn, index) { + onCategoryClick: function(btn, index, cmp, e) { Common.Views.AdvancedSettingsWindow.prototype.onCategoryClick.call(this, btn, index); var me = this; @@ -423,6 +423,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. break; case 1: me.numSpacing.focus(); + if (e && (e instanceof jQuery.Event)) + me.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', me._originalProps || new Asc.asc_CParagraphProperty()); break; case 2: me.numDefaultTab.focus(); @@ -431,6 +433,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. }, 10); }, + onAnimateAfter: function() { + (this.getActiveCategory()==1) && this.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps || new Asc.asc_CParagraphProperty()); + }, + getSettings: function() { if ( this._tabListChanged ) { if (this._changedProps.asc_getTabs()===null || this._changedProps.asc_getTabs()===undefined) @@ -489,8 +495,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced. this.numSpacing.setValue((props.asc_getTextSpacing() !== null && props.asc_getTextSpacing() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getTextSpacing()) : '', true); - this.api.asc_setDrawImagePlaceParagraph('paragraphadv-font-img', this._originalProps); - // Tabs this.numDefaultTab.setValue((props.asc_getDefaultTab() !== null && props.asc_getDefaultTab() !== undefined) ? Common.Utils.Metric.fnRecalcFromMM(parseFloat(props.asc_getDefaultTab().toFixed(1))) : '', true); From 2ef1c936e93173d80c901e28e2f47f41ed8425bc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 16:06:47 +0300 Subject: [PATCH 84/88] [DE][PE] Fix translation --- apps/documenteditor/main/locale/da.json | 2 +- apps/documenteditor/main/locale/de.json | 2 +- apps/documenteditor/main/locale/el.json | 2 +- apps/documenteditor/main/locale/en.json | 3 ++- apps/documenteditor/main/locale/es.json | 2 +- apps/documenteditor/main/locale/fr.json | 2 +- apps/documenteditor/main/locale/hu.json | 2 +- apps/documenteditor/main/locale/nl.json | 2 +- apps/documenteditor/main/locale/ro.json | 2 +- apps/documenteditor/main/locale/ru.json | 2 +- apps/documenteditor/main/locale/sk.json | 2 +- apps/documenteditor/main/locale/sl.json | 2 +- apps/presentationeditor/main/locale/da.json | 2 +- apps/presentationeditor/main/locale/de.json | 2 +- apps/presentationeditor/main/locale/el.json | 2 +- apps/presentationeditor/main/locale/en.json | 3 ++- apps/presentationeditor/main/locale/es.json | 2 +- apps/presentationeditor/main/locale/fr.json | 2 +- apps/presentationeditor/main/locale/hu.json | 2 +- apps/presentationeditor/main/locale/ja.json | 2 +- apps/presentationeditor/main/locale/nl.json | 2 +- apps/presentationeditor/main/locale/ro.json | 2 +- apps/presentationeditor/main/locale/ru.json | 2 +- 23 files changed, 25 insertions(+), 23 deletions(-) diff --git a/apps/documenteditor/main/locale/da.json b/apps/documenteditor/main/locale/da.json index 827d3d06d..968652305 100644 --- a/apps/documenteditor/main/locale/da.json +++ b/apps/documenteditor/main/locale/da.json @@ -2602,7 +2602,7 @@ "DE.Views.Toolbar.tipAlignRight": "Tilpas til højre", "DE.Views.Toolbar.tipBack": "Tilbage", "DE.Views.Toolbar.tipBlankPage": "Indsæt tom side", - "DE.Views.Toolbar.tipChangeCase:": "Ændre store/små bogstaver", + "DE.Views.Toolbar.tipChangeCase": "Ændre store/små bogstaver", "DE.Views.Toolbar.tipChangeChart": "Skift diagramtype", "DE.Views.Toolbar.tipClearStyle": "Ryd formatering", "DE.Views.Toolbar.tipColorSchemas": "Skift farveskema", diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 16ea6fa25..2ac2f3932 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -2606,7 +2606,7 @@ "DE.Views.Toolbar.tipAlignRight": "Rechtsbündig ausrichten", "DE.Views.Toolbar.tipBack": "Zurück", "DE.Views.Toolbar.tipBlankPage": "Leere Seite einlegen", - "DE.Views.Toolbar.tipChangeCase:": "Groß-/Kleinschreibung", + "DE.Views.Toolbar.tipChangeCase": "Groß-/Kleinschreibung", "DE.Views.Toolbar.tipChangeChart": "Diagrammtyp ändern", "DE.Views.Toolbar.tipClearStyle": "Formatierung löschen", "DE.Views.Toolbar.tipColorSchemas": "Farbschema ändern", diff --git a/apps/documenteditor/main/locale/el.json b/apps/documenteditor/main/locale/el.json index cfe8c2fb1..9050ab43d 100644 --- a/apps/documenteditor/main/locale/el.json +++ b/apps/documenteditor/main/locale/el.json @@ -2602,7 +2602,7 @@ "DE.Views.Toolbar.tipAlignRight": "Στοίχιση δεξιά", "DE.Views.Toolbar.tipBack": "Πίσω", "DE.Views.Toolbar.tipBlankPage": "Εισαγωγή κενής σελίδας", - "DE.Views.Toolbar.tipChangeCase:": "Αλλαγή πεζών-κεφαλαίων", + "DE.Views.Toolbar.tipChangeCase": "Αλλαγή πεζών-κεφαλαίων", "DE.Views.Toolbar.tipChangeChart": "Αλλαγή τύπου γραφήματος", "DE.Views.Toolbar.tipClearStyle": "Εκκαθάριση τεχνοτροπίας", "DE.Views.Toolbar.tipColorSchemas": "Αλλαγή χρωματικού σχεδίου", diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index bdee122a0..9184d62e9 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2609,7 +2609,8 @@ "DE.Views.Toolbar.tipAlignRight": "Align right", "DE.Views.Toolbar.tipBack": "Back", "DE.Views.Toolbar.tipBlankPage": "Insert blank page", - "DE.Views.Toolbar.tipChangeCase:": "Change case", + "del_DE.Views.Toolbar.tipChangeCase:": "Change case", + "DE.Views.Toolbar.tipChangeCase": "Change case", "DE.Views.Toolbar.tipChangeChart": "Change chart type", "DE.Views.Toolbar.tipClearStyle": "Clear style", "DE.Views.Toolbar.tipColorSchemas": "Change color scheme", diff --git a/apps/documenteditor/main/locale/es.json b/apps/documenteditor/main/locale/es.json index a9949d3b9..d5a88daa3 100644 --- a/apps/documenteditor/main/locale/es.json +++ b/apps/documenteditor/main/locale/es.json @@ -2606,7 +2606,7 @@ "DE.Views.Toolbar.tipAlignRight": "Alinear a la derecha", "DE.Views.Toolbar.tipBack": "Atrás", "DE.Views.Toolbar.tipBlankPage": "Insertar página en blanco", - "DE.Views.Toolbar.tipChangeCase:": "Cambiar mayúsculas y minúsculas", + "DE.Views.Toolbar.tipChangeCase": "Cambiar mayúsculas y minúsculas", "DE.Views.Toolbar.tipChangeChart": "Cambiar tipo de gráfico", "DE.Views.Toolbar.tipClearStyle": "Borrar estilo", "DE.Views.Toolbar.tipColorSchemas": "Cambiar combinación de colores", diff --git a/apps/documenteditor/main/locale/fr.json b/apps/documenteditor/main/locale/fr.json index 8de06560c..b68477ac0 100644 --- a/apps/documenteditor/main/locale/fr.json +++ b/apps/documenteditor/main/locale/fr.json @@ -2606,7 +2606,7 @@ "DE.Views.Toolbar.tipAlignRight": "Aligner à droite", "DE.Views.Toolbar.tipBack": "Arrière", "DE.Views.Toolbar.tipBlankPage": "Insérer page vide", - "DE.Views.Toolbar.tipChangeCase:": "Changer de cas", + "DE.Views.Toolbar.tipChangeCase": "Changer de cas", "DE.Views.Toolbar.tipChangeChart": "Modifier le type de graphique", "DE.Views.Toolbar.tipClearStyle": "Effacer le style", "DE.Views.Toolbar.tipColorSchemas": "Modifier le jeu de couleurs", diff --git a/apps/documenteditor/main/locale/hu.json b/apps/documenteditor/main/locale/hu.json index 692fe8f06..22f07e375 100644 --- a/apps/documenteditor/main/locale/hu.json +++ b/apps/documenteditor/main/locale/hu.json @@ -2599,7 +2599,7 @@ "DE.Views.Toolbar.tipAlignRight": "Jobbra rendez", "DE.Views.Toolbar.tipBack": "Vissza", "DE.Views.Toolbar.tipBlankPage": "Üres oldal beillesztése", - "DE.Views.Toolbar.tipChangeCase:": "Kis- és nagybetűk megváltoztatása", + "DE.Views.Toolbar.tipChangeCase": "Kis- és nagybetűk megváltoztatása", "DE.Views.Toolbar.tipChangeChart": "Diagramtípus módosítása", "DE.Views.Toolbar.tipClearStyle": "Stílus törlése", "DE.Views.Toolbar.tipColorSchemas": "Színséma módosítása", diff --git a/apps/documenteditor/main/locale/nl.json b/apps/documenteditor/main/locale/nl.json index 5597f8850..a48440332 100644 --- a/apps/documenteditor/main/locale/nl.json +++ b/apps/documenteditor/main/locale/nl.json @@ -2599,7 +2599,7 @@ "DE.Views.Toolbar.tipAlignRight": "Rechts uitlijnen", "DE.Views.Toolbar.tipBack": "Terug", "DE.Views.Toolbar.tipBlankPage": "Invoegen nieuwe pagina", - "DE.Views.Toolbar.tipChangeCase:": "Verander lettertype", + "DE.Views.Toolbar.tipChangeCase": "Verander lettertype", "DE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen", "DE.Views.Toolbar.tipClearStyle": "Stijl wissen", "DE.Views.Toolbar.tipColorSchemas": "Kleurenschema wijzigen", diff --git a/apps/documenteditor/main/locale/ro.json b/apps/documenteditor/main/locale/ro.json index 7b5dc2dc5..a3c2fe6b4 100644 --- a/apps/documenteditor/main/locale/ro.json +++ b/apps/documenteditor/main/locale/ro.json @@ -2599,7 +2599,7 @@ "DE.Views.Toolbar.tipAlignRight": "Aliniere la dreapta", "DE.Views.Toolbar.tipBack": "Înapoi", "DE.Views.Toolbar.tipBlankPage": "Inserare pagină necompletată", - "DE.Views.Toolbar.tipChangeCase:": "Modificarea scrierii cu majuscule sau minuscule", + "DE.Views.Toolbar.tipChangeCase": "Modificarea scrierii cu majuscule sau minuscule", "DE.Views.Toolbar.tipChangeChart": "Modificare tip diagramă", "DE.Views.Toolbar.tipClearStyle": "Golire stil", "DE.Views.Toolbar.tipColorSchemas": "Modificare schemă de culori", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 7275ecc3a..2db5d9399 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -2609,7 +2609,7 @@ "DE.Views.Toolbar.tipAlignRight": "Выравнивание по правому краю", "DE.Views.Toolbar.tipBack": "Назад", "DE.Views.Toolbar.tipBlankPage": "Вставить пустую страницу", - "DE.Views.Toolbar.tipChangeCase:": "Изменить регистр", + "DE.Views.Toolbar.tipChangeCase": "Изменить регистр", "DE.Views.Toolbar.tipChangeChart": "Изменить тип диаграммы", "DE.Views.Toolbar.tipClearStyle": "Очистить стиль", "DE.Views.Toolbar.tipColorSchemas": "Изменение цветовой схемы", diff --git a/apps/documenteditor/main/locale/sk.json b/apps/documenteditor/main/locale/sk.json index 3f820502a..a015d51f6 100644 --- a/apps/documenteditor/main/locale/sk.json +++ b/apps/documenteditor/main/locale/sk.json @@ -2421,7 +2421,7 @@ "DE.Views.Toolbar.tipAlignRight": "Zarovnať doprava", "DE.Views.Toolbar.tipBack": "Späť", "DE.Views.Toolbar.tipBlankPage": "Vložiť prázdnu stranu", - "DE.Views.Toolbar.tipChangeCase:": "Zmeniť púzdro", + "DE.Views.Toolbar.tipChangeCase": "Zmeniť púzdro", "DE.Views.Toolbar.tipChangeChart": "Zmeniť typ grafu", "DE.Views.Toolbar.tipClearStyle": "Vymazať štýl", "DE.Views.Toolbar.tipColorSchemas": "Zmeniť farebnú schému", diff --git a/apps/documenteditor/main/locale/sl.json b/apps/documenteditor/main/locale/sl.json index 8e1ad0fef..68ef7f146 100644 --- a/apps/documenteditor/main/locale/sl.json +++ b/apps/documenteditor/main/locale/sl.json @@ -1885,7 +1885,7 @@ "DE.Views.Toolbar.tipAlignRight": "Poravnaj desno", "DE.Views.Toolbar.tipBack": "Nazaj", "DE.Views.Toolbar.tipBlankPage": "Vstavi prazno stran", - "DE.Views.Toolbar.tipChangeCase:": "Zamenjaj velikost črk", + "DE.Views.Toolbar.tipChangeCase": "Zamenjaj velikost črk", "DE.Views.Toolbar.tipChangeChart": "Spremeni vrsto razpredelnice", "DE.Views.Toolbar.tipClearStyle": "Počisti stil", "DE.Views.Toolbar.tipColorSchemas": "Spremeni barvno shemo", diff --git a/apps/presentationeditor/main/locale/da.json b/apps/presentationeditor/main/locale/da.json index 58cfbe1a0..9a35d40fc 100644 --- a/apps/presentationeditor/main/locale/da.json +++ b/apps/presentationeditor/main/locale/da.json @@ -1901,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Understreg", "PE.Views.Toolbar.tipAddSlide": "Tilføj dias", "PE.Views.Toolbar.tipBack": "Tilbage", - "PE.Views.Toolbar.tipChangeCase:": "Ændre store/små bogstaver", + "PE.Views.Toolbar.tipChangeCase": "Ændre store/små bogstaver", "PE.Views.Toolbar.tipChangeChart": "Skift diagramtype", "PE.Views.Toolbar.tipChangeSlide": "Skift dias layout", "PE.Views.Toolbar.tipClearStyle": "Ryd formatering", diff --git a/apps/presentationeditor/main/locale/de.json b/apps/presentationeditor/main/locale/de.json index 2aa98b85c..205fed73d 100644 --- a/apps/presentationeditor/main/locale/de.json +++ b/apps/presentationeditor/main/locale/de.json @@ -1901,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Unterstrichen", "PE.Views.Toolbar.tipAddSlide": "Folie hinzufügen", "PE.Views.Toolbar.tipBack": "Zurück", - "PE.Views.Toolbar.tipChangeCase:": "Groß-/Kleinschreibung", + "PE.Views.Toolbar.tipChangeCase": "Groß-/Kleinschreibung", "PE.Views.Toolbar.tipChangeChart": "Diagrammtyp ändern", "PE.Views.Toolbar.tipChangeSlide": "Folienlayout ändern", "PE.Views.Toolbar.tipClearStyle": "Formatierung löschen", diff --git a/apps/presentationeditor/main/locale/el.json b/apps/presentationeditor/main/locale/el.json index ecea761f6..4cdb130b4 100644 --- a/apps/presentationeditor/main/locale/el.json +++ b/apps/presentationeditor/main/locale/el.json @@ -1901,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Υπογράμμιση", "PE.Views.Toolbar.tipAddSlide": "Προσθήκη διαφάνειας", "PE.Views.Toolbar.tipBack": "Πίσω", - "PE.Views.Toolbar.tipChangeCase:": "Αλλαγή πεζών-κεφαλαίων", + "PE.Views.Toolbar.tipChangeCase": "Αλλαγή πεζών-κεφαλαίων", "PE.Views.Toolbar.tipChangeChart": "Αλλαγή τύπου γραφήματος", "PE.Views.Toolbar.tipChangeSlide": "Αλλαγή διάταξης διαφάνειας", "PE.Views.Toolbar.tipClearStyle": "Εκκαθάριση τεχνοτροπίας", diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index bd6bdbf80..e6f2b6ffe 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1906,7 +1906,8 @@ "PE.Views.Toolbar.textUnderline": "Underline", "PE.Views.Toolbar.tipAddSlide": "Add slide", "PE.Views.Toolbar.tipBack": "Back", - "PE.Views.Toolbar.tipChangeCase:": "Change case", + "del_PE.Views.Toolbar.tipChangeCase:": "Change case", + "PE.Views.Toolbar.tipChangeCase": "Change case", "PE.Views.Toolbar.tipChangeChart": "Change chart type", "PE.Views.Toolbar.tipChangeSlide": "Change slide layout", "PE.Views.Toolbar.tipClearStyle": "Clear style", diff --git a/apps/presentationeditor/main/locale/es.json b/apps/presentationeditor/main/locale/es.json index fc21b9d52..f4b8ab3cc 100644 --- a/apps/presentationeditor/main/locale/es.json +++ b/apps/presentationeditor/main/locale/es.json @@ -1901,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Subrayar", "PE.Views.Toolbar.tipAddSlide": "Añadir diapositiva", "PE.Views.Toolbar.tipBack": "Atrás", - "PE.Views.Toolbar.tipChangeCase:": "Cambiar mayúsculas y minúsculas", + "PE.Views.Toolbar.tipChangeCase": "Cambiar mayúsculas y minúsculas", "PE.Views.Toolbar.tipChangeChart": "Cambiar tipo de gráfico", "PE.Views.Toolbar.tipChangeSlide": "Cambiar diseño de diapositiva", "PE.Views.Toolbar.tipClearStyle": "Limpiar estilo", diff --git a/apps/presentationeditor/main/locale/fr.json b/apps/presentationeditor/main/locale/fr.json index 34c178bf5..0e3ba8f7e 100644 --- a/apps/presentationeditor/main/locale/fr.json +++ b/apps/presentationeditor/main/locale/fr.json @@ -1901,7 +1901,7 @@ "PE.Views.Toolbar.textUnderline": "Souligné", "PE.Views.Toolbar.tipAddSlide": "Ajouter diapositive", "PE.Views.Toolbar.tipBack": "En arrière", - "PE.Views.Toolbar.tipChangeCase:": "Changer de cas", + "PE.Views.Toolbar.tipChangeCase": "Changer de cas", "PE.Views.Toolbar.tipChangeChart": "Modifier le type de graphique", "PE.Views.Toolbar.tipChangeSlide": "Modifier la disposition de diapositive", "PE.Views.Toolbar.tipClearStyle": "Effacer le style", diff --git a/apps/presentationeditor/main/locale/hu.json b/apps/presentationeditor/main/locale/hu.json index a0731cd94..d544aad51 100644 --- a/apps/presentationeditor/main/locale/hu.json +++ b/apps/presentationeditor/main/locale/hu.json @@ -1900,7 +1900,7 @@ "PE.Views.Toolbar.textUnderline": "Aláhúzott", "PE.Views.Toolbar.tipAddSlide": "Minden dia", "PE.Views.Toolbar.tipBack": "Vissza", - "PE.Views.Toolbar.tipChangeCase:": "Kis- és nagybetűk megváltoztatása", + "PE.Views.Toolbar.tipChangeCase": "Kis- és nagybetűk megváltoztatása", "PE.Views.Toolbar.tipChangeChart": "Diagramtípus módosítása", "PE.Views.Toolbar.tipChangeSlide": "Dia elrendezés módosítása", "PE.Views.Toolbar.tipClearStyle": "Stílus törlése", diff --git a/apps/presentationeditor/main/locale/ja.json b/apps/presentationeditor/main/locale/ja.json index 16f957a88..01987b2b7 100644 --- a/apps/presentationeditor/main/locale/ja.json +++ b/apps/presentationeditor/main/locale/ja.json @@ -1898,7 +1898,7 @@ "PE.Views.Toolbar.textUnderline": "下線", "PE.Views.Toolbar.tipAddSlide": "スライドの追加", "PE.Views.Toolbar.tipBack": "戻る", - "PE.Views.Toolbar.tipChangeCase:": "大文字小文字を変更", + "PE.Views.Toolbar.tipChangeCase": "大文字小文字を変更", "PE.Views.Toolbar.tipChangeChart": "グラフの種類を変更", "PE.Views.Toolbar.tipChangeSlide": "レイアウトスライドの変更", "PE.Views.Toolbar.tipClearStyle": "スタイルのクリア", diff --git a/apps/presentationeditor/main/locale/nl.json b/apps/presentationeditor/main/locale/nl.json index 7f3815496..0d6080230 100644 --- a/apps/presentationeditor/main/locale/nl.json +++ b/apps/presentationeditor/main/locale/nl.json @@ -1900,7 +1900,7 @@ "PE.Views.Toolbar.textUnderline": "Onderstrepen", "PE.Views.Toolbar.tipAddSlide": "Dia toevoegen", "PE.Views.Toolbar.tipBack": "Terug", - "PE.Views.Toolbar.tipChangeCase:": "Verander lettertype", + "PE.Views.Toolbar.tipChangeCase": "Verander lettertype", "PE.Views.Toolbar.tipChangeChart": "Grafiektype wijzigen", "PE.Views.Toolbar.tipChangeSlide": "Dia-indeling wijzigen", "PE.Views.Toolbar.tipClearStyle": "Stijl wissen", diff --git a/apps/presentationeditor/main/locale/ro.json b/apps/presentationeditor/main/locale/ro.json index 999b92d32..805499313 100644 --- a/apps/presentationeditor/main/locale/ro.json +++ b/apps/presentationeditor/main/locale/ro.json @@ -1900,7 +1900,7 @@ "PE.Views.Toolbar.textUnderline": "Subliniat", "PE.Views.Toolbar.tipAddSlide": "Adăugare diapozitiv", "PE.Views.Toolbar.tipBack": "Înapoi", - "PE.Views.Toolbar.tipChangeCase:": "Modificarea scrierii cu majuscule sau minuscule", + "PE.Views.Toolbar.tipChangeCase": "Modificarea scrierii cu majuscule sau minuscule", "PE.Views.Toolbar.tipChangeChart": "Modificare tip diagramă", "PE.Views.Toolbar.tipChangeSlide": "Modificare aspect diapozitiv", "PE.Views.Toolbar.tipClearStyle": "Golire stil", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index a4f01e425..fe50d29de 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -1906,7 +1906,7 @@ "PE.Views.Toolbar.textUnderline": "Подчеркнутый", "PE.Views.Toolbar.tipAddSlide": "Добавить слайд", "PE.Views.Toolbar.tipBack": "Назад", - "PE.Views.Toolbar.tipChangeCase:": "Изменить регистр", + "PE.Views.Toolbar.tipChangeCase": "Изменить регистр", "PE.Views.Toolbar.tipChangeChart": "Изменить тип диаграммы", "PE.Views.Toolbar.tipChangeSlide": "Изменить макет слайда", "PE.Views.Toolbar.tipClearStyle": "Очистить стиль", From 663cf2afc68a6872ab150f4d339b27d9a4757644 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 19:21:41 +0300 Subject: [PATCH 85/88] Fix Bug 50139 --- apps/common/main/resources/less/table-styler.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/common/main/resources/less/table-styler.less b/apps/common/main/resources/less/table-styler.less index 3399084bb..ad979147e 100644 --- a/apps/common/main/resources/less/table-styler.less +++ b/apps/common/main/resources/less/table-styler.less @@ -1,4 +1,6 @@ .table-styler { + background-color: @canvas-content-background; + table { &.transparent { background-color: @canvas-content-background !important; From 1244f69115133ea43fddab89c379194bc5a94bd9 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Thu, 29 Apr 2021 19:32:00 +0300 Subject: [PATCH 86/88] [common] fix bug 50136 --- apps/common/main/lib/component/MultiSliderGradient.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/MultiSliderGradient.js b/apps/common/main/lib/component/MultiSliderGradient.js index d4bf91a62..28c2daf09 100644 --- a/apps/common/main/lib/component/MultiSliderGradient.js +++ b/apps/common/main/lib/component/MultiSliderGradient.js @@ -55,7 +55,7 @@ define([ values: [0, 100], colorValues: ['#000000', '#ffffff'], currentThumb: 0, - thumbTemplate: '
' + + thumbTemplate: '
' + '
' + '
' + '
' From ef801c5994704a82a900e25532dc784dc28a1551 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 20:12:12 +0300 Subject: [PATCH 87/88] [SSE] Add translations --- apps/spreadsheeteditor/main/app/controller/Main.js | 8 ++++++-- apps/spreadsheeteditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/ru.json | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index b1eacbf97..2bae4579a 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -139,7 +139,9 @@ define([ 'Days': this.txtDays, 'Months': this.txtMonths, 'Quarters': this.txtQuarters, - 'Years': this.txtYears + 'Years': this.txtYears, + '%1 or %2': this.txtOr, + 'Qtr': this.txtQuarter }; styleNames.forEach(function(item){ @@ -2837,7 +2839,9 @@ define([ txtYears: 'Years', errorPivotGroup: 'Cannot group that selection.', errorPasteMultiSelect: 'This action cannot be done on a multiple range selection.
Select a single range and try again.', - errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.' + errorPivotWithoutUnderlying: 'The Pivot Table report was saved without the underlying data.
Use the \'Refresh\' button to update the report.', + txtQuarter: 'Qtr', + txtOr: '%1 or %2' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 66b2f5931..b7ed732cf 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -704,6 +704,8 @@ "SSE.Controllers.Main.txtPreparedBy": "Prepared by", "SSE.Controllers.Main.txtPrintArea": "Print_Area", "SSE.Controllers.Main.txtQuarters": "Quarters", + "SSE.Controllers.Main.txtQuarter": "Qtr", + "SSE.Controllers.Main.txtOr": "%1 or %2", "SSE.Controllers.Main.txtRectangles": "Rectangles", "SSE.Controllers.Main.txtRow": "Row", "SSE.Controllers.Main.txtRowLbls": "Row Labels", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 808c3243e..041f17eba 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -691,7 +691,9 @@ "SSE.Controllers.Main.txtFiguredArrows": "Фигурные стрелки", "SSE.Controllers.Main.txtFile": "Файл", "SSE.Controllers.Main.txtGrandTotal": "Общий итог", - "SSE.Controllers.Main.txtGroup": "Сгруппировать", + "SSE.Controllers.Main.txtGroup": "Группа", + "SSE.Controllers.Main.txtQuarter": "Квартал", + "SSE.Controllers.Main.txtOr": "%1 или %2", "SSE.Controllers.Main.txtHours": "Часы", "SSE.Controllers.Main.txtLines": "Линии", "SSE.Controllers.Main.txtMath": "Математические знаки", From 15d30ed39ba884f51ecdd1a97cae2a4f9e6e7dc5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 29 Apr 2021 20:45:25 +0300 Subject: [PATCH 88/88] Update translation --- apps/spreadsheeteditor/main/locale/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 041f17eba..70d747319 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -692,7 +692,7 @@ "SSE.Controllers.Main.txtFile": "Файл", "SSE.Controllers.Main.txtGrandTotal": "Общий итог", "SSE.Controllers.Main.txtGroup": "Группа", - "SSE.Controllers.Main.txtQuarter": "Квартал", + "SSE.Controllers.Main.txtQuarter": "Кв-л", "SSE.Controllers.Main.txtOr": "%1 или %2", "SSE.Controllers.Main.txtHours": "Часы", "SSE.Controllers.Main.txtLines": "Линии",