From 0d15124cae44354163a4cd9617445d7646d816e8 Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Fri, 14 Jan 2022 10:14:08 +0100
Subject: [PATCH] Use "emoji"

---
 src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs | 2 +-
 src/Greenshot/Languages/language-en-US.xml             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs b/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs
index 938068f8e..ebcf30031 100644
--- a/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs
+++ b/src/Greenshot.Editor/Forms/ImageEditorForm.Designer.cs
@@ -452,7 +452,7 @@ namespace Greenshot.Editor.Forms {
             this.btnEmoji.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.btnEmoji.Image = ((System.Drawing.Image)(resources.GetObject("btnEmoji.Image")));
             this.btnEmoji.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnEmoji.LanguageKey = "editor_emoji";
+            this.btnEmoji.Text = "Emoji";
             this.btnEmoji.Name = "btnEmoji";
             this.btnEmoji.Click += new System.EventHandler(this.BtnEmojiClick);
             // 
diff --git a/src/Greenshot/Languages/language-en-US.xml b/src/Greenshot/Languages/language-en-US.xml
index 09570f11f..3db9fbf0e 100644
--- a/src/Greenshot/Languages/language-en-US.xml
+++ b/src/Greenshot/Languages/language-en-US.xml
@@ -305,9 +305,8 @@ All Greenshot features still work directly from the tray icon context menu witho
     
     <resource name="editor_counter">Add counter (I)</resource>
     <resource name="editor_speechbubble">Add speechbubble (S)</resource>
-    <resource name="editor_emoji">Add emoji</resource>
 
-        <resource name="editor_resize">Resize</resource>
+    <resource name="editor_resize">Resize</resource>
     <resource name="editor_resize_settings">Resize settings</resource>
     <resource name="editor_resize_aspectratio">Maintain aspect ratio</resource>
     <resource name="editor_resize_width">Width</resource>