fixed #6840: Added "Pause" button to screen recording tray menu

ShareX.HelpersLib/Forms/OutputBox.Designer.cs

@@ -33,7 +33,6 @@ private void InitializeComponent()
             // 
             // rtbText
             // 
-            this.rtbText.BackColor = System.Drawing.Color.Black;
             this.rtbText.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.rtbText.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rtbText.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -49,14 +48,12 @@ private void InitializeComponent()
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.BackColor = System.Drawing.Color.Black;
             this.ClientSize = new System.Drawing.Size(984, 761);
             this.Controls.Add(this.rtbText);
             this.Name = "OutputBox";
             this.Padding = new System.Windows.Forms.Padding(8);
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "OutputBox";
             this.Shown += new System.EventHandler(this.OutputBox_Shown);
             this.ResumeLayout(false);
 

ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.Designer.cs

@@ -25,6 +25,7 @@ private void InitializeComponent()
             this.btnPause = new ShareX.HelpersLib.NoFocusBorderButton();
             this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.tsmiStart = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmiPause = new System.Windows.Forms.ToolStripMenuItem();
             this.tsmiAbort = new System.Windows.Forms.ToolStripMenuItem();
             this.niTray = new System.Windows.Forms.NotifyIcon(this.components);
             this.pInfo.SuspendLayout();
@@ -74,6 +75,7 @@ private void InitializeComponent()
             // 
             this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsmiStart,
+            this.tsmiPause,
             this.tsmiAbort});
             this.cmsMain.Name = "cmsMain";
             resources.ApplyResources(this.cmsMain, "cmsMain");
@@ -85,6 +87,13 @@ private void InitializeComponent()
             resources.ApplyResources(this.tsmiStart, "tsmiStart");
             this.tsmiStart.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnStart_MouseClick);
             // 
+            // tsmiPause
+            // 
+            this.tsmiPause.Image = global::ShareX.ScreenCaptureLib.Properties.Resources.control_pause;
+            this.tsmiPause.Name = "tsmiPause";
+            resources.ApplyResources(this.tsmiPause, "tsmiPause");
+            this.tsmiPause.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnPause_MouseClick);
+            // 
             // tsmiAbort
             // 
             this.tsmiAbort.Image = global::ShareX.ScreenCaptureLib.Properties.Resources.cross;
@@ -128,5 +137,6 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripMenuItem tsmiAbort;
         private System.Windows.Forms.NotifyIcon niTray;
         private HelpersLib.NoFocusBorderButton btnPause;
+        private System.Windows.Forms.ToolStripMenuItem tsmiPause;
     }
 }

ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.cs

@@ -261,17 +261,43 @@ private void UpdateTimer()
 
         private void UpdateUI()
         {
-            if (Status == ScreenRecordingStatus.Waiting || Status == ScreenRecordingStatus.Paused)
+            switch (Status)
             {
+                case ScreenRecordingStatus.Working:
+                    string trayTextWorking = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_;
+                    niTray.Text = trayTextWorking.Truncate(63);
+                    niTray.Icon = Resources.control_record.ToIcon();
+                    btnStart.Text = Resources.ScreenRecordForm_Stop;
+                    tsmiStart.Text = Resources.ScreenRecordForm_Stop;
+                    tsmiStart.Image = Resources.tick;
+                    break;
+                case ScreenRecordingStatus.Waiting:
+                case ScreenRecordingStatus.Paused:
+                    if (Status == ScreenRecordingStatus.Paused)
+                    {
+                        string trayTextWaiting = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_;
+                        niTray.Text = trayTextWaiting.Truncate(63);
+                    }
+                    else
+                    {
+                        string trayTextBeforeStart = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_start_recording_;
+                        niTray.Text = trayTextBeforeStart.Truncate(63);
+                    }
+                    niTray.Icon = Resources.control_record_yellow.ToIcon();
                     btnPause.Text = Resources.Resume;
+                    tsmiPause.Text = Resources.Resume;
+                    tsmiPause.Image = Resources.control;
                     lblTimer.Cursor = Cursors.SizeAll;
                     borderColor = Color.FromArgb(241, 196, 27);
                     Refresh();
-            }
+                    break;
-            else if (Status == ScreenRecordingStatus.Recording)
+                case ScreenRecordingStatus.Recording:
-            {
+                    niTray.Icon = Resources.control_record.ToIcon();
                     btnPause.Text = Resources.Pause;
+                    tsmiPause.Text = Resources.Pause;
+                    tsmiPause.Image = Resources.control_pause;
                     lblTimer.Cursor = Cursors.Default;
+                    break;
             }
         }
 
@@ -289,20 +315,12 @@ public void ChangeState(ScreenRecordState state)
                         niTray.Visible = true;
                         break;
                     case ScreenRecordState.BeforeStart:
-                        string trayTextBeforeStart = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_start_recording_;
-                        niTray.Text = trayTextBeforeStart.Truncate(63);
-                        tsmiStart.Text = Resources.ScreenRecordForm_Start;
                         cmsMain.Enabled = true;
                         UpdateUI();
                         break;
                     case ScreenRecordState.AfterStart:
                         dragging = false;
                         Status = ScreenRecordingStatus.Working;
