From 10722556a51acc378e9ccf20879eb52e1e46dfcd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2019 11:11:30 +0300 Subject: [PATCH 01/36] Bug 43469 --- apps/documenteditor/main/app/view/ImageSettings.js | 2 +- .../documenteditor/main/app/view/ImageSettingsAdvanced.js | 2 +- apps/documenteditor/main/locale/en.json | 8 ++++---- apps/documenteditor/mobile/app/view/edit/EditImage.js | 2 +- apps/documenteditor/mobile/locale/en.json | 2 +- apps/presentationeditor/main/app/view/DocumentHolder.js | 2 +- apps/presentationeditor/main/app/view/ImageSettings.js | 2 +- .../main/app/view/ImageSettingsAdvanced.js | 2 +- apps/presentationeditor/main/locale/en.json | 6 +++--- apps/presentationeditor/mobile/app/view/edit/EditImage.js | 2 +- apps/presentationeditor/mobile/locale/en.json | 2 +- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index 84b2e50fd..527037a2b 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -572,7 +572,7 @@ define([ textWrap: 'Wraping Style', textWidth: 'Width', textHeight: 'Height', - textOriginalSize: 'Default Size', + textOriginalSize: 'Actual Size', textInsert: 'Replace Image', textFromUrl: 'From URL', textFromFile: 'From File', diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 1dc6a5a6f..0ff970072 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -2013,7 +2013,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat textLeft: 'Left', textBottom: 'Bottom', textRight: 'Right', - textOriginalSize: 'Default Size', + textOriginalSize: 'Actual Size', textPosition: 'Position', textDistance: 'Distance From Text', textSize: 'Size', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 44fadf966..a488c637e 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1049,7 +1049,7 @@ "DE.Views.ChartSettings.textEditData": "Edit Data", "DE.Views.ChartSettings.textHeight": "Height", "DE.Views.ChartSettings.textLine": "Line", - "DE.Views.ChartSettings.textOriginalSize": "Default Size", + "DE.Views.ChartSettings.textOriginalSize": "Actual Size", "DE.Views.ChartSettings.textPie": "Pie", "DE.Views.ChartSettings.textPoint": "XY (Scatter)", "DE.Views.ChartSettings.textSize": "Size", @@ -1131,7 +1131,7 @@ "DE.Views.DocumentHolder.mergeCellsText": "Merge Cells", "DE.Views.DocumentHolder.moreText": "More variants...", "DE.Views.DocumentHolder.noSpellVariantsText": "No variants", - "DE.Views.DocumentHolder.originalSizeText": "Default Size", + "DE.Views.DocumentHolder.originalSizeText": "Actual Size", "DE.Views.DocumentHolder.paragraphText": "Paragraph", "DE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink", "DE.Views.DocumentHolder.rightText": "Right", @@ -1491,7 +1491,7 @@ "DE.Views.ImageSettings.textHintFlipH": "Flip Horizontally", "DE.Views.ImageSettings.textHintFlipV": "Flip Vertically", "DE.Views.ImageSettings.textInsert": "Replace Image", - "DE.Views.ImageSettings.textOriginalSize": "Default Size", + "DE.Views.ImageSettings.textOriginalSize": "Actual Size", "DE.Views.ImageSettings.textRotate90": "Rotate 90°", "DE.Views.ImageSettings.textRotation": "Rotation", "DE.Views.ImageSettings.textSize": "Size", @@ -1543,7 +1543,7 @@ "DE.Views.ImageSettingsAdvanced.textMiter": "Miter", "DE.Views.ImageSettingsAdvanced.textMove": "Move object with text", "DE.Views.ImageSettingsAdvanced.textOptions": "Options", - "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size", + "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size", "DE.Views.ImageSettingsAdvanced.textOverlap": "Allow overlap", "DE.Views.ImageSettingsAdvanced.textPage": "Page", "DE.Views.ImageSettingsAdvanced.textParagraph": "Paragraph", diff --git a/apps/documenteditor/mobile/app/view/edit/EditImage.js b/apps/documenteditor/mobile/app/view/edit/EditImage.js index f5f6b1605..c0e194fb3 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditImage.js +++ b/apps/documenteditor/mobile/app/view/edit/EditImage.js @@ -159,7 +159,7 @@ define([ textWrap: 'Wrap', textReplace: 'Replace', textReorder: 'Reorder', - textDefault: 'Default Size', + textDefault: 'Actual Size', textRemove: 'Remove Image', textBack: 'Back', textToForeground: 'Bring to Foreground', diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 61850a9fc..ce2b8b404 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -337,7 +337,7 @@ "DE.Views.EditImage.textBack": "Back", "DE.Views.EditImage.textBackward": "Move Backward", "DE.Views.EditImage.textBehind": "Behind", - "DE.Views.EditImage.textDefault": "Default Size", + "DE.Views.EditImage.textDefault": "Actual Size", "DE.Views.EditImage.textDistanceText": "Distance from Text", "DE.Views.EditImage.textForward": "Move Forward", "DE.Views.EditImage.textFromLibrary": "Picture from Library", diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 8f6a3bce8..48cac30b7 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -3443,7 +3443,7 @@ define([ mergeCellsText : 'Merge Cells', splitCellsText : 'Split Cell...', splitCellTitleText : 'Split Cell', - originalSizeText : 'Default Size', + originalSizeText : 'Actual Size', advancedImageText : 'Image Advanced Settings', hyperlinkText : 'Hyperlink', editHyperlinkText : 'Edit Hyperlink', diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 447502f11..e45f14888 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -415,7 +415,7 @@ define([ textSize: 'Size', textWidth: 'Width', textHeight: 'Height', - textOriginalSize: 'Default Size', + textOriginalSize: 'Actual Size', textInsert: 'Replace Image', textFromUrl: 'From URL', textFromFile: 'From File', diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js index fa3a58662..00fd24cfd 100644 --- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js @@ -316,7 +316,7 @@ define([ 'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem }; }, - textOriginalSize: 'Default Size', + textOriginalSize: 'Actual Size', textPosition: 'Position', textSize: 'Size', textWidth: 'Width', diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index edf026d50..16fd1f43d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -969,7 +969,7 @@ "PE.Views.DocumentHolder.mergeCellsText": "Merge Cells", "PE.Views.DocumentHolder.moreText": "More variants...", "PE.Views.DocumentHolder.noSpellVariantsText": "No variants", - "PE.Views.DocumentHolder.originalSizeText": "Default Size", + "PE.Views.DocumentHolder.originalSizeText": "Actual Size", "PE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink", "PE.Views.DocumentHolder.rightText": "Right", "PE.Views.DocumentHolder.rowText": "Row", @@ -1253,7 +1253,7 @@ "PE.Views.ImageSettings.textHintFlipH": "Flip Horizontally", "PE.Views.ImageSettings.textHintFlipV": "Flip Vertically", "PE.Views.ImageSettings.textInsert": "Replace Image", - "PE.Views.ImageSettings.textOriginalSize": "Default Size", + "PE.Views.ImageSettings.textOriginalSize": "Actual Size", "PE.Views.ImageSettings.textRotate90": "Rotate 90°", "PE.Views.ImageSettings.textRotation": "Rotation", "PE.Views.ImageSettings.textSize": "Size", @@ -1267,7 +1267,7 @@ "PE.Views.ImageSettingsAdvanced.textHeight": "Height", "PE.Views.ImageSettingsAdvanced.textHorizontally": "Horizontally", "PE.Views.ImageSettingsAdvanced.textKeepRatio": "Constant proportions", - "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Default Size", + "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Actual Size", "PE.Views.ImageSettingsAdvanced.textPlacement": "Placement", "PE.Views.ImageSettingsAdvanced.textPosition": "Position", "PE.Views.ImageSettingsAdvanced.textRotation": "Rotation", diff --git a/apps/presentationeditor/mobile/app/view/edit/EditImage.js b/apps/presentationeditor/mobile/app/view/edit/EditImage.js index 7807807ca..92344a37a 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditImage.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditImage.js @@ -157,7 +157,7 @@ define([ textReplace: 'Replace', textReorder: 'Reorder', - textDefault: 'Default Size', + textDefault: 'Actual Size', textRemove: 'Remove Image', textBack: 'Back', textToForeground: 'Bring to Foreground', diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 21f7ca693..d3d620c77 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -288,7 +288,7 @@ "PE.Views.EditImage.textAlignTop": "Align Top", "PE.Views.EditImage.textBack": "Back", "PE.Views.EditImage.textBackward": "Move Backward", - "PE.Views.EditImage.textDefault": "Default Size", + "PE.Views.EditImage.textDefault": "Actual Size", "PE.Views.EditImage.textForward": "Move Forward", "PE.Views.EditImage.textFromLibrary": "Picture from Library", "PE.Views.EditImage.textFromURL": "Picture from URL", diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 8f251fb6d..525ffa781 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -514,7 +514,7 @@ define([ textSize: 'Size', textWidth: 'Width', textHeight: 'Height', - textOriginalSize: 'Default Size', + textOriginalSize: 'Actual Size', textInsert: 'Replace Image', textFromUrl: 'From URL', textFromFile: 'From File', From 345c8dd292fb8ffbe0dc36c29dd57be9c27c1bd8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2019 11:16:29 +0300 Subject: [PATCH 02/36] Bug 43469 --- apps/documenteditor/main/app/view/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/view/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/locale/en.json | 4 ++-- apps/spreadsheeteditor/mobile/app/view/edit/EditImage.js | 2 +- apps/spreadsheeteditor/mobile/locale/en.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 8a85358a6..219fe0260 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -3982,7 +3982,7 @@ define([ mergeCellsText : 'Merge Cells', splitCellsText : 'Split Cell...', splitCellTitleText : 'Split Cell', - originalSizeText : 'Default Size', + originalSizeText : 'Actual Size', advancedText : 'Advanced Settings', breakBeforeText : 'Page break before', keepLinesText : 'Keep lines together', diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 5613d6d40..2a2d81402 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -1057,7 +1057,7 @@ define([ strDetails: 'Signature Details', strSetup: 'Signature Setup', strDelete: 'Remove Signature', - originalSizeText: 'Default Size', + originalSizeText: 'Actual Size', textReplace: 'Replace image', textFromUrl: 'From URL', textFromFile: 'From File', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index c78215630..b228e0117 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1391,7 +1391,7 @@ "SSE.Views.DocumentHolder.insertColumnRightText": "Column Right", "SSE.Views.DocumentHolder.insertRowAboveText": "Row Above", "SSE.Views.DocumentHolder.insertRowBelowText": "Row Below", - "SSE.Views.DocumentHolder.originalSizeText": "Default Size", + "SSE.Views.DocumentHolder.originalSizeText": "Actual Size", "SSE.Views.DocumentHolder.removeHyperlinkText": "Remove Hyperlink", "SSE.Views.DocumentHolder.selectColumnText": "Entire Column", "SSE.Views.DocumentHolder.selectDataText": "Column Data", @@ -1702,7 +1702,7 @@ "SSE.Views.ImageSettings.textHintFlipV": "Flip Vertically", "SSE.Views.ImageSettings.textInsert": "Replace Image", "SSE.Views.ImageSettings.textKeepRatio": "Constant proportions", - "SSE.Views.ImageSettings.textOriginalSize": "Default Size", + "SSE.Views.ImageSettings.textOriginalSize": "Actual Size", "SSE.Views.ImageSettings.textRotate90": "Rotate 90°", "SSE.Views.ImageSettings.textRotation": "Rotation", "SSE.Views.ImageSettings.textSize": "Size", diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditImage.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditImage.js index 9ac2bd999..d89a575a1 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditImage.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditImage.js @@ -148,7 +148,7 @@ define([ textReplace: 'Replace', textReorder: 'Reorder', - textDefault: 'Default Size', + textDefault: 'Actual Size', textRemove: 'Remove Image', textBack: 'Back', textToForeground: 'Bring to Foreground', diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 3bbdb136b..bffbbb5e6 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -466,7 +466,7 @@ "SSE.Views.EditImage.textAddress": "Address", "SSE.Views.EditImage.textBack": "Back", "SSE.Views.EditImage.textBackward": "Move Backward", - "SSE.Views.EditImage.textDefault": "Default Size", + "SSE.Views.EditImage.textDefault": "Actual Size", "SSE.Views.EditImage.textForward": "Move Forward", "SSE.Views.EditImage.textFromLibrary": "Picture from Library", "SSE.Views.EditImage.textFromURL": "Picture from URL", From 33b073115fdaf63a2a27d69f48fa6b5b6f204fe5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Nov 2019 14:16:09 +0300 Subject: [PATCH 03/36] Bug 43433 --- apps/documenteditor/main/app/view/BookmarksDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index 60dea4536..9210e9648 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -110,7 +110,7 @@ define([ '', '', '', - '