Ros-diffs

ros-diffs@reactos.org

17 participants
81085 discussions

[reactos] 01/01: [MSPAINT] Sync translations between the main and popup menus

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dafa00b554319ef6c5c01… commit dafa00b554319ef6c5c0129f3c0103576c6882f1 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 20 12:06:04 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Aug 20 12:06:08 2023 +0300 [MSPAINT] Sync translations between the main and popup menus Also some minor corrections and fixes for mnemonic keys. --- base/applications/mspaint/lang/bg-BG.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/cs-CZ.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/de-DE.rc | 52 +++++++++++++++---------------- base/applications/mspaint/lang/en-GB.rc | 8 ++--- base/applications/mspaint/lang/en-US.rc | 8 ++--- base/applications/mspaint/lang/es-ES.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/et-EE.rc | 26 ++++++++-------- base/applications/mspaint/lang/eu-ES.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/fr-FR.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/he-IL.rc | 20 ++++++------ base/applications/mspaint/lang/hu-HU.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/id-ID.rc | 20 ++++++------ base/applications/mspaint/lang/it-IT.rc | 52 +++++++++++++++---------------- base/applications/mspaint/lang/ja-JP.rc | 4 +-- base/applications/mspaint/lang/nl-NL.rc | 52 +++++++++++++++---------------- base/applications/mspaint/lang/no-NO.rc | 54 ++++++++++++++++----------------- base/applications/mspaint/lang/pl-PL.rc | 2 +- base/applications/mspaint/lang/pt-BR.rc | 22 +++++++------- base/applications/mspaint/lang/pt-PT.rc | 20 ++++++------ base/applications/mspaint/lang/ro-RO.rc | 36 +++++++++++----------- base/applications/mspaint/lang/sk-SK.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/sq-AL.rc | 38 +++++++++++------------ base/applications/mspaint/lang/sv-SE.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/tr-TR.rc | 20 ++++++------ base/applications/mspaint/lang/uk-UA.rc | 50 +++++++++++++++--------------- base/applications/mspaint/lang/vi-VN.rc | 30 +++++++++--------- base/applications/mspaint/lang/zh-CN.rc | 24 +++++++-------- base/applications/mspaint/lang/zh-HK.rc | 24 +++++++-------- base/applications/mspaint/lang/zh-TW.rc | 24 +++++++-------- 29 files changed, 503 insertions(+), 503 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index cfc791946ae..cf525cd4514 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Обработка" BEGIN - MENUITEM "Назад\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Напред\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Назад\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Н&апред\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Отрязване\tCtrl+X", IDM_EDITCUT - MENUITEM "Копиране\tCtrl+C", IDM_EDITCOPY - MENUITEM "Поставяне\tCtrl+V", IDM_EDITPASTE - MENUITEM "Изтриване на избраното\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обръщане на избора", IDM_EDITINVERTSELECTION - MENUITEM "Избиране на всичко\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "О&бръщане на избора", IDM_EDITINVERTSELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Запомняне в...", IDM_EDITCOPYTO - MENUITEM "Поставяне в...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM END POPUP "Из&глед" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "Из&ображение" BEGIN - MENUITEM "Завъртане\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Разпъване/Изкривяване\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Изрязване", IDM_IMAGECROP - MENUITEM "Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозрачно изчертаване", IDM_IMAGEDRAWOPAQUE + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Из&рязване", IDM_IMAGECROP + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Принадлежности\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Изтриване на изображението\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Непрозра&чно изчертаване", IDM_IMAGEDRAWOPAQUE END POPUP "&Цветове" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "От&рязване\tCtrl+X", IDM_EDITCUT + MENUITEM "&Запомняне\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Поставяне\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Изтриване на избраното\tDel", IDM_EDITDELETESELECTION + MENUITEM "Избиране на &всичко\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Запо&мняне в...", IDM_EDITCOPYTO + MENUITEM "По&ставяне в...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "З&авъртане...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Разпъва&не/Изкривяване...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Обръщане на цветовете\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 32d33bf98d2..c6a8c018a83 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "Úpr&avy" BEGIN - MENUITEM "Zpět\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znovu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Zpět\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Z&novu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vyjmout\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovat\tCtrl+C", IDM_EDITCOPY - MENUITEM "Vložit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazat výběr\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovat výběr", IDM_EDITINVERTSELECTION + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovat výběr", IDM_EDITINVERTSELECTION MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovat do...", IDM_EDITCOPYTO - MENUITEM "Vložit z...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM END POPUP "&Zobrazit" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Obrázek" BEGIN - MENUITEM "Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Oříznout", IDM_IMAGECROP - MENUITEM "Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazat obrázek", IDM_IMAGEDELETEIMAGE - MENUITEM "Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Oříznout", IDM_IMAGECROP + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributy...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazat obrázek", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kreslit neprůhledně", IDM_IMAGEDRAWOPAQUE END POPUP "&Barvy" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Vyjmou&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovat\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Vložit\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazat výběr\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vybrat v&še\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopírovat &do...", IDM_EDITCOPYTO + MENUITEM "V&ložit z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Překlopit nebo otočit...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Inverovat barvy\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 20fb505484f..97466efcbb1 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Bearbeiten" BEGIN - MENUITEM "Rückgängig\tStrg+Z", IDM_EDITUNDO - MENUITEM "Wiederholen\tStrg+Y", IDM_EDITREDO + MENUITEM "&Rückgängig\tStrg+Z", IDM_EDITUNDO + MENUITEM "&Wiederholen\tStrg+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ausschneiden\tStrg+X", IDM_EDITCUT - MENUITEM "Kopieren\tStrg+C", IDM_EDITCOPY - MENUITEM "Einfügen\tStrg+V", IDM_EDITPASTE - MENUITEM "Auswahl löschen\tEntf", IDM_EDITDELETESELECTION - MENUITEM "Markierung umkehren", IDM_EDITINVERTSELECTION + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Markierung &umkehren", IDM_EDITINVERTSELECTION MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopieren nach...", IDM_EDITCOPYTO - MENUITEM "Einfügen aus...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM END POPUP "&Ansicht" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "B&ild" BEGIN - MENUITEM "Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR - MENUITEM "Strecken/Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW - MENUITEM "Zuschneiden", IDM_IMAGECROP - MENUITEM "Farben umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES - MENUITEM "Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Deckend zeichnen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Zu&schneiden", IDM_IMAGECROP + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribute...\tStrg+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Bild löschen\tStrg+Umschalt+N", IDM_IMAGEDELETEIMAGE + MENUITEM "D&eckend zeichnen", IDM_IMAGEDRAWOPAQUE END POPUP "&Farben" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Ausschneiden\tStrg+X", IDM_EDITCUT + MENUITEM "&Kopieren\tStrg+C", IDM_EDITCOPY + MENUITEM "&Einfügen\tStrg+V", IDM_EDITPASTE + MENUITEM "Auswahl &löschen\tEntf", IDM_EDITDELETESELECTION + MENUITEM "Alles &markieren\tStrg+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopieren &nach...", IDM_EDITCOPYTO + MENUITEM "Einfügen au&s...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Drehen/Spiegeln...\tStrg+D", IDM_IMAGEROTATEMIRROR + MENUITEM "Strecken/&Zerren...\tStrg+K", IDM_IMAGESTRETCHSKEW + MENUITEM "Farben &umkehren\tStrg+U", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index b5267ad1d0e..6a714ff0998 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -78,10 +78,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colours" @@ -103,8 +103,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 987e1ab7449..029eaa11384 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Crop", IDM_IMAGECROP + MENUITEM "C&rop", IDM_IMAGECROP MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Attributes...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Delete image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Clear image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Draw opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Colors" @@ -104,8 +104,8 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY + MENUITEM "Cu&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copy\tCtrl+C", IDM_EDITCOPY MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 850307363b6..5ad11ac1f2c 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -39,18 +39,18 @@ BEGIN END POPUP "&Edición" BEGIN - MENUITEM "Deshacer\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rehacer\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Deshacer\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rehacer\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Cortar\tCtrl+X", IDM_EDITCUT - MENUITEM "Copiar\tCtrl+C", IDM_EDITCOPY - MENUITEM "Pegar\tCtrl+V", IDM_EDITPASTE - MENUITEM "Borrar selección\tSupr", IDM_EDITDELETESELECTION - MENUITEM "Invertir selección", IDM_EDITINVERTSELECTION - MENUITEM "Seleccionar todo\tCtrl+E", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "&Invertir selección", IDM_EDITINVERTSELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copiar a...", IDM_EDITCOPYTO - MENUITEM "Pegar desde...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM END POPUP "&Ver" BEGIN @@ -79,13 +79,13 @@ BEGIN END POPUP "&Imagen" BEGIN - MENUITEM "Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Estirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Recortar", IDM_IMAGECROP - MENUITEM "Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dibujar figuras opacas", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&cortar", IDM_IMAGECROP + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributos...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Borrar imagen\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dibujar figuras &opacas", IDM_IMAGEDRAWOPAQUE END POPUP "&Colores" BEGIN @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Pegar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Borrar selección\tSupr", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar t&odo\tCtrl+E", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar &a...", IDM_EDITCOPYTO + MENUITEM "Pegar d&esde...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Rotar/Invertir...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "E&stirar/Inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertir colores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index b3996096fd2..6103e1608cb 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -41,7 +41,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY - MENUITEM "K&leebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION MENUITEM "&Pööra valikut", IDM_EDITINVERTSELECTION MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL @@ -76,12 +76,12 @@ BEGIN END POPUP "&Pilt" BEGIN - MENUITEM "Pööra/&Peegelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Kärbi", IDM_IMAGECROP MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atribuudid...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kustuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Ku&stuta pilt\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Joonista läbipaistmatult", IDM_IMAGEDRAWOPAQUE END POPUP "&Värvid" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Lõika\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopeeri\tCtrl+C", IDM_EDITCOPY + MENUITEM "Kl&eebi\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kustuta &valik\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vali k&õik\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopee&ri asukohta...", IDM_EDITCOPYTO + MENUITEM "Klee&bi asukohast...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Pööra/Pee&gelda...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Venita/Kalluta...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Pööra värvid\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 708d62466d2..3340d338c46 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Editatu" BEGIN - MENUITEM "Desegin\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Errepikatu\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Desegin\tCtrl+Z", IDM_EDITUNDO + MENUITEM "E&rrepikatu\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Ebaki\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiatu\tCtrl+C", IDM_EDITCOPY - MENUITEM "Itsasti\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selekzioa ezabatu\tDel", IDM_EDITDELETESELECTION - MENUITEM "selekzioa alderantzikatu", IDM_EDITINVERTSELECTION - MENUITEM "Huatatu dena\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selekzioa &alderantzikatu", IDM_EDITINVERTSELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiatu hona...", IDM_EDITCOPYTO - MENUITEM "Itsasti hemendik...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM END POPUP "&Ikusi" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "I&rudia" BEGIN - MENUITEM "Irauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Hedatu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Moztu", IDM_IMAGECROP - MENUITEM "Alderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Marraztu opako", IDM_IMAGEDRAWOPAQUE + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Moztu", IDM_IMAGECROP + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atributuak...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Garbitu irudia\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Marraztu &opako", IDM_IMAGEDRAWOPAQUE END POPUP "&Koloreak" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "E&baki\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiatu\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Itsasti\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selekzioa &ezabatu\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Huatatu dena\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiatu h&ona...", IDM_EDITCOPYTO + MENUITEM "Itsasti he&mendik...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&rauli/biratu...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "He&datu/Zeharkatu...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "A&lderantzikatu koloreak\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 9fd0034abdc..6fb2dc383be 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Edition" BEGIN - MENUITEM "Annuler\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Rétablir\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annuler\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Rétablir\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Couper\tCtrl+X", IDM_EDITCUT - MENUITEM "Copier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Coller\tCtrl+V", IDM_EDITPASTE - MENUITEM "Effacer la sélection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Inverser la sélection", IDM_EDITINVERTSELECTION - MENUITEM "Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Inverser la sélection", IDM_EDITINVERTSELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copier vers...", IDM_EDITCOPYTO - MENUITEM "Coller à partir de...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM END POPUP "&Affichage" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Image" BEGIN - MENUITEM "Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Rogner", IDM_IMAGECROP - MENUITEM "Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Dessiner opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Ro&gner", IDM_IMAGECROP + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributs...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Effacer l'image\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Dessiner &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Couleurs" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Co&uper\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copier\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&oller\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Effacer la sélection\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Sélectionner tout\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copier &vers...", IDM_EDITCOPYTO + MENUITEM "Coller à &partir de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Retourner/Faire pivoter...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Agrandir/Pencher...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverser les couleurs\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 1623e258a0c..1dff4387dc0 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -77,7 +77,7 @@ BEGIN POPUP "ת&מונה" BEGIN MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "חתוך", IDM_IMAGECROP MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "תכונות...\tCtrl+E", IDM_IMAGEATTRIBUTES @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "גזור\tCtrl+X", IDM_EDITCUT + MENUITEM "העתק\tCtrl+C", IDM_EDITCOPY + MENUITEM "הדבק\tCtrl+V", IDM_EDITPASTE + MENUITEM "מחק בחירה\tDel", IDM_EDITDELETESELECTION + MENUITEM "בחר הכל\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "העתק ל...", IDM_EDITCOPYTO + MENUITEM "הדבק מ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "סובב/הפוך...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "הפוך צבעים\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 07f84d6a3a9..1d97acb2681 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "S&zerkesztés" BEGIN - MENUITEM "Visszavonás\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ismét\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Visszavonás\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ismét\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Kivágás\tCtrl+X", IDM_EDITCUT - MENUITEM "Másolás\tCtrl+C", IDM_EDITCOPY - MENUITEM "Beillesztés\tCtrl+V", IDM_EDITPASTE - MENUITEM "Kijelölés törlése\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kijelölés megfordítása", IDM_EDITINVERTSELECTION - MENUITEM "Mindent kijelöl\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kijelölés megf&ordítása", IDM_EDITINVERTSELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Másolás fájlba...", IDM_EDITCOPYTO - MENUITEM "Fájl beillesztése...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM END POPUP "&Nézet" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Kép" BEGIN - MENUITEM "Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Nyújtás/Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Vágás", IDM_IMAGECROP - MENUITEM "Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Nem átlátszó", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Vágás", IDM_IMAGECROP + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribútumok...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Kép törlése\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Nem átlátszó", IDM_IMAGEDRAWOPAQUE END POPUP "Szín&ek" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Kivá&gás\tCtrl+X", IDM_EDITCUT + MENUITEM "&Másolás\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Beillesztés\tCtrl+V", IDM_EDITPASTE + MENUITEM "Kijelölés &törlése\tDel", IDM_EDITDELETESELECTION + MENUITEM "Mindent &kijelöl\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Másolás &fájlba...", IDM_EDITCOPYTO + MENUITEM "Fájl b&eillesztése...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Forgatás/Tükrözés...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Nyújtás/&Döntés...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Színek megfordítása\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 556aa5efb6c..3ae30e7f170 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Gunting\tCtrl+X", IDM_EDITCUT + MENUITEM "&Salin\tCtrl+C", IDM_EDITCOPY + MENUITEM "Te&mpel\tCtrl+V", IDM_EDITPASTE + MENUITEM "Hapus &Pilihan\tDel", IDM_EDITDELETESELECTION + MENUITEM "Pilih S&emua\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Salin &ke...", IDM_EDITCOPYTO + MENUITEM "Tempel da&ri...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Putar/&Cermin...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Perluas/Condongkan...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Balikkan warna\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index ae66f2a3e33..9327ca498e5 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Modifica" BEGIN - MENUITEM "Annulla\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Ripeti\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Annulla\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Ripeti\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Taglia\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia\tCtrl+C", IDM_EDITCOPY - MENUITEM "Incolla\tCtrl+V", IDM_EDITPASTE - MENUITEM "Cancella area selezionata\tCanc", IDM_EDITDELETESELECTION - MENUITEM "Inverte selezione", IDM_EDITINVERTSELECTION + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "&Inverte selezione", IDM_EDITINVERTSELECTION MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Copia su...", IDM_EDITCOPYTO - MENUITEM "Incolla da...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM END POPUP "&Visualizza" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Immagine" BEGIN - MENUITEM "Capovolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Ritaglia", IDM_IMAGECROP - MENUITEM "Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Opaco", IDM_IMAGEDRAWOPAQUE + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Ritaglia", IDM_IMAGECROP + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributi...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Cancella immagine\tCtrl+Maiusc+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Opaco", IDM_IMAGEDRAWOPAQUE END POPUP "&Colori" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Taglia\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copia\tCtrl+C", IDM_EDITCOPY + MENUITEM "I&ncolla\tCtrl+V", IDM_EDITPASTE + MENUITEM "Cance&lla area selezionata\tCanc", IDM_EDITDELETESELECTION + MENUITEM "Sele&ziona tutto\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copia &su...", IDM_EDITCOPYTO + MENUITEM "Incolla &da...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Ca&povolgi/ruota...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverti colori\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 5042af212b7..5969044d5b4 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -80,10 +80,10 @@ BEGIN BEGIN MENUITEM "回転と反転(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "伸縮と傾斜(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "切り取り(&C)", IDM_IMAGECROP + MENUITEM "切り取り(&R)", IDM_IMAGECROP MENUITEM "色の反転(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "画像の属性(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "画像の削除\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "画像の削除(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明色を描画する(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "色(&C)" diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 199c8be03f7..a6c32b7e7ab 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "Be&werken" BEGIN - MENUITEM "Ongedaan maken\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Opnieuw\tCtrl+Y", IDM_EDITREDO + MENUITEM "On&gedaan maken\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Opni&euw\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Knippen\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiëren\tCtrl+C", IDM_EDITCOPY - MENUITEM "Plakken\tCtrl+V", IDM_EDITPASTE - MENUITEM "Selectie wissen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectie omkeren", IDM_EDITINVERTSELECTION + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectie o&mkeren", IDM_EDITINVERTSELECTION MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiëren naar...", IDM_EDITCOPYTO - MENUITEM "Plakken uit...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM END POPUP "Beel&d" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Afbeelding" BEGIN - MENUITEM "Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Bijsnijden", IDM_IMAGECROP - MENUITEM "Negatief\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Kenmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Afbeelding wissen", IDM_IMAGEDELETEIMAGE - MENUITEM "Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Bijsnijden", IDM_IMAGECROP + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "K&enmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Afbeelding wissen", IDM_IMAGEDELETEIMAGE + MENUITEM "&Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE END POPUP "&Kleuren" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie &wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Alles selecteren\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopiëren &naar...", IDM_EDITCOPYTO + MENUITEM "Plakken &uit...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "S&tretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Negat&ief\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 3cc7679639f..4c4f0398db5 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Rediger" BEGIN - MENUITEM "Angre\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Gjenopprett\tCtrl+Y", IDM_EDITREDO + MENUITEM "A&ngre\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Gjenopprett\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopier\tCtrl+C", IDM_EDITCOPY - MENUITEM "Lim inn\tCtrl+V", IDM_EDITPASTE - MENUITEM "Slett valgt\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertere valg", IDM_EDITINVERTSELECTION - MENUITEM "Velg alt\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertere valg", IDM_EDITINVERTSELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopier til...", IDM_EDITCOPYTO - MENUITEM "Lim inn fra...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM END POPUP "&Vis" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Bilde" BEGIN - MENUITEM "Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskjær", IDM_IMAGECROP - MENUITEM "Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Gjør ugjennomsiktig", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskjær", IDM_IMAGECROP + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attributter...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Fjern bilde\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Gjør &ugjennomsiktig", IDM_IMAGEDRAWOPAQUE END POPUP "&Farger" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopier\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Lim inn\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Slett valgt\tDel", IDM_EDITDELETESELECTION + MENUITEM "Velg &alt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Kopier &til...", IDM_EDITCOPYTO + MENUITEM "Lim inn &fra...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Roter/speile...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Str&etch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Invertere farger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 04dde3f8aa4..d29933dd321 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -107,7 +107,7 @@ BEGIN POPUP "Popup #0" BEGIN MENUITEM "&Wytnij\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiuj\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Kopiuj\tCtrl+C", IDM_EDITCOPY MENUITEM "Wkl&ej\tCtrl+V", IDM_EDITPASTE MENUITEM "Wyczyść z&aznaczenie\tDel", IDM_EDITDELETESELECTION MENUITEM "&Zaznacz wszystko\tCtrl+A", IDM_EDITSELECTALL diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index fc38012623b..c178150a2a5 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -79,7 +79,7 @@ BEGIN BEGIN MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Cortar", IDM_IMAGECROP + MENUITEM "&Cortar", IDM_IMAGECROP MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "A&tributos...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "&Limpar imagem\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Recortar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "C&olar\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Limpar seleção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selecionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Copiar &para...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Inverter/&girar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Alongar/inclinar...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 7457d339fee..155c6b3e9a2 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cor&tar\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiar\tCtrl+C", IDM_EDITCOPY + MENUITEM "Co&lar\tCtrl+V", IDM_EDITPASTE + MENUITEM "Limpar &selecção\tDel", IDM_EDITDELETESELECTION + MENUITEM "Seleccionar &tudo\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "C&opiar para...", IDM_EDITCOPYTO + MENUITEM "Colar &de...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "I&nverter/rodar...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Redimensionar/Torcer...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverter cores\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 134acf54bc1..b74925b6523 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -16,17 +16,17 @@ BEGIN POPUP "&Fișier" BEGIN MENUITEM "&Nou\tCtrl+N", IDM_FILENEW - MENUITEM "&Deschidere…\tCtrl+O", IDM_FILEOPEN + MENUITEM "&Deschidere...\tCtrl+O", IDM_FILEOPEN MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE - MENUITEM "Păst&rare în…", IDM_FILESAVEAS + MENUITEM "Păst&rare în...", IDM_FILESAVEAS MENUITEM SEPARATOR - MENUITEM "Din aparat media…", IDM_FILEFROMSCANNERORCAMERA + MENUITEM "Din aparat media...", IDM_FILEFROMSCANNERORCAMERA MENUITEM SEPARATOR MENUITEM "Pre&vizionează pagina", IDM_FILEPAGEVIEW - MENUITEM "C&onfigurare pagină…", IDM_FILEPAGESETUP - MENUITEM "I&mprimă…\tCtrl+P", IDM_FILEPRINT + MENUITEM "C&onfigurare pagină...", IDM_FILEPAGESETUP + MENUITEM "I&mprimă...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR - MENUITEM "Transmite…", IDM_FILESEND + MENUITEM "Transmite...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE MENUITEM "Decor de birou (&centrat)", IDM_FILEASWALLPAPERCENTERED @@ -48,8 +48,8 @@ BEGIN MENUITEM "In&versează selecția", IDM_EDITINVERTSELECTION MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opiere în…", IDM_EDITCOPYTO - MENUITEM "Lipire di&n…", IDM_EDITPASTEFROM + MENUITEM "C&opiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM END POPUP "&Afișare" BEGIN @@ -78,26 +78,26 @@ BEGIN END POPUP "I&magine" BEGIN - MENUITEM "&Rotire/Oglindire…\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Întin&dere/Înclinare…\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Întin&dere/Înclinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "Recoltea&ză", IDM_IMAGECROP MENUITEM "In&versează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "&Atribute…\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "&Atribute...\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "Șt&erge imaginea", IDM_IMAGEDELETEIMAGE MENUITEM "Mod &opac", IDM_IMAGEDRAWOPAQUE END POPUP "&Culori" BEGIN - MENUITEM "&Editare paletă…", IDM_COLORSEDITPALETTE + MENUITEM "&Editare paletă...", IDM_COLORSEDITPALETTE MENUITEM SEPARATOR MENUITEM "Paletă &modernă", IDM_COLORSMODERNPALETTE MENUITEM "Paletă &veche", IDM_COLORSOLDPALETTE END POPUP "Aj&utor" BEGIN - MENUITEM "&Manual…", IDM_HELPHELPTOPICS + MENUITEM "&Manual...", IDM_HELPHELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Despre…", IDM_HELPINFO + MENUITEM "&Despre...", IDM_HELPINFO END END @@ -105,14 +105,14 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "Dec&upează\tCtrl+X", IDM_EDITCUT - MENUITEM "Copia&ză\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Decupează\tCtrl+X", IDM_EDITCUT + MENUITEM "&Copiază\tCtrl+C", IDM_EDITCOPY MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION - MENUITEM "Selectea&ză tot\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR MENUITEM "C&opiere în...", IDM_EDITCOPYTO - MENUITEM "Lipire &din...", IDM_EDITPASTEFROM + MENUITEM "Lipire di&n...", IDM_EDITPASTEFROM MENUITEM SEPARATOR MENUITEM "&Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "Întindere/În&clinare...\tCtrl+W", IDM_IMAGESTRETCHSKEW diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 16695f6d212..ab02f98cf27 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Upraviť" BEGIN - MENUITEM "Späť\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Znova\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Späť\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Znova\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Vystrihnúť\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopírovať\tCtrl+C", IDM_EDITCOPY - MENUITEM "Prilepiť\tCtrl+V", IDM_EDITPASTE - MENUITEM "Vymazať výber\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertovať výber", IDM_EDITINVERTSELECTION + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertovať výber", IDM_EDITINVERTSELECTION MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopírovať do...", IDM_EDITCOPYTO - MENUITEM "Prilepiť z...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM END POPUP "&Zobraziť" BEGIN @@ -76,13 +76,13 @@ BEGIN END POPUP "&Obrázok" BEGIN - MENUITEM "Prevrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Orezať", IDM_IMAGECROP - MENUITEM "Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Vymazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Orezať", IDM_IMAGECROP + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Atribúty...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Vy&mazať obrázok\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Kresliť nepriesvitne", IDM_IMAGEDRAWOPAQUE END POPUP "&Farby" BEGIN @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Vystrihnúť\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopírovať\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Prilepiť\tCtrl+V", IDM_EDITPASTE + MENUITEM "Vy&mazať výber\tDel", IDM_EDITDELETESELECTION + MENUITEM "Vy&brať všetko\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opírovať do...", IDM_EDITCOPYTO + MENUITEM "P&rilepiť z...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Pr&evrátiť alebo otočiť...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertovať farby\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index 916fb382a0d..e19521d570e 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -36,18 +36,18 @@ BEGIN END POPUP "&Modifiko" BEGIN - MENUITEM "&v\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Undo\tCtrl+Z", IDM_EDITUNDO MENUITEM "&Perserit\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Prej\tCtrl+X", IDM_EDITCUT + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE - MENUITEM "Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION - MENUITEM "Kthe perzgjedhjen", IDM_EDITINVERTSELECTION - MENUITEM "Perzgjedh te gjitha\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Kth&e perzgjedhjen", IDM_EDITINVERTSELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopjo tek...", IDM_EDITCOPYTO - MENUITEM "Ngjit nga...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM END POPUP "Shiko" BEGIN @@ -77,11 +77,11 @@ BEGIN POPUP "&Imazhe" BEGIN MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW MENUITEM "&Copto", IDM_IMAGECROP MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Atributet...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Fshi foton\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "Vizato errët", IDM_IMAGEDRAWOPAQUE END POPUP "Ngjyrat" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Pre&j\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopjo\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Ngjit\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Fshi perzgjedhjen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Perzgjedh te gjith&a\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "K&opjo tek...", IDM_EDITCOPYTO + MENUITEM "N&gjit nga...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Rrotullu/&Pamjen...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Streq/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Inverto ngjyrat\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 95a379dbdf8..cdfc04e71a3 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -37,18 +37,18 @@ BEGIN END POPUP "&Redigera" BEGIN - MENUITEM "Ångra\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Göra om\tCtrl+Y", IDM_EDITREDO + MENUITEM "Å&ngra\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Göra om\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Klipp ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Kopiera\tCtrl+C", IDM_EDITCOPY - MENUITEM "Klistra in\tCtrl+V", IDM_EDITPASTE - MENUITEM "Ta bort\tDel", IDM_EDITDELETESELECTION - MENUITEM "Invertera val", IDM_EDITINVERTSELECTION + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Invertera val", IDM_EDITINVERTSELECTION MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Kopiera till...", IDM_EDITCOPYTO - MENUITEM "Klistra från...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM END POPUP "&Visa" BEGIN @@ -77,13 +77,13 @@ BEGIN END POPUP "&Bild" BEGIN - MENUITEM "Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Beskära", IDM_IMAGECROP - MENUITEM "Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Radera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "???Draw opaque", IDM_IMAGEDRAWOPAQUE + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Beskära", IDM_IMAGECROP + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Attribut...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ra&dera bild\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Draw &opaque", IDM_IMAGEDRAWOPAQUE END POPUP "&Färger" BEGIN @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Klipp &ut\tCtrl+X", IDM_EDITCUT + MENUITEM "&Kopiera\tCtrl+C", IDM_EDITCOPY + MENUITEM "K&listra in\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ta &bort\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Markera allt\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ko&piera till...", IDM_EDITCOPYTO + MENUITEM "Klistra &från...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Rotera/Spegelvänd...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invertera färger\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 42706400c2d..de836e273e4 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Kes\tCtrl+X", IDM_EDITCUT + MENUITEM "K&opyala\tCtrl+C", IDM_EDITCOPY + MENUITEM "Y&apıştır\tCtrl+V", IDM_EDITPASTE + MENUITEM "&Seçimi Sil\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Tümünü Seç\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ş&uraya Kopyala...", IDM_EDITCOPYTO + MENUITEM "Şu&radan Yapıştır...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Döndür ya da Yansıt...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Yeniden Boyutlandır veya Eğ...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Re&nkleri Tersine Çevir\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 3df7b6724fa..e50eb7b1877 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -38,18 +38,18 @@ BEGIN END POPUP "&Редагування" BEGIN - MENUITEM "Скасувати\tCtrl+Z", IDM_EDITUNDO - MENUITEM "Повторити\tCtrl+Y", IDM_EDITREDO + MENUITEM "&Скасувати\tCtrl+Z", IDM_EDITUNDO + MENUITEM "&Повторити\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR - MENUITEM "Вирізати\tCtrl+X", IDM_EDITCUT - MENUITEM "Копіювати\tCtrl+C", IDM_EDITCOPY - MENUITEM "Вставити\tCtrl+V", IDM_EDITPASTE - MENUITEM "Видалити виділення\tDel", IDM_EDITDELETESELECTION - MENUITEM "Обернути виділення", IDM_EDITINVERTSELECTION + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "&Обернути виділення", IDM_EDITINVERTSELECTION MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "Копіювати до файлу...", IDM_EDITCOPYTO - MENUITEM "Вставити з файлу...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM END POPUP "В&игляд" BEGIN @@ -78,13 +78,13 @@ BEGIN END POPUP "&Зображення" BEGIN - MENUITEM "Відобразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "Обітнути", IDM_IMAGECROP - MENUITEM "Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Видалити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "Непрозоре тло", IDM_IMAGEDRAWOPAQUE + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "Обі&тнути", IDM_IMAGECROP + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Атрибути...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Ви&далити малюнок\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "Не&прозоре тло", IDM_IMAGEDRAWOPAQUE END POPUP "&Кольори" BEGIN @@ -105,18 +105,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "&Вирізати\tCtrl+X", IDM_EDITCUT + MENUITEM "&Копіювати\tCtrl+C", IDM_EDITCOPY + MENUITEM "Вс&тавити\tCtrl+V", IDM_EDITPASTE + MENUITEM "Ви&далити виділення\tDel", IDM_EDITDELETESELECTION + MENUITEM "Виді&лити все\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "Ко&піювати до файлу...", IDM_EDITCOPYTO + MENUITEM "Вставити з &файлу...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Відо&бразити/повернути...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Обернути кольори\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index 6d5847da4b3..07cc7fa0ae0 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -37,17 +37,17 @@ BEGIN POPUP "&Chỉnh sửa" BEGIN MENUITEM "&Quay về trạng thái trước\tCtrl+Z", IDM_EDITUNDO - MENUITEM "&Quay về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO + MENUITEM "Qua&y về trạng thái sau đó\tCtrl+Y", IDM_EDITREDO MENUITEM SEPARATOR MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION MENUITEM "&Nghịch đảo phần chọn", IDM_EDITINVERTSELECTION - MENUITEM "Chọn &Tất cả\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO - MENUITEM "Dán &từ...", IDM_EDITPASTEFROM + MENUITEM "Sa&o chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM END POPUP "&Xem" BEGIN @@ -81,7 +81,7 @@ BEGIN MENUITEM "&Cắt hình ảnh", IDM_IMAGECROP MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "&Thuộc tính...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "&Xóa hình ảnh\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "&Vẽ nét mờ", IDM_IMAGEDRAWOPAQUE END POPUP "&Màu sắc" @@ -103,18 +103,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "Cắ&t\tCtrl+X", IDM_EDITCUT + MENUITEM "&Sao chép\tCtrl+C", IDM_EDITCOPY + MENUITEM "&Dán\tCtrl+V", IDM_EDITPASTE + MENUITEM "Xó&a phần đã chọn\tDel", IDM_EDITDELETESELECTION + MENUITEM "C&họn Tất cả\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "S&ao chép đến...", IDM_EDITCOPYTO + MENUITEM "Dán t&ừ...", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Xoay/&Lật hình ảnh...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "&Kéo dãn/Nghiêng...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "&Nghịch đảo màu sắc (âm bản)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index ec8eab59263..6a5e2d6349e 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -81,10 +81,10 @@ BEGIN BEGIN MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "属性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "删除图像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "删除图像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明处理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "颜色(&C)" @@ -106,18 +106,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪切(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "复制(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "粘贴(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "删除选中区域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全部选择(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "复制到(&O)...", IDM_EDITCOPYTO + MENUITEM "从...粘贴(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋转/镜像...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸/倾斜...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "反色(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 748acf93f03..f3429ab9c1f 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index d3c35628019..953bf47b481 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -79,10 +79,10 @@ BEGIN BEGIN MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "剪裁(&C)", IDM_IMAGECROP + MENUITEM "剪裁(&R)", IDM_IMAGECROP MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS MENUITEM "屬性(&A)...\tCtrl+E", IDM_IMAGEATTRIBUTES - MENUITEM "刪除圖像\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE + MENUITEM "刪除圖像(&C)\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE MENUITEM "不透明處理(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "顏色(&C)" @@ -104,18 +104,18 @@ ID_POPUPMENU MENU BEGIN POPUP "Popup #0" BEGIN - MENUITEM "C&ut\tCtrl+X", IDM_EDITCUT - MENUITEM "Copy\tCtrl+C", IDM_EDITCOPY - MENUITEM "&Paste\tCtrl+V", IDM_EDITPASTE - MENUITEM "De&lete selection\tDel", IDM_EDITDELETESELECTION - MENUITEM "Select &All\tCtrl+A", IDM_EDITSELECTALL + MENUITEM "剪下(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "複製(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "貼上(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "刪除選中區域(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "全選(&A)\tCtrl+A", IDM_EDITSELECTALL MENUITEM SEPARATOR - MENUITEM "C&opy to...", IDM_EDITCOPYTO - MENUITEM "Paste &from...", IDM_EDITPASTEFROM + MENUITEM "複製到(&O)...", IDM_EDITCOPYTO + MENUITEM "從...貼上(&F)", IDM_EDITPASTEFROM MENUITEM SEPARATOR - MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "旋轉／翻轉(&M)...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "拉伸／傾斜(&S)...\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "顏色反轉(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS END END

1 year, 5 months

[reactos] 01/01: [MSPAINT] Speed up for black and white (#5563)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=455c1fe1b989a3c1a6731… commit 455c1fe1b989a3c1a6731e2aa8beb2bdf05fdf2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 20 16:46:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 20 16:46:18 2023 +0900 [MSPAINT] Speed up for black and white (#5563) Follow-up to #5554. - Speed up ImageModel::PushBlackAndWhite by using GetDIBits and SetDIBits. CORE-19094 --- base/applications/mspaint/dib.cpp | 93 +++++++++++++++++++++++++++++++++++ base/applications/mspaint/dib.h | 2 + base/applications/mspaint/history.cpp | 44 ++++------------- 3 files changed, 104 insertions(+), 35 deletions(-) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index c12a2f013a8..e770f5494d0 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -13,6 +13,13 @@ float g_xDpi = 96; float g_yDpi = 96; SYSTEMTIME g_fileTime; +#define WIDTHBYTES(i) (((i) + 31) / 32 * 4) + +struct BITMAPINFOEX : BITMAPINFO +{ + RGBQUAD bmiColorsExtra[256 - 1]; +}; + /* FUNCTIONS ********************************************************/ // Convert DPI (dots per inch) into PPCM (pixels per centimeter) @@ -519,3 +526,89 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) return hbm; } + +BOOL IsBitmapBlackAndWhite(HBITMAP hbm) +{ + BITMAP bm; + if (!::GetObjectW(hbm, sizeof(bm), &bm)) + return FALSE; + + if (bm.bmBitsPixel == 1) + return TRUE; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 24; + + DWORD widthbytes = WIDTHBYTES(24 * bm.bmWidth); + DWORD cbBits = widthbytes * bm.bmHeight; + LPBYTE pbBits = new BYTE[cbBits]; + + HDC hdc = ::CreateCompatibleDC(NULL); + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pbBits, &bmi, DIB_RGB_COLORS); + ::DeleteDC(hdc); + + BOOL bBlackAndWhite = TRUE; + for (LONG y = 0; y < bm.bmHeight; ++y) + { + LPBYTE pbLine = &pbBits[widthbytes * y]; + for (LONG x = 0; x < bm.bmWidth; ++x) + { + BYTE Blue = *pbLine++; + BYTE Green = *pbLine++; + BYTE Red = *pbLine++; + COLORREF rgbColor = RGB(Red, Green, Blue); + if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) + { + bBlackAndWhite = FALSE; + goto Finish; + } + } + } + +Finish: + delete[] pbBits; + + return bBlackAndWhite; +} + +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) +{ + BITMAP bm; + if (!::GetObject(hbm, sizeof(bm), &bm)) + return NULL; + + BITMAPINFOEX bmi; + ZeroMemory(&bmi, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiColors[1].rgbBlue = 255; + bmi.bmiColors[1].rgbGreen = 255; + bmi.bmiColors[1].rgbRed = 255; + HDC hdc = ::CreateCompatibleDC(NULL); + LPVOID pvMonoBits; + HBITMAP hMonoBitmap = ::CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &pvMonoBits, NULL, 0); + if (!hMonoBitmap) + { + ::DeleteDC(hdc); + return NULL; + } + + HBITMAP hNewBitmap = CreateDIBWithProperties(bm.bmWidth, bm.bmHeight); + if (hNewBitmap) + { + ::GetDIBits(hdc, hbm, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + ::SetDIBits(hdc, hNewBitmap, 0, bm.bmHeight, pvMonoBits, &bmi, DIB_RGB_COLORS); + } + ::DeleteObject(hMonoBitmap); + ::DeleteDC(hdc); + + return hNewBitmap; +} diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index cefdb6e42b5..bb9d933a14a 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -7,10 +7,12 @@ #pragma once +BOOL IsBitmapBlackAndWhite(HBITMAP hbm); HBITMAP CreateDIBWithProperties(int width, int height); HBITMAP CreateMonoBitmap(int width, int height, BOOL bWhite); HBITMAP CreateColorDIB(int width, int height, COLORREF rgb); HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight); +HBITMAP ConvertToBlackAndWhite(HBITMAP hbm); HBITMAP CopyMonoImage(HBITMAP hbm, INT cx = 0, INT cy = 0); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 8867a53025a..4451b06f927 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -270,44 +270,18 @@ HBITMAP ImageModel::CopyBitmap() BOOL ImageModel::IsBlackAndWhite() { - LONG cxWidth = GetWidth(), cyHeight = GetHeight(); - for (LONG y = 0; y < cyHeight; ++y) - { - for (LONG x = 0; x < cxWidth; ++x) - { - COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); - if (rgbColor != RGB(0, 0, 0) && rgbColor != RGB(255, 255, 255)) - return FALSE; - } - } - return TRUE; + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + BOOL bBlackAndWhite = IsBitmapBlackAndWhite(m_hBms[m_currInd]); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select + return bBlackAndWhite; } void ImageModel::PushBlackAndWhite() { - HBITMAP hNewBitmap = CopyBitmap(); - if (!hNewBitmap) - return; - - HDC hdc2 = ::CreateCompatibleDC(NULL); - HGDIOBJ hbm2Old = ::SelectObject(hdc2, hNewBitmap); - LONG cxWidth = GetWidth(), cyHeight = GetHeight(); - for (LONG y = 0; y < cyHeight; ++y) - { - for (LONG x = 0; x < cxWidth; ++x) - { - COLORREF rgbColor = ::GetPixel(m_hDrawingDC, x, y); - BYTE Red = GetRValue(rgbColor); - BYTE Green = GetGValue(rgbColor); - BYTE Blue = GetBValue(rgbColor); - if ((Red + Green + Blue) / 3 >= 255 / 2) - ::SetPixelV(hdc2, x, y, RGB(255, 255, 255)); // White - else - ::SetPixelV(hdc2, x, y, RGB(0, 0, 0)); // Black - } - } - ::SelectObject(hdc2, hbm2Old); - ::DeleteDC(hdc2); + ::SelectObject(m_hDrawingDC, m_hbmOld); // De-select + HBITMAP hNewBitmap = ConvertToBlackAndWhite(m_hBms[m_currInd]); + m_hbmOld = ::SelectObject(m_hDrawingDC, m_hBms[m_currInd]); // Re-select - PushImageForUndo(hNewBitmap); + if (hNewBitmap) + PushImageForUndo(hNewBitmap); }

1 year, 5 months

[reactos] 01/01: [NTUSER] Whitspace-fixes winpos.c

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49dbc8fbbb090812d21ac… commit 49dbc8fbbb090812d21ac10e79d42c787638e2ec Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Aug 20 01:41:28 2023 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Aug 20 01:41:28 2023 +0200 [NTUSER] Whitspace-fixes winpos.c I just can't stand that whitespace-diff at those 2 if-conditions any longer, which was introduced into co_WinPosSetWindowPos() by 0.4.13-dev-8-g cfdf36e44250048b3377f333c93bc311e424ac3d Everytime I port something back, I don't know where to put that diff temporarily. And I don't want to make the older branches worse as well. So finally squeeze it out at right-hand-side in master head. --- win32ss/user/ntuser/winpos.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 45c721de368..2ec319505d1 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Windows - * FILE: win32ss/user/ntuser/winpos.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Windows + * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -2175,7 +2174,7 @@ co_WinPosSetWindowPos( } IntInvalidateWindows(Window, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } - else if ( RgnType != ERROR && RgnType == NULLREGION ) // Must be the same. See CORE-7166 & CORE-15934, NC HACK fix. + else if (RgnType != ERROR && RgnType == NULLREGION) // Must be the same. See CORE-7166 & CORE-15934, NC HACK fix. { if ( !PosChanged && !(WinPos.flags & SWP_DEFERERASE) && @@ -2224,7 +2223,7 @@ co_WinPosSetWindowPos( } /* Expose what was covered before but not covered anymore */ - if ( VisBefore != NULL ) + if (VisBefore != NULL) { PREGION ExposedRgn = IntSysCreateRectpRgn(0, 0, 0, 0); if (ExposedRgn) @@ -2234,7 +2233,7 @@ co_WinPosSetWindowPos( OldWindowRect.left - NewWindowRect.left, OldWindowRect.top - NewWindowRect.top); - if ( VisAfter != NULL ) + if (VisAfter != NULL) RgnType = IntGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); if (RgnType != ERROR && RgnType != NULLREGION) @@ -2282,7 +2281,7 @@ co_WinPosSetWindowPos( if ( !(Window->style & WS_CHILD) && (Parent) && (Parent->style & WS_CLIPCHILDREN)) { TRACE("SWP_FRAMECHANGED Parent %p WS_CLIPCHILDREN %p\n",Parent,Window); - UserSyncAndPaintWindows( Parent, RDW_CLIPCHILDREN); // NC should redraw here, see NC HACK fix. + UserSyncAndPaintWindows(Parent, RDW_CLIPCHILDREN); // NC should redraw here, see NC HACK fix. } }

1 year, 5 months

[reactos] 01/01: [RTL][NTDLL] Implement and export RtlCompareUnicodeStrings

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d00d883a21c9308fa9c96… commit d00d883a21c9308fa9c96300e7e182c13f444da9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 12 17:47:38 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:52:21 2023 +0300 [RTL][NTDLL] Implement and export RtlCompareUnicodeStrings --- dll/ntdll/def/ntdll.spec | 2 +- sdk/lib/rtl/unicode.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 99fcbc96ed3..ee2598f8040 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -682,7 +682,7 @@ @ stdcall RtlCompareMemoryUlong(ptr long long) @ stdcall RtlCompareString(ptr ptr long) @ stdcall RtlCompareUnicodeString (ptr ptr long) -@ stub -version=0x600+ RtlCompareUnicodeStrings +@ stdcall -version=0x600+ RtlCompareUnicodeStrings(wstr long wstr long long) @ stub -version=0x600+ -arch=x86_64 RtlCompleteProcessCloning @ stdcall RtlCompressBuffer(long ptr long ptr long long ptr ptr) @ stdcall RtlComputeCrc32(long ptr long) diff --git a/sdk/lib/rtl/unicode.c b/sdk/lib/rtl/unicode.c index c29dfa4f3b8..6cd70dda1e7 100644 --- a/sdk/lib/rtl/unicode.c +++ b/sdk/lib/rtl/unicode.c @@ -2222,6 +2222,53 @@ RtlCompareUnicodeString( return ret; } +/* + * @implemented + */ +_IRQL_requires_max_(PASSIVE_LEVEL) +_Must_inspect_result_ +NTSYSAPI +LONG +NTAPI +RtlCompareUnicodeStrings( + _In_reads_(String1Length) PCWCH String1, + _In_ SIZE_T String1Length, + _In_reads_(String2Length) PCWCH String2, + _In_ SIZE_T String2Length, + _In_ BOOLEAN CaseInSensitive) +{ + LONG Result = 0; + SIZE_T MinStringLength = min(String1Length, String2Length); + SIZE_T Index; + + if (CaseInSensitive) + { + for (Index = 0; Index < MinStringLength; Index++) + { + WCHAR Char1 = RtlpUpcaseUnicodeChar(String1[Index]); + WCHAR Char2 = RtlpUpcaseUnicodeChar(String2[Index]); + Result = Char1 - Char2; + if (Result != 0) + { + return Result; + } + } + } + else + { + for (Index = 0; Index < MinStringLength; Index++) + { + Result = String1[Index] - String2[Index]; + if (Result != 0) + { + return Result; + } + } + } + + return String1Length - String2Length; +} + /* * @implemented */

1 year, 5 months

[reactos] 06/06: [CRT] Reduce diff to wine-5.0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c332b917dccf7b3c9563c… commit c332b917dccf7b3c9563c24f02a1550b8a5ab600 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 12:12:22 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [CRT] Reduce diff to wine-5.0 --- sdk/lib/crt/except/i386/cpp.s | 16 ++++++++++++++++ sdk/lib/crt/wine/cpp.c | 2 -- sdk/lib/crt/wine/cxx.h | 6 +++++- sdk/lib/crt/wine/except_i386.c | 20 -------------------- sdk/lib/crt/wine/undname.c | 14 ++++++++------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/sdk/lib/crt/except/i386/cpp.s b/sdk/lib/crt/except/i386/cpp.s index 0a553936060..7985dc1d9fe 100644 --- a/sdk/lib/crt/except/i386/cpp.s +++ b/sdk/lib/crt/except/i386/cpp.s @@ -5,6 +5,8 @@ .code .align 4 +EXTERN _cxx_frame_handler:PROC + MACRO(DEFINE_THISCALL_ALIAS, cxxname, target) #ifdef _USE_ML EXTERN ___thiscall&target:PROC @@ -166,5 +168,19 @@ _call_handler: pop ebp ret + +PUBLIC ___CxxFrameHandler +___CxxFrameHandler: + push 0 + push 0 + push eax + push[esp + 28] + push[esp + 28] + push[esp + 28] + push[esp + 28] + call _cxx_frame_handler + add esp, 28 + ret + END diff --git a/sdk/lib/crt/wine/cpp.c b/sdk/lib/crt/wine/cpp.c index 4b12b2dfbe1..b5636b1fb1a 100644 --- a/sdk/lib/crt/wine/cpp.c +++ b/sdk/lib/crt/wine/cpp.c @@ -995,7 +995,6 @@ void __thiscall MSVCRT_improper_scheduler_detach_dtor( #endif /* _MSVCR_VER >= 100 */ -#ifndef _MSC_VER #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -1049,7 +1048,6 @@ __ASM_VTABLE(improper_scheduler_detach, #ifndef __GNUC__ } #endif -#endif /* !_MSC_VER */ DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) #if _MSVCR_VER >= 80 diff --git a/sdk/lib/crt/wine/cxx.h b/sdk/lib/crt/wine/cxx.h index b22ff22cc85..58afc75bd15 100644 --- a/sdk/lib/crt/wine/cxx.h +++ b/sdk/lib/crt/wine/cxx.h @@ -18,6 +18,9 @@ #include "wine/asm.h" +#ifdef _MSC_VER +#define __ASM_VTABLE(name,funcs) +#else #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -43,6 +46,7 @@ funcs "\n\t.text") #endif /* _WIN64 */ +#endif // _MSC_VER #ifndef __x86_64__ @@ -264,4 +268,4 @@ extern void *vtbl_wrapper_48; #endif -//exception* __thiscall MSVCRT_exception_ctor(exception*, const char**); +exception* __thiscall MSVCRT_exception_ctor(exception*, const char**); diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 7512196c096..68f6c75c1b3 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -652,25 +652,6 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame */ extern DWORD CDECL __CxxFrameHandler( PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch ); -#ifdef _MSC_VER -DWORD _declspec(naked) __CxxFrameHandler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, - PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch) -{ - __asm - { - push 0 - push 0 - push eax - push[esp + 28] - push[esp + 28] - push[esp + 28] - push[esp + 28] - call cxx_frame_handler - add esp, 28 - ret - } -} -#else __ASM_GLOBAL_FUNC( __CxxFrameHandler, "pushl $0\n\t" /* nested_trylevel */ __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -690,7 +671,6 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler, "add $28,%esp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -28\n\t") "ret" ) -#endif /********************************************************************* diff --git a/sdk/lib/crt/wine/undname.c b/sdk/lib/crt/wine/undname.c index c81dfcc273a..df3e4e8cc80 100644 --- a/sdk/lib/crt/wine/undname.c +++ b/sdk/lib/crt/wine/undname.c @@ -19,12 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define __WINE_DEBUG_CHANNEL__ -#include <precomp.h> +#include "config.h" +#include "wine/port.h" + #include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include "msvcrt.h" -#include <internal/wine/msvcrt.h> -#include <internal/wine/cppexcept.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -199,8 +202,7 @@ static BOOL str_array_push(struct parsed_symbol* sym, const char* ptr, int len, c = '>'; if (i < a->start) c = '-'; else if (i >= a->num) c = '}'; - /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ - if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, debugstr_a(a->elts[i])); + TRACE("%p\t%d%c %s\n", a, i, c, debugstr_a(a->elts[i])); } }

1 year, 5 months

[reactos] 05/06: [WINESYNC]: crt is now in sync with wine-staging wine-5.0

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e04b79653441e3d8d78d9… commit e04b79653441e3d8d78d943271fd4b9b3b327767 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Aug 10 11:14:57 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC]: crt is now in sync with wine-staging wine-5.0 --- sdk/tools/winesync/crt.cfg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sdk/tools/winesync/crt.cfg b/sdk/tools/winesync/crt.cfg new file mode 100644 index 00000000000..81308194937 --- /dev/null +++ b/sdk/tools/winesync/crt.cfg @@ -0,0 +1,16 @@ +directories: null +files: + dlls/msvcrt/cpp.c: sdk/lib/crt/wine/cpp.c + dlls/msvcrt/cppexcept.h: sdk/lib/crt/wine/cppexcept.h + dlls/msvcrt/cxx.h: sdk/lib/crt/wine/cxx.h + dlls/msvcrt/except.c: sdk/lib/crt/wine/except.c + dlls/msvcrt/except_arm.c: sdk/lib/crt/wine/except_arm.c + dlls/msvcrt/except_arm64.c: sdk/lib/crt/wine/except_arm64.c + dlls/msvcrt/except_i386.c: sdk/lib/crt/wine/except_i386.c + dlls/msvcrt/except_x86_64.c: sdk/lib/crt/wine/except_x86_64.c + dlls/msvcrt/heap.c: sdk/lib/crt/wine/heap.c + dlls/msvcrt/msvcrt.h: sdk/lib/crt/wine/msvcrt.h + dlls/msvcrt/mtdll.h: sdk/lib/crt/wine/mtdll.h + dlls/msvcrt/undname.c: sdk/lib/crt/wine/undname.c +tags: + wine: wine-5.0

1 year, 5 months

[reactos] 04/06: [WINESYNC] msvcrt: Fix handling tryblocks inside current catch block on nested exception.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f8eda78537507e5b3ec4… commit 1f8eda78537507e5b3ec41941ef896d72a87aea8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:08:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Fix handling tryblocks inside current catch block on nested exception. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48335 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6babdb5508bd2f1b659218483f5df76859898712 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index d3bcc3aaadd..7512196c096 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -389,7 +389,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG /* returns the address to continue execution to after the catch block was called */ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, - const cxx_function_descr *descr, int nested_trylevel, + const cxx_function_descr *descr, catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { @@ -407,7 +407,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, const tryblock_info *tryblock = &descr->tryblock[i]; /* only handle try blocks inside current catch block */ - if (catch_frame && nested_trylevel > tryblock->start_level) continue; + if (catch_frame && catch_frame->trylevel > tryblock->start_level) continue; if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; @@ -458,7 +458,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, nested_frame.frame.Handler = catch_function_nested_handler; nested_frame.cxx_frame = frame; nested_frame.descr = descr; - nested_frame.trylevel = nested_trylevel + 1; + nested_frame.trylevel = tryblock->end_level + 1; __wine_push_frame( &nested_frame.frame ); addr = call_handler( catchblock->handler, &frame->ebp ); @@ -545,7 +545,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; call_catch_block( rec, ep->ContextRecord, ctx->frame, ctx->descr, - ctx->frame->trylevel, ctx->nested_frame, exc_type ); + ctx->nested_frame, exc_type ); __DestructExceptionObject( rec ); return ExceptionContinueSearch; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + nested_frame, exc_type ); return ExceptionContinueSearch; }