-                        string trayTextAfterStart = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_;
-                        niTray.Text = trayTextAfterStart.Truncate(63);
-                        niTray.Icon = Resources.control_record.ToIcon();
-                        tsmiStart.Text = Resources.ScreenRecordForm_Stop;
-                        btnStart.Text = Resources.ScreenRecordForm_Stop;
                         UpdateUI();
                         break;
                     case ScreenRecordState.AfterRecordingStart:
@@ -316,10 +334,10 @@ public void ChangeState(ScreenRecordState state)
                         break;
                     case ScreenRecordState.Encoding:
                         Hide();
+                        cmsMain.Enabled = false;
                         string trayTextAfterStop = "ShareX - " + Resources.ScreenRecordForm_StartRecording_Encoding___;
                         niTray.Text = trayTextAfterStop.Truncate(63);
                         niTray.Icon = Resources.camcorder__pencil.ToIcon();
-                        cmsMain.Enabled = false;
                         break;
                 }
             });

ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.resx

@@ -145,7 +145,7 @@
     <value>btnStart</value>
   </data>
   <data name="&gt;&gt;btnStart.Type" xml:space="preserve">
-    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=14.1.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;btnStart.Parent" xml:space="preserve">
     <value>pInfo</value>
@@ -170,7 +170,6 @@
   </data>
   <data name="lblTimer.Text" xml:space="preserve">
     <value>00:00:00</value>
-    <comment>@Invariant</comment>
   </data>
   <data name="lblTimer.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleCenter</value>
@@ -215,7 +214,7 @@
     <value>btnAbort</value>
   </data>
   <data name="&gt;&gt;btnAbort.Type" xml:space="preserve">
-    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=14.1.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;btnAbort.Parent" xml:space="preserve">
     <value>pInfo</value>
@@ -229,6 +228,39 @@
   <data name="pInfo.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
+  <data name="&gt;&gt;btnPause.Name" xml:space="preserve">
+    <value>btnPause</value>
+  </data>
+  <data name="&gt;&gt;btnPause.Type" xml:space="preserve">
+    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;btnPause.Parent" xml:space="preserve">
+    <value>pInfo</value>
+  </data>
+  <data name="&gt;&gt;btnPause.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="pInfo.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 8</value>
+  </data>
+  <data name="pInfo.Size" type="System.Drawing.Size, System.Drawing">
+    <value>377, 36</value>
+  </data>
+  <data name="pInfo.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;pInfo.Name" xml:space="preserve">
+    <value>pInfo</value>
+  </data>
+  <data name="&gt;&gt;pInfo.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pInfo.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;pInfo.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="btnPause.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
   </data>
@@ -257,7 +289,7 @@
     <value>btnPause</value>
   </data>
   <data name="&gt;&gt;btnPause.Type" xml:space="preserve">
-    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=14.1.2.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>ShareX.HelpersLib.NoFocusBorderButton, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;btnPause.Parent" xml:space="preserve">
     <value>pInfo</value>
@@ -265,44 +297,29 @@
   <data name="&gt;&gt;btnPause.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="pInfo.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 8</value>
-  </data>
-  <data name="pInfo.Size" type="System.Drawing.Size, System.Drawing">
-    <value>377, 36</value>
-  </data>
-  <data name="pInfo.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;pInfo.Name" xml:space="preserve">
-    <value>pInfo</value>
-  </data>
-  <data name="&gt;&gt;pInfo.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;pInfo.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;pInfo.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <metadata name="cmsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>138, 17</value>
   </metadata>
   <data name="tsmiStart.Size" type="System.Drawing.Size, System.Drawing">
-    <value>104, 22</value>
+    <value>105, 22</value>
   </data>
   <data name="tsmiStart.Text" xml:space="preserve">
     <value>Start</value>
   </data>
+  <data name="tsmiPause.Size" type="System.Drawing.Size, System.Drawing">
+    <value>105, 22</value>
+  </data>
+  <data name="tsmiPause.Text" xml:space="preserve">
+    <value>Pause</value>
+  </data>
   <data name="tsmiAbort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>104, 22</value>
+    <value>105, 22</value>
   </data>
   <data name="tsmiAbort.Text" xml:space="preserve">
     <value>Abort</value>
   </data>
   <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>105, 48</value>
+    <value>106, 70</value>
   </data>
   <data name="&gt;&gt;cmsMain.Name" xml:space="preserve">
     <value>cmsMain</value>
@@ -315,7 +332,6 @@
   </metadata>
   <data name="niTray.Text" xml:space="preserve">
     <value>ShareX</value>
-    <comment>@Invariant</comment>
   </data>
   <data name="niTray.Visible" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -347,6 +363,12 @@
   <data name="&gt;&gt;tsmiStart.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;tsmiPause.Name" xml:space="preserve">
+    <value>tsmiPause</value>
+  </data>
+  <data name="&gt;&gt;tsmiPause.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;tsmiAbort.Name" xml:space="preserve">
     <value>tsmiAbort</value>
   </data>

ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs

