Ros-diffs August 2024

ros-diffs@reactos.org

26 participants
139 discussions

[reactos] 01/01: [CALC] de-DE: add menu-accels, *.rc: Portu, CTRL->Ctrl, STRG->Strg (#7191)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=703078dc408b3eee41499… commit 703078dc408b3eee41499e85de9d899b7d332e72 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Aug 8 00:22:36 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 00:22:36 2024 +0200 [CALC] de-DE: add menu-accels, *.rc: Portu, CTRL->Ctrl, STRG->Strg (#7191) - de-DE: add accelerators for the menus, inspired by german XPSP3 - *.rc: It is portuguese, not portoguese (this has been fixed in en-US earlier already, but was forgotten to be merged into other languages - *.rc: CTRL is not used in capital manner by MS, but MS used Ctrl, and MS did not use STRG but Strg for de-DE. Our en-US respected that already, but again stuff was not synced into other languages when it was improved earlier in ros Therefore this PR has absolutely no changes for en-US because that was good already. --- base/applications/calc/lang/bg-BG.rc | 12 ++--- base/applications/calc/lang/cs-CZ.rc | 12 ++--- base/applications/calc/lang/de-DE.rc | 96 ++++++++++++++++++------------------ base/applications/calc/lang/el-GR.rc | 12 ++--- base/applications/calc/lang/es-ES.rc | 12 ++--- base/applications/calc/lang/fr-FR.rc | 12 ++--- base/applications/calc/lang/it-IT.rc | 12 ++--- base/applications/calc/lang/ko-KR.rc | 14 +++--- base/applications/calc/lang/nl-NL.rc | 12 ++--- base/applications/calc/lang/no-NO.rc | 12 ++--- base/applications/calc/lang/pl-PL.rc | 12 ++--- base/applications/calc/lang/ro-RO.rc | 8 +-- base/applications/calc/lang/ru-RU.rc | 12 ++--- base/applications/calc/lang/sk-SK.rc | 12 ++--- base/applications/calc/lang/sv-SE.rc | 12 ++--- base/applications/calc/lang/th-TH.rc | 14 +++--- base/applications/calc/lang/uk-UA.rc | 12 ++--- 17 files changed, 144 insertions(+), 144 deletions(-) diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index 96a90ec192d..2c5184d8b82 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -309,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "&Обработка" BEGIN - MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE END POPUP "Изглед" BEGIN @@ -341,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "&Обработка" BEGIN - MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE END POPUP "Изглед" BEGIN @@ -374,8 +374,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "&Обработка" BEGIN - MENUITEM "Запомняне\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Поставяне\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Запомняне\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Поставяне\tCtrl-V", IDM_EDIT_PASTE END POPUP "Изглед" BEGIN diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index 75700382052..eb423fe45c3 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -309,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Úpravy" BEGIN - MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE END POPUP "Zobrazit" BEGIN @@ -341,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Úpravy" BEGIN - MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE END POPUP "Zobrazit" BEGIN @@ -374,8 +374,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Úpravy" BEGIN - MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Vložit\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopírovat\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Vložit\tCtrl-V", IDM_EDIT_PASTE END POPUP "Zobrazit" BEGIN diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index bd6142a6a9f..f9d7dda54b1 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -303,89 +303,89 @@ END IDR_MENU_SCIENTIFIC_1 MENU BEGIN - POPUP "Bearbeiten" + POPUP "&Bearbeiten" BEGIN - MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY - MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE + MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY + MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE END - POPUP "Ansicht" + POPUP "&Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC - MENUITEM "Konversion", IDM_VIEW_CONVERSION + MENUITEM "&Standard", IDM_VIEW_STANDARD + MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC + MENUITEM "Kon&version", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Dezimal\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "De&zimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "O&ktal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Binär\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR - MENUITEM "Degree\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radiant\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Grad\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM "&Deg\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Rad\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Grad\tF4", IDM_VIEW_GRAD, CHECKED MENUITEM SEPARATOR - MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED + MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED END - POPUP "Hilfe" + POPUP "&?" BEGIN - MENUITEM "Hilfethemen", IDM_HELP_HELP + MENUITEM "&Hilfethemen", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Info", IDM_HELP_ABOUT + MENUITEM "&Info", IDM_HELP_ABOUT END END IDR_MENU_SCIENTIFIC_2 MENU BEGIN - POPUP "Bearbeiten" + POPUP "&Bearbeiten" BEGIN - MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY - MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE + MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY + MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE END - POPUP "Ansicht" + POPUP "&Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC - MENUITEM "Konversion", IDM_VIEW_CONVERSION + MENUITEM "&Standard", IDM_VIEW_STANDARD + MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC + MENUITEM "Kon&version", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Dezimal\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Oktal\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binär\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&Dezimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "O&ktal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Bi&när\tF8", IDM_VIEW_BIN, CHECKED MENUITEM SEPARATOR - MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dw&ord\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Wo&rd\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "&Byte\tF4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR - MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED + MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED END - POPUP "Hilfe" + POPUP "&?" BEGIN - MENUITEM "Hilfethemen", IDM_HELP_HELP + MENUITEM "&Hilfethemen", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT + MENUITEM "&Info", IDM_HELP_ABOUT END END IDR_MENU_STANDARD MENU BEGIN - POPUP "Bearbeiten" + POPUP "&Bearbeiten" BEGIN - MENUITEM "Kopieren\tSTRG-C", IDM_EDIT_COPY - MENUITEM "Einfügen\tSTRG-V", IDM_EDIT_PASTE + MENUITEM "&Kopieren\tStrg-C", IDM_EDIT_COPY + MENUITEM "&Einfügen\tStrg-V", IDM_EDIT_PASTE END - POPUP "Ansicht" + POPUP "&Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC - MENUITEM "Konversion", IDM_VIEW_CONVERSION + MENUITEM "&Standard", IDM_VIEW_STANDARD + MENUITEM "&Wissenschaftlich", IDM_VIEW_SCIENTIFIC + MENUITEM "Kon&version", IDM_VIEW_CONVERSION MENUITEM SEPARATOR - MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED + MENUITEM "Zifferngr&uppierung", IDM_VIEW_GROUP, CHECKED END - POPUP "Hilfe" + POPUP "&?" BEGIN - MENUITEM "Hilfethemen", IDM_HELP_HELP + MENUITEM "&Hilfethemen", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Über ReactOS Rechner", IDM_HELP_ABOUT + MENUITEM "&Info", IDM_HELP_ABOUT END END diff --git a/base/applications/calc/lang/el-GR.rc b/base/applications/calc/lang/el-GR.rc index 8bad94ed768..bcb193bb574 100644 --- a/base/applications/calc/lang/el-GR.rc +++ b/base/applications/calc/lang/el-GR.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Επεξεργασία" BEGIN - MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE END POPUP "View" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Επεξεργασία" BEGIN - MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE END POPUP "View" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Επεξεργασία" BEGIN - MENUITEM "Αντιγραφή\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Επικόλληση\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Αντιγραφή\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Επικόλληση\tCtrl-V", IDM_EDIT_PASTE END POPUP "View" BEGIN diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index d4241c95d7f..6ab1c005e87 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -311,8 +311,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Edición" BEGIN - MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE END POPUP "Ver" BEGIN @@ -343,8 +343,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Edición" BEGIN - MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE END POPUP "Ver" BEGIN @@ -376,8 +376,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Edición" BEGIN - MENUITEM "Copiar\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Pegar\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copiar\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Pegar\tCtrl-V", IDM_EDIT_PASTE END POPUP "Ver" BEGIN diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index c8ef24d55af..7c13665e373 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Édition" BEGIN - MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE END POPUP "Affichage" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Édition" BEGIN - MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE END POPUP "Affichage" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Édition" BEGIN - MENUITEM "Copier\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Coller\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copier\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Coller\tCtrl-V", IDM_EDIT_PASTE END POPUP "Affichage" BEGIN diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index bf57f1b1811..1f3342c5fb2 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Modifica" BEGIN - MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE END POPUP "Visualizza" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Modifica" BEGIN - MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE END POPUP "Visualizza" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Modifica" BEGIN - MENUITEM "Copia\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Incolla\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Copia\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Incolla\tCtrl-V", IDM_EDIT_PASTE END POPUP "Visualizza" BEGIN diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 9677e8b0bf2..577b2d25725 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -307,8 +307,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "편집" BEGIN - MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY - MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY + MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE END POPUP "보기" BEGIN @@ -339,8 +339,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "편집" BEGIN - MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY - MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY + MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE END POPUP "보기" BEGIN @@ -372,8 +372,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "편집" BEGIN - MENUITEM "복사\tCTRL-C", IDM_EDIT_COPY - MENUITEM "붙여넣기\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "복사\tCtrl-C", IDM_EDIT_COPY + MENUITEM "붙여넣기\tCtrl-V", IDM_EDIT_PASTE END POPUP "보기" BEGIN @@ -502,7 +502,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index 18531140ec7..ad65c4aa863 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Bewerken" BEGIN - MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE END POPUP "Beeld" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Edit" BEGIN - MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE END POPUP "Beeld" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Edit" BEGIN - MENUITEM "Kopiëren\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Plakken\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiëren\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Plakken\tCtrl-V", IDM_EDIT_PASTE END POPUP "View" BEGIN diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index b385e6d90cb..e2a399895fc 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Rediger" BEGIN - MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE END POPUP "Vis" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Rediger" BEGIN - MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE END POPUP "Vis" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Rediger" BEGIN - MENUITEM "Kopier\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Lim inn\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopier\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Lim inn\tCtrl-V", IDM_EDIT_PASTE END POPUP "Vis" BEGIN diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index 3ba478c9037..bb8143f2805 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -312,8 +312,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Edycja" BEGIN - MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE END POPUP "Wygląd" BEGIN @@ -344,8 +344,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Edycja" BEGIN - MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE END POPUP "Wygląd" BEGIN @@ -377,8 +377,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Edycja" BEGIN - MENUITEM "Kopiuj\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Wklej\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiuj\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Wklej\tCtrl-V", IDM_EDIT_PASTE END POPUP "Wygląd" BEGIN diff --git a/base/applications/calc/lang/ro-RO.rc b/base/applications/calc/lang/ro-RO.rc index 267f0ca8b6a..1eff00f6642 100644 --- a/base/applications/calc/lang/ro-RO.rc +++ b/base/applications/calc/lang/ro-RO.rc @@ -346,8 +346,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "&Editare" BEGIN - MENUITEM "&Copiere\tCTRL-C", IDM_EDIT_COPY - MENUITEM "&Lipire\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY + MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE END POPUP "&Vizualizare" BEGIN @@ -379,8 +379,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "&Editare" BEGIN - MENUITEM "&Copiere\tCTRL-C", IDM_EDIT_COPY - MENUITEM "&Lipire\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "&Copiere\tCtrl-C", IDM_EDIT_COPY + MENUITEM "&Lipire\tCtrl-V", IDM_EDIT_PASTE END POPUP "&Vizualizare" BEGIN diff --git a/base/applications/calc/lang/ru-RU.rc b/base/applications/calc/lang/ru-RU.rc index 6187dc692fe..548452ea418 100644 --- a/base/applications/calc/lang/ru-RU.rc +++ b/base/applications/calc/lang/ru-RU.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "&Правка" BEGIN - MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE END POPUP "В&ид" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "&Правка" BEGIN - MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE END POPUP "В&ид" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "&Правка" BEGIN - MENUITEM "&Копировать\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Вст&авить\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "&Копировать\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Вст&авить\tCtrl-V", IDM_EDIT_PASTE END POPUP "В&ид" BEGIN diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index 911f0bfa306..1a5b69a3bfc 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -309,8 +309,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Úpravy" BEGIN - MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE END POPUP "Zobraziť" BEGIN @@ -341,8 +341,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Úpravy" BEGIN - MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE END POPUP "Zobraziť" BEGIN @@ -374,8 +374,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Úpravy" BEGIN - MENUITEM "Kopírovať\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Prilepiť\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopírovať\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Prilepiť\tCtrl-V", IDM_EDIT_PASTE END POPUP "Zobraziť" BEGIN diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index 52ea6f7d510..e497a9c5b23 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -311,8 +311,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Redigera" BEGIN - MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE END POPUP "Visa" BEGIN @@ -343,8 +343,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Redigera" BEGIN - MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE END POPUP "Vis" BEGIN @@ -376,8 +376,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Redigera" BEGIN - MENUITEM "Kopiera\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Klistra in\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Kopiera\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Klistra in\tCtrl-V", IDM_EDIT_PASTE END POPUP "Visa" BEGIN diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index e59abfa63e1..b34e9afdd60 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -305,8 +305,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "แ&ก้ไข" BEGIN - MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY - MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY + MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE END POPUP "&มุมมอง" BEGIN @@ -337,8 +337,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "แ&ก้ไข" BEGIN - MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY - MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY + MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE END POPUP "&มุมมอง" BEGIN @@ -370,8 +370,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "แ&ก้ไข" BEGIN - MENUITEM "คัดลอก\tCTRL-C", IDM_EDIT_COPY - MENUITEM "วาง\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "คัดลอก\tCtrl-C", IDM_EDIT_COPY + MENUITEM "วาง\tCtrl-V", IDM_EDIT_PASTE END POPUP "&มุมมอง" BEGIN @@ -500,7 +500,7 @@ BEGIN IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portuguese escudo" IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index 01b8b466888..d907373ea7f 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -312,8 +312,8 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN POPUP "Правка" BEGIN - MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE END POPUP "Вигляд" BEGIN @@ -344,8 +344,8 @@ IDR_MENU_SCIENTIFIC_2 MENU BEGIN POPUP "Правка" BEGIN - MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE END POPUP "Вигляд" BEGIN @@ -377,8 +377,8 @@ IDR_MENU_STANDARD MENU BEGIN POPUP "Правка" BEGIN - MENUITEM "Копіювати\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Вставити\tCTRL-V", IDM_EDIT_PASTE + MENUITEM "Копіювати\tCtrl-C", IDM_EDIT_COPY + MENUITEM "Вставити\tCtrl-V", IDM_EDIT_PASTE END POPUP "Вигляд" BEGIN

4 months, 2 weeks

[reactos] 01/01: [CALC] *.rc: Harmonize 3 captions (#7192)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d39269888a1497bbcf49b… commit d39269888a1497bbcf49b5828e3c937b7444570d Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Aug 8 00:18:42 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 00:18:42 2024 +0200 [CALC] *.rc: Harmonize 3 captions (#7192) Harmonize the captions of the 3 dlgs IDD_DIALOG_SCIENTIFIC, IDD_DIALOG_STANDARD, IDD_DIALOG_CONVERSION Some languages had different strings used here, which leads to an undesired flip in the caption if one switches between the different views of the app. Very unelegant. E.g. cs-CZ, ko-KR, th-TH suffered from that. MS uses just the term "Calculator" in these captions, and not "Windows Calculator". So we can also just use "Calculator" instead of "ReactOS calculator". To perfectify the illusion / being more similar to MS. Don't worry: The word "ReactOS" is still present in at least 4 strings, e.g. in 3x IDM_HELP_ABOUT and IDS_CALC_NAME. So nobody will think it is not our Calculator after that change. As a nice side-effect the binary size shrinks slightly: e.g. for GCC8.4.0dbg: 530.432 -> 528.596 bytes --- base/applications/calc/lang/bg-BG.rc | 6 +++--- base/applications/calc/lang/cs-CZ.rc | 6 +++--- base/applications/calc/lang/de-DE.rc | 6 +++--- base/applications/calc/lang/en-US.rc | 6 +++--- base/applications/calc/lang/es-ES.rc | 6 +++--- base/applications/calc/lang/fr-FR.rc | 6 +++--- base/applications/calc/lang/he-IL.rc | 6 +++--- base/applications/calc/lang/hu-HU.rc | 6 +++--- base/applications/calc/lang/id-ID.rc | 6 +++--- base/applications/calc/lang/it-IT.rc | 6 +++--- base/applications/calc/lang/ja-JP.rc | 6 +++--- base/applications/calc/lang/ko-KR.rc | 6 +++--- base/applications/calc/lang/nl-NL.rc | 6 +++--- base/applications/calc/lang/no-NO.rc | 6 +++--- base/applications/calc/lang/pl-PL.rc | 6 +++--- base/applications/calc/lang/pt-BR.rc | 6 +++--- base/applications/calc/lang/pt-PT.rc | 6 +++--- base/applications/calc/lang/sk-SK.rc | 6 +++--- base/applications/calc/lang/sq-AL.rc | 6 +++--- base/applications/calc/lang/sv-SE.rc | 6 +++--- base/applications/calc/lang/th-TH.rc | 4 ++-- base/applications/calc/lang/tr-TR.rc | 6 +++--- base/applications/calc/lang/uk-UA.rc | 6 +++--- base/applications/calc/lang/zh-CN.rc | 6 +++--- base/applications/calc/lang/zh-HK.rc | 6 +++--- base/applications/calc/lang/zh-TW.rc | 6 +++--- 26 files changed, 77 insertions(+), 77 deletions(-) diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index 56dc24c61ab..96a90ec192d 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Калкулатор за ReactOS" +CAPTION "Калкулатор" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -152,7 +152,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Калкулатор за ReactOS" +CAPTION "Калкулатор" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -217,7 +217,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Калкулатор за ReactOS" +CAPTION "Калкулатор" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index 135d9102531..75700382052 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS kalkulačka" +CAPTION "Kalkulačka" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -152,7 +152,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulačka" +CAPTION "Kalkulačka" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -217,7 +217,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulačka" +CAPTION "Kalkulačka" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index dcc06972495..bd6142a6a9f 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Rechner" +CAPTION "Rechner" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Rechner" +CAPTION "Rechner" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Rechner" +CAPTION "Rechner" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/en-US.rc b/base/applications/calc/lang/en-US.rc index 2fde8038f49..c6762a3d947 100644 --- a/base/applications/calc/lang/en-US.rc +++ b/base/applications/calc/lang/en-US.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Calculator" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Calculator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Calculator" +CAPTION "Calculator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index 0b9fdffc38e..d4241c95d7f 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora de ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -154,7 +154,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora de ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -219,7 +219,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora de ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index 9e68fbbffed..c8ef24d55af 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculatrice ReactOS" +CAPTION "Calculatrice" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculatrice ReactOS" +CAPTION "Calculatrice" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculatrice ReactOS" +CAPTION "Calculatrice" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/he-IL.rc b/base/applications/calc/lang/he-IL.rc index 6dfb5b13f8a..ed039acb4f8 100644 --- a/base/applications/calc/lang/he-IL.rc +++ b/base/applications/calc/lang/he-IL.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL -CAPTION "מחשבון ReactOS" +CAPTION "מחשבון" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -152,7 +152,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL -CAPTION "מחשבון ReactOS" +CAPTION "מחשבון" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -218,7 +218,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_LAYOUTRTL -CAPTION "מחשבון ReactOS" +CAPTION "מחשבון" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/hu-HU.rc b/base/applications/calc/lang/hu-HU.rc index d600f8d1039..7e5e2967a2b 100644 --- a/base/applications/calc/lang/hu-HU.rc +++ b/base/applications/calc/lang/hu-HU.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Számológép" +CAPTION "Számológép" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -155,7 +155,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Számológép" +CAPTION "Számológép" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -220,7 +220,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Számológép" +CAPTION "Számológép" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/id-ID.rc b/base/applications/calc/lang/id-ID.rc index 33020ff35ab..fe6dfb4a1e0 100644 --- a/base/applications/calc/lang/id-ID.rc +++ b/base/applications/calc/lang/id-ID.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" +CAPTION "Kalkulator" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -155,7 +155,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" +CAPTION "Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -220,7 +220,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" +CAPTION "Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index 4b439b6fc89..bf57f1b1811 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calcolatrice ReactOS" +CAPTION "Calcolatrice" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calcolatrice ReactOS" +CAPTION "Calcolatrice" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calcolatrice ReactOS" +CAPTION "Calcolatrice" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/ja-JP.rc b/base/applications/calc/lang/ja-JP.rc index 4e7bc97f0b4..32a3b593e39 100644 --- a/base/applications/calc/lang/ja-JP.rc +++ b/base/applications/calc/lang/ja-JP.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 電卓" +CAPTION "電卓" MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 電卓" +CAPTION "電卓" MENU IDR_MENU_STANDARD FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 電卓" +CAPTION "電卓" MENU IDR_MENU_STANDARD FONT 9, "MS UI Gothic" BEGIN diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index d4c5346941e..9677e8b0bf2 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 계산기" +CAPTION "계산기" MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "굴림", 0, 0, 0x1 BEGIN @@ -150,7 +150,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 계산기" +CAPTION "계산기" MENU IDR_MENU_STANDARD FONT 9, "굴림", 0, 0, 0x1 BEGIN @@ -215,7 +215,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 계산기 정보" +CAPTION "계산기" MENU IDR_MENU_STANDARD FONT 9, "굴림" BEGIN diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index 8be319626f6..18531140ec7 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Rekenmachine" +CAPTION "Rekenmachine" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Rekenmachine" +CAPTION "Rekenmachine" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Rekenmachine" +CAPTION "Rekenmachine" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index 7ccd2302de5..b385e6d90cb 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulator" +CAPTION "Kalkulator" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -148,7 +148,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulator" +CAPTION "Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulator" +CAPTION "Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index cd25dab6601..3ba478c9037 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" +CAPTION "Kalkulator" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -155,7 +155,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" +CAPTION "Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -220,7 +220,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulator ReactOS" +CAPTION "Kalkulator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/pt-BR.rc b/base/applications/calc/lang/pt-BR.rc index 72e9d91da57..967867aabf6 100644 --- a/base/applications/calc/lang/pt-BR.rc +++ b/base/applications/calc/lang/pt-BR.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -150,7 +150,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -215,7 +215,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/pt-PT.rc b/base/applications/calc/lang/pt-PT.rc index 90f8a8faf94..df0b7401d78 100644 --- a/base/applications/calc/lang/pt-PT.rc +++ b/base/applications/calc/lang/pt-PT.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -150,7 +150,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -215,7 +215,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Calculadora ReactOS" +CAPTION "Calculadora" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index e8cb81bd1d7..911f0bfa306 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulačka systému ReactOS" +CAPTION "Kalkulačka" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -152,7 +152,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulačka systému ReactOS" +CAPTION "Kalkulačka" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -217,7 +217,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Kalkulačka systému ReactOS" +CAPTION "Kalkulačka" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/sq-AL.rc b/base/applications/calc/lang/sq-AL.rc index 2e58a6dda33..8290e28e17d 100644 --- a/base/applications/calc/lang/sq-AL.rc +++ b/base/applications/calc/lang/sq-AL.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Makine Llogaritje" +CAPTION "Makine Llogaritje" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -151,7 +151,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Makine Llogaritje" +CAPTION "Makine Llogaritje" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -216,7 +216,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Makine Llogaritje" +CAPTION "Makine Llogaritje" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index 282d8d250d4..52ea6f7d510 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkylator" +CAPTION "Kalkylator" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -154,7 +154,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkylator" +CAPTION "Kalkylator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -219,7 +219,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkylator" +CAPTION "Kalkylator" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index 2fd2bfbae04..e59abfa63e1 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -4,7 +4,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "เครื่องคิดเลข ReactOS" +CAPTION "เครื่องคิดเลข" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -213,7 +213,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "เครื่องคิดเลข ReactOS" +CAPTION "เครื่องคิดเลข" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index e632b6e0441..433de10c17c 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Hesap Makinesi" +CAPTION "Hesap Makinesi" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -153,7 +153,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Hesap Makinesi" +CAPTION "Hesap Makinesi" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -218,7 +218,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Hesap Makinesi" +CAPTION "Hesap Makinesi" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index ad223d37316..01b8b466888 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -11,7 +11,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Калькулятор ReactOS" +CAPTION "Калькулятор" MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -155,7 +155,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Калькулятор ReactOS" +CAPTION "Калькулятор" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN @@ -220,7 +220,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Калькулятор ReactOS" +CAPTION "Калькулятор" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/calc/lang/zh-CN.rc b/base/applications/calc/lang/zh-CN.rc index 467b91cf1a7..6030e84df92 100644 --- a/base/applications/calc/lang/zh-CN.rc +++ b/base/applications/calc/lang/zh-CN.rc @@ -12,7 +12,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 计算器" +CAPTION "计算器" MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "宋体", 0, 0, 0x1 BEGIN @@ -156,7 +156,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 计算器" +CAPTION "计算器" MENU IDR_MENU_STANDARD FONT 9, "宋体", 0, 0, 0x1 BEGIN @@ -221,7 +221,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 计算器" +CAPTION "计算器" MENU IDR_MENU_STANDARD FONT 9, "宋体" BEGIN diff --git a/base/applications/calc/lang/zh-HK.rc b/base/applications/calc/lang/zh-HK.rc index 90474568b10..284d2908349 100644 --- a/base/applications/calc/lang/zh-HK.rc +++ b/base/applications/calc/lang/zh-HK.rc @@ -12,7 +12,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 計數機" +CAPTION "計數機" MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "新細明體", 0, 0, 0x1 BEGIN @@ -156,7 +156,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 計數機" +CAPTION "計數機" MENU IDR_MENU_STANDARD FONT 9, "新細明體", 0, 0, 0x1 BEGIN @@ -221,7 +221,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 計數機" +CAPTION "計數機" MENU IDR_MENU_STANDARD FONT 9, "新細明體" BEGIN diff --git a/base/applications/calc/lang/zh-TW.rc b/base/applications/calc/lang/zh-TW.rc index 1f8992bf57b..7ede2b4c3f3 100644 --- a/base/applications/calc/lang/zh-TW.rc +++ b/base/applications/calc/lang/zh-TW.rc @@ -6,7 +6,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL IDD_DIALOG_SCIENTIFIC DIALOGEX CW_USEDEFAULT16, 0, 316, 163 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 計算機" +CAPTION "計算機" MENU IDR_MENU_SCIENTIFIC_1 FONT 9, "新細明體", 0, 0, 0x1 BEGIN @@ -150,7 +150,7 @@ END IDD_DIALOG_STANDARD DIALOGEX CW_USEDEFAULT16, 0, 169, 128 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 計算機" +CAPTION "計算機" MENU IDR_MENU_STANDARD FONT 9, "新細明體", 0, 0, 0x1 BEGIN @@ -215,7 +215,7 @@ END IDD_DIALOG_CONVERSION DIALOGEX CW_USEDEFAULT16, 0, 320, 130 STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS 計算機" +CAPTION "計算機" MENU IDR_MENU_STANDARD FONT 9, "新細明體" BEGIN

4 months, 2 weeks

[reactos] 01/01: [USETUP] Fix typo in Japanese (ja-JP) translation (#7219)

by Kenta Kubo

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ac536d78739bc8389051… commit 6ac536d78739bc8389051c4eaffae7014228df1f Author: Kenta Kubo <kabuto669(a)icloud.com> AuthorDate: Wed Aug 7 23:52:27 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 17:52:27 2024 +0300 [USETUP] Fix typo in Japanese (ja-JP) translation (#7219) Fix a typo in "ジドウテキニ" word: `\274\336\304\336\263\303\306` (ジドウテニ) that was introduced in 2009 year (commit 379ce6f163ac). The word "ジドウテキニ" is "自動的に" in Kanji, means "automatically". --- base/setup/usetup/lang/ja-JP.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index 4bf79c460a9..2702a013d36 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -748,7 +748,7 @@ static MUI_ENTRY jaJPFlushPageEntries[] = { 10, 9, - "\266\335\330\256\263\272\336\244 \272\335\313\337\255\260\300\312 \274\336\304\336\263\303\306 \273\262\267\304\336\263 \273\332\317\275", + "\266\335\330\256\263\272\336\244 \272\335\313\337\255\260\300\312 \274\336\304\336\263\303\267\306 \273\262\267\304\336\263 \273\332\317\275", TEXT_STYLE_NORMAL, TEXT_ID_STATIC },

4 months, 2 weeks

[reactos] 01/01: [UXTHEME] Add German (de-DE) translation (#7204)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ca6b319e34e5e9daf760… commit 0ca6b319e34e5e9daf760d3a4c422f445f9270c5 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Wed Aug 7 11:26:38 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 12:26:38 2024 +0300 [UXTHEME] Add German (de-DE) translation (#7204) Matches German translation in the desk.cpl applet. --- dll/win32/uxtheme/lang/de-DE.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/uxtheme.rc | 3 +++ 2 files changed, 22 insertions(+) diff --git a/dll/win32/uxtheme/lang/de-DE.rc b/dll/win32/uxtheme/lang/de-DE.rc new file mode 100644 index 00000000000..d0e6e9030fc --- /dev/null +++ b/dll/win32/uxtheme/lang/de-DE.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: German resource file + * TRANSLATOR: Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Dialogfeld" + IDS_ACTIVEWIN "Aktives Fenster" + IDS_INACTIVEWIN "Inaktives Fenster" + IDS_OK "OK" + IDS_WINTEXT "Fenstertext" +END diff --git a/dll/win32/uxtheme/uxtheme.rc b/dll/win32/uxtheme/uxtheme.rc index 9e1101293c0..65cb7424ecd 100644 --- a/dll/win32/uxtheme/uxtheme.rc +++ b/dll/win32/uxtheme/uxtheme.rc @@ -22,6 +22,9 @@ #ifdef LANGUAGE_CS_CZ #include "lang/cs-CZ.rc" #endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

4 months, 2 weeks

[reactos] 01/01: [EXPLORER] Update Czech (cs-CZ) translation (#7203)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d23422dbc0208b3fd22a1… commit d23422dbc0208b3fd22a10f4590a4cecb6191969 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Wed Aug 7 11:14:21 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 12:14:21 2024 +0300 [EXPLORER] Update Czech (cs-CZ) translation (#7203) --- base/shell/explorer/lang/cs-CZ.rc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index 8c8438e967f..96dacb3e5b2 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -2,7 +2,8 @@ * PROJECT: ReactOS Explorer * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Czech resource file - * TRANSLATOR: Copyright 2008-2015 Radek Liška aka Black_Fox <radekliska(a)gmail.com> + * TRANSLATORS: Copyright 2008-2015 Radek Liška (Black_Fox) <radekliska(a)gmail.com> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -78,7 +79,7 @@ BEGIN AUTOCHECKBOX "&Zobrazit hlavní panel nad ostatními okny", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 AUTOCHECKBOX "&Seskupovat podobná tlačítka hlavního panelu", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 AUTOCHECKBOX "Zobrazit &panel Snadné spuštění", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 - AUTOCHECKBOX "U&se small icons", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 + AUTOCHECKBOX "Použít &malé ikony", IDC_TASKBARPROP_SMALLICONS, 13, 110, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 @@ -101,15 +102,15 @@ CAPTION "Oznamovací oblast" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN | SS_CENTERIMAGE, 12, 6, 229, 24 - GROUPBOX "Icons", IDC_STATIC, 6, 36, 240, 56 + GROUPBOX "Ikony", IDC_STATIC, 6, 36, 240, 56 LTEXT "Přehlednost oznamovací oblasti lze zachovat pomocí skrytí nepoužívaných ikon.", IDC_STATIC, 13, 48, 223, 16 AUTOCHECKBOX "Sk&rýt neaktivní ikony", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10 PUSHBUTTON "&Upravit...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14 - GROUPBOX "System icons", IDC_STATIC, 6, 99, 240, 56 - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 113, 223, 8 + GROUPBOX "Systémové ikony", IDC_STATIC, 6, 99, 240, 56 + LTEXT "Vyberte, které systémové ikony se mají zobrazovat vždy.", IDC_STATIC, 13, 113, 223, 8 AUTOCHECKBOX "&Zobrazit hodiny", IDC_TASKBARPROP_CLOCK, 13, 127, 80, 10 AUTOCHECKBOX "Zobrazit sekundy", IDC_TASKBARPROP_SECONDS, 120, 127, 80, 10, WS_DISABLED - AUTOCHECKBOX "&Desktop", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 + AUTOCHECKBOX "&Plocha", IDC_TASKBARPROP_DESKTOP, 13, 140, 80, 10 END IDD_NOTIFICATIONS_CUSTOMIZE DIALOGEX 0, 0, 232, 240 @@ -211,7 +212,7 @@ END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Vlastnosti hlavního panelu a Start menu" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Hlavního panelu a nabídky Start" IDS_RESTORE_ALL "&Show Open Windows" IDS_TRAYWND_UNDO_CASCADE "&Undo Cascade" IDS_TRAYWND_UNDO_TILE "&Undo Tile"

4 months, 2 weeks

[reactos] 01/01: [SYSDM] Improve for Chinese Simplified (zh-CN) translation (#7217)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2ae8e8cb2192c2a2b99f… commit d2ae8e8cb2192c2a2b99f6aaec0d1ce6de38ae2a Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed Aug 7 16:51:09 2024 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 10:51:09 2024 +0200 [SYSDM] Improve for Chinese Simplified (zh-CN) translation (#7217) --- dll/cpl/sysdm/lang/zh-CN.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index 9d9e24eb595..4163961fbb2 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -365,8 +365,8 @@ BEGIN IDS_MESSAGEBOXTITLE "系统控制面板小程序" IDS_WARNINITIALSIZE "为分页文件的初始大小输入一个数字值。" IDS_WARNMAXIMUMSIZE "为分页文件的最大大小输入一个数字值。" - IDS_WARNINITIALRANGE "在所选驱动器上初始页面文件大小必须介于 2 MB 和 %lu MB 之间。" - IDS_WARNMAXIMUMRANGE "在所选驱动器上页面文件大小最大值必须大于或等于初始页面文件大小，但要小于 %lu MB。" + IDS_WARNINITIALRANGE "所选驱动器上分页文件的初始大小必须在 2 MB 和 %lu MB 之间。" + IDS_WARNMAXIMUMRANGE "所选驱动器上分页文件的最大大小必须大于或等于其初始大小，但要小于 %lu MB。" IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "无" IDS_PAGEFILE_SYSTEM "系统已托管"

4 months, 2 weeks

[reactos] 01/01: [SHELL32] Simplify CExplorerBand::CompareTreeItems (#7214)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e51fddf030f80fc99fa38… commit e51fddf030f80fc99fa383d4d5212b71f3e92c4a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 7 10:33:48 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 7 10:33:48 2024 +0900 [SHELL32] Simplify CExplorerBand::CompareTreeItems (#7214) Reduce code. JIRA issue: CORE-19686 - Delete useless _ILIsSpecialFolder and GetDisplayName helper functions. - Simply use IShellFolder::CompareIDs for item comparison. --- dll/win32/shdocvw/CExplorerBand.cpp | 105 ++++-------------------------------- 1 file changed, 10 insertions(+), 95 deletions(-) diff --git a/dll/win32/shdocvw/CExplorerBand.cpp b/dll/win32/shdocvw/CExplorerBand.cpp index d47964f08ab..8a60321a706 100644 --- a/dll/win32/shdocvw/CExplorerBand.cpp +++ b/dll/win32/shdocvw/CExplorerBand.cpp @@ -20,51 +20,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); * - TESTING */ -typedef struct _PIDLDATA -{ - BYTE type; - BYTE data[1]; -} PIDLDATA, *LPPIDLDATA; - -#define PT_GUID 0x1F -#define PT_SHELLEXT 0x2E -#define PT_YAGUID 0x70 - -static BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl) -{ - LPPIDLDATA lpPData = (LPPIDLDATA)&pidl->mkid.abID; - - return (pidl && - ((lpPData && (PT_GUID == lpPData->type || PT_SHELLEXT== lpPData->type || - PT_YAGUID == lpPData->type)) || (pidl && pidl->mkid.cb == 0x00))); -} - -HRESULT GetDisplayName(LPCITEMIDLIST pidlDirectory,TCHAR *szDisplayName,UINT cchMax,DWORD uFlags) -{ - IShellFolder *pShellFolder = NULL; - LPCITEMIDLIST pidlRelative = NULL; - STRRET str; - HRESULT hr; - - if (pidlDirectory == NULL || szDisplayName == NULL) - { - return E_FAIL; - } - - hr = SHBindToParent(pidlDirectory, IID_PPV_ARG(IShellFolder, &pShellFolder), &pidlRelative); - - if (SUCCEEDED(hr)) - { - hr = pShellFolder->GetDisplayNameOf(pidlRelative,uFlags,&str); - if (SUCCEEDED(hr)) - { - hr = StrRetToBuf(&str,pidlDirectory,szDisplayName,cchMax); - } - pShellFolder->Release(); - } - return hr; -} - CExplorerBand::CExplorerBand() : m_pSite(NULL) , m_fVisible(FALSE) @@ -788,7 +743,7 @@ CExplorerBand::InsertItem( TVSORTCB sortCallback; sortCallback.hParent = hParent; sortCallback.lpfnCompare = CompareTreeItems; - sortCallback.lParam = (LPARAM)this; + sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); } @@ -882,7 +837,7 @@ BOOL CExplorerBand::InsertSubitems(HTREEITEM hItem, NodeInfo *pNodeInfo) /* Let's do sorting */ sortCallback.hParent = hItem; sortCallback.lpfnCompare = CompareTreeItems; - sortCallback.lParam = (LPARAM)this; + sortCallback.lParam = (LPARAM)(PVOID)m_pDesktop; SendMessage(TVM_SORTCHILDRENCB, 0, (LPARAM)&sortCallback); /* Now we can redraw */ @@ -1014,55 +969,15 @@ BOOL CExplorerBand::NavigateToCurrentFolder() // *** Tree item sorting callback *** int CALLBACK CExplorerBand::CompareTreeItems(LPARAM p1, LPARAM p2, LPARAM p3) { - /* - * We first sort drive letters (Path root), then PIDLs and then regular folder - * display name. - * This is not how Windows sorts item, but it gives decent results. - */ - NodeInfo *info1; - NodeInfo *info2; - CExplorerBand *pThis; - WCHAR wszFolder1[MAX_PATH]; - WCHAR wszFolder2[MAX_PATH]; - - info1 = (NodeInfo*)p1; - info2 = (NodeInfo*)p2; - pThis = (CExplorerBand*)p3; - - GetDisplayName(info1->absolutePidl, wszFolder1, MAX_PATH, SHGDN_FORPARSING); - GetDisplayName(info2->absolutePidl, wszFolder2, MAX_PATH, SHGDN_FORPARSING); - if (PathIsRoot(wszFolder1) && PathIsRoot(wszFolder2)) - { - return lstrcmpiW(wszFolder1,wszFolder2); - } - if (PathIsRoot(wszFolder1) && !PathIsRoot(wszFolder2)) - { - return -1; - } - if (!PathIsRoot(wszFolder1) && PathIsRoot(wszFolder2)) - { - return 1; - } - // Now, we compare non-root folders, grab display name - GetDisplayName(info1->absolutePidl, wszFolder1, MAX_PATH, SHGDN_INFOLDER); - GetDisplayName(info2->absolutePidl, wszFolder2, MAX_PATH, SHGDN_INFOLDER); + NodeInfo *info1 = (NodeInfo*)p1; + NodeInfo *info2 = (NodeInfo*)p2; + IShellFolder *pDesktop = (IShellFolder *)p3; - if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) - { - return -1; - } - if (!_ILIsSpecialFolder(info1->relativePidl) && _ILIsSpecialFolder(info2->relativePidl)) - { - return 1; - } - if (_ILIsSpecialFolder(info1->relativePidl) && !_ILIsSpecialFolder(info2->relativePidl)) - { - HRESULT hr; - hr = pThis->m_pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); - if (!hr) return 0; - return (hr > 0) ? -1 : 1; - } - return StrCmpLogicalW(wszFolder1, wszFolder2); + HRESULT hr = pDesktop->CompareIDs(0, info1->absolutePidl, info2->absolutePidl); + if (FAILED(hr)) + return 0; + + return (SHORT)HRESULT_CODE(hr); } // *** IOleWindow methods ***

4 months, 2 weeks

[reactos] 01/01: [NTUSER] Implement BroadcastSystemMessage with 'Environment' parameter (#6884)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90de2b660b12919c2f60f… commit 90de2b660b12919c2f60f2f31ad41e37c123d662 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Aug 4 02:53:04 2024 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 02:53:04 2024 -0500 [NTUSER] Implement BroadcastSystemMessage with 'Environment' parameter (#6884) * [NTUSER] Implement BroadcastSystemMessage with 'Environment' parameter CORE-19372 CORE-19583 * Changes based on reviewer comments. * Make sure that lParamMsg has a UNICODE_NULL in it. * Skip extra handling of 1 word messsages. --- win32ss/user/ntuser/message.c | 68 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index ce9da97c1a5..c86754abc56 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -13,8 +13,30 @@ DBG_DEFAULT_CHANNEL(UserMsg); #define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE) +/* Strings that are OK to pass between user and kernel mode. + * There may be other strings needed that can easily be added here. */ +WCHAR StrUserKernel[3][20] = {{L"intl"}, {L"Environment"}, {L"Policy"}}; + /* FUNCTIONS *****************************************************************/ +/* PosInArray checks for strings that can pass between user and kernel mode. + * See: https://learn.microsoft.com/en-us/windows/win32/winmsg/wm-settingchange + * It mentions 'Environment', 'intl', and 'Policy'. + * These strings are enumerated in the StrUserKernel definition. + * Returns: A positive integer indicating its position in the array if the + * string is found, or returns a minus one (-1) if the string is not found. */ +static INT PosInArray(_In_ PCWSTR String) +{ + INT i; + + for (i = 0; i < ARRAYSIZE(StrUserKernel); ++i) + { + if (wcsncmp(String, StrUserKernel[i], _countof(StrUserKernel[0])) == 0) + return i; + } + return -1; +} + NTSTATUS FASTCALL IntInitMessageImpl(VOID) { @@ -431,7 +453,7 @@ CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEnt NTSTATUS Status; PVOID KernelMem; - UINT Size; + UINT Size, i; *KernelModeMsg = *UserModeMsg; @@ -460,8 +482,42 @@ CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEnt if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) { TRACE("Copy Message %u from usermode buffer\n", KernelModeMsg->message); - Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) + /* Don't do extra testing for 1 word messages. For examples see + * https://wiki.winehq.org/List_Of_Windows_Messages. */ + if (Size > 1) + { + WCHAR lParamMsg[_countof(StrUserKernel[0]) + 1] = { 0 }; + _SEH2_TRY + { + if (UserModeMsg->lParam) + RtlCopyMemory(lParamMsg, (WCHAR*)UserModeMsg->lParam, sizeof(lParamMsg)); + /* Make sure that the last WCHAR is a UNICODE_NULL */ + for (i = 0; i < ARRAYSIZE(lParamMsg); ++i) + { + if (lParamMsg[i] == 0) + break; + } + /* If we did not find a UNICODE_NULL, then set last WCHAR to one */ + if (i == ARRAYSIZE(lParamMsg)) + lParamMsg[_countof(StrUserKernel[0])] = UNICODE_NULL; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); + } + _SEH2_END; + + if (UserModeMsg->lParam && !UserModeMsg->wParam && + PosInArray(lParamMsg) >= 0) + { + TRACE("Copy String '%S' from usermode buffer\n", lParamMsg); + wcscpy(KernelMem, lParamMsg); + return STATUS_SUCCESS; + } + } + + Status = MmCopyFromCaller(KernelMem, (PVOID)UserModeMsg->lParam, Size); + if (!NT_SUCCESS(Status)) { ERR("Failed to copy message to kernel: invalid usermode lParam buffer\n"); ExFreePoolWithTag(KernelMem, TAG_MSG); @@ -2721,6 +2777,12 @@ NtUserMessageCall( HWND hWnd, } ExFreePoolWithTag(List, USERTAG_WINDOWLIST); } + if (lParam && !wParam && wcsicmp((WCHAR*)lParam, L"Environment") == 0) + { + /* Handle Broadcast of WM_SETTINGCHAGE for Environment */ + co_IntDoSendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, + 0, (LPARAM)L"Environment", 0); + } Ret = TRUE; } }

4 months, 3 weeks

[reactos] 10/10: [ISAPNP] Make sure that APCs are disabled before acquiring a lock

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdc1d96dc1259093a07d6… commit fdc1d96dc1259093a07d6cd36c050716e831de74 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Jul 6 00:50:03 2024 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sat Aug 3 17:08:44 2024 +0600 [ISAPNP] Make sure that APCs are disabled before acquiring a lock Note: We could just use a fast mutex instead --- drivers/bus/isapnp/isapnp.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 344cc23691d..8c58679d156 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -111,6 +111,8 @@ FORCEINLINE VOID IsaPnpAcquireBusDataLock(VOID) { + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + KeWaitForSingleObject(&BusSyncEvent, Executive, KernelMode, FALSE, NULL); } @@ -129,6 +131,8 @@ VOID IsaPnpAcquireDeviceDataLock( _In_ PISAPNP_FDO_EXTENSION FdoExt) { + ASSERT(PsGetCurrentProcess() == PsInitialSystemProcess); + KeWaitForSingleObject(&FdoExt->DeviceSyncEvent, Executive, KernelMode, FALSE, NULL); }

4 months, 3 weeks

[reactos] 09/10: [ISAPNP] Improvements around hardware access helpers

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6091dde0d348d138bc6f8… commit 6091dde0d348d138bc6f80fbe7354cc30627cbe2 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Fri May 3 20:43:40 2024 +0600 Commit: Dmitry Borisov <di.sean(a)protonmail.com> CommitDate: Sat Aug 3 17:08:43 2024 +0600 [ISAPNP] Improvements around hardware access helpers - Reimplement WriteWord using the WriteByte helper. - Remove inline qualifiers from the bus read and write functions. This code path is considered "cold" and using an inline for it is overkill. - Don't apply the IRQL restrictions to our PnP state transition helpers. They are only called at IRQL below dispatch level. --- drivers/bus/isapnp/hardware.c | 33 +++++++++++++++++++++++---------- drivers/bus/isapnp/isapnp.h | 8 ++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index ecaec120c14..443fb787bbd 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -48,12 +48,14 @@ ReadData( } static -inline +CODE_SEG("PAGE") VOID WriteByte( _In_ UCHAR Address, _In_ UCHAR Value) { + PAGED_CODE(); + WriteAddress(Address); WriteData(Value); } @@ -65,10 +67,8 @@ WriteWord( _In_ UCHAR Address, _In_ USHORT Value) { - WriteAddress(Address + 1); - WriteData((UCHAR)Value); - WriteAddress(Address); - WriteData(Value >> 8); + WriteByte(Address + 1, (UCHAR)Value); + WriteByte(Address, Value >> 8); } static @@ -83,12 +83,14 @@ WriteDoubleWord( } static -inline +CODE_SEG("PAGE") UCHAR ReadByte( _In_ PUCHAR ReadDataPort, _In_ UCHAR Address) { + PAGED_CODE(); + WriteAddress(Address); return ReadData(ReadDataPort); } @@ -325,11 +327,14 @@ NextLFSR( } static +CODE_SEG("PAGE") VOID SendKey(VOID) { UCHAR i, Lfsr; + PAGED_CODE(); + WriteAddress(0x00); WriteAddress(0x00); @@ -1634,37 +1639,45 @@ IsaHwConfigureDevice( return STATUS_SUCCESS; } -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWakeDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { + PAGED_CODE(); + SendKey(); Wake(LogicalDevice->CSN); } -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwActivateDevice( _In_ PISAPNP_FDO_EXTENSION FdoExt, _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { + PAGED_CODE(); + ActivateDevice(FdoExt->ReadDataPort, LogicalDevice->LDN); } #ifndef UNIT_TEST -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwDeactivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice) { + PAGED_CODE(); + DeactivateDevice(LogicalDevice->LDN); } #endif /* UNIT_TEST */ -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWaitForKey(VOID) { + PAGED_CODE(); + WaitForKey(); } diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 998c7e766f0..344cc23691d 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -244,23 +244,23 @@ IsaHwConfigureDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice, _In_ PCM_RESOURCE_LIST Resources); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWakeDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwDeactivateDevice( _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwActivateDevice( _In_ PISAPNP_FDO_EXTENSION FdoExt, _In_ PISAPNP_LOGICAL_DEVICE LogicalDevice); -_IRQL_requires_max_(DISPATCH_LEVEL) +CODE_SEG("PAGE") VOID IsaHwWaitForKey(VOID);

4 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2024