Merge pull request #6533 from L1Q/develop

Move lines to resx
This commit is contained in:
Jaex 2022-10-03 04:25:11 +03:00 committed by GitHub
commit 55e2cbb35b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 66 additions and 10 deletions

View file

@ -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;
}
}

View file

@ -1242,6 +1242,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Pause.
/// </summary>
internal static string Pause {
get {
return ResourceManager.GetString("Pause", resourceCulture);
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@ -1365,6 +1374,15 @@ internal class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Resume.
/// </summary>
internal static string Resume {
get {
return ResourceManager.GetString("Resume", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Are you sure you want to abort this recording?.
/// </summary>

View file

@ -811,4 +811,10 @@ X: {4} Y: {5}</value>
<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>

View file

@ -1423,6 +1423,33 @@ public class Resources {
}
}
/// <summary>
/// Looks up a localized string similar to FFmpeg does not exist at the following path:.
/// </summary>
public static string FFmpegDoesNotExistAtTheFollowingPath {
get {
return ResourceManager.GetString("FFmpegDoesNotExistAtTheFollowingPath", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to FFmpeg is missing.
/// </summary>
public static string FFmpegIsMissing {
get {
return ResourceManager.GetString("FFmpegIsMissing", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to FFmpeg that comes with ShareX only supports 64-bit operating systems..
/// </summary>
public static string FFmpegOnlySupports64BitOperatingSystems {
get {
return ResourceManager.GetString("FFmpegOnlySupports64BitOperatingSystems", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Use new name: .
/// </summary>

View file

@ -1110,4 +1110,13 @@ Middle click to close</value>
<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="FFmpegOnlySupports64BitOperatingSystems" xml:space="preserve">
<value>FFmpeg that comes with ShareX only supports 64-bit operating systems.</value>
</data>
<data name="FFmpegIsMissing" xml:space="preserve">
<value>FFmpeg is missing</value>
</data>
<data name="FFmpegDoesNotExistAtTheFollowingPath" xml:space="preserve">
<value>FFmpeg does not exist at the following path:</value>
</data>
</root>

View file

@ -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;
}