@@ -215,6 +215,16 @@ internal static System.Drawing.Bitmap control {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap control_pause {
+            get {
+                object obj = ResourceManager.GetObject("control-pause", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

ShareX.ScreenCaptureLib/Properties/Resources.resx

@@ -145,8 +145,11 @@
   <data name="image_resize" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\image-resize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrow_circle_135_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="CutOutEffectSize" xml:space="preserve">
-    <value>..\Resources\arrow-circle-135-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Cut out effect size:</value>
+  </data>
+  <data name="ImageEffects" xml:space="preserve">
+    <value>Add image effects...</value>
   </data>
   <data name="layer_shape_round_region" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-round-region.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -163,6 +166,9 @@
   <data name="ShapeManager_CreateContextMenu_Multi_region_mode" xml:space="preserve">
     <value>Multi region mode</value>
   </data>
+  <data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
+    <value>Pixel size:</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_ImageSize" xml:space="preserve">
     <value>Image size...</value>
   </data>
@@ -181,18 +187,37 @@
   <data name="OpenKeybindsPage" xml:space="preserve">
     <value>Open keybinds web page...</value>
   </data>
-  <data name="arrow_circle_double" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="layers_stack_arrange_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="edit_outline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-outline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="table_delete_column" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\table-delete-column.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Duplicate" xml:space="preserve">
+    <value>Duplicate</value>
+  </data>
   <data name="exclamation_button" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\exclamation-button.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ShapeManager_CreateToolbar_Edit" xml:space="preserve">
     <value>Edit</value>
   </data>
+  <data name="control_record" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CRF" xml:space="preserve">
+    <value>CRF:</value>
+    <comment>@Invariant</comment>
+  </data>
+  <data name="edit_italic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\edit-italic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ImageSaved" xml:space="preserve">
+    <value>Image saved</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_AutoCloseEditorOnTask" xml:space="preserve">
     <value>Auto close editor on task</value>
   </data>
@@ -202,14 +227,11 @@
   <data name="ShapeManager_CreateToolbar_Undo" xml:space="preserve">
     <value>Undo</value>
   </data>
-  <data name="ShapeManager_CreateContextMenu_Width_" xml:space="preserve">
-    <value>Width:</value>
-  </data>
   <data name="folder_open_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder-open-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ShapeManager_CreateToolbar_DropShadow" xml:space="preserve">
+  <data name="disks_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Drop shadow</value>
+    <value>..\Resources\disks-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="edit_alignment" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-alignment.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -229,15 +251,12 @@
   <data name="BaseRegionForm_InitializeComponent_Region_capture" xml:space="preserve">
     <value>Region capture</value>
   </data>
-  <data name="edit_vertical_alignment_top_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="layer_flip" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\edit-vertical-alignment-top-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\layer-flip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="monitor_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\monitor-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="image_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="edit_italic_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-italic-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -250,9 +269,15 @@
   <data name="EditorStartupForm_ClipboardDoesNotContainAnImage" xml:space="preserve">
     <value>Clipboard does not contain an image.</value>
   </data>
+  <data name="NewLineCtrlEnterOKEnter" xml:space="preserve">
+    <value>New line: Ctrl + Enter, OK: Enter</value>
+  </data>
   <data name="ShapeManager_CreateContextMenu_Capture_monitor" xml:space="preserve">
     <value>Capture monitor</value>
   </data>
+  <data name="camcorder__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="layer__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -268,11 +293,18 @@
   <data name="ShapeManager_CreateToolbar_Rotate90CounterClockwise" xml:space="preserve">
     <value>Rotate 90° counter clockwise</value>
   </data>
+  <data name="ScrollingCaptureForm_StopCapture_Start_capture" xml:space="preserve">
+    <value>Start capture</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_InterpolationMode" xml:space="preserve">
     <value>Interpolation mode:</value>
   </data>
-  <data name="layers_stack_arrange_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ShapeManager_CreateContextMenu_Width_" xml:space="preserve">
-    <value>..\Resources\layers-stack-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Width:</value>
+  </data>
+  <data name="ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_" xml:space="preserve">
+    <value>Click to stop recording.</value>
+    <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
   </data>
   <data name="ShapeManager_CenterPoints" xml:space="preserve">
     <value>Center points:</value>
@@ -283,6 +315,9 @@
   <data name="layers_arrange_back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layers-arrange-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ShapeManager_BorderStyle" xml:space="preserve">
+    <value>Border style:</value>
+  </data>
   <data name="layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -295,12 +330,19 @@
   <data name="RectangleRegion_GetAreaText_Area" xml:space="preserve">
     <value>X: {0} Y: {1} W: {2} H: {3}</value>
   </data>
-  <data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ScreenRecordForm_ConfirmCancel" xml:space="preserve">
-    <value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Are you sure you want to abort this recording?</value>
   </data>
   <data name="ShapeManager_CreateToolbar_OpenImageFile" xml:space="preserve">
     <value>Open image file...</value>
   </data>
+  <data name="Processing" xml:space="preserve">
+    <value>Processing...</value>
+  </data>
+  <data name="ScreenRecordForm_StartRecording_Waiting___" xml:space="preserve">
+    <value>Waiting...</value>
+    <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
+  </data>
   <data name="ShapeManager_CreateToolbar_Rotate90Clockwise" xml:space="preserve">
     <value>Rotate 90° clockwise</value>
   </data>
@@ -313,9 +355,15 @@
   <data name="layer_flip_vertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-flip-vertical.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_StartingStepValue" xml:space="preserve">
+    <value>Value of first step:</value>
+  </data>
   <data name="WebpageCaptureForm_UpdateControls_Capture" xml:space="preserve">
     <value>Capture</value>
   </data>
+  <data name="Highlight" xml:space="preserve">
+    <value>Highlight</value>
+  </data>
   <data name="test_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\test_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -325,11 +373,17 @@
   <data name="MagnifyStrength" xml:space="preserve">
     <value>Magnify strength:</value>
   </data>
+  <data name="ShapeManager_CreateContextMenu_Corner_radius_" xml:space="preserve">
+    <value>Corner radius:</value>
+  </data>
+  <data name="Bitrate" xml:space="preserve">
+    <value>Bitrate:</value>
+  </data>
   <data name="layout_split" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layout-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ShapeManager_CreateToolbar_CopyImageToClipboard" xml:space="preserve">
+  <data name="closedhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Copy image to clipboard (Ctrl + Shift + C)</value>
+    <value>..\Resources\closedhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="ShapeManager_CreateToolbar_PrintImage" xml:space="preserve">
     <value>Print image... (Ctrl + P)</value>
@@ -343,6 +397,9 @@
   <data name="edit_underline" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-underline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="NewLineEnterOKCtrlEnter" xml:space="preserve">
+    <value>New line: Enter, OK: Ctrl + Enter</value>
+  </data>
   <data name="magnifier_zoom" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\magnifier-zoom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -352,11 +409,8 @@
   <data name="FFmpegOptionsForm_buttonFFmpegBrowse_Click_Browse_for_ffmpeg_exe" xml:space="preserve">
     <value>Browse for ffmpeg.exe</value>
   </data>
-  <data name="layer_flip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ShapeManager_CreateToolbar_DropShadow" xml:space="preserve">
-    <value>..\Resources\layer-flip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Drop shadow</value>
-  </data>
-  <data name="openhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="ShapeManager_CreateContextMenu_Square_shape_magnifier" xml:space="preserve">
     <value>Square shape magnifier</value>
@@ -367,8 +421,8 @@
   <data name="FFmpegOptionsForm_UpdateUI_Bitrate___0_k" xml:space="preserve">
     <value>Bitrate: {0}k</value>
   </data>
-  <data name="edit_vertical_alignment_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Resume" xml:space="preserve">
-    <value>..\Resources\edit-vertical-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Resume</value>
   </data>
   <data name="image_empty" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\image-empty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -379,12 +433,15 @@
   <data name="ShapeManager_CreateToolbar_EditorStartMode" xml:space="preserve">
     <value>Editor start mode:</value>
   </data>
-  <data name="ShapeManager_CreateToolbar_ZoomToFitOnOpen" xml:space="preserve">
-    <value>Zoom to fit on open</value>
-  </data>
   <data name="layer_shade" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shade.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ImageSavedAs" xml:space="preserve">
+    <value>Image saved</value>
+  </data>
+  <data name="ShapeManager_ArrowHeadDirection" xml:space="preserve">
+    <value>Arrow head direction:</value>
+  </data>
   <data name="layer_shape_text" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -394,9 +451,6 @@
   <data name="ShapeManager_CreateToolbar_CaptureRegions" xml:space="preserve">
     <value>Capture regions</value>
   </data>
-  <data name="ScrollingCaptureForm_StopCapture_Start_capture" xml:space="preserve">
-    <value>Start capture</value>
-  </data>
   <data name="RectangleLight_InitializeComponent_Rectangle_capture_light" xml:space="preserve">
     <value>Rectangle capture light</value>
   </data>
@@ -412,8 +466,18 @@
   <data name="ShapeManager_CreateToolbar_NewImage" xml:space="preserve">
     <value>New image...</value>
   </data>
-  <data name="disks_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Blur" xml:space="preserve">
-    <value>..\Resources\disks-black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Blur</value>
+  </data>
+  <data name="stamp_cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\stamp-cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="layer_shape_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScreenRecordForm_StartRecording_Encoding___" xml:space="preserve">
+    <value>Encoding...</value>
+    <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
   </data>
   <data name="layers_stack_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layers-stack-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -427,8 +491,8 @@
   <data name="edit_vertical_alignment_middle_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-vertical-alignment-middle-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="stamp_cursor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ImageUploading" xml:space="preserve">
-    <value>..\Resources\stamp-cursor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Image uploading</value>
   </data>
   <data name="ShapeManager_CreateContextMenu_EnableAnimations" xml:space="preserve">
     <value>Enable animations</value>
@@ -445,8 +509,11 @@
   <data name="ShapeManager_CreateContextMenu_Height_" xml:space="preserve">
     <value>Height:</value>
   </data>
-  <data name="ImageEffects" xml:space="preserve">
+  <data name="ImageCopied" xml:space="preserve">
-    <value>Add image effects...</value>
+    <value>Image copied</value>
+  </data>
+  <data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ShapeManager_CreateContextMenu_Fill_color___" xml:space="preserve">
     <value>Fill color...</value>
@@ -460,11 +527,14 @@
   <data name="ShapeManager_CreateToolbar_ContinueTaskSpaceOrRightClick" xml:space="preserve">
     <value>Continue task (Space or right click)</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_FontSize" xml:space="preserve">
+    <value>Font size:</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_CanvasSize" xml:space="preserve">
     <value>Canvas size...</value>
   </data>
-  <data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="MenuIconSize" xml:space="preserve">
-    <value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Menu icon size:</value>
   </data>
   <data name="image_saturation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\image-saturation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -493,16 +563,27 @@
   <data name="image__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\image--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="RegionCaptureForm_ShowExitConfirmation_Text" xml:space="preserve">
+  <data name="edit_vertical_alignment_top_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>There are unsaved changes.
+    <value>..\Resources\edit-vertical-alignment-top-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-Would you like to close image editor?</value>
   </data>
-  <data name="DropShadowColor" xml:space="preserve">
+  <data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Drop shadow color...</value>
+    <value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Pixelate" xml:space="preserve">
+    <value>Pixelate</value>
+  </data>
+  <data name="keyboard-enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\keyboard-enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="layer_shape_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="drive_globe" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\drive-globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="LockMenu" xml:space="preserve">
+    <value>Lock menu</value>
+  </data>
   <data name="wrench_screwdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -518,6 +599,9 @@ Would you like to close image editor?</value>
   <data name="LightResizeNodes" xml:space="preserve">
     <value>Use light resize nodes</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_LastRegion" xml:space="preserve">
+    <value>Capture last region</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_InsertImageFromScreen" xml:space="preserve">
     <value>Insert image from screen...</value>
   </data>
@@ -530,8 +614,8 @@ Would you like to close image editor?</value>
   <data name="ShapeManager_CreateToolbar_DeleteAll" xml:space="preserve">
     <value>Delete all</value>
   </data>
-  <data name="closedhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="AutoCopyImageToClipboard" xml:space="preserve">
-    <value>..\Resources\closedhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>Auto copy image to clipboard</value>
   </data>
   <data name="edit_alignment_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-alignment-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -542,6 +626,9 @@ Would you like to close image editor?</value>
   <data name="ShapeManager_CreateToolbar_AnnotateMenu" xml:space="preserve">
     <value>Editor menu</value>
   </data>
+  <data name="arrow_circle_135_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow-circle-135-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_PasteImageText" xml:space="preserve">
     <value>Paste image/text</value>
   </data>
@@ -563,8 +650,11 @@ Would you like to close image editor?</value>
   <data name="ShapeManager_CreateContextMenu_Show_magnifier" xml:space="preserve">
     <value>Show magnifier</value>
   </data>
-  <data name="ShapeManager_CreateToolbar_StartingStepValue" xml:space="preserve">
+  <data name="Pause" xml:space="preserve">
-    <value>Value of first step:</value>
+    <value>Pause</value>
+  </data>
+  <data name="edit_vertical_alignment_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\edit-vertical-alignment-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="RegionCaptureForm_ShowExitConfirmation_ShareXImageEditor" xml:space="preserve">
     <value>ShareX - Image editor</value>
@@ -572,8 +662,8 @@ Would you like to close image editor?</value>
   <data name="arrow_circle_225_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow-circle-225-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ThisWindowWillCloseBeforeOpeningKeybindsPageWantContinue" xml:space="preserve">
+  <data name="DropShadowColor" xml:space="preserve">
-    <value>This window will close before opening the keybinds web page. Do you want to continue?</value>
+    <value>Drop shadow color...</value>
   </data>
   <data name="ShapeManager_CreateContextMenu_SwitchToSelectionToolAfterDrawing" xml:space="preserve">
     <value>Switch to selection tool after shape drawing</value>
@@ -596,12 +686,21 @@ Would you like to close image editor?</value>
   <data name="ShapeManager_CreateContextMenu_Show_position_and_size_info" xml:space="preserve">
     <value>Show position and size info</value>
   </data>
-  <data name="layer_shape_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="control" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\layer-shape-polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ScreenRecordForm_Start" xml:space="preserve">
+    <value>Start</value>
   </data>
   <data name="ScrollingCaptureForm_StartCapture_Stop_capture" xml:space="preserve">
     <value>Stop capture</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_StepType" xml:space="preserve">
+    <value>Step type:</value>
+  </data>
+  <data name="ShapeManager_CreateToolbar_CopyImageToClipboard" xml:space="preserve">
+    <value>Copy image to clipboard (Ctrl + Shift + C)</value>
+  </data>
   <data name="ShapeManager_CreateContextMenu_Show_screen_wide_crosshair" xml:space="preserve">
     <value>Show screen wide crosshair</value>
   </data>
@@ -626,27 +725,43 @@ X: {4} Y: {5}</value>
   <data name="ShapeManager_CreateContextMenu_Magnifier_pixel_count_" xml:space="preserve">
     <value>Magnifier pixel count:</value>
   </data>
+  <data name="ThisWindowWillCloseBeforeOpeningKeybindsPageWantContinue" xml:space="preserve">
+    <value>This window will close before opening the keybinds web page. Do you want to continue?</value>
+  </data>
   <data name="layer_shape" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="edit_underline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="FPSLimit" xml:space="preserve">
-    <value>..\Resources\edit-underline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>FPS limit:</value>
   </data>
-  <data name="ShapeManager_CreateToolbar_FontSize" xml:space="preserve">
+  <data name="openhand" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Font size:</value>
+    <value>..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="ShapeManager_CreateToolbar_InsertImageFile" xml:space="preserve">
     <value>Insert image file...</value>
   </data>
+  <data name="ShapeManager_CreateToolbar_ZoomToFitOnOpen" xml:space="preserve">
+    <value>Zoom to fit on open</value>
+  </data>
   <data name="RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleButtonAndDragging" xml:space="preserve">
     <value>Tip: You can pan image by holding mouse middle button and dragging.</value>
   </data>
+  <data name="RegionCaptureForm_ShowExitConfirmation_Text" xml:space="preserve">
+    <value>There are unsaved changes.
+Would you like to close image editor?</value>
+  </data>
   <data name="ShapeManager_CreateToolbar_RunAfterCaptureTasks" xml:space="preserve">
     <value>Run after capture tasks (Enter)</value>
   </data>
   <data name="ShapeManager_CreateContextMenu_RememberMenuState" xml:space="preserve">
     <value>Remember menu state</value>
   </data>
+  <data name="CutOutEffectType" xml:space="preserve">
+    <value>Cut out effect:</value>
+  </data>
+  <data name="pencil__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pencil--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ShapeManager_CreateContextMenu_Magnifier_pixel_size_" xml:space="preserve">
     <value>Magnifier pixel size:</value>
   </data>
@@ -659,23 +774,23 @@ X: {4} Y: {5}</value>
   <data name="clipboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ShapeManager_CreateContextMenu_Corner_radius_" xml:space="preserve">
+  <data name="arrow_circle_double" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Corner radius:</value>
+    <value>..\Resources\arrow-circle-double.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="monitor" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="edit_italic" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="edit_underline_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\edit-italic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\edit-underline-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="layers_arrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="image_select" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\layers-arrange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\image-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ShapeManager_CreateToolbar_LastRegion" xml:space="preserve">
+  <data name="eraser" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Capture last region</value>
+    <value>..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="edit_alignment_center_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\edit-alignment-center-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -689,132 +804,20 @@ X: {4} Y: {5}</value>
   <data name="layer_shape_line_white" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\layer-shape-line-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="smiley_cool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ShapeManager_CreateToolbar_ToolOptions" xml:space="preserve">
-    <value>..\Resources\smiley-cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>Tool options</value>
   </data>
-  <data name="ShapeManager_CreateContextMenu_Pixel_size_" xml:space="preserve">
+  <data name="ScreenRecordForm_Stop" xml:space="preserve">
-    <value>Pixel size:</value>
+    <value>Stop</value>
-  </data>
-  <data name="layer_shape_line" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\layer-shape-line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="keyboard-enter" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\keyboard-enter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ShapeManager_ArrowHeadDirection" xml:space="preserve">
-    <value>Arrow head direction:</value>
-  </data>
-  <data name="NewLineEnterOKCtrlEnter" xml:space="preserve">
-    <value>New line: Enter, OK: Ctrl + Enter</value>
-  </data>
-  <data name="NewLineCtrlEnterOKEnter" xml:space="preserve">
-    <value>New line: Ctrl + Enter, OK: Enter</value>
-  </data>
-  <data name="LockMenu" xml:space="preserve">
-    <value>Lock menu</value>
-  </data>
-  <data name="ImageUploading" xml:space="preserve">
-    <value>Image uploading</value>
-  </data>
-  <data name="ImageCopied" xml:space="preserve">
-    <value>Image copied</value>
-  </data>
-  <data name="ImageSaved" xml:space="preserve">
-    <value>Image saved</value>
-  </data>
-  <data name="ImageSavedAs" xml:space="preserve">
-    <value>Image saved</value>
-  </data>
-  <data name="Duplicate" xml:space="preserve">
-    <value>Duplicate</value>
-  </data>
-  <data name="MenuIconSize" xml:space="preserve">
-    <value>Menu icon size:</value>
-  </data>
-  <data name="ShapeManager_CreateToolbar_StepType" xml:space="preserve">
-    <value>Step type:</value>
-  </data>
-  <data name="camcorder__pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\camcorder--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="control_record" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\control-record.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="control_record_yellow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\control-record-yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="ScreenRecordForm_ConfirmCancel" xml:space="preserve">
-    <value>Are you sure you want to abort this recording?</value>
   </data>
   <data name="ScreenRecordForm_StartRecording_Click_tray_icon_to_start_recording_" xml:space="preserve">
     <value>Click to start recording.</value>
     <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
   </data>
-  <data name="ScreenRecordForm_StartRecording_Click_tray_icon_to_stop_recording_" xml:space="preserve">
+  <data name="smiley_cool" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Click to stop recording.</value>
+    <value>..\Resources\smiley-cool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-    <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
   </data>
-  <data name="ScreenRecordForm_StartRecording_Encoding___" xml:space="preserve">
+  <data name="control-pause" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>Encoding...</value>
+    <value>..\Resources\control-pause.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-    <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
-  </data>
-  <data name="ScreenRecordForm_StartRecording_Waiting___" xml:space="preserve">
-    <value>Waiting...</value>
-    <comment>Text must be equal to or lower than 54 characters because of tray icon text length limit.</comment>
-  </data>
-  <data name="ScreenRecordForm_Start" xml:space="preserve">
-    <value>Start</value>
-  </data>
-  <data name="ScreenRecordForm_Stop" xml:space="preserve">
-    <value>Stop</value>
-  </data>
-  <data name="ShapeManager_BorderStyle" xml:space="preserve">
-    <value>Border style:</value>
-  </data>
-  <data name="ShapeManager_CreateToolbar_ToolOptions" xml:space="preserve">
-    <value>Tool options</value>
-  </data>
-  <data name="Processing" xml:space="preserve">
-    <value>Processing...</value>
-  </data>
-  <data name="Blur" xml:space="preserve">
-    <value>Blur</value>
-  </data>
-  <data name="Highlight" xml:space="preserve">
-    <value>Highlight</value>
-  </data>
-  <data name="Pixelate" xml:space="preserve">
-    <value>Pixelate</value>
-  </data>
-  <data name="AutoCopyImageToClipboard" xml:space="preserve">
-    <value>Auto copy image to clipboard</value>
-  </data>
-  <data name="FPSLimit" xml:space="preserve">
-    <value>FPS limit:</value>
-  </data>
-  <data name="Bitrate" xml:space="preserve">
-    <value>Bitrate:</value>
-  </data>
-  <data name="CRF" xml:space="preserve">
-    <value>CRF:</value>
-    <comment>@Invariant</comment>
-  </data>
-  <data name="CutOutEffectSize" xml:space="preserve">
-    <value>Cut out effect size:</value>
-  </data>
-  <data name="CutOutEffectType" xml:space="preserve">
-    <value>Cut out effect:</value>
-  </data>
-  <data name="table_delete_column" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\table-delete-column.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="pencil__arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pencil--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Resume" xml:space="preserve">
-    <value>Resume</value>
-  </data>
-  <data name="Pause" xml:space="preserve">
-    <value>Pause</value>
   </data>
 </root>

ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj

@@ -1003,6 +1003,9 @@
   <ItemGroup>
     <None Include="Resources\pencil--arrow.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\control-pause.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.Designer.cs

@@ -61,7 +61,11 @@ private void InitializeComponent()
             this.btnFileUploaderTest = new System.Windows.Forms.Button();
             this.lblImageUploader = new System.Windows.Forms.Label();
             this.dgvHeaders = new System.Windows.Forms.DataGridView();
+            this.cHeadersName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cHeadersValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dgvParameters = new System.Windows.Forms.DataGridView();
+            this.cParametersName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cParametersValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.lblHeaders = new System.Windows.Forms.Label();
             this.lblParameters = new System.Windows.Forms.Label();
             this.pRequestURL = new System.Windows.Forms.Panel();
@@ -73,6 +77,8 @@ private void InitializeComponent()
             this.lblBody = new System.Windows.Forms.Label();
             this.pBodyArguments = new System.Windows.Forms.Panel();
             this.dgvArguments = new System.Windows.Forms.DataGridView();
+            this.cArgumentsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cArgumentsValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.lblFileFormName = new System.Windows.Forms.Label();
             this.txtFileFormName = new System.Windows.Forms.TextBox();
             this.pBodyData = new System.Windows.Forms.Panel();
@@ -104,12 +110,6 @@ private void InitializeComponent()
             this.lblUploaders = new System.Windows.Forms.Label();
             this.pMain = new System.Windows.Forms.Panel();
             this.btnTestURLSyntax = new System.Windows.Forms.Button();
-            this.cParametersName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cParametersValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cHeadersName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cHeadersValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cArgumentsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cArgumentsValue = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cmsHelp.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvHeaders)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvParameters)).BeginInit();
@@ -326,6 +326,19 @@ private void InitializeComponent()
             this.dgvHeaders.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvHeaders_CellValueChanged);
             this.dgvHeaders.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgv_EditingControlShowing);
             // 
