From 20f7a5d415c255a7c62f791fa75fc3c3442ff1a4 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Mon, 28 Oct 2019 15:24:54 +0300
Subject: [PATCH] Make ImageSplitterForm localizable

---
 .../Forms/ImageSplitterForm.Designer.cs       |  63 +---
 ShareX.MediaLib/Forms/ImageSplitterForm.resx  | 294 ++++++++++++++++++
 .../Forms/ApplicationSettingsForm.Designer.cs |  40 +--
 ShareX/Forms/ApplicationSettingsForm.resx     |   8 +-
 4 files changed, 331 insertions(+), 74 deletions(-)

diff --git a/ShareX.MediaLib/Forms/ImageSplitterForm.Designer.cs b/ShareX.MediaLib/Forms/ImageSplitterForm.Designer.cs
index bf8673469..5f5e5c9c5 100644
--- a/ShareX.MediaLib/Forms/ImageSplitterForm.Designer.cs
+++ b/ShareX.MediaLib/Forms/ImageSplitterForm.Designer.cs
@@ -28,6 +28,7 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageSplitterForm));
             this.lblImageFilePath = new System.Windows.Forms.Label();
             this.lblRowCount = new System.Windows.Forms.Label();
             this.lblColumnCount = new System.Windows.Forms.Label();
@@ -45,43 +46,28 @@ private void InitializeComponent()
             // 
             // lblImageFilePath
             // 
-            this.lblImageFilePath.AutoSize = true;
-            this.lblImageFilePath.Location = new System.Drawing.Point(13, 16);
+            resources.ApplyResources(this.lblImageFilePath, "lblImageFilePath");
             this.lblImageFilePath.Name = "lblImageFilePath";
-            this.lblImageFilePath.Size = new System.Drawing.Size(79, 13);
-            this.lblImageFilePath.TabIndex = 0;
-            this.lblImageFilePath.Text = "Image file path:";
             // 
             // lblRowCount
             // 
-            this.lblRowCount.AutoSize = true;
-            this.lblRowCount.Location = new System.Drawing.Point(13, 40);
+            resources.ApplyResources(this.lblRowCount, "lblRowCount");
             this.lblRowCount.Name = "lblRowCount";
-            this.lblRowCount.Size = new System.Drawing.Size(62, 13);
-            this.lblRowCount.TabIndex = 3;
-            this.lblRowCount.Text = "Row count:";
             // 
             // lblColumnCount
             // 
-            this.lblColumnCount.AutoSize = true;
-            this.lblColumnCount.Location = new System.Drawing.Point(13, 64);
+            resources.ApplyResources(this.lblColumnCount, "lblColumnCount");
             this.lblColumnCount.Name = "lblColumnCount";
-            this.lblColumnCount.Size = new System.Drawing.Size(75, 13);
-            this.lblColumnCount.TabIndex = 5;
-            this.lblColumnCount.Text = "Column count:";
             // 
             // nudRowCount
             // 
-            this.nudRowCount.Location = new System.Drawing.Point(120, 36);
+            resources.ApplyResources(this.nudRowCount, "nudRowCount");
             this.nudRowCount.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
             this.nudRowCount.Name = "nudRowCount";
