From 2ad448317e1fda334f51eabae963c9ce327b026e Mon Sep 17 00:00:00 2001
From: Dmitry-Ilyushechkin <mysh.1919@gmail.com>
Date: Thu, 12 Dec 2024 16:18:05 +0300
Subject: [PATCH] fix hint

---
 apps/documenteditor/main/locale/en.json          | 2 +-
 apps/pdfeditor/main/app/view/Toolbar.js          | 2 +-
 apps/pdfeditor/main/locale/en.json               | 2 +-
 apps/presentationeditor/main/app/view/Toolbar.js | 2 +-
 apps/presentationeditor/main/locale/en.json      | 2 +-
 apps/spreadsheeteditor/main/locale/en.json       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index e790993efd..2180961de7 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -3573,7 +3573,7 @@
   "DE.Views.Toolbar.tipHyphenation": "Change hyphenation",
   "DE.Views.Toolbar.tipImgAlign": "Align objects",
   "DE.Views.Toolbar.tipImgGroup": "Group objects",
-  "DE.Views.Toolbar.tipShapesMerge": "Merge objects",
+  "DE.Views.Toolbar.tipShapesMerge": "Merge shapes",
   "DE.Views.Toolbar.tipImgWrapping": "Wrap text",
   "DE.Views.Toolbar.tipIncFont": "Increment font size",
   "DE.Views.Toolbar.tipIncPrLeft": "Increase indent",
diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js
index 93292c8189..036246a64c 100644
--- a/apps/pdfeditor/main/app/view/Toolbar.js
+++ b/apps/pdfeditor/main/app/view/Toolbar.js
@@ -773,7 +773,7 @@ define([
                     }),
                     action: 'object-merge',
                     dataHint: '1',
-                    dataHintDirection: 'bottom',
+                    dataHintDirection: 'top',
                     dataHintOffset: '0, -6'
                 });
                 this.shapeControls.push(this.btnShapesMerge);
diff --git a/apps/pdfeditor/main/locale/en.json b/apps/pdfeditor/main/locale/en.json
index 91ad6fcfdc..10f8a5bac9 100644
--- a/apps/pdfeditor/main/locale/en.json
+++ b/apps/pdfeditor/main/locale/en.json
@@ -1996,7 +1996,7 @@
   "PDFE.Views.Toolbar.tipSelectTool": "Select tool",
   "PDFE.Views.Toolbar.tipShapeAlign": "Align shape",
   "PDFE.Views.Toolbar.tipShapeArrange": "Arrange shape",
-  "PDFE.Views.Toolbar.tipShapeMerge": "Merge shape",
+  "PDFE.Views.Toolbar.tipShapeMerge": "Merge shapes",
   "PDFE.Views.Toolbar.tipSubmit": "Submit form",
   "PDFE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
   "PDFE.Views.Toolbar.tipUndo": "Undo",
diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js
index 43e2c5e8ab..16df20cfad 100644
--- a/apps/presentationeditor/main/app/view/Toolbar.js
+++ b/apps/presentationeditor/main/app/view/Toolbar.js
@@ -1250,7 +1250,7 @@ define([
                         }),
                         action: 'object-merge',
                         dataHint: '1',
-                        dataHintDirection: 'bottom',
+                        dataHintDirection: 'top',
                         dataHintOffset: '0, -6'
                     });
                     me.shapeControls.push(me.btnShapesMerge);
diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json
index 8d384d97f9..5781ff091b 100644
--- a/apps/presentationeditor/main/locale/en.json
+++ b/apps/presentationeditor/main/locale/en.json
@@ -2874,7 +2874,7 @@
   "PE.Views.Toolbar.tipSaveCoauth": "Save your changes for the other users to see them.",
   "PE.Views.Toolbar.tipSelectAll": "Select all",
   "PE.Views.Toolbar.tipShapeAlign": "Align shape",
-  "PE.Views.Toolbar.tipShapesMerge": "Merge objects",
+  "PE.Views.Toolbar.tipShapesMerge": "Merge shapes",
   "PE.Views.Toolbar.tipShapeArrange": "Arrange shape",
   "PE.Views.Toolbar.tipSlideNum": "Insert slide number",
   "PE.Views.Toolbar.tipSlideSize": "Select slide size",
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index fb8fee1f45..3d101cb60c 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -4309,7 +4309,7 @@
   "SSE.Views.Toolbar.tipHAlighOle": "Horizontal align",
   "SSE.Views.Toolbar.tipImgAlign": "Align objects",
   "SSE.Views.Toolbar.tipImgGroup": "Group objects",
-  "SSE.Views.Toolbar.tipShapesMerge": "Merge objects",
+  "SSE.Views.Toolbar.tipShapesMerge": "Merge shapes",
   "SSE.Views.Toolbar.tipIncDecimal": "Increase decimal",
   "SSE.Views.Toolbar.tipIncFont": "Increment font size",
   "SSE.Views.Toolbar.tipInsertChart": "Insert chart",