+            // cHeadersName
+            // 
+            resources.ApplyResources(this.cHeadersName, "cHeadersName");
+            this.cHeadersName.Name = "cHeadersName";
+            this.cHeadersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // cHeadersValue
+            // 
+            this.cHeadersValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            resources.ApplyResources(this.cHeadersValue, "cHeadersValue");
+            this.cHeadersValue.Name = "cHeadersValue";
+            this.cHeadersValue.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // dgvParameters
             // 
             this.dgvParameters.AllowUserToResizeRows = false;
@@ -362,6 +375,19 @@ private void InitializeComponent()
             this.dgvParameters.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvParameters_CellValueChanged);
             this.dgvParameters.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgv_EditingControlShowing);
             // 
+            // cParametersName
+            // 
+            resources.ApplyResources(this.cParametersName, "cParametersName");
+            this.cParametersName.Name = "cParametersName";
+            this.cParametersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // cParametersValue
+            // 
+            this.cParametersValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            resources.ApplyResources(this.cParametersValue, "cParametersValue");
+            this.cParametersValue.Name = "cParametersValue";
+            this.cParametersValue.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // lblHeaders
             // 
             resources.ApplyResources(this.lblHeaders, "lblHeaders");
@@ -464,6 +490,21 @@ private void InitializeComponent()
             this.dgvArguments.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvArguments_CellValueChanged);
             this.dgvArguments.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgv_EditingControlShowing);
             // 