1 year, 5 months

[reactos] 03/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4df4baa391ee4f9801ffd… commit 4df4baa391ee4f9801ffd6b50617bc1a416effbb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:08:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 48a447c5eb238d673ce5db4eeacf3ba4c1a9da90 by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 5c1c9df3368..d3bcc3aaadd 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -110,7 +110,7 @@ typedef struct { cxx_exception_frame *frame; const cxx_function_descr *descr; - EXCEPTION_REGISTRATION_RECORD *nested_frame; + catch_func_nested_frame *nested_frame; } se_translator_ctx; typedef struct _SCOPETABLE @@ -390,7 +390,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, cxx_exception_frame *frame, const cxx_function_descr *descr, int nested_trylevel, - EXCEPTION_REGISTRATION_RECORD *catch_frame, + catch_func_nested_frame *catch_frame, cxx_exception_type *info ) { UINT i; @@ -440,7 +440,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, (void*)rec->ExceptionInformation[1]); /* unwind the stack */ - RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); + RtlUnwind( catch_frame ? &catch_frame->frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; @@ -627,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; + ctx.nested_frame = nested_frame; __TRY { except_ptrs.ExceptionRecord = rec; @@ -642,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); + frame->trylevel, nested_frame, exc_type ); return ExceptionContinueSearch; }

