From ae9cb033d70ede99ab74a898a6f1341c4d87763d Mon Sep 17 00:00:00 2001
From: L1Q <6942070+L1Q@users.noreply.github.com>
Date: Sat, 7 Jan 2023 20:03:11 +0200
Subject: [PATCH 1/2] Move lines to resx
- "Pin to screen"
- "Connect..." and "Disconnect" in OAuthLoopbackControl
---
.../HistoryItemManager_ContextMenu.cs | 2 +-
.../Properties/Resources.Designer.cs | 9 +++++++++
ShareX.HistoryLib/Properties/Resources.resx | 5 ++++-
.../Controls/OAuthLoopbackControl.cs | 6 ++----
.../Properties/Resources.Designer.cs | 18 ++++++++++++++++++
ShareX.UploadersLib/Properties/Resources.resx | 6 ++++++
6 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs b/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
index 508460319..cbab6fb8e 100644
--- a/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
+++ b/ShareX.HistoryLib/HistoryItemManager_ContextMenu.cs
@@ -439,7 +439,7 @@ private void InitializeComponent()
tsmiPinToScreen.Name = "tsmiPinToScreen";
tsmiPinToScreen.ShortcutKeyDisplayString = "Ctrl+P";
tsmiPinToScreen.Size = new Size(127, 22);
- tsmiPinToScreen.Text = "Pin to screen"; // TODO: Translate
+ tsmiPinToScreen.Text = Resources.PinToScreen;
tsmiPinToScreen.Click += tsmiPinToScreen_Click;
//
// tsmiShowMoreInfo
diff --git a/ShareX.HistoryLib/Properties/Resources.Designer.cs b/ShareX.HistoryLib/Properties/Resources.Designer.cs
index 7b45ccf2c..173d50376 100644
--- a/ShareX.HistoryLib/Properties/Resources.Designer.cs
+++ b/ShareX.HistoryLib/Properties/Resources.Designer.cs
@@ -492,6 +492,15 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Pin to screen.
+ ///
+ internal static string PinToScreen {
+ get {
+ return ResourceManager.GetString("PinToScreen", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Process names:.
///
diff --git a/ShareX.HistoryLib/Properties/Resources.resx b/ShareX.HistoryLib/Properties/Resources.resx
index 233b0bfae..51ad2304b 100644
--- a/ShareX.HistoryLib/Properties/Resources.resx
+++ b/ShareX.HistoryLib/Properties/Resources.resx
@@ -265,4 +265,7 @@
History stats
-
+
+ Pin to screen
+
+
\ No newline at end of file
diff --git a/ShareX.UploadersLib/Controls/OAuthLoopbackControl.cs b/ShareX.UploadersLib/Controls/OAuthLoopbackControl.cs
index 9d223587c..bbbc20e2b 100644
--- a/ShareX.UploadersLib/Controls/OAuthLoopbackControl.cs
+++ b/ShareX.UploadersLib/Controls/OAuthLoopbackControl.cs
@@ -79,8 +79,7 @@ private void UpdateStatus()
{
if (Connected)
{
- // TODO: Translate
- btnConnect.Text = "Disconnect";
+ btnConnect.Text = Resources.Disconnect;
if (UserInfo != null && !string.IsNullOrEmpty(UserInfo.name))
{
lblStatusValue.Text = string.Format(Resources.LoggedInAs0, UserInfo.name);
@@ -93,8 +92,7 @@ private void UpdateStatus()
}
else
{
- // TODO: Translate
- btnConnect.Text = "Connect...";
+ btnConnect.Text = Resources.Connect;
lblStatusValue.Text = Resources.OAuthControl_Status_NotLoggedIn;
lblStatusValue.ForeColor = Color.FromArgb(220, 0, 0);
}
diff --git a/ShareX.UploadersLib/Properties/Resources.Designer.cs b/ShareX.UploadersLib/Properties/Resources.Designer.cs
index 705fadf3b..1fe49ff33 100644
--- a/ShareX.UploadersLib/Properties/Resources.Designer.cs
+++ b/ShareX.UploadersLib/Properties/Resources.Designer.cs
@@ -139,6 +139,15 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Connect....
+ ///
+ internal static string Connect {
+ get {
+ return ResourceManager.GetString("Connect", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to "File form name" must be configured..
///
@@ -166,6 +175,15 @@ internal class Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Disconnect.
+ ///
+ internal static string Disconnect {
+ get {
+ return ResourceManager.GetString("Disconnect", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/ShareX.UploadersLib/Properties/Resources.resx b/ShareX.UploadersLib/Properties/Resources.resx
index 2da4f6fa8..bd2e8c1f3 100644
--- a/ShareX.UploadersLib/Properties/Resources.resx
+++ b/ShareX.UploadersLib/Properties/Resources.resx
@@ -449,4 +449,10 @@ Created folders:
..\resources\oauthcallbackpage.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
+ Disconnect
+
+
+ Connect...
+
\ No newline at end of file
From d5dd3d041145408b6389354ba84eaf4acbe386d5 Mon Sep 17 00:00:00 2001
From: L1Q <6942070+L1Q@users.noreply.github.com>
Date: Sat, 7 Jan 2023 20:04:07 +0200
Subject: [PATCH 2/2] Update russian translation
---
.../Properties/Resources.ru.resx | 5 +-
.../Forms/ImageCombinerForm.ru.resx | 6 +
.../Controls/OAuthLoopbackControl.ru.resx | 126 +++++++++++++++++
.../OAuth/OAuthListenerForm.ru.resx | 129 ++++++++++++++++++
.../Properties/Resources.ru.resx | 6 +
.../ShareX.UploadersLib.csproj | 6 +
ShareX/Controls/TaskThumbnailPanel.ru.resx | 8 ++
7 files changed, 285 insertions(+), 1 deletion(-)
create mode 100644 ShareX.UploadersLib/Controls/OAuthLoopbackControl.ru.resx
create mode 100644 ShareX.UploadersLib/OAuth/OAuthListenerForm.ru.resx
diff --git a/ShareX.HistoryLib/Properties/Resources.ru.resx b/ShareX.HistoryLib/Properties/Resources.ru.resx
index 20b793d6c..d8835aa22 100644
--- a/ShareX.HistoryLib/Properties/Resources.ru.resx
+++ b/ShareX.HistoryLib/Properties/Resources.ru.resx
@@ -237,4 +237,7 @@
Статистика истории
-
+
+ Закрепить на экране
+
+
\ No newline at end of file
diff --git a/ShareX.MediaLib/Forms/ImageCombinerForm.ru.resx b/ShareX.MediaLib/Forms/ImageCombinerForm.ru.resx
index 87442a56c..49e4ef66e 100644
--- a/ShareX.MediaLib/Forms/ImageCombinerForm.ru.resx
+++ b/ShareX.MediaLib/Forms/ImageCombinerForm.ru.resx
@@ -159,4 +159,10 @@
Заполнить фон автомитически
+
+ изображений
+
+
+ Переносить после:
+
\ No newline at end of file
diff --git a/ShareX.UploadersLib/Controls/OAuthLoopbackControl.ru.resx b/ShareX.UploadersLib/Controls/OAuthLoopbackControl.ru.resx
new file mode 100644
index 000000000..9ed7b4d02
--- /dev/null
+++ b/ShareX.UploadersLib/Controls/OAuthLoopbackControl.ru.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Состояние:
+
+
+ Подключить...
+
+
\ No newline at end of file
diff --git a/ShareX.UploadersLib/OAuth/OAuthListenerForm.ru.resx b/ShareX.UploadersLib/OAuth/OAuthListenerForm.ru.resx
new file mode 100644
index 000000000..e2a70c389
--- /dev/null
+++ b/ShareX.UploadersLib/OAuth/OAuthListenerForm.ru.resx
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Ожидается завершение авторизации в вашем браузере...
+
+
+ Отменить
+
+
+ ShareX - Авторизация
+
+
\ No newline at end of file
diff --git a/ShareX.UploadersLib/Properties/Resources.ru.resx b/ShareX.UploadersLib/Properties/Resources.ru.resx
index 69147a8e3..23d295fe9 100644
--- a/ShareX.UploadersLib/Properties/Resources.ru.resx
+++ b/ShareX.UploadersLib/Properties/Resources.ru.resx
@@ -280,4 +280,10 @@
Ссылка
+
+ Отключить
+
+
+ Подключить...
+
\ No newline at end of file
diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
index 06145844f..77d0d8096 100644
--- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj
+++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj
@@ -523,6 +523,9 @@
OAuthLoopbackControl.cs
+
+ OAuthLoopbackControl.cs
+
CustomUploaderSettingsForm.cs
@@ -1096,6 +1099,9 @@
OAuthListenerForm.cs
+
+ OAuthListenerForm.cs
+
Designer
diff --git a/ShareX/Controls/TaskThumbnailPanel.ru.resx b/ShareX/Controls/TaskThumbnailPanel.ru.resx
index fd9e3671f..33afdfa67 100644
--- a/ShareX/Controls/TaskThumbnailPanel.ru.resx
+++ b/ShareX/Controls/TaskThumbnailPanel.ru.resx
@@ -120,4 +120,12 @@
Ошибка
+
+ Объединить изображения
+(Горизонтально)
+
+
+ Объединить изображения
+(Вертикально)
+
\ No newline at end of file