+            // cArgumentsName
+            // 
+            resources.ApplyResources(this.cArgumentsName, "cArgumentsName");
+            this.cArgumentsName.Name = "cArgumentsName";
+            this.cArgumentsName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // cArgumentsValue
+            // 
+            this.cArgumentsValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.cArgumentsValue.DefaultCellStyle = dataGridViewCellStyle6;
+            resources.ApplyResources(this.cArgumentsValue, "cArgumentsValue");
+            this.cArgumentsValue.Name = "cArgumentsValue";
+            this.cArgumentsValue.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // lblFileFormName
             // 
             resources.ApplyResources(this.lblFileFormName, "lblFileFormName");
@@ -696,47 +737,6 @@ private void InitializeComponent()
             this.btnTestURLSyntax.UseVisualStyleBackColor = true;
             this.btnTestURLSyntax.Click += new System.EventHandler(this.btnTestURLSyntax_Click);
             // 
-            // cParametersName
-            // 
-            resources.ApplyResources(this.cParametersName, "cParametersName");
-            this.cParametersName.Name = "cParametersName";
-            this.cParametersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // cParametersValue
-            // 
-            this.cParametersValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            resources.ApplyResources(this.cParametersValue, "cParametersValue");
-            this.cParametersValue.Name = "cParametersValue";
-            this.cParametersValue.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // cHeadersName
-            // 
-            resources.ApplyResources(this.cHeadersName, "cHeadersName");
-            this.cHeadersName.Name = "cHeadersName";
-            this.cHeadersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // cHeadersValue
-            // 
-            this.cHeadersValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            resources.ApplyResources(this.cHeadersValue, "cHeadersValue");
-            this.cHeadersValue.Name = "cHeadersValue";
-            this.cHeadersValue.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // cArgumentsName
-            // 
-            resources.ApplyResources(this.cArgumentsName, "cArgumentsName");
-            this.cArgumentsName.Name = "cArgumentsName";
-            this.cArgumentsName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // cArgumentsValue
-            // 
-            this.cArgumentsValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.cArgumentsValue.DefaultCellStyle = dataGridViewCellStyle6;
-            resources.ApplyResources(this.cArgumentsValue, "cArgumentsValue");
-            this.cArgumentsValue.Name = "cArgumentsValue";
-            this.cArgumentsValue.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
             // CustomUploaderSettingsForm
             // 
             this.AllowDrop = true;

ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.resx

