diff --git a/ShareX/Forms/ApplicationSettingsForm.Designer.cs b/ShareX/Forms/ApplicationSettingsForm.Designer.cs index 5f18fb0c6..bd1ece361 100644 --- a/ShareX/Forms/ApplicationSettingsForm.Designer.cs +++ b/ShareX/Forms/ApplicationSettingsForm.Designer.cs @@ -88,7 +88,8 @@ private void InitializeComponent() this.lblSaveImageSubFolderPattern = new System.Windows.Forms.Label(); this.lblSaveImageSubFolderPatternPreview = new System.Windows.Forms.Label(); this.txtSaveImageSubFolderPattern = new System.Windows.Forms.TextBox(); - this.tpExportImport = new System.Windows.Forms.TabPage(); + this.tpSettings = new System.Windows.Forms.TabPage(); + this.pbExportImportNote = new System.Windows.Forms.PictureBox(); this.cbExportHistory = new System.Windows.Forms.CheckBox(); this.cbExportSettings = new System.Windows.Forms.CheckBox(); this.lblExportImportNote = new System.Windows.Forms.Label(); @@ -163,7 +164,8 @@ private void InitializeComponent() this.gbChrome.SuspendLayout(); this.gbWindows.SuspendLayout(); this.tpPaths.SuspendLayout(); - this.tpExportImport.SuspendLayout(); + this.tpSettings.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbExportImportNote)).BeginInit(); this.tpUpload.SuspendLayout(); this.tcUpload.SuspendLayout(); this.tpPerformance.SuspendLayout(); @@ -192,7 +194,7 @@ private void InitializeComponent() this.tcSettings.Controls.Add(this.tpTheme); this.tcSettings.Controls.Add(this.tpIntegration); this.tcSettings.Controls.Add(this.tpPaths); - this.tcSettings.Controls.Add(this.tpExportImport); + this.tcSettings.Controls.Add(this.tpSettings); this.tcSettings.Controls.Add(this.tpUpload); this.tcSettings.Controls.Add(this.tpHistory); this.tcSettings.Controls.Add(this.tpPrint); @@ -623,18 +625,26 @@ private void InitializeComponent() this.txtSaveImageSubFolderPattern.Name = "txtSaveImageSubFolderPattern"; this.txtSaveImageSubFolderPattern.TextChanged += new System.EventHandler(this.txtSaveImageSubFolderPattern_TextChanged); // - // tpExportImport + // tpSettings // - this.tpExportImport.BackColor = System.Drawing.SystemColors.Window; - this.tpExportImport.Controls.Add(this.cbExportHistory); - this.tpExportImport.Controls.Add(this.cbExportSettings); - this.tpExportImport.Controls.Add(this.lblExportImportNote); - this.tpExportImport.Controls.Add(this.btnResetSettings); - this.tpExportImport.Controls.Add(this.pbExportImport); - this.tpExportImport.Controls.Add(this.btnExport); - this.tpExportImport.Controls.Add(this.btnImport); - resources.ApplyResources(this.tpExportImport, "tpExportImport"); - this.tpExportImport.Name = "tpExportImport"; + this.tpSettings.BackColor = System.Drawing.SystemColors.Window; + this.tpSettings.Controls.Add(this.pbExportImportNote); + this.tpSettings.Controls.Add(this.cbExportHistory); + this.tpSettings.Controls.Add(this.cbExportSettings); + this.tpSettings.Controls.Add(this.lblExportImportNote); + this.tpSettings.Controls.Add(this.btnResetSettings); + this.tpSettings.Controls.Add(this.pbExportImport); + this.tpSettings.Controls.Add(this.btnExport); + this.tpSettings.Controls.Add(this.btnImport); + resources.ApplyResources(this.tpSettings, "tpSettings"); + this.tpSettings.Name = "tpSettings"; + // + // pbExportImportNote + // + this.pbExportImportNote.Image = global::ShareX.Properties.Resources.exclamation; + resources.ApplyResources(this.pbExportImportNote, "pbExportImportNote"); + this.pbExportImportNote.Name = "pbExportImportNote"; + this.pbExportImportNote.TabStop = false; // // cbExportHistory // @@ -1150,6 +1160,7 @@ private void InitializeComponent() // ApplicationSettingsForm // resources.ApplyResources(this, "$this"); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.Window; this.Controls.Add(this.tcSettings); this.Controls.Add(this.tttvMain); @@ -1173,8 +1184,9 @@ private void InitializeComponent() this.gbWindows.PerformLayout(); this.tpPaths.ResumeLayout(false); this.tpPaths.PerformLayout(); - this.tpExportImport.ResumeLayout(false); - this.tpExportImport.PerformLayout(); + this.tpSettings.ResumeLayout(false); + this.tpSettings.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbExportImportNote)).EndInit(); this.tpUpload.ResumeLayout(false); this.tcUpload.ResumeLayout(false); this.tpPerformance.ResumeLayout(false); @@ -1200,8 +1212,6 @@ private void InitializeComponent() this.tpProxy.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudProxyPort)).EndInit(); this.tpAdvanced.ResumeLayout(false); - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.ResumeLayout(false); } @@ -1289,7 +1299,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox cbSteamShowInApp; private System.Windows.Forms.TabPage tpIntegration; private System.Windows.Forms.GroupBox gbSteam; - private System.Windows.Forms.TabPage tpExportImport; + private System.Windows.Forms.TabPage tpSettings; private System.Windows.Forms.Button btnImport; private System.Windows.Forms.Button btnExport; private System.Windows.Forms.ProgressBar pbExportImport; @@ -1333,5 +1343,6 @@ private void InitializeComponent() private System.Windows.Forms.Label lblExportImportNote; private System.Windows.Forms.CheckBox cbExportHistory; private System.Windows.Forms.CheckBox cbExportSettings; + private System.Windows.Forms.PictureBox pbExportImportNote; } } \ No newline at end of file diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index 6292c0ef7..24e947559 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -784,7 +784,9 @@ await Task.Run(() => private void btnResetSettings_Click(object sender, EventArgs e) { - if (MessageBox.Show(Resources.ApplicationSettingsForm_btnResetSettings_Click_WouldYouLikeToResetShareXSettings, "ShareX", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) + // TODO: Translate + if (MessageBox.Show(Resources.ApplicationSettingsForm_btnResetSettings_Click_WouldYouLikeToResetShareXSettings, "ShareX - " + "Confirmation", + MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) == DialogResult.Yes) { SettingManager.ResetSettings(); SettingManager.SaveAllSettings(); diff --git a/ShareX/Forms/ApplicationSettingsForm.resx b/ShareX/Forms/ApplicationSettingsForm.resx index 60aa91d6a..e7ac3c478 100644 --- a/ShareX/Forms/ApplicationSettingsForm.resx +++ b/ShareX/Forms/ApplicationSettingsForm.resx @@ -1632,6 +1632,30 @@ 3 + + 16, 16 + + + 32, 32 + + + AutoSize + + + 7 + + + pbExportImportNote + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tpSettings + + + 0 + True @@ -1654,10 +1678,10 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 0 + 1 True @@ -1681,16 +1705,16 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 1 + 2 - 13, 16 + 56, 16 - 528, 32 + 488, 32 0 @@ -1698,6 +1722,9 @@ Note: Do not share the exported file with anyone because it might contain private information such as account details and your upload history. + + MiddleLeft + lblExportImportNote @@ -1705,10 +1732,10 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 2 + 3 NoControl @@ -1732,10 +1759,10 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 3 + 4 NoControl @@ -1759,10 +1786,10 @@ System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 4 + 5 NoControl @@ -1786,10 +1813,10 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 5 + 6 NoControl @@ -1813,36 +1840,36 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tpExportImport + tpSettings - 6 - - - 4, 22 - - - 3, 3, 3, 3 - - - 550, 370 - - 7 - - Export / Import + + 4, 22 - - tpExportImport + + 3, 3, 3, 3 - + + 550, 370 + + + 7 + + + Settings + + + tpSettings + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tcSettings - + 4 @@ -3304,7 +3331,7 @@ True - 6, 13 + 96, 96 737, 402 diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 0c1789cea..20c396c73 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -1264,6 +1264,16 @@ public static System.Drawing.Bitmap es { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap exclamation { + get { + object obj = ResourceManager.GetObject("exclamation", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 9b961e245..2293546d2 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -135,9 +135,15 @@ Are you sure you want to continue? ..\Resources\Exclamation-16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + URL shortener: {0} + Are you sure you want to upload {0} files? + + Portuguese + Stopping @@ -147,8 +153,8 @@ Are you sure you want to continue? Shorten URL ({0}) - - ..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Clipboard content: Image (Size: {0}x{1}) Custom @@ -156,9 +162,15 @@ Are you sure you want to continue? Open at ShareX startup + + Downloading + French + + Persian + Uploading @@ -168,9 +180,6 @@ Are you sure you want to continue? ..\Resources\tw.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Dutch @@ -189,6 +198,9 @@ Are you sure you want to continue? ..\Resources\images-stack.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\br.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -267,14 +279,11 @@ Are you sure you want to continue? ..\Resources\application-monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Hide columns - Name can't be empty. - - ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Patreon-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\globe--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -294,9 +303,6 @@ Are you sure you want to continue? URL is empty. - - Text upload test - Choose ShareX personal folder path @@ -313,11 +319,11 @@ Please select a different hotkey or quit the conflicting application and reopen Stop - - ..\Resources\Discord-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Left click to copy URL to clipboard. Right click to open URL. - - ..\Resources\film--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ui-menu-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\clock--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,14 +331,17 @@ Please select a different hotkey or quit the conflicting application and reopen Share URL ({0}) + + Supported variables: {0} and other variables such as {1} etc. + X: {0}, Y: {1}, Width: {2}, Height: {3} Don't show this message again. - - Task settings + + Download of FFmpeg failed. Reset all hotkeys to defaults? @@ -352,8 +361,8 @@ Please select a different hotkey or quit the conflicting application and reopen Changelog - - ..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Start hotkey @@ -361,18 +370,24 @@ Please select a different hotkey or quit the conflicting application and reopen ..\Resources\application-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Select a hotkey... + + This feature will not work when "DisableUpload" option is enabled! - - ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Switch to thumbnail view - - hotkeys + + ..\Resources\GitHub-White-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Task settings Please choose a destination. + + ..\Resources\ErrorSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Starting @@ -384,11 +399,14 @@ Would you like to automatically download it? ..\Resources\application-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Translators + ..\Resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ui-menu-blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\inbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -396,8 +414,11 @@ Would you like to automatically download it? ..\Resources\fr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\checkbox_uncheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Cancel ..\Resources\network-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -406,20 +427,20 @@ Would you like to automatically download it? Waiting... Text must be equal to or lower than 54 characters because of tray icon text length limit. - - FFmpeg successfully downloaded. + + Shorten Image uploader: {0} - - ..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\application-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\camcorder-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Copied to clipboard: {0} @@ -427,11 +448,8 @@ Would you like to automatically download it? Hide menu - - Unable to create folder: - - - ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Task settings for {0} Unable to find a valid Twitter account. @@ -454,6 +472,9 @@ Would you like to automatically download it? Show columns + + Clipboard is empty or contains unknown data. + URL to download and upload @@ -466,12 +487,6 @@ Would you like to automatically download it? Enable hotkeys - - Cancel - - - ..\Resources\Patreon-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Timeleft: {0}s ({1}%) Total: {2} @@ -511,21 +526,27 @@ Would you like to automatically download it? ..\Resources\Bitcoin-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\edit-drop-cap-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Separator + + ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Error - - Supported variables: {0} and other variables such as {1} etc. + + Select a hotkey... Drop here - - ..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\checkbox_uncheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Hotkeys enabled. @@ -536,11 +557,16 @@ here ..\Resources\clipboard-block.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Download of FFmpeg failed. + + ShareX needs to be restarted for the personal folder changes to apply. + +Would you like to restart ShareX? - - ..\Resources\pipette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + The debug log can contain sensitive information. Are you sure you want to proceed? + + + hotkeys ..\Resources\drive.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -557,20 +583,20 @@ here ..\Resources\traffic-cone.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Traditional Chinese - - ..\Resources\balloon-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ui-splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Portuguese (Brazil) - - ..\Resources\GitHub-White-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a File uploader: {0} @@ -588,15 +614,15 @@ here Can't access to "{0}" file. Please run ShareX as administrator to change personal folder path. + + ..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\GitHub.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ru.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - History - After upload: {0} @@ -613,15 +639,18 @@ Please run ShareX as administrator to change personal folder path. ShareX - Optical character recognition - - ..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Russian ..\Resources\es.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\barcode-2d-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + Clipboard content: File (Count: {0}) + Could not write image to path {0}. @@ -633,15 +662,9 @@ Would you like to restart ShareX? ..\Resources\layer-shape.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\GitHub-Black-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\camcorder--exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -654,6 +677,12 @@ Would you like to restart ShareX? ..\Resources\cn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Simplified Chinese + + + Clipboard content: Text (Length: {0}) + ..\Resources\it.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -672,6 +701,9 @@ Would you like to restart ShareX? ..\Resources\ua.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + {0} is about to be uploaded to {1}. You may choose a different destination. + ..\Resources\upload-cloud.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -702,8 +734,8 @@ Would you like to restart ShareX? ..\Resources\folder-tree.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Translators + + ..\Resources\arrow-270.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a First time upload warning @@ -735,8 +767,8 @@ Would you like to restart ShareX? OCR is processing. - - URL shortener: {0} + + History ..\Resources\clipboard-paste-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -744,20 +776,23 @@ Would you like to restart ShareX? Upload errors - - ..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\clipboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\pt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\edit-scale-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\barcode-2d.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Switch to thumbnail view + + Unable to create folder: + + + Choose screenshots folder path Currently configured hotkeys: @@ -765,14 +800,14 @@ Would you like to restart ShareX? ..\Resources\film.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Left click to copy URL to clipboard. Right click to open URL. + + ..\Resources\arrow-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\layer_fullscreen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Twitter-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\layout-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\clipboard-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -802,8 +837,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading. ..\Resources\navigation-000-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\camcorder-image.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\layout-select-sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Do you really want to delete this file? @@ -827,11 +862,11 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading. Upload with ShareX - - ..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\application-text-image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\balloon-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Preparing @@ -848,11 +883,8 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading. ..\Resources\control.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\checkbox_check.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Switch to list view + + ..\Resources\toolbox.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Edit this menu... @@ -863,13 +895,14 @@ Press 'No' to cancel the current upload and disable screenshot auto uploading. URL sharing service: {0} + + ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Edit with ShareX - - ShareX needs to be restarted for the personal folder changes to apply. - -Would you like to restart ShareX? + + ..\Resources\cross-button.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Hold left down to drag @@ -879,8 +912,11 @@ Middle click to close Chrome support disabled. - - ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Shorten URL + + + Switch to list view ..\Resources\clipboard-paste-document-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -888,11 +924,11 @@ Middle click to close ..\Resources\bin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Start + + ..\Resources\globe-share.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ui-splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\layer-transparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\wrench-screwdriver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -900,23 +936,23 @@ Middle click to close ..\Resources\application-browser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ErrorSound.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Preview: - - ..\Resources\drive-upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Text upload test - - The debug log can contain sensitive information. Are you sure you want to proceed? + + ..\Resources\application-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\crown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + Hide columns - - Shorten + + FFmpeg successfully downloaded. Mexican Spanish @@ -933,14 +969,14 @@ Middle click to close Please note that ShareX is using OCR.Space's online API to perform optical character recognition. Do you give permission to ShareX to upload images to this service? - - Task settings for {0} + + ..\Resources\mx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Shorten URL + + ..\Resources\color.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Downloading + + ..\Resources\film--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\gear.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -948,6 +984,9 @@ Middle click to close ..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\image-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -969,14 +1008,11 @@ Middle click to close ..\Resources\image--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\categories.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Discord-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Simplified Chinese - - - {0} is about to be uploaded to {1}. You may choose a different destination. + + ..\Resources\monitor.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Website @@ -984,20 +1020,20 @@ Middle click to close ..\Resources\clock-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pencil.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\categories.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a German - - Choose screenshots folder path + + ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Reset all quick tasks to defaults? - - ..\Resources\camera.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tr.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Spanish @@ -1005,8 +1041,8 @@ Middle click to close Would you like to reset ShareX settings? - - ..\Resources\layout-select.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Twitter-32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Hungarian @@ -1018,40 +1054,7 @@ Middle click to close ..\Resources\application-home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\image-split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - This feature will not work when "DisableUpload" option is enabled! - - - ..\Resources\barcode-2d-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\edit-drop-cap-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\edit-scale-white.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\pt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - Portuguese - - - Persian - - - Clipboard content: File (Count: {0}) - - - Clipboard content: Image (Size: {0}x{1}) - - - Clipboard content: Text (Length: {0}) - - - Clipboard is empty or contains unknown data. + + ..\Resources\exclamation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ShareX/Resources/exclamation.png b/ShareX/Resources/exclamation.png new file mode 100644 index 000000000..51fde5ab0 Binary files /dev/null and b/ShareX/Resources/exclamation.png differ diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index 9ab7f3cc0..7e7d9cb69 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -1828,6 +1828,9 @@ + + +