12 Feb
2024
12 Feb
'24
8:41 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ac79d7c455b1b58e9bd6…
commit 0ac79d7c455b1b58e9bd6d36c48fe13dbcaf5a0a
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com>
AuthorDate: Mon Feb 12 17:40:57 2024 +0900
Commit: GitHub <noreply(a)github.com>
CommitDate: Mon Feb 12 17:40:57 2024 +0900
[MSUTB] Improve English (#6473)
Follow-up to #6472. Improve UI/UX.
JIRA issue: CORE-19363
- Improve English text in resource.
- Reduce earth.ico icon file size.
---
dll/win32/msutb/lang/en-US.rc | 28 ++++++++++++++--------------
dll/win32/msutb/msutb.rc | 3 ++-
dll/win32/msutb/res/earth.ico | Bin 22382 -> 5430 bytes
dll/win32/msutb/resource.h | 13 +++++++------
4 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc
index 6c1925f28fa..a26cc46c0ae 100644
--- a/dll/win32/msutb/lang/en-US.rc
+++ b/dll/win32/msutb/lang/en-US.rc
@@ -2,7 +2,7 @@
* PROJECT: ReactOS msutb.dll
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
* PURPOSE: English (United States) resource file
- * TRANSLATOR: Copyright 2023 Katayama Hirofumi MZ
<katayama.hirofumi.mz(a)gmail.com>
+ * TRANSLATOR: Copyright 2023-2024 Katayama Hirofumi MZ
<katayama.hirofumi.mz(a)gmail.com>
*/
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -18,61 +18,61 @@ BEGIN
IDS_NO "&No"
IDS_SETTINGS "S&ettings..."
- IDS_RESTORELANGBAR "Restore Language Bar"
+ IDS_RESTORELANGBAR "Restore the Language bar"
IDS_LANGUAGE "Language"
IDS_LANGUAGEBUTTON "Language Button"
IDS_TRANSPARENCY "&Transparency"
IDS_TEXTLABELS "Tex&t Labels"
IDS_MINIMIZE "&Minimize"
- IDS_CLOSELANGBAR "&Close Language Bar"
+ IDS_CLOSELANGBAR "&Close the Language bar"
IDS_EXTRAICONS "&Additional icons in taskbar"
- IDS_LANGUAGEBAR "Language Bar"
- IDS_RESTORELANGBAR2 "&Restore Language Bar"
+ IDS_LANGUAGEBAR "The Language bar"
+ IDS_RESTORELANGBAR2 "&Restore the Language bar"
IDS_MENUWND "Menu Window"
IDS_VERTICAL "&Vertical"
- IDS_ADJUSTLANGBAND "&Adjust Language Band position"
+ IDS_ADJUSTLANGBAND "&Adjust the Language band position"
IDS_LEFTCLICK "Left Click"
END
IDD_CLOSELANGBARNOBAND DIALOGEX 0, 0, 200, 105
-CAPTION "Language Bar"
+CAPTION "Language bar"
STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME
FONT 8, "MS Shell Dlg"
{
- LTEXT "You have closed Language Bar.\r\n\r\nTo use Language Bar later, check
""Show Language Bar on the desktop"" in Language Bar Settings dialog,
which you can find within Text Services control panel.", -1, 5, 5, 190, 60
+ LTEXT "You have closed the Language bar.\r\n\r\nTo use the Language bar later,
check ""Show the Language bar on the desktop"" in the Language bar
Settings dialog, which you can find within the Text Services control panel.", -1, 5,
5, 190, 60
AUTOCHECKBOX "&Don't show me this message again",
IDC_CLOSELANGBAR_CHECK, 5, 70, 145, 10
DEFPUSHBUTTON "OK", IDOK, 80, 85, 55, 15
PUSHBUTTON "Cancel", IDCANCEL, 140, 85, 55, 15
}
IDD_CLOSELANGBAR DIALOGEX 0, 0, 200, 105
-CAPTION "Language Bar"
+CAPTION "Language bar"
STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME
FONT 8, "MS Shell Dlg"
{
- LTEXT "You have closed Language Bar.\r\n\r\nTo use Language Bar later, check
""Show Language Bar on the desktop"" in Language Bar Settings dialog,
which you can find within Regional and Language Options control panel.", -1, 5, 5,
190, 60
+ LTEXT "You have closed the Language bar.\r\n\r\nTo use the Language bar later,
check ""Show the Language bar on the desktop"" in the Language bar
Settings dialog, which you can find within the Regional and Language Options control
panel.", -1, 5, 5, 190, 60
AUTOCHECKBOX "&Don't show me this message again",
IDC_CLOSELANGBAR_CHECK, 5, 70, 145, 10
DEFPUSHBUTTON "OK", IDOK, 80, 85, 55, 15
PUSHBUTTON "Cancel", IDCANCEL, 140, 85, 55, 15
}
IDD_MINIMIZELANGBARNOBAND DIALOGEX 0, 0, 205, 124
-CAPTION "Language Bar"
+CAPTION "Language bar"
STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME
FONT 8, "MS Shell Dlg"
{
- LTEXT "You have minimized Language Bar. To restore it, just click Language Bar
icon (near the clock) and select ""Restore Language Bar"" from the
pop-up menu.", -1, 5, 5, 190, 50
+ LTEXT "You have minimized the Language bar. To restore it, just click the
Language bar icon (near the clock) and select ""Restore the Language
bar"" from the pop-up menu.", -1, 5, 5, 190, 50
CONTROL IDB_BITMAP154, -1, "STATIC", SS_BITMAP, 72, 63, 60, 60,
WS_EX_STATICEDGE
AUTOCHECKBOX "Don't show me this message again",
IDC_MINIMIZELANGBAR_CHECK, 5, 105, 125, 10
DEFPUSHBUTTON "OK", IDOK, 140, 105, 60, 15
}
IDD_MINIMIZELANGBAR DIALOGEX 0, 0, 205, 124
-CAPTION "Language Bar"
+CAPTION "Language bar"
STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME
FONT 8, "MS Shell Dlg"
{
- LTEXT "You have minimized Language Bar. To restore it, just click Language Bar
icon (near the clock) and select ""Restore Language Bar"" from the
pop-up menu.", -1, 5, 5, 190, 50
+ LTEXT "You have minimized the Language bar. To restore it, just click the
Language bar icon (near the clock) and select ""Restore the Language
bar"" from the pop-up menu.", -1, 5, 5, 190, 50
CONTROL IDB_BITMAP155, -1, "STATIC", SS_BITMAP, 53, 67, 60, 60,
WS_EX_STATICEDGE
AUTOCHECKBOX "Don't show me this message again",
IDC_MINIMIZELANGBAR_CHECK, 5, 105, 125, 10
DEFPUSHBUTTON "OK", IDOK, 140, 105, 60, 15
diff --git a/dll/win32/msutb/msutb.rc b/dll/win32/msutb/msutb.rc
index bc2ad8380ed..056be8e474f 100644
--- a/dll/win32/msutb/msutb.rc
+++ b/dll/win32/msutb/msutb.rc
@@ -2,7 +2,7 @@
* PROJECT: ReactOS msutb.dll
* LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later)
* PURPOSE: Resource of msutb.dll
- * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ
<katayama.hirofumi.mz(a)gmail.com>
+ * COPYRIGHT: Copyright 2023-2024 Katayama Hirofumi MZ
<katayama.hirofumi.mz(a)gmail.com>
*/
#include <windef.h>
@@ -21,6 +21,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#include <reactos/manifest_hosted.rc>
IDI_MAINICON ICON "res/earth.ico"
+
IDB_BITMAP154 BITMAP "res/Bitmap-154.bmp"
IDB_BITMAP155 BITMAP "res/Bitmap-155.bmp"
diff --git a/dll/win32/msutb/res/earth.ico b/dll/win32/msutb/res/earth.ico
index 7d47171f990..36757a3d47e 100644
Binary files a/dll/win32/msutb/res/earth.ico and b/dll/win32/msutb/res/earth.ico differ
diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h
index e00fa496048..d97513362f4 100644
--- a/dll/win32/msutb/resource.h
+++ b/dll/win32/msutb/resource.h
@@ -40,12 +40,13 @@
#define ID_RESTORELANGBAR 216
#define ID_VERTICAL 217
#define ID_ADJUSTDESKBAND 219
+
#define ID_SETTINGS 2000
-#define IDD_CLOSELANGBARNOBAND 1000
-#define IDD_CLOSELANGBAR 1001
-#define IDD_MINIMIZELANGBARNOBAND 1003
-#define IDD_MINIMIZELANGBAR 1004
+#define IDD_CLOSELANGBARNOBAND 1000
+#define IDD_CLOSELANGBAR 1001
+#define IDD_MINIMIZELANGBARNOBAND 1003
+#define IDD_MINIMIZELANGBAR 1004
-#define IDC_CLOSELANGBAR_CHECK 1002
-#define IDC_MINIMIZELANGBAR_CHECK 1002
+#define IDC_CLOSELANGBAR_CHECK 1002
+#define IDC_MINIMIZELANGBAR_CHECK 1002