@@ -1429,7 +1429,7 @@
     <value>False</value>
   </data>
   <data name="rtbResultURL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>586, 14</value>
+    <value>570, 14</value>
   </data>
   <data name="rtbResultURL.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1456,7 +1456,7 @@
     <value>2, 2, 2, 2</value>
   </data>
   <data name="pResultURL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>592, 20</value>
+    <value>576, 20</value>
   </data>
   <data name="pResultURL.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
@@ -1765,16 +1765,16 @@
     <value>3</value>
   </data>
   <data name="btnTestURLSyntax.Location" type="System.Drawing.Point, System.Drawing">
-    <value>608, 478</value>
+    <value>592, 478</value>
   </data>
   <data name="btnTestURLSyntax.Size" type="System.Drawing.Size, System.Drawing">
-    <value>72, 24</value>
+    <value>88, 24</value>
   </data>
   <data name="btnTestURLSyntax.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
   </data>
   <data name="btnTestURLSyntax.Text" xml:space="preserve">
-    <value>Test</value>
+    <value>Test...</value>
   </data>
   <data name="&gt;&gt;btnTestURLSyntax.Name" xml:space="preserve">
     <value>btnTestURLSyntax</value>
@@ -1821,9 +1821,6 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>984, 628</value>
   </data>
-  <data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
     <value>1000, 600</value>
   </data>