1 year, 5 months

[reactos] 02/06: [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c7dc46702a9615065372… commit 6c7dc46702a96150653721431dc3f27da0f28922 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Jan 9 22:07:07 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] msvcrt: Pass catch_func_nested_frame struct to cxx_frame_handler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ea20974cdd7457715bf4d758818d03bff664f62b by Piotr Caban <piotr(a)codeweavers.com> --- sdk/lib/crt/wine/except_i386.c | 43 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/sdk/lib/crt/wine/except_i386.c b/sdk/lib/crt/wine/except_i386.c index 746ddad77da..5c1c9df3368 100644 --- a/sdk/lib/crt/wine/except_i386.c +++ b/sdk/lib/crt/wine/except_i386.c @@ -96,6 +96,16 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; +/* exception frame for nested exceptions in catch block */ +typedef struct +{ + EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ + cxx_exception_frame *cxx_frame; /* frame of parent exception */ + const cxx_function_descr *descr; /* descriptor of parent exception */ + int trylevel; /* current try level */ + cxx_frame_info frame_info; +} catch_func_nested_frame; + typedef struct { cxx_exception_frame *frame; @@ -135,7 +145,7 @@ typedef struct DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) DECLSPEC_HIDDEN; + catch_func_nested_frame* nested_frame ) DECLSPEC_HIDDEN; /* call a copy constructor */ extern void call_copy_ctor( void *func, void *this, void *src, int has_vbase ); @@ -332,21 +342,11 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des frame->trylevel = last_level; } -/* exception frame for nested exceptions in catch block */ -struct catch_func_nested_frame -{ - EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ - cxx_exception_frame *cxx_frame; /* frame of parent exception */ - const cxx_function_descr *descr; /* descriptor of parent exception */ - int trylevel; /* current try level */ - cxx_frame_info frame_info; -}; - /* handler for exceptions happening while calling a catch function */ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { - struct catch_func_nested_frame *nested_frame = (struct catch_func_nested_frame *)frame; + catch_func_nested_frame *nested_frame = (catch_func_nested_frame *)frame; if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) { @@ -382,8 +382,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG } return cxx_frame_handler( rec, nested_frame->cxx_frame, context, - NULL, nested_frame->descr, &nested_frame->frame, - nested_frame->trylevel ); + NULL, nested_frame->descr, nested_frame ); } /* find and call the appropriate catch block for an exception */ @@ -397,7 +396,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, CONTEXT *context, UINT i; int j; void *addr, *object = (void *)rec->ExceptionInformation[1]; - struct catch_func_nested_frame nested_frame; + catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; DWORD save_esp = ((DWORD*)frame)[-1]; thread_data_t *data = msvcrt_get_thread_data(); @@ -560,8 +559,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c ) DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, const cxx_function_descr *descr, - EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel ) + catch_func_nested_frame* nested_frame ) { cxx_exception_type *exc_type; @@ -577,7 +575,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (descr->unwind_count && !nested_trylevel) cxx_local_unwind( frame, descr, -1 ); + if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 ); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch; @@ -602,8 +600,9 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 && exc_type->custom_handler) { - return exc_type->custom_handler( rec, frame, context, dispatch, - descr, nested_trylevel, nested_frame, 0 ); + return exc_type->custom_handler( rec, frame, context, dispatch, descr, + nested_frame ? nested_frame->trylevel : 0, + nested_frame ? &nested_frame->frame : NULL, 0 ); } if (TRACE_ON(seh)) @@ -628,7 +627,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame ctx.frame = frame; ctx.descr = descr; - ctx.nested_frame = nested_frame; + ctx.nested_frame = nested_frame ? &nested_frame->frame : NULL; __TRY { except_ptrs.ExceptionRecord = rec; @@ -643,7 +642,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } call_catch_block( rec, context, frame, descr, - frame->trylevel, nested_frame, exc_type ); + frame->trylevel, nested_frame ? &nested_frame->frame : NULL, exc_type ); return ExceptionContinueSearch; }

1 year, 5 months

[reactos] 01/06: [WINESYNC] Allow directories to be None

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b5a555161d01102db86f… commit 4b5a555161d01102db86f230548e6ec37c757813 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 9 22:07:53 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Aug 19 23:50:52 2023 +0300 [WINESYNC] Allow directories to be None --- sdk/tools/winesync/winesync.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 8547ee97306..cdee060db52 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -100,6 +100,9 @@ class wine_sync: # root files should have a direct mapping return None + if self.module_cfg['directories'] is None: + return None + wine_dir, wine_file = os.path.split(wine_path) if wine_dir in self.module_cfg['directories']: # we have a mapping for the directory

1 year, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs