From 33a5ffb9601153ac9b02d47c8fa7800bc962c3cd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 23 Nov 2020 17:41:56 +0300 Subject: [PATCH 1/2] [DE] Fix translation --- apps/documenteditor/main/app/view/LineNumbersDialog.js | 6 +++--- apps/documenteditor/main/app/view/NoteSettingsDialog.js | 6 +++--- apps/documenteditor/main/locale/de.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/view/LineNumbersDialog.js b/apps/documenteditor/main/app/view/LineNumbersDialog.js index f1c37058e..39713eaf2 100644 --- a/apps/documenteditor/main/app/view/LineNumbersDialog.js +++ b/apps/documenteditor/main/app/view/LineNumbersDialog.js @@ -47,7 +47,7 @@ define([ DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({ options: { width: 290, - height: 308, + height: 320, header: true, style: 'min-width: 290px;', cls: 'modal-dlg', @@ -72,7 +72,7 @@ define([ '
', '
', '
', - '
', + '
', '
', '' ].join(''); @@ -161,7 +161,7 @@ define([ this.cmbApply = new Common.UI.ComboBox({ el: $('#line-numbers-combo-apply'), cls: 'input-group-nr', - menuStyle: 'min-width: 125px;', + menuStyle: 'min-width: 150px;', editable: false, data: [ { displayValue: this.textSection, value: Asc.c_oAscSectionApplyType.Current }, diff --git a/apps/documenteditor/main/app/view/NoteSettingsDialog.js b/apps/documenteditor/main/app/view/NoteSettingsDialog.js index 72c78ec91..adb5f8452 100644 --- a/apps/documenteditor/main/app/view/NoteSettingsDialog.js +++ b/apps/documenteditor/main/app/view/NoteSettingsDialog.js @@ -49,7 +49,7 @@ define([ DE.Views.NoteSettingsDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ options: { contentWidth: 300, - height: 380, + height: 395, buttons: null }, @@ -110,8 +110,8 @@ define([ '', '', '', - '', - '
', + '', + '
', '', '', '', diff --git a/apps/documenteditor/main/locale/de.json b/apps/documenteditor/main/locale/de.json index 3a94d7de1..83e061811 100644 --- a/apps/documenteditor/main/locale/de.json +++ b/apps/documenteditor/main/locale/de.json @@ -1794,7 +1794,7 @@ "DE.Views.LeftMenu.txtTrial": "Trial-Modus", "DE.Views.LeftMenu.txtTrialDev": "Testversion für Entwickler-Modus", "DE.Views.LineNumbersDialog.textAddLineNumbering": "Zeilennummer hinzufügen", - "DE.Views.LineNumbersDialog.textApplyTo": "Anwendung von Änderungen auf", + "DE.Views.LineNumbersDialog.textApplyTo": "Änderungen anwenden", "DE.Views.LineNumbersDialog.textContinuous": "Ununterbrochen", "DE.Views.LineNumbersDialog.textCountBy": "Zählintervall", "DE.Views.LineNumbersDialog.textDocument": "Zum ganzen Dokument", From 73a832242dc7486aeaab5f86e641f413716a0c06 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 23 Nov 2020 17:56:11 +0300 Subject: [PATCH 2/2] Update help, Fix Bug 47620 --- .../ConvertFootnotesEndnotes.htm | 2 +- .../InsertCrossReference.htm | 1 + .../UsageInstructions/InsertLineNumbers.htm | 1 + .../de/UsageInstructions/OpenCreateNew.htm | 6 +- .../help/de/images/convert_all_notes.png | Bin 0 -> 13674 bytes .../de/images/cross_refference_window.png | Bin 0 -> 8024 bytes .../help/de/images/linenumbers_window.png | Bin 0 -> 6541 bytes .../InsertCrossReference.htm | 1 + .../UsageInstructions/InsertLineNumbers.htm | 1 + .../en/images/cross_refference_window.png | Bin 0 -> 7488 bytes .../help/en/images/linenumbers_window.png | Bin 0 -> 5583 bytes .../main/resources/help/ru/Contents.json | 1 + .../help/ru/HelpfulHints/SupportedFormats.htm | 69 +- .../help/ru/ProgramInterface/LayoutTab.htm | 1 + .../ru/ProgramInterface/ReferencesTab.htm | 7 +- .../ConvertFootnotesEndnotes.htm | 32 + .../ru/UsageInstructions/InsertAutoshapes.htm | 22 +- .../InsertCrossReference.htm | 184 + .../ru/UsageInstructions/InsertEndnotes.htm | 88 + .../UsageInstructions/InsertLineNumbers.htm | 54 + .../UsageInstructions/InsertTextObjects.htm | 18 +- .../ru/UsageInstructions/MathAutoCorrect.htm | 86 +- .../help/ru/images/addgradientpoint.png | Bin 0 -> 342 bytes .../help/ru/images/autoformatasyoutype.png | Bin 0 -> 9262 bytes .../ru/images/convert_footnotes_endnotes.png | Bin 0 -> 17218 bytes .../help/ru/images/cross_refference_icon.png | Bin 0 -> 183 bytes .../ru/images/cross_refference_window.png | Bin 0 -> 7011 bytes .../help/ru/images/endnotes_settings.png | Bin 0 -> 6127 bytes .../help/ru/images/endnotesadded.png | Bin 0 -> 3528 bytes .../resources/help/ru/images/endnotetext.png | Bin 0 -> 3531 bytes .../help/ru/images/fill_gradient.png | Bin 5601 -> 12769 bytes .../ru/images/interface/desktop_layouttab.png | Bin 12483 -> 12697 bytes .../interface/desktop_referencestab.png | Bin 11176 -> 11490 bytes .../help/ru/images/interface/layouttab.png | Bin 11069 -> 11382 bytes .../ru/images/interface/referencestab.png | Bin 9688 -> 10028 bytes .../help/ru/images/linenumbers_icon.png | Bin 0 -> 391 bytes .../help/ru/images/linenumbers_window.png | Bin 0 -> 5246 bytes .../help/ru/images/recognizedfunctions.png | Bin 0 -> 10886 bytes .../help/ru/images/removegradientpoint.png | Bin 0 -> 338 bytes .../resources/help/ru/images/replacetext.png | Bin 0 -> 9037 bytes .../main/resources/help/ru/search/indexes.js | 64 +- .../de/UsageInstructions/OpenCreateNew.htm | 6 +- .../es/UsageInstructions/OpenCreateNew.htm | 6 +- .../FillObjectsSelectColor.htm | 18 +- .../ru/UsageInstructions/MathAutoCorrect.htm | 86 +- .../help/ru/images/addgradientpoint.png | Bin 0 -> 216 bytes .../resources/help/ru/images/fill_color.png | Bin 2521 -> 2069 bytes .../help/ru/images/fill_gradient.png | Bin 5739 -> 6610 bytes .../resources/help/ru/images/fill_pattern.png | Bin 3706 -> 3029 bytes .../resources/help/ru/images/fill_picture.png | Bin 4399 -> 3759 bytes .../help/ru/images/removegradientpoint.png | Bin 0 -> 242 bytes .../main/resources/help/ru/search/indexes.js | 30 +- .../de/UsageInstructions/OpenCreateNew.htm | 6 +- .../main/resources/help/ru/Contents.json | 4 +- .../main/resources/help/ru/Functions/cell.htm | 127 +- .../resources/help/ru/Functions/linest.htm | 49 +- .../help/ru/HelpfulHints/Navigation.htm | 19 +- .../help/ru/ProgramInterface/InsertTab.htm | 1 + .../help/ru/ProgramInterface/LayoutTab.htm | 2 +- .../help/ru/ProgramInterface/ViewTab.htm | 37 + .../help/ru/UsageInstructions/AddBorders.htm | 9 +- .../ru/UsageInstructions/InsertAutoshapes.htm | 22 +- .../help/ru/UsageInstructions/InsertChart.htm | 458 +- .../ru/UsageInstructions/MathAutoCorrect.htm | 5032 +++++++++-------- .../help/ru/UsageInstructions/SheetView.htm | 58 + .../help/ru/images/addgradientpoint.png | Bin 0 -> 216 bytes .../help/ru/images/autoformatasyoutype.png | Bin 0 -> 9262 bytes .../resources/help/ru/images/axislabels.png | Bin 0 -> 2999 bytes .../main/resources/help/ru/images/cell.png | Bin 5530 -> 3531 bytes .../help/ru/images/cell_fill_gradient.png | Bin 4250 -> 5884 bytes .../resources/help/ru/images/chartdata.png | Bin 0 -> 9200 bytes .../help/ru/images/chartsettings.png | Bin 10997 -> 6993 bytes .../resources/help/ru/images/close_icon.png | Bin 0 -> 466 bytes .../resources/help/ru/images/editseries.png | Bin 0 -> 3797 bytes .../help/ru/images/fill_gradient.png | Bin 5492 -> 7517 bytes .../ru/images/interface/collaborationtab.png | Bin 9422 -> 9855 bytes .../help/ru/images/interface/datatab.png | Bin 15198 -> 10323 bytes .../interface/desktop_collaborationtab.png | Bin 8926 -> 9800 bytes .../ru/images/interface/desktop_datatab.png | Bin 10860 -> 11811 bytes .../images/interface/desktop_editorwindow.png | Bin 124222 -> 124519 bytes .../ru/images/interface/desktop_filetab.png | Bin 20593 -> 21616 bytes .../images/interface/desktop_formulatab.png | Bin 31511 -> 32486 bytes .../ru/images/interface/desktop_hometab.png | Bin 13889 -> 14949 bytes .../ru/images/interface/desktop_inserttab.png | Bin 12617 -> 13490 bytes .../ru/images/interface/desktop_layouttab.png | Bin 11844 -> 12718 bytes .../interface/desktop_pivottabletab.png | Bin 8970 -> 9554 bytes .../images/interface/desktop_pluginstab.png | Bin 18806 -> 13707 bytes .../ru/images/interface/desktop_viewtab.png | Bin 0 -> 13268 bytes .../help/ru/images/interface/editorwindow.png | Bin 112911 -> 113196 bytes .../help/ru/images/interface/filetab.png | Bin 40563 -> 28882 bytes .../help/ru/images/interface/formulatab.png | Bin 18055 -> 12358 bytes .../help/ru/images/interface/hometab.png | Bin 13114 -> 13627 bytes .../help/ru/images/interface/inserttab.png | Bin 17460 -> 12318 bytes .../help/ru/images/interface/layouttab.png | Bin 10748 -> 11242 bytes .../ru/images/interface/pivottabletab.png | Bin 19910 -> 12828 bytes .../help/ru/images/interface/pluginstab.png | Bin 10805 -> 11249 bytes .../help/ru/images/interface/viewtab.png | Bin 0 -> 11584 bytes .../main/resources/help/ru/images/linest.png | Bin 4255 -> 3101 bytes .../help/ru/images/recognizedfunctions.png | Bin 0 -> 10886 bytes .../help/ru/images/removegradientpoint.png | Bin 0 -> 242 bytes .../resources/help/ru/images/replacetext.png | Bin 0 -> 9037 bytes .../help/ru/images/sheetview_icon.png | Bin 0 -> 721 bytes .../main/resources/help/ru/search/indexes.js | 97 +- 103 files changed, 3743 insertions(+), 2962 deletions(-) create mode 100644 apps/documenteditor/main/resources/help/de/images/convert_all_notes.png create mode 100644 apps/documenteditor/main/resources/help/de/images/cross_refference_window.png create mode 100644 apps/documenteditor/main/resources/help/de/images/linenumbers_window.png create mode 100644 apps/documenteditor/main/resources/help/en/images/cross_refference_window.png create mode 100644 apps/documenteditor/main/resources/help/en/images/linenumbers_window.png create mode 100644 apps/documenteditor/main/resources/help/ru/UsageInstructions/ConvertFootnotesEndnotes.htm create mode 100644 apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertCrossReference.htm create mode 100644 apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertEndnotes.htm create mode 100644 apps/documenteditor/main/resources/help/ru/UsageInstructions/InsertLineNumbers.htm create mode 100644 apps/documenteditor/main/resources/help/ru/images/addgradientpoint.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/autoformatasyoutype.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/convert_footnotes_endnotes.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/cross_refference_icon.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/cross_refference_window.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/endnotes_settings.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/endnotesadded.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/endnotetext.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/linenumbers_icon.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/linenumbers_window.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/recognizedfunctions.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/removegradientpoint.png create mode 100644 apps/documenteditor/main/resources/help/ru/images/replacetext.png create mode 100644 apps/presentationeditor/main/resources/help/ru/images/addgradientpoint.png create mode 100644 apps/presentationeditor/main/resources/help/ru/images/removegradientpoint.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/ProgramInterface/ViewTab.htm create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/UsageInstructions/SheetView.htm create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/addgradientpoint.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/autoformatasyoutype.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/axislabels.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/chartdata.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/close_icon.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/editseries.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/interface/desktop_viewtab.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/interface/viewtab.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/recognizedfunctions.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/removegradientpoint.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/replacetext.png create mode 100644 apps/spreadsheeteditor/main/resources/help/ru/images/sheetview_icon.png diff --git a/apps/documenteditor/main/resources/help/de/UsageInstructions/ConvertFootnotesEndnotes.htm b/apps/documenteditor/main/resources/help/de/UsageInstructions/ConvertFootnotesEndnotes.htm index f0a542c68..539ee9e08 100644 --- a/apps/documenteditor/main/resources/help/de/UsageInstructions/ConvertFootnotesEndnotes.htm +++ b/apps/documenteditor/main/resources/help/de/UsageInstructions/ConvertFootnotesEndnotes.htm @@ -18,7 +18,7 @@
  1. Klicken Sie auf den Pfeil neben dem Symbol Fußnoten Symbol Fußnote auf der Registerkarte Verweise in der oberen Symbolleiste,
  2. Bewegen Sie den Mauszeiger über den Menüpunkt Alle Anmerkungen konvertieren und wählen Sie eine der Optionen aus der Liste rechts aus: -

    Fußnoten_Endnoten konvertieren

  3. +

    Fußnoten_Endnoten konvertieren