@@ -1857,11 +1854,17 @@
   <data name="&gt;&gt;tsmiUpdateFolder.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ttHelpTip.Name" xml:space="preserve">
+  <data name="&gt;&gt;cHeadersName.Name" xml:space="preserve">
-    <value>ttHelpTip</value>
+    <value>cHeadersName</value>
   </data>
-  <data name="&gt;&gt;ttHelpTip.Type" xml:space="preserve">
+  <data name="&gt;&gt;cHeadersName.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cHeadersValue.Name" xml:space="preserve">
+    <value>cHeadersValue</value>
+  </data>
+  <data name="&gt;&gt;cHeadersValue.Type" xml:space="preserve">
+    <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;cParametersName.Name" xml:space="preserve">
     <value>cParametersName</value>
@@ -1875,18 +1878,6 @@
   <data name="&gt;&gt;cParametersValue.Type" xml:space="preserve">
     <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;cHeadersName.Name" xml:space="preserve">
-    <value>cHeadersName</value>
-  </data>
-  <data name="&gt;&gt;cHeadersName.Type" xml:space="preserve">
-    <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cHeadersValue.Name" xml:space="preserve">
-    <value>cHeadersValue</value>
-  </data>
-  <data name="&gt;&gt;cHeadersValue.Type" xml:space="preserve">
-    <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;cArgumentsName.Name" xml:space="preserve">
     <value>cArgumentsName</value>
   </data>
@@ -1899,6 +1890,12 @@
   <data name="&gt;&gt;cArgumentsValue.Type" xml:space="preserve">
     <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;ttHelpTip.Name" xml:space="preserve">
+    <value>ttHelpTip</value>
+  </data>
+  <data name="&gt;&gt;ttHelpTip.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>CustomUploaderSettingsForm</value>
   </data>