-            this.nudRowCount.Size = new System.Drawing.Size(56, 20);
-            this.nudRowCount.TabIndex = 4;
-            this.nudRowCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.nudRowCount.Value = new decimal(new int[] {
             1,
             0,
@@ -90,16 +76,13 @@ private void InitializeComponent()
             // 
             // nudColumnCount
             // 
-            this.nudColumnCount.Location = new System.Drawing.Point(120, 60);
+            resources.ApplyResources(this.nudColumnCount, "nudColumnCount");
             this.nudColumnCount.Minimum = new decimal(new int[] {
             1,
             0,
             0,
             0});
             this.nudColumnCount.Name = "nudColumnCount";
-            this.nudColumnCount.Size = new System.Drawing.Size(56, 20);
-            this.nudColumnCount.TabIndex = 6;
-            this.nudColumnCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.nudColumnCount.Value = new decimal(new int[] {
             1,
             0,
@@ -108,63 +91,45 @@ private void InitializeComponent()
             // 
             // txtImageFilePath
             // 
-            this.txtImageFilePath.Location = new System.Drawing.Point(120, 12);
+            resources.ApplyResources(this.txtImageFilePath, "txtImageFilePath");
             this.txtImageFilePath.Name = "txtImageFilePath";
-            this.txtImageFilePath.Size = new System.Drawing.Size(280, 20);
-            this.txtImageFilePath.TabIndex = 1;
             // 
             // lblOutputFolder
             // 
-            this.lblOutputFolder.AutoSize = true;
-            this.lblOutputFolder.Location = new System.Drawing.Point(13, 88);
+            resources.ApplyResources(this.lblOutputFolder, "lblOutputFolder");
             this.lblOutputFolder.Name = "lblOutputFolder";
-            this.lblOutputFolder.Size = new System.Drawing.Size(71, 13);
-            this.lblOutputFolder.TabIndex = 7;
-            this.lblOutputFolder.Text = "Output folder:";
             // 
             // txtOutputFolder
             // 
-            this.txtOutputFolder.Location = new System.Drawing.Point(120, 84);
+            resources.ApplyResources(this.txtOutputFolder, "txtOutputFolder");
             this.txtOutputFolder.Name = "txtOutputFolder";
-            this.txtOutputFolder.Size = new System.Drawing.Size(280, 20);
-            this.txtOutputFolder.TabIndex = 8;
             // 
             // btnImageFilePathBrowse
             // 
-            this.btnImageFilePathBrowse.Location = new System.Drawing.Point(408, 11);
+            resources.ApplyResources(this.btnImageFilePathBrowse, "btnImageFilePathBrowse");
             this.btnImageFilePathBrowse.Name = "btnImageFilePathBrowse";
-            this.btnImageFilePathBrowse.Size = new System.Drawing.Size(32, 23);
-            this.btnImageFilePathBrowse.TabIndex = 2;
-            this.btnImageFilePathBrowse.Text = "...";
             this.btnImageFilePathBrowse.UseVisualStyleBackColor = true;
             this.btnImageFilePathBrowse.Click += new System.EventHandler(this.BtnImageFilePathBrowse_Click);
             // 
             // btnOutputFolderBrowse
             // 
-            this.btnOutputFolderBrowse.Location = new System.Drawing.Point(408, 83);
+            resources.ApplyResources(this.btnOutputFolderBrowse, "btnOutputFolderBrowse");
             this.btnOutputFolderBrowse.Name = "btnOutputFolderBrowse";
-            this.btnOutputFolderBrowse.Size = new System.Drawing.Size(32, 23);
-            this.btnOutputFolderBrowse.TabIndex = 9;
-            this.btnOutputFolderBrowse.Text = "...";
             this.btnOutputFolderBrowse.UseVisualStyleBackColor = true;
             this.btnOutputFolderBrowse.Click += new System.EventHandler(this.BtnOutputFolderBrowse_Click);
             // 
             // btnSplitImage
             // 
-            this.btnSplitImage.Location = new System.Drawing.Point(16, 112);
+            resources.ApplyResources(this.btnSplitImage, "btnSplitImage");
             this.btnSplitImage.Name = "btnSplitImage";
-            this.btnSplitImage.Size = new System.Drawing.Size(424, 24);
-            this.btnSplitImage.TabIndex = 10;
-            this.btnSplitImage.Text = "Split image";
             this.btnSplitImage.UseVisualStyleBackColor = true;
             this.btnSplitImage.Click += new System.EventHandler(this.BtnSplitImage_Click);
             // 
             // ImageSplitterForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Window;
-            this.ClientSize = new System.Drawing.Size(449, 145);
             this.Controls.Add(this.btnSplitImage);
             this.Controls.Add(this.btnOutputFolderBrowse);
             this.Controls.Add(this.btnImageFilePathBrowse);
@@ -179,8 +144,6 @@ private void InitializeComponent()
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.Name = "ImageSplitterForm";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "ShareX - Image splitter";
             ((System.ComponentModel.ISupportInitialize)(this.nudRowCount)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudColumnCount)).EndInit();
             this.ResumeLayout(false);
diff --git a/ShareX.MediaLib/Forms/ImageSplitterForm.resx b/ShareX.MediaLib/Forms/ImageSplitterForm.resx
index 1af7de150..b10c56758 100644
--- a/ShareX.MediaLib/Forms/ImageSplitterForm.resx
+++ b/ShareX.MediaLib/Forms/ImageSplitterForm.resx
@@ -117,4 +117,298 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lblImageFilePath.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="lblImageFilePath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 16</value>
+  </data>
+  <data name="lblImageFilePath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>79, 13</value>
+  </data>
+  <data name="lblImageFilePath.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="lblImageFilePath.Text" xml:space="preserve">
+    <value>Image file path:</value>
+  </data>
+  <data name="&gt;&gt;lblImageFilePath.Name" xml:space="preserve">
+    <value>lblImageFilePath</value>
+  </data>
+  <data name="&gt;&gt;lblImageFilePath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblImageFilePath.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblImageFilePath.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="lblRowCount.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblRowCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 40</value>
+  </data>
+  <data name="lblRowCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>62, 13</value>
+  </data>
+  <data name="lblRowCount.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="lblRowCount.Text" xml:space="preserve">
+    <value>Row count:</value>
+  </data>
+  <data name="&gt;&gt;lblRowCount.Name" xml:space="preserve">
+    <value>lblRowCount</value>
+  </data>
+  <data name="&gt;&gt;lblRowCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblRowCount.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblRowCount.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="lblColumnCount.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblColumnCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 64</value>
+  </data>
+  <data name="lblColumnCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 13</value>
+  </data>
+  <data name="lblColumnCount.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="lblColumnCount.Text" xml:space="preserve">
+    <value>Column count:</value>
+  </data>
+  <data name="&gt;&gt;lblColumnCount.Name" xml:space="preserve">
+    <value>lblColumnCount</value>
+  </data>
+  <data name="&gt;&gt;lblColumnCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblColumnCount.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblColumnCount.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="nudRowCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>120, 36</value>
+  </data>
+  <data name="nudRowCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 20</value>
+  </data>
+  <data name="nudRowCount.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="nudRowCount.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Center</value>
+  </data>
+  <data name="&gt;&gt;nudRowCount.Name" xml:space="preserve">
+    <value>nudRowCount</value>
+  </data>
+  <data name="&gt;&gt;nudRowCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;nudRowCount.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;nudRowCount.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="nudColumnCount.Location" type="System.Drawing.Point, System.Drawing">
+    <value>120, 60</value>
+  </data>
+  <data name="nudColumnCount.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 20</value>
+  </data>
+  <data name="nudColumnCount.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="nudColumnCount.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Center</value>
+  </data>
+  <data name="&gt;&gt;nudColumnCount.Name" xml:space="preserve">
+    <value>nudColumnCount</value>
+  </data>
+  <data name="&gt;&gt;nudColumnCount.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;nudColumnCount.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;nudColumnCount.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="txtImageFilePath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>120, 12</value>
+  </data>
+  <data name="txtImageFilePath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>280, 20</value>
+  </data>
+  <data name="txtImageFilePath.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtImageFilePath.Name" xml:space="preserve">
+    <value>txtImageFilePath</value>
+  </data>
+  <data name="&gt;&gt;txtImageFilePath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtImageFilePath.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtImageFilePath.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="lblOutputFolder.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblOutputFolder.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 88</value>
+  </data>
+  <data name="lblOutputFolder.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 13</value>
+  </data>
+  <data name="lblOutputFolder.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="lblOutputFolder.Text" xml:space="preserve">
+    <value>Output folder:</value>
+  </data>
+  <data name="&gt;&gt;lblOutputFolder.Name" xml:space="preserve">
+    <value>lblOutputFolder</value>
+  </data>
+  <data name="&gt;&gt;lblOutputFolder.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblOutputFolder.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblOutputFolder.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="txtOutputFolder.Location" type="System.Drawing.Point, System.Drawing">
+    <value>120, 84</value>
+  </data>
+  <data name="txtOutputFolder.Size" type="System.Drawing.Size, System.Drawing">
+    <value>280, 20</value>
+  </data>
+  <data name="txtOutputFolder.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;txtOutputFolder.Name" xml:space="preserve">
+    <value>txtOutputFolder</value>
+  </data>
+  <data name="&gt;&gt;txtOutputFolder.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtOutputFolder.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtOutputFolder.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="btnImageFilePathBrowse.Location" type="System.Drawing.Point, System.Drawing">
+    <value>408, 11</value>
+  </data>
+  <data name="btnImageFilePathBrowse.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 23</value>
+  </data>
+  <data name="btnImageFilePathBrowse.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="btnImageFilePathBrowse.Text" xml:space="preserve">
+    <value>...</value>
+  </data>
+  <data name="&gt;&gt;btnImageFilePathBrowse.Name" xml:space="preserve">
+    <value>btnImageFilePathBrowse</value>
+  </data>
+  <data name="&gt;&gt;btnImageFilePathBrowse.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnImageFilePathBrowse.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnImageFilePathBrowse.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="btnOutputFolderBrowse.Location" type="System.Drawing.Point, System.Drawing">
+    <value>408, 83</value>
+  </data>
+  <data name="btnOutputFolderBrowse.Size" type="System.Drawing.Size, System.Drawing">
+    <value>32, 23</value>
+  </data>
+  <data name="btnOutputFolderBrowse.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="btnOutputFolderBrowse.Text" xml:space="preserve">
+    <value>...</value>
+  </data>
+  <data name="&gt;&gt;btnOutputFolderBrowse.Name" xml:space="preserve">
+    <value>btnOutputFolderBrowse</value>
+  </data>
+  <data name="&gt;&gt;btnOutputFolderBrowse.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnOutputFolderBrowse.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnOutputFolderBrowse.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="btnSplitImage.Location" type="System.Drawing.Point, System.Drawing">
+    <value>16, 112</value>
+  </data>
+  <data name="btnSplitImage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>424, 24</value>
+  </data>
+  <data name="btnSplitImage.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="btnSplitImage.Text" xml:space="preserve">
+    <value>Split image</value>
+  </data>
+  <data name="&gt;&gt;btnSplitImage.Name" xml:space="preserve">
+    <value>btnSplitImage</value>
+  </data>
+  <data name="&gt;&gt;btnSplitImage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnSplitImage.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnSplitImage.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>449, 145</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>ShareX - Image splitter</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>ImageSplitterForm</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ShareX/Forms/ApplicationSettingsForm.Designer.cs b/ShareX/Forms/ApplicationSettingsForm.Designer.cs
index 954c56d78..0bc574bcb 100644
--- a/ShareX/Forms/ApplicationSettingsForm.Designer.cs
+++ b/ShareX/Forms/ApplicationSettingsForm.Designer.cs
@@ -91,6 +91,8 @@ private void InitializeComponent()
             this.lblSaveImageSubFolderPatternPreview = new System.Windows.Forms.Label();
             this.txtSaveImageSubFolderPattern = new System.Windows.Forms.TextBox();
             this.tpExportImport = new System.Windows.Forms.TabPage();
+            this.cbExportHistory = new System.Windows.Forms.CheckBox();
+            this.cbExportSettings = new System.Windows.Forms.CheckBox();
             this.lblExportImportNote = new System.Windows.Forms.Label();
             this.btnResetSettings = new System.Windows.Forms.Button();
             this.pbExportImport = new System.Windows.Forms.ProgressBar();
@@ -154,8 +156,6 @@ private void InitializeComponent()
             this.tpAdvanced = new System.Windows.Forms.TabPage();
             this.pgSettings = new System.Windows.Forms.PropertyGrid();
             this.tttvMain = new ShareX.HelpersLib.TabToTreeView();
-            this.cbExportSettings = new System.Windows.Forms.CheckBox();
-            this.cbExportHistory = new System.Windows.Forms.CheckBox();
             this.tcSettings.SuspendLayout();
             this.tpGeneral.SuspendLayout();
             this.tpTheme.SuspendLayout();
@@ -652,6 +652,24 @@ private void InitializeComponent()
             resources.ApplyResources(this.tpExportImport, "tpExportImport");
             this.tpExportImport.Name = "tpExportImport";
             // 
+            // cbExportHistory
+            // 
+            resources.ApplyResources(this.cbExportHistory, "cbExportHistory");
+            this.cbExportHistory.Checked = true;
+            this.cbExportHistory.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbExportHistory.Name = "cbExportHistory";
+            this.cbExportHistory.UseVisualStyleBackColor = true;
+            this.cbExportHistory.CheckedChanged += new System.EventHandler(this.cbExportHistory_CheckedChanged);
+            // 
+            // cbExportSettings
+            // 
+            resources.ApplyResources(this.cbExportSettings, "cbExportSettings");
+            this.cbExportSettings.Checked = true;
+            this.cbExportSettings.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbExportSettings.Name = "cbExportSettings";
+            this.cbExportSettings.UseVisualStyleBackColor = true;
+            this.cbExportSettings.CheckedChanged += new System.EventHandler(this.cbExportSettings_CheckedChanged);
+            // 
             // lblExportImportNote
             // 
             resources.ApplyResources(this.lblExportImportNote, "lblExportImportNote");
@@ -1145,24 +1163,6 @@ private void InitializeComponent()
             this.tttvMain.TreeViewSize = 175;
             this.tttvMain.TabChanged += new ShareX.HelpersLib.TabToTreeView.TabChangedEventHandler(this.tttvMain_TabChanged);
             // 
-            // cbExportSettings
-            // 
-            resources.ApplyResources(this.cbExportSettings, "cbExportSettings");
-            this.cbExportSettings.Checked = true;
-            this.cbExportSettings.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.cbExportSettings.Name = "cbExportSettings";
-            this.cbExportSettings.UseVisualStyleBackColor = true;
-            this.cbExportSettings.CheckedChanged += new System.EventHandler(this.cbExportSettings_CheckedChanged);
-            // 
-            // cbExportHistory
-            // 
-            resources.ApplyResources(this.cbExportHistory, "cbExportHistory");
-            this.cbExportHistory.Checked = true;
-            this.cbExportHistory.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.cbExportHistory.Name = "cbExportHistory";
-            this.cbExportHistory.UseVisualStyleBackColor = true;
-            this.cbExportHistory.CheckedChanged += new System.EventHandler(this.cbExportHistory_CheckedChanged);
-            // 
             // ApplicationSettingsForm
             // 
             resources.ApplyResources(this, "$this");
diff --git a/ShareX/Forms/ApplicationSettingsForm.resx b/ShareX/Forms/ApplicationSettingsForm.resx
index 80bee8817..3502ff91d 100644
--- a/ShareX/Forms/ApplicationSettingsForm.resx
+++ b/ShareX/Forms/ApplicationSettingsForm.resx
@@ -1753,7 +1753,7 @@
     <value>0</value>
   </data>
   <data name="lblExportImportNote.Text" xml:space="preserve">
-    <value>Note: Do not share this exported file with anyone because it may contain private informations such as your account passwords.</value>
+    <value>Note: Do not share the exported file with anyone because it might contain private information such as account details and your upload history.</value>
   </data>
   <data name="&gt;&gt;lblExportImportNote.Name" xml:space="preserve">
     <value>lblExportImportNote</value>
@@ -1777,7 +1777,7 @@
     <value>184, 24</value>
   </data>
   <data name="btnResetSettings.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="btnResetSettings.Text" xml:space="preserve">
     <value>Reset settings...</value>
@@ -1804,7 +1804,7 @@
     <value>184, 23</value>
   </data>
   <data name="pbExportImport.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="pbExportImport.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -1858,7 +1858,7 @@
     <value>184, 23</value>
   </data>
   <data name="btnImport.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="btnImport.Text" xml:space="preserve">
     <value>Import...</value>