Merge pull request #6411 from L1Q/develop

Improve translations

ShareX.HelpersLib/Forms/ImageViewer.cs

@@ -23,6 +23,7 @@ You should have received a copy of the GNU General Public License
 
 #endregion License Information (GPL v3)
 
+using ShareX.HelpersLib.Properties;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -336,8 +337,7 @@ private void InitializeComponent()
             Bounds = CaptureHelpers.GetActiveScreenBounds();
             DoubleBuffered = true;
             FormBorderStyle = FormBorderStyle.None;
-            // TODO: Translate
+            Text = Resources.ShareXImageViewer;
-            Text = "ShareX - Image viewer";
             TopMost = true;
             WindowState = FormWindowState.Normal;
             StartPosition = FormStartPosition.Manual;

ShareX.HelpersLib/Properties/Resources.Designer.cs

@@ -3691,6 +3691,15 @@ internal static System.Drawing.Bitmap ShareX_Logo {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to ShareX - Image viewer.
+        /// </summary>
+        internal static string ShareXImageViewer {
+            get {
+                return ResourceManager.GetString("ShareXImageViewer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Start.
         /// </summary>

ShareX.HelpersLib/Properties/Resources.resx

@@ -1451,4 +1451,7 @@ Would you like to download and install it?</value>
   <data name="ToastClickAction_PinToScreen" xml:space="preserve">
     <value>Pin to screen</value>
   </data>
+  <data name="ShareXImageViewer" xml:space="preserve">
+    <value>ShareX - Image viewer</value>
+  </data>
 </root>

ShareX.HelpersLib/Properties/Resources.ru.resx

@@ -1411,4 +1411,13 @@
   <data name="HotkeyType_ImageViewer" xml:space="preserve">
     <value>Просмотр изображений</value>
   </data>
+  <data name="ShareXImageViewer" xml:space="preserve">
+    <value>ShareX - Просмотр изображений</value>
+  </data>
+  <data name="AfterCaptureTasks_PinToScreen" xml:space="preserve">
+    <value>Закрепить на экране</value>
+  </data>
+  <data name="ToastClickAction_PinToScreen" xml:space="preserve">
+    <value>Закрепить на экране</value>
+  </data>
 </root>

ShareX.ScreenCaptureLib/Forms/FFmpegOptionsForm.cs

@@ -203,8 +203,7 @@ private void UpdateUI()
         {
             if (settingsLoaded)
             {
-                // TODO: Translate
+                lblx264CRF.Text = Options.FFmpeg.x264_Use_Bitrate ? Resources.Bitrate : Resources.CRF;
-                lblx264CRF.Text = Options.FFmpeg.x264_Use_Bitrate ? "Bitrate:" : "CRF:";
                 nudx264CRF.Visible = !Options.FFmpeg.x264_Use_Bitrate;
                 nudx264Bitrate.Visible = lblx264BitrateK.Visible = Options.FFmpeg.x264_Use_Bitrate;
 

ShareX.ScreenCaptureLib/Properties/Resources.Designer.cs

@@ -128,6 +128,15 @@ internal static string BaseRegionForm_InitializeComponent_Region_capture {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Bitrate:.
+        /// </summary>
+        internal static string Bitrate {
+            get {
+                return ResourceManager.GetString("Bitrate", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Blur.
         /// </summary>
@@ -236,6 +245,15 @@ internal static System.Drawing.Bitmap counter_reset {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to CRF:.
+        /// </summary>
+        internal static string CRF {
+            get {
+                return ResourceManager.GetString("CRF", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

ShareX.ScreenCaptureLib/Properties/Resources.resx

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

ShareX.ScreenCaptureLib/Properties/Resources.ru.resx

@@ -334,7 +334,7 @@
     <value>Заметка: Изображение можно перемещать, удерживая среднюю кнопку мыши.</value>
   </data>
   <data name="EditorStartupForm_ClipboardDoesNotContainAnImage" xml:space="preserve">
-    <value>Буфер обмена не содержит изображений.</value>
+    <value>Буфер обмена не содержит изображение.</value>
   </data>
   <data name="ShapeManager_CreateToolbar_PasteImageText" xml:space="preserve">
     <value>Вставить картинку/текст</value>
@@ -484,4 +484,7 @@
   <data name="ShapeManager_CreateToolbar_ZoomToFitOnOpen" xml:space="preserve">
     <value>Подогнать под размеры окна при открывании</value>
   </data>
+  <data name="Bitrate" xml:space="preserve">
+    <value>Битрейт:</value>
+  </data>
 </root>

ShareX/Forms/MainForm.ru.resx

@@ -750,4 +750,13 @@
   <data name="tsmiOCR.Text" xml:space="preserve">
     <value>Распознавание текста (OCR)...</value>
   </data>
+  <data name="tsmiPinSelectedFile.Text" xml:space="preserve">
+    <value>Закрепить на экране</value>
+  </data>
+  <data name="tsmiPinToScreen.Text" xml:space="preserve">
+    <value>Закрепить на экране...</value>
+  </data>
+  <data name="tsmiTrayPinToScreen.Text" xml:space="preserve">
+    <value>Закрепить на экране...</value>
+  </data>
 </root>

ShareX/OCR/OCRHelper.cs

@@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
 #endregion License Information (GPL v3)
 
 using ShareX.HelpersLib;
+using ShareX.Properties;
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -63,8 +64,7 @@ public static void ThrowIfNotSupported()
         {
             if (!IsSupported)
             {
-                // TODO: Translate
+                throw new Exception(string.Format(Resources.OpticalCharacterRecognitionFeatureIsOnlyAvailableWithWindowsVersion0OrNewer,
-                throw new Exception(string.Format("Optical character recognition feature is only available with Windows version {0} or newer.",
                     SupportedVersion));
             }
         }

ShareX/Properties/Resources.Designer.cs

@@ -1022,6 +1022,15 @@ public static string ClipboardContentViewer_ClipboardContentViewer_Load_Clipboar
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clipboard does not contain an image..
+        /// </summary>
+        public static string ClipboardDoesNotContainAnImage {
+            get {
+                return ResourceManager.GetString("ClipboardDoesNotContainAnImage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Supported variables: {0} and other variables such as {1} etc..
         /// </summary>
@@ -2254,6 +2263,15 @@ public static string OCRForm_AutoProcessing {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Optical character recognition feature is only available with Windows version {0} or newer..
+        /// </summary>
+        public static string OpticalCharacterRecognitionFeatureIsOnlyAvailableWithWindowsVersion0OrNewer {
+            get {
+                return ResourceManager.GetString("OpticalCharacterRecognitionFeatureIsOnlyAvailableWithWindowsVersion0OrNewer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -2274,6 +2292,15 @@ public static System.Drawing.Bitmap pin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pin to screen.
+        /// </summary>
+        public static string PinToScreen {
+            get {
+                return ResourceManager.GetString("PinToScreen", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

ShareX/Properties/Resources.resx

@@ -1105,4 +1105,13 @@ Middle click to close</value>
   <data name="pin" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="OpticalCharacterRecognitionFeatureIsOnlyAvailableWithWindowsVersion0OrNewer" xml:space="preserve">
+    <value>Optical character recognition feature is only available with Windows version {0} or newer.</value>
+  </data>
+  <data name="ClipboardDoesNotContainAnImage" xml:space="preserve">
+    <value>Clipboard does not contain an image.</value>
+  </data>
+  <data name="PinToScreen" xml:space="preserve">
+    <value>Pin to screen</value>
+  </data>
 </root>

ShareX/Properties/Resources.ru.resx

@@ -661,4 +661,10 @@
   <data name="InspectWindow_ExtendedWindowStyles" xml:space="preserve">
     <value>Расширенные стили окна</value>
   </data>
+  <data name="ClipboardDoesNotContainAnImage" xml:space="preserve">
+    <value>Буфер обмена не содержит изображение.</value>
+  </data>
+  <data name="PinToScreen" xml:space="preserve">
+    <value>Закрепить на экране</value>
+  </data>
 </root>

ShareX/TaskHelpers.cs

@@ -1292,8 +1292,7 @@ public static void PinToScreenFromClipboard()
 
             if (bmp == null)
             {
-                // TODO: Translate
+                MessageBox.Show(Resources.ClipboardDoesNotContainAnImage, "ShareX - " + Resources.PinToScreen, MessageBoxButtons.OK, MessageBoxIcon.Information);
-                MessageBox.Show("Clipboard does not contain an image.", "ShareX - " + "Pin to screen", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
             else
             {