From d8d8eda53eb6fad500c90cd3a329432344add7c4 Mon Sep 17 00:00:00 2001
From: L1Q <6942070+L1Q@users.noreply.github.com>
Date: Sun, 2 Oct 2022 19:52:50 +0300
Subject: [PATCH] Move lines to resx
---
.../Forms/ScreenRecordForm.cs | 6 ++---
.../Properties/Resources.Designer.cs | 18 +++++++++++++
.../Properties/Resources.resx | 6 +++++
ShareX/Properties/Resources.Designer.cs | 27 +++++++++++++++++++
ShareX/Properties/Resources.resx | 9 +++++++
ShareX/TaskHelpers.cs | 10 +++----
6 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.cs b/ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.cs
index 22f47c453..72f515ea7 100644
--- a/ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/ScreenRecordForm.cs
@@ -263,16 +263,14 @@ private void UpdateUI()
{
if (Status == ScreenRecordingStatus.Waiting || Status == ScreenRecordingStatus.Paused)
{
- // TODO: Translate
- btnPause.Text = "Resume";
+ btnPause.Text = Resources.Resume;
lblTimer.Cursor = Cursors.SizeAll;
borderColor = Color.FromArgb(241, 196, 27);
Refresh();
}
else if (Status == ScreenRecordingStatus.Recording)
{
- // TODO: Translate
- btnPause.Text = "Pause";
+ btnPause.Text = Resources.Pause;
lblTimer.Cursor = Cursors.Default;
}
}
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
index 89f303075..adeac34a2 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs
@@ -1242,6 +1242,15 @@ internal static string OpenKeybindsPage {
}
}
+ ///
+ /// Looks up a localized string similar to Pause.
+ ///
+ internal static string Pause {
+ get {
+ return ResourceManager.GetString("Pause", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -1365,6 +1374,15 @@ internal static string RegionCaptureForm_TipYouCanPanImageByHoldingMouseMiddleBu
}
}
+ ///
+ /// Looks up a localized string similar to Resume.
+ ///
+ internal static string Resume {
+ get {
+ return ResourceManager.GetString("Resume", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Are you sure you want to abort this recording?.
///
diff --git a/ShareX.ScreenCaptureLib/Properties/Resources.resx b/ShareX.ScreenCaptureLib/Properties/Resources.resx
index b93587c1a..d62bc2382 100644
--- a/ShareX.ScreenCaptureLib/Properties/Resources.resx
+++ b/ShareX.ScreenCaptureLib/Properties/Resources.resx
@@ -811,4 +811,10 @@ X: {4} Y: {5}
..\Resources\pencil--arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Resume
+
+
+ Pause
+
\ No newline at end of file
diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs
index 3b7887e33..e646044b4 100644
--- a/ShareX/Properties/Resources.Designer.cs
+++ b/ShareX/Properties/Resources.Designer.cs
@@ -1423,6 +1423,33 @@ public static string FFmpeg_FFmpeg_video_and_audio_source_both_can_t_be__None__
}
}
+ ///
+ /// Looks up a localized string similar to FFmpeg does not exist at the following path:.
+ ///
+ public static string FFmpegDoesNotExistAtTheFollowingPath {
+ get {
+ return ResourceManager.GetString("FFmpegDoesNotExistAtTheFollowingPath", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to FFmpeg is missing.
+ ///
+ public static string FFmpegIsMissing {
+ get {
+ return ResourceManager.GetString("FFmpegIsMissing", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to FFmpeg that comes with ShareX only supports 64-bit operating systems..
+ ///
+ public static string FFmpegOnlySupports64BitOperatingSystems {
+ get {
+ return ResourceManager.GetString("FFmpegOnlySupports64BitOperatingSystems", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Use new name: .
///
diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx
index 7a3def175..d88f5cbc6 100644
--- a/ShareX/Properties/Resources.resx
+++ b/ShareX/Properties/Resources.resx
@@ -1110,4 +1110,13 @@ Middle click to close
..\Resources\openhand.cur;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ FFmpeg that comes with ShareX only supports 64-bit operating systems.
+
+
+ FFmpeg is missing
+
+
+ FFmpeg does not exist at the following path:
+
\ No newline at end of file
diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs
index fcffdd4f3..d63bf8430 100644
--- a/ShareX/TaskHelpers.cs
+++ b/ShareX/TaskHelpers.cs
@@ -1424,9 +1424,8 @@ public static bool CheckFFmpeg(TaskSettings taskSettings)
{
if (!Environment.Is64BitOperatingSystem && !taskSettings.CaptureSettings.FFmpegOptions.OverrideCLIPath)
{
- // TODO: Translate
- MessageBox.Show("FFmpeg that comes with ShareX only supports 64-bit operating systems.",
- "ShareX - " + "FFmpeg is missing", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ MessageBox.Show(Resources.FFmpegOnlySupports64BitOperatingSystems,
+ "ShareX - " + Resources.FFmpegIsMissing, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return false;
}
@@ -1435,9 +1434,8 @@ public static bool CheckFFmpeg(TaskSettings taskSettings)
if (!File.Exists(ffmpegPath))
{
- // TODO: Translate
- MessageBox.Show("FFmpeg does not exist at the following path:\r\n" + ffmpegPath,
- "ShareX - " + "FFmpeg is missing", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ MessageBox.Show(Resources.FFmpegDoesNotExistAtTheFollowingPath + "\r\n" + ffmpegPath,
+ "ShareX - " + Resources.FFmpegIsMissing, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return false;
}