Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/04: [MSPAINT] Make Attributes dialog layout consistent between languages
by Stanislav Motylkov 23 Jun '23

23 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6c4222f25e04d35c91a8… commit b6c4222f25e04d35c91a8dce7dd6c09bf1125323 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 23 15:36:00 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jun 23 20:51:45 2023 +0300 [MSPAINT] Make Attributes dialog layout consistent between languages - Add missing mnemonic keys - Remove unneeded mnemonic keys - Fix some translated strings being too long - Fix mispositioned elements - Reposition overlapping elements Validated the changes with Resource Hacker. CORE-18867 --- base/applications/mspaint/lang/bg-BG.rc | 34 ++++++++++++++++----------------- base/applications/mspaint/lang/cs-CZ.rc | 28 +++++++++++++-------------- base/applications/mspaint/lang/de-DE.rc | 16 ++++++++-------- base/applications/mspaint/lang/en-GB.rc | 14 +++++++------- base/applications/mspaint/lang/en-US.rc | 14 +++++++------- base/applications/mspaint/lang/es-ES.rc | 32 +++++++++++++++---------------- base/applications/mspaint/lang/et-EE.rc | 14 +++++++------- base/applications/mspaint/lang/eu-ES.rc | 32 +++++++++++++++---------------- base/applications/mspaint/lang/fr-FR.rc | 28 +++++++++++++-------------- base/applications/mspaint/lang/he-IL.rc | 6 +++--- base/applications/mspaint/lang/hu-HU.rc | 22 ++++++++++----------- base/applications/mspaint/lang/id-ID.rc | 20 +++++++++---------- base/applications/mspaint/lang/it-IT.rc | 28 +++++++++++++-------------- base/applications/mspaint/lang/ja-JP.rc | 14 +++++++------- base/applications/mspaint/lang/nl-NL.rc | 28 +++++++++++++-------------- base/applications/mspaint/lang/no-NO.rc | 16 ++++++++-------- base/applications/mspaint/lang/pl-PL.rc | 6 +++--- base/applications/mspaint/lang/pt-BR.rc | 18 ++++++++--------- base/applications/mspaint/lang/pt-PT.rc | 6 +++--- base/applications/mspaint/lang/ro-RO.rc | 18 ++++++++--------- base/applications/mspaint/lang/ru-RU.rc | 26 ++++++++++++------------- base/applications/mspaint/lang/sk-SK.rc | 24 +++++++++++------------ base/applications/mspaint/lang/sq-AL.rc | 14 +++++++------- base/applications/mspaint/lang/sv-SE.rc | 16 ++++++++-------- base/applications/mspaint/lang/tr-TR.rc | 8 ++++---- base/applications/mspaint/lang/uk-UA.rc | 16 ++++++++-------- base/applications/mspaint/lang/vi-VN.rc | 26 ++++++++++++------------- base/applications/mspaint/lang/zh-CN.rc | 14 +++++++------- base/applications/mspaint/lang/zh-HK.rc | 14 +++++++------- base/applications/mspaint/lang/zh-TW.rc | 14 +++++++------- 30 files changed, 283 insertions(+), 283 deletions(-) diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 283268f5f52..bdb017608e6 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -158,31 +158,31 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 125, 24, 48, 14 END -IDD_ATTRIBUTES DIALOGEX 100, 100, 225, 120 +IDD_ATTRIBUTES DIALOGEX 100, 100, 243, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Принадлежности" BEGIN - LTEXT "Ширина:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Ширина:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Височина:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Височина:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Дата на файла:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Файлов размер:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Разделителна:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Неналично", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Неналично", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Дата на файла:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Файлов размер:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Разделителна:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "Неналично", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "Неналично", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Единици", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Инчове", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "Сантиметри", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Пиксели", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "&Инчове", IDD_ATTRIBUTESRB1, 12, 69, 40, 10, WS_GROUP + AUTORADIOBUTTON "Санти&метри", IDD_ATTRIBUTESRB2, 55, 69, 54, 10 + AUTORADIOBUTTON "&Пиксели", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Цветове", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Черно-бяло", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Цветове", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 - DEFPUSHBUTTON "Добре", IDOK, 170, 8, 48, 14 - PUSHBUTTON "Отказ", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "По подразбиране", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + AUTORADIOBUTTON "&Черно-бяло", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "Цв&етове", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 + DEFPUSHBUTTON "Добре", IDOK, 170, 8, 66, 14 + PUSHBUTTON "Отказ", IDCANCEL, 170, 24, 66, 14 + PUSHBUTTON "По по&дразбиране", IDD_ATTRIBUTESSTANDARD, 170, 40, 66, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index e148a49bb3f..f500d7ebc52 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -163,26 +163,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atributy" BEGIN - LTEXT "Šířka:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "Šíř&ka:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Výška:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Výška:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Datum změny:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Velikost souboru:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Rozlišení:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Datum změny:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Velikost souboru:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Rozlišení:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Jednotka", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Palce", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "Centimetry", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixely", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "P&alce", IDD_ATTRIBUTESRB1, 12, 69, 40, 10, WS_GROUP + AUTORADIOBUTTON "Centi&metry", IDD_ATTRIBUTESRB2, 55, 69, 54, 10 + AUTORADIOBUTTON "&Pixely", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Barvy", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Černobílé", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Barvy", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "Č&ernobílé", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Barvy", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Storno", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Výchozí", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Výc&hozí", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 5b841d75b40..086c5bb953c 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -162,9 +162,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attribute" BEGIN - LTEXT "Breite:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Breite:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Höhe:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Höhe:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Dateidatum:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Dateigröße:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -173,15 +173,15 @@ BEGIN LTEXT "Nicht verfügbar", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Maßeinheit", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Zoll", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "&Zoll", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Farben", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Schwarzweiß", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Farben", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Schwarzweiß", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Farben", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Stan&dard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index b745e5f5404..699fc815286 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -162,13 +162,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attributes" BEGIN - LTEXT "&Width:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Width:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Height:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Height:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "File &date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "File &size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "&Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "File date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "File size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "dpi", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -178,10 +178,10 @@ BEGIN AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Colours", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Black and white", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Co&lours", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "Co&lours", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancel", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Standard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index ffefc4a5f43..b3d8f58be45 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -163,13 +163,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attributes" BEGIN - LTEXT "&Width:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Width:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Height:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Height:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "File &date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "File &size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "&Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "File date:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "File size:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Resolution:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "dpi", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -179,10 +179,10 @@ BEGIN AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Colors", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Black and white", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Co&lors", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "Co&lors", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancel", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Default", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Default", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 741e38e135d..734938c6e7e 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -165,26 +165,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atributos" BEGIN - LTEXT "Anchura:", IDD_ATTRIBUTESTEXT1, 10, 42, 30, 10 + LTEXT "&Anchura:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Altura:", IDD_ATTRIBUTESTEXT2, 101, 42, 23, 10 + LTEXT "Al&tura:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Fecha modificación:", IDD_ATTRIBUTESTEXT3, 3, 5, 67, 10, SS_RIGHT - LTEXT "Espacio en disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10, SS_RIGHT - LTEXT "Resolución:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10, SS_RIGHT - LTEXT "No disponible", IDD_ATTRIBUTESTEXT6, 73, 5, 80, 10 - LTEXT "No disponible", IDD_ATTRIBUTESTEXT7, 73, 15, 80, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 73, 25, 80, 10 /* This unit must match IDS_PRINTRES */ - GROUPBOX "Unidades ", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Pulgadas", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "Centímetros", IDD_ATTRIBUTESRB2, 60, 69, 51, 10 - AUTORADIOBUTTON "Píxeles", IDD_ATTRIBUTESRB3, 120, 69, 42, 10 - GROUPBOX "Colores ", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Blanco y negro", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "En color", IDD_ATTRIBUTESRB5, 92, 100, 40, 10 + LTEXT "Fecha modificación:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Espacio en disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Resolución:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "No disponible", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "No disponible", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + GROUPBOX "Unidades", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 + AUTORADIOBUTTON "P&ulgadas", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "Centí&metros", IDD_ATTRIBUTESRB2, 60, 69, 51, 10 + AUTORADIOBUTTON "&Píxeles", IDD_ATTRIBUTESRB3, 120, 69, 42, 10 + GROUPBOX "Colores", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 + AUTORADIOBUTTON "&Blanco y negro", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "En &color", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "Aceptar", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Predefinido", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Pre&definido", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 0355917e163..eb1f2eb2a11 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -162,13 +162,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atribuudid" BEGIN - LTEXT "&Laius:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Laius:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Pikkus:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Pikkus:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Faili &kuupäev:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Faili &suurus:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "&Resolutsioon:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Faili kuupäev:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Faili suurus:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Resolutsioon:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "Pole saadaval", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "Pole saadaval", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -178,10 +178,10 @@ BEGIN AUTORADIOBUTTON "Piksl&id", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Värvid", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Mustvalge", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "&Värvid", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Värvid", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Tühista", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Vaikimisi", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "V&aikimisi", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 4b0a412c008..e06db967538 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -163,26 +163,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atributuak" BEGIN - LTEXT "Zabalera:", IDD_ATTRIBUTESTEXT1, 10, 42, 30, 10 + LTEXT "&Zabalera:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Altuera:", IDD_ATTRIBUTESTEXT2, 82, 42, 23, 10 + LTEXT "&Altuera:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Azken gordetze-data:", IDD_ATTRIBUTESTEXT3, 10, 5, 80, 10 - LTEXT "Diskoko tamaina:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Bereizmena:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT6, 80, 5, 70, 10 - LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT7, 80, 15, 70, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 80, 25, 70, 10 /* This unit must match IDS_PRINTRES */ - GROUPBOX "Unitateak ", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Hazbetea", IDD_ATTRIBUTESRB1, 12, 69, 42, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 60, 69, 30, 10 - AUTORADIOBUTTON "Pixela", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 - GROUPBOX "Koloreak ", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Zuri-beltzean", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Koloretean", IDD_ATTRIBUTESRB5, 92, 100, 50, 10 + LTEXT "Azken gordetze-data:", IDD_ATTRIBUTESTEXT3, 10, 5, 70, 10 + LTEXT "Diskoko tamaina:", IDD_ATTRIBUTESTEXT4, 10, 15, 70, 10 + LTEXT "Bereizmena:", IDD_ATTRIBUTESTEXT5, 10, 25, 70, 10 + LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT6, 82, 5, 86, 10 + LTEXT "Ez dago erabilgarri", IDD_ATTRIBUTESTEXT7, 82, 15, 86, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 82, 25, 86, 10 /* This unit must match IDS_PRINTRES */ + GROUPBOX "Unitateak", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 + AUTORADIOBUTTON "&Hazbetea", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 60, 69, 45, 10 + AUTORADIOBUTTON "&Pixela", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + GROUPBOX "Koloreak", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 + AUTORADIOBUTTON "&Zuri-beltzean", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Koloretean", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "Ados", IDOK, 170, 8, 48, 14 PUSHBUTTON "Utzi", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Lehenetsia", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Lehenetsia", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 9603956a2f1..38f365838e5 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -163,26 +163,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attributs" BEGIN - LTEXT "Largeur :", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Largeur :", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Hauteur :", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Hauteur :", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Dernier enregistrement du fichier :", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Taille sur le disque :", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Résolution :", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Non disponible", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Non disponible", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Date de modification :", IDD_ATTRIBUTESTEXT3, 10, 5, 70, 10 + LTEXT "Taille sur le disque :", IDD_ATTRIBUTESTEXT4, 10, 15, 70, 10 + LTEXT "Résolution :", IDD_ATTRIBUTESTEXT5, 10, 25, 70, 10 + LTEXT "Non disponible", IDD_ATTRIBUTESTEXT6, 82, 5, 86, 10 + LTEXT "Non disponible", IDD_ATTRIBUTESTEXT7, 82, 15, 86, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 82, 25, 86, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Unités", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Pouces", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "Cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "P&ouces", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "C&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Couleurs", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Noir et blanc", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Couleurs", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Noir et blanc", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Couleurs", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Annuler", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Par défaut", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Par &défaut", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index d1471dde612..eec4f332e19 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -164,9 +164,9 @@ EXSTYLE WS_EX_LAYOUTRTL FONT 8, "MS Shell Dlg" CAPTION "תכונות" BEGIN - LTEXT "רוחב:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "רוחב:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "גובה:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "גובה:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "תאריך קובץ:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "גודל קובץ:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -180,7 +180,7 @@ BEGIN AUTORADIOBUTTON "פיקסלים", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "צבעים", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "שחור ולבן", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "צבעוני", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "צבעוני", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "אישור", IDOK, 170, 8, 48, 14 PUSHBUTTON "ביטול", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "ברירת מחדל", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 025a0144f79..195907b30dd 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -158,14 +158,14 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 125, 24, 48, 14 END -IDD_ATTRIBUTES DIALOGEX 100, 100, 245, 120 +IDD_ATTRIBUTES DIALOGEX 100, 100, 243, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attribútumok" BEGIN - LTEXT "Szélesség:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Szélesség:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Magasság:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Magasság:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Fájl dátuma:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Fájlméret:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -174,15 +174,15 @@ BEGIN LTEXT "Nem elérhető", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Egység", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Hüvelyk", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "&Hüvelyk", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Színek", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Fekete-fehér", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Színes", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 - DEFPUSHBUTTON "OK", IDOK, 170, 8, 68, 14 - PUSHBUTTON "Mégse", IDCANCEL, 170, 24, 68, 14 - PUSHBUTTON "Alapértelmezett", IDD_ATTRIBUTESSTANDARD, 170, 40, 68, 14 + AUTORADIOBUTTON "&Fekete-fehér", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "S&zínes", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 + DEFPUSHBUTTON "OK", IDOK, 170, 8, 66, 14 + PUSHBUTTON "Mégse", IDCANCEL, 170, 24, 66, 14 + PUSHBUTTON "&Alapértelmezett", IDD_ATTRIBUTESSTANDARD, 170, 40, 66, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 6f00d16791a..888c1557ed9 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -162,26 +162,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atribut" BEGIN - LTEXT "&Lebar:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Lebar:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Tinggi:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Tinggi:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "T&anggal berkas:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "&Ukuran berkas:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "&Resolusi:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Tidak tersedia", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Tidak tersedia", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Tanggal berkas:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Ukuran berkas:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Resolusi:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "Tidak tersedia", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "Tidak tersedia", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Satuan", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 AUTORADIOBUTTON "&Inci", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 AUTORADIOBUTTON "&Piksel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Warna", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Hitam Putih", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "&Berwarna", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Berwarna", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Batal", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Asli", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Asli", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index c3157a419cb..9470b433909 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -163,26 +163,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attributi" BEGIN - LTEXT "Larghezza:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Larghezza:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Altezza:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Altezza:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Ultimo salvataggio:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Dimensioni su disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Risoluzione:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Non disponibile", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Non disponibile", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Ultimo salvataggio:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Dimensioni su disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Risoluzione:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "Non disponibile", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "Non disponibile", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Unità di misura", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Pollici", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "Cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "P&ollici", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "C&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Colori", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Bianco e nero", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Colori", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Bianco e nero", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Colori", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Annulla", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Predefiniti", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Pre&definiti", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index 78725c05798..17e48fbfe11 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -164,13 +164,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "MS UI Gothic" CAPTION "画像の属性" BEGIN - LTEXT "幅(&W):", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "幅(&W):", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "高さ(&H):", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "高さ(&H):", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "ファイルの日付(&D):", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "ファイルのサイズ(&S):", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "解像度(&R):", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "ファイルの日付:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "ファイルのサイズ:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "解像度:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "利用不可", IDD_ATTRIBUTESTEXT6, 75, 5, 90, 10 LTEXT "利用不可", IDD_ATTRIBUTESTEXT7, 75, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 75, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -180,10 +180,10 @@ BEGIN AUTORADIOBUTTON "ピクセル(&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "色", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "白黒(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "カラー(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "カラー(&L)", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "キャンセル", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "デフォルト", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "デフォルト(&D)", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index 986ffef3742..2d348a9ab8d 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -162,26 +162,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Kenmerken" BEGIN - LTEXT "Breedte:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Breedte:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Hoogte:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Hoogte:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Datum laatst gewijzigd:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Bestandsgrootte:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Resolutie:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Datum van wijziging:", IDD_ATTRIBUTESTEXT3, 10, 5, 70, 10 + LTEXT "Bestandsgrootte:", IDD_ATTRIBUTESTEXT4, 10, 15, 70, 10 + LTEXT "Resolutie:", IDD_ATTRIBUTESTEXT5, 10, 25, 70, 10 + LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT6, 82, 5, 86, 10 + LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT7, 82, 15, 86, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 82, 25, 86, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Eenheden", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Inch", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "&Inch", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Kleuren", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Zwart-wit", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Kleuren", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Zwart-wit", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Kleuren", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Annuleren", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Standaard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Standaard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index 94a19c3a5ac..e400c5bc2bb 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -162,9 +162,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attributter" BEGIN - LTEXT "Bredde:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Bredde:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Høyde:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Høyde:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Fildato:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Filstørrelse:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -173,15 +173,15 @@ BEGIN LTEXT "Ikke tilgjengelig", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Enheter", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "Tommer", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "Centimeter", IDD_ATTRIBUTESRB2, 52, 69, 55, 10 - AUTORADIOBUTTON "Piksler", IDD_ATTRIBUTESRB3, 106, 69, 35, 10 + AUTORADIOBUTTON "&Tommer", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "Centi&meter", IDD_ATTRIBUTESRB2, 52, 69, 55, 10 + AUTORADIOBUTTON "&Piksler", IDD_ATTRIBUTESRB3, 106, 69, 35, 10 GROUPBOX "Farger", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Svart og hvit", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Farger", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "S&vart og hvit", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Farger", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Avbryt", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Standard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 5df781bee4a..4ed134606fc 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -164,9 +164,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atrybuty" BEGIN - LTEXT "&Szerokość:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Szerokość:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Wysokość:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Wysokość:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Data:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Rozmiar:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -180,7 +180,7 @@ BEGIN AUTORADIOBUTTON "&Piksele", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Kolory", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "Czarno-&biały", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "K&olory", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "K&olory", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Anuluj", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "&Domyślne", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index b5f2ed03dc4..c3fc84f47a8 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -163,23 +163,23 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atributos" BEGIN - LTEXT "&Largura:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Largura:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Altura:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Altura:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Data do arquivo:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Tamanho do arquivo:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Resolução:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Data do arquivo:", IDD_ATTRIBUTESTEXT3, 10, 5, 70, 10 + LTEXT "Tamanho do arquivo:", IDD_ATTRIBUTESTEXT4, 10, 15, 70, 10 + LTEXT "Resolução:", IDD_ATTRIBUTESTEXT5, 10, 25, 70, 10 + LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 82, 5, 86, 10 + LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 82, 15, 86, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 82, 25, 86, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Unidades", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 AUTORADIOBUTTON "P&olegadas", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 AUTORADIOBUTTON "Pi&xels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Cores", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "Preto e &branco", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Co&res", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "Co&res", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "&Padrão", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 66582d2fd60..f1378126d93 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -163,9 +163,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atributos" BEGIN - LTEXT "&Largura:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Largura:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Altura:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Altura:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Data do ficheiro:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Tamanho no disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -179,7 +179,7 @@ BEGIN AUTORADIOBUTTON "Pi&xels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Cores", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "Preto e &branco", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Co&res", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "Co&res", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Cancelar", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "&Predefinição", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 38bec55e4a8..2a3775ca390 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -164,9 +164,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atribute" BEGIN - LTEXT "Lățime:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Lățime:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Înălțime:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "Î&nălțime:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Dată fișier:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Dimensiune:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -175,14 +175,14 @@ BEGIN LTEXT "Indisponibil", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Unități", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "țoli", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "pixeli", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "ț&oli", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&pixeli", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Culori", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Alb-negru", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Culoare", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 - DEFPUSHBUTTON "Con&firmă", IDOK, 170, 8, 48, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 170, 24, 48, 14 + AUTORADIOBUTTON "&Alb-negru", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "C&uloare", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 + DEFPUSHBUTTON "Confirmă", IDOK, 170, 8, 48, 14 + PUSHBUTTON "Anulează", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "Impli&cite", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 2fd79828213..843034d492b 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -161,31 +161,31 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 125, 24, 48, 14 END -IDD_ATTRIBUTES DIALOGEX 100, 100, 225, 120 +IDD_ATTRIBUTES DIALOGEX 100, 100, 234, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Атрибуты" BEGIN - LTEXT "Ширина:", IDD_ATTRIBUTESTEXT1, 10, 42, 30, 10 + LTEXT "&Ширина:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Высота:", IDD_ATTRIBUTESTEXT2, 80, 42, 30, 10 + LTEXT "&Высота:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Дата сохранения:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Размер на диске:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Разрешение:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "недоступно", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "недоступно", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Дата сохранения:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Размер на диске:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Разрешение:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "недоступно", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "недоступно", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Единицы измерения", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 AUTORADIOBUTTON "д&юймы", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP AUTORADIOBUTTON "с&м", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 AUTORADIOBUTTON "т&очки", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Палитра", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&чёрно-белая", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "цв&етная", IDD_ATTRIBUTESRB5, 92, 100, 45, 10 - DEFPUSHBUTTON "OK", IDOK, 150, 8, 57, 14 - PUSHBUTTON "Отмена", IDCANCEL, 150, 24, 57, 14 - PUSHBUTTON "По умо&лчанию", IDD_ATTRIBUTESSTANDARD, 150, 40, 57, 14 + AUTORADIOBUTTON "цв&етная", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 + DEFPUSHBUTTON "OK", IDOK, 170, 8, 57, 14 + PUSHBUTTON "Отмена", IDCANCEL, 170, 24, 57, 14 + PUSHBUTTON "По умо&лчанию", IDD_ATTRIBUTESSTANDARD, 170, 40, 57, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index dd2de3bafc7..b85e192dd3d 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -162,23 +162,23 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atribúty" BEGIN - LTEXT "Šírka:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "Ší&rka:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Výška:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Výška:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Dátum zmeny:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 //File date - LTEXT "Veľkosť súboru:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 //File size - LTEXT "Rozlíšenie:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Nie je k dispozícii", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Nie je k dispozícii", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Dátum zmeny:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Veľkosť súboru:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Rozlíšenie:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "Nie je k dispozícii", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "Nie je k dispozícii", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Jednotky", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "palce", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "pixely", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "p&alce", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&pixely", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Farby", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "Čierno&bielo", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "&Farebne", IDD_ATTRIBUTESRB5, 92, 100, 45, 10 + AUTORADIOBUTTON "&Farebne", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Zrušiť", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "&Predvolené", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index eb7c38ce763..1488e35ede6 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -162,13 +162,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Atributet" BEGIN - LTEXT "Gjerësi:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Gjerësi:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Lartësi:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Lartësi:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "File &data:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "File &mase:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "&Resolucioni:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "File data:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "File mase:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Resolucioni:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "Jo në dispozicion", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "Jo në dispozicion", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -178,10 +178,10 @@ BEGIN AUTORADIOBUTTON "&Pixels", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Ngjyrat", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Bardh e Zi", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Ngjyrat", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Ngjyrat", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Anulo", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Parazgjedhur", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Parazgjedhur", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 252debedee9..cf9ab447e42 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -163,9 +163,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Attribut" BEGIN - LTEXT "Bredd:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Bredd:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Höjd:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Höjd:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Fildatum:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Filstorlek:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -174,15 +174,15 @@ BEGIN LTEXT "Ej tillgänglig", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Enheter", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "tum", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "Pixlar", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "&tum", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Pixlar", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Färger", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "Svart och vitt", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Färger", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Svart och vitt", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&Färger", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Avbryt", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Stan&dard", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 296383fc1af..3113476be88 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -163,9 +163,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Öznitelikler" BEGIN - LTEXT "&En:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&En:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Boy:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Boy:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Dosya Tarihi:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Dosya Boyutu:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -179,10 +179,10 @@ BEGIN AUTORADIOBUTTON "&Piksel", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Renk", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Siyah ve Beyaz", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "&Renkli", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "&Renkli", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "Tamam", IDOK, 170, 8, 48, 14 PUSHBUTTON "İptal", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Varsayılan", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Varsayılan", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 764bb50a8e8..2858cfb2432 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -164,9 +164,9 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Атрибути" BEGIN - LTEXT "Ширина:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "&Ширина:", IDD_ATTRIBUTESTEXT1, 10, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "Висота:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Висота:", IDD_ATTRIBUTESTEXT2, 90, 42, 35, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 LTEXT "Дата файлу:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Розмір файлу:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 @@ -175,15 +175,15 @@ BEGIN LTEXT "Недоступно", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Одиниці вимірювання", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "дюйми", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "см", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "пікселі", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "д&юйми", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "с&м", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&пікселі", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Кольори", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "чорно-білий", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "кольори", IDD_ATTRIBUTESRB5, 92, 100, 39, 10 + AUTORADIOBUTTON "&чорно-білий", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "&кольори", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "OK", IDOK, 170, 8, 48, 14 PUSHBUTTON "Скасувати", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Стандартно", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "&Стандартно", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index b041e5faae2..3e1e85f1102 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -162,26 +162,26 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Thuộc tính" BEGIN - LTEXT "&Chiều rộng:", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 - EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "&Chiều cao:", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "&Chiều rộng:", IDD_ATTRIBUTESTEXT1, 10, 42, 38, 10 + EDITTEXT IDD_ATTRIBUTESEDIT1, 50, 40, 35, 12 + LTEXT "C&hiều cao:", IDD_ATTRIBUTESTEXT2, 90, 42, 38, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "Ngày tạo &tập tin:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Kích thước &tập tin :", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "&Độ phân giải:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "Ngày tạo tập tin:", IDD_ATTRIBUTESTEXT3, 10, 5, 64, 10 + LTEXT "Kích thước tập tin:", IDD_ATTRIBUTESTEXT4, 10, 15, 64, 10 + LTEXT "Độ phân giải:", IDD_ATTRIBUTESTEXT5, 10, 25, 64, 10 + LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT6, 77, 5, 90, 10 + LTEXT "Không có sẵn", IDD_ATTRIBUTESTEXT7, 77, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 77, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Đơn vị", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "&Inch (1 inch = 2,54 cm)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "&Inch (= 2,54 cm)", IDD_ATTRIBUTESRB1, 12, 69, 66, 10, WS_GROUP + AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 82, 69, 25, 10 AUTORADIOBUTTON "&Điểm ảnh", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "Màu sắc", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "&Đen trắng", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "Màu &sắc", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "Màu &sắc", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "Đồng ý", IDOK, 170, 8, 48, 14 PUSHBUTTON "Hủy", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "Mặc định", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "Mặc đị&nh", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150 diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 9251a1e6bb4..307a0cda341 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -165,13 +165,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "宋体" CAPTION "属性" BEGIN - LTEXT "宽度(&W)：", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "宽度(&W)：", IDD_ATTRIBUTESTEXT1, 10, 42, 37, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "高度(&H)：", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "高度(&H)：", IDD_ATTRIBUTESTEXT2, 90, 42, 37, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "文件日期(&D)：", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "文件大小(&S)：", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "分辨率(&R)：", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "文件日期：", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "文件大小：", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "分辨率：", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "不可用", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "不可用", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -181,10 +181,10 @@ BEGIN AUTORADIOBUTTON "像素(&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "颜色", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "黑白(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "彩色(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "彩色(&L)", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "确定", IDOK, 170, 8, 48, 14 PUSHBUTTON "取消", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "默认值", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "默认值(&D)", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index 7a3cfc086d4..ea6ca319c38 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -163,13 +163,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "新細明體" CAPTION "內容" BEGIN - LTEXT "寬度(&W)：", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 + LTEXT "寬度(&W)：", IDD_ATTRIBUTESTEXT1, 10, 42, 37, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "高度(&H)：", IDD_ATTRIBUTESTEXT2, 90, 40, 30, 10 + LTEXT "高度(&H)：", IDD_ATTRIBUTESTEXT2, 90, 42, 37, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "檔案日期(&D)：", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "檔案大小(&S)：", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "解析度(&R)：", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "檔案日期：", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "檔案大小：", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "解析度：", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "不可用", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "不可用", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -179,10 +179,10 @@ BEGIN AUTORADIOBUTTON "像素(&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "顏色", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "黑白(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "彩色(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "彩色(&L)", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "確定", IDOK, 170, 8, 48, 14 PUSHBUTTON "取消", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "預設值", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "預設值(&D)", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index 12917131d2c..4b90a8185ea 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -163,13 +163,13 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 9, "新細明體" CAPTION "內容" BEGIN - LTEXT "寬度(&W)：", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 + LTEXT "寬度(&W)：", IDD_ATTRIBUTESTEXT1, 10, 42, 37, 10 EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 - LTEXT "高度(&H)：", IDD_ATTRIBUTESTEXT2, 90, 40, 30, 10 + LTEXT "高度(&H)：", IDD_ATTRIBUTESTEXT2, 90, 42, 37, 10 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "檔案日期(&D)：", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "檔案大小(&S)：", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "解析度(&R)：", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "檔案日期：", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "檔案大小：", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "解析度：", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "不可用", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "不可用", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ @@ -179,10 +179,10 @@ BEGIN AUTORADIOBUTTON "畫素(&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "顏色", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 AUTORADIOBUTTON "黑白(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "彩色(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "彩色(&L)", IDD_ATTRIBUTESRB5, 92, 100, 42, 10 DEFPUSHBUTTON "確定", IDOK, 170, 8, 48, 14 PUSHBUTTON "取消", IDCANCEL, 170, 24, 48, 14 - PUSHBUTTON "預設值", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 + PUSHBUTTON "預設值(&D)", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 END IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80

1 0

[reactos] 01/04: [MSPAINT] Update copyright headers
by Stanislav Motylkov 23 Jun '23

23 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f1f1c7a5a6f8466967a9… commit 8f1f1c7a5a6f8466967a9721294e231a6f2a1c03 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Jun 23 14:04:32 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Jun 23 20:49:28 2023 +0300 [MSPAINT] Update copyright headers Use LGPL-2.0-or-later as the first available LGPL version on SPDX taking into account 530512f17ec67a42e7971e3d2a9c7a00e35c32d0 commit message. CORE-18867 --- base/applications/mspaint/atlimagedx.h | 2 +- base/applications/mspaint/canvas.cpp | 9 ++++----- base/applications/mspaint/canvas.h | 9 ++++----- base/applications/mspaint/common.h | 13 ++++++------- base/applications/mspaint/dialogs.cpp | 9 ++++----- base/applications/mspaint/dialogs.h | 9 ++++----- base/applications/mspaint/dib.cpp | 9 ++++----- base/applications/mspaint/dib.h | 9 ++++----- base/applications/mspaint/drawing.cpp | 9 ++++----- base/applications/mspaint/drawing.h | 9 ++++----- base/applications/mspaint/fullscreen.cpp | 9 ++++----- base/applications/mspaint/fullscreen.h | 9 ++++----- base/applications/mspaint/globalvar.h | 9 ++++----- base/applications/mspaint/history.cpp | 11 +++++------ base/applications/mspaint/history.h | 9 ++++----- base/applications/mspaint/lang/bg-BG.rc | 10 +++++----- base/applications/mspaint/lang/cs-CZ.rc | 10 +++++----- base/applications/mspaint/lang/de-DE.rc | 9 ++++----- base/applications/mspaint/lang/en-GB.rc | 9 ++++----- base/applications/mspaint/lang/en-US.rc | 8 ++++---- base/applications/mspaint/lang/es-ES.rc | 12 ++++++------ base/applications/mspaint/lang/et-EE.rc | 7 +++---- base/applications/mspaint/lang/eu-ES.rc | 8 ++++++++ base/applications/mspaint/lang/fr-FR.rc | 8 ++++++++ base/applications/mspaint/lang/he-IL.rc | 7 +++++++ base/applications/mspaint/lang/hu-HU.rc | 8 ++++++++ base/applications/mspaint/lang/id-ID.rc | 7 +++---- base/applications/mspaint/lang/it-IT.rc | 10 +++++----- base/applications/mspaint/lang/ja-JP.rc | 9 +++++---- base/applications/mspaint/lang/nl-NL.rc | 9 ++++----- base/applications/mspaint/lang/no-NO.rc | 7 +++---- base/applications/mspaint/lang/pl-PL.rc | 12 ++++++------ base/applications/mspaint/lang/pt-BR.rc | 10 +++++----- base/applications/mspaint/lang/pt-PT.rc | 10 +++++----- base/applications/mspaint/lang/ro-RO.rc | 2 +- base/applications/mspaint/lang/ru-RU.rc | 11 +++++++++++ base/applications/mspaint/lang/sk-SK.rc | 8 +++----- base/applications/mspaint/lang/sq-AL.rc | 7 +++---- base/applications/mspaint/lang/sv-SE.rc | 8 ++++++++ base/applications/mspaint/lang/tr-TR.rc | 10 +++++----- base/applications/mspaint/lang/uk-UA.rc | 9 +++++---- base/applications/mspaint/lang/vi-VN.rc | 7 +++---- base/applications/mspaint/lang/zh-CN.rc | 2 +- base/applications/mspaint/lang/zh-HK.rc | 2 +- base/applications/mspaint/lang/zh-TW.rc | 2 +- base/applications/mspaint/main.cpp | 9 ++++----- base/applications/mspaint/miniature.cpp | 13 ++++++------- base/applications/mspaint/miniature.h | 11 +++++------ base/applications/mspaint/mouse.cpp | 11 +++++------ base/applications/mspaint/palette.cpp | 11 +++++------ base/applications/mspaint/palette.h | 9 ++++----- base/applications/mspaint/palettemodel.cpp | 11 +++++------ base/applications/mspaint/palettemodel.h | 9 ++++----- base/applications/mspaint/registry.cpp | 11 +++++------ base/applications/mspaint/registry.h | 9 ++++----- base/applications/mspaint/resource.h | 9 ++++----- base/applications/mspaint/rsrc.rc | 9 ++++----- base/applications/mspaint/selectionmodel.cpp | 11 +++++------ base/applications/mspaint/selectionmodel.h | 11 +++++------ base/applications/mspaint/sizebox.cpp | 11 +++++------ base/applications/mspaint/sizebox.h | 11 +++++------ base/applications/mspaint/textedit.cpp | 9 ++++----- base/applications/mspaint/textedit.h | 9 ++++----- base/applications/mspaint/toolbox.cpp | 11 +++++------ base/applications/mspaint/toolbox.h | 11 +++++------ base/applications/mspaint/toolsettings.cpp | 13 ++++++------- base/applications/mspaint/toolsettings.h | 9 ++++----- base/applications/mspaint/toolsmodel.cpp | 9 ++++----- base/applications/mspaint/toolsmodel.h | 9 ++++----- base/applications/mspaint/winproc.cpp | 15 +++++++-------- base/applications/mspaint/winproc.h | 11 +++++------ 71 files changed, 323 insertions(+), 321 deletions(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 98ecb8612c7..0d56b187029 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -1,6 +1,6 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Loading/Saving an image file with getting/setting resolution * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 85b53df3273..2645694ec71 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/canvas.cpp - * PURPOSE: Providing the canvas window class - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Providing the canvas window class + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 40c07689acd..b8fda073477 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/canvas.h - * PURPOSE: Providing the canvas window class - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Providing the canvas window class + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 0c99517c599..15ebeff2d13 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -1,11 +1,10 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/common.h - * PURPOSE: Commonly used functions and definitions - * PROGRAMMERS: Benedikt Freisen - * Stanislav Motylkov - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Commonly used functions and definitions + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2018 Stanislav Motylkov <x86corez(a)gmail.com> + * Copyright 2021-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index b08e33974c7..c5288d60660 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/dialogs.cpp - * PURPOSE: Window procedures of the dialog windows plus launching functions - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedures of the dialog windows plus launching functions + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ /* INCLUDES *********************************************************/ diff --git a/base/applications/mspaint/dialogs.h b/base/applications/mspaint/dialogs.h index 0df4f48e409..65c01fec25c 100644 --- a/base/applications/mspaint/dialogs.h +++ b/base/applications/mspaint/dialogs.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/dialogs.h - * PURPOSE: Window procedures of the dialog windows plus launching functions - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedures of the dialog windows plus launching functions + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index e2886e80a79..6c2f3d36181 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/dib.cpp - * PURPOSE: Some DIB related functions - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Some DIB related functions + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index 0aa6fa41796..f273416528f 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/dib.h - * PURPOSE: Some DIB related functions - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Some DIB related functions + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 5b3d1a24f62..c470193fa29 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/drawing.cpp - * PURPOSE: The drawing functions used by the tools - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: The drawing functions used by the tools + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ /* INCLUDES *********************************************************/ diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 11c0bcd6516..3c5c3a35762 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/drawing.h - * PURPOSE: The drawing functions used by the tools - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: The drawing functions used by the tools + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index 5baadac6f02..7b349192d79 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/fullscreen.cpp - * PURPOSE: Window for fullscreen view - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window for fullscreen view + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/fullscreen.h b/base/applications/mspaint/fullscreen.h index 5afe843700e..6ba67237a1d 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/fullscreen.h - * PURPOSE: Window for fullscreen view - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window for fullscreen view + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index b38c82e665a..ddf29beb620 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/globalvar.h - * PURPOSE: Declaring global variables for later initialization - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Declaring global variables for later initialization + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 91cc1736614..3772cf0d13e 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/history.cpp - * PURPOSE: Undo and redo functionality - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Undo and redo functionality + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 321680236c7..4abcee1ff79 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/history.h - * PURPOSE: Undo and redo functionality - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Undo and redo functionality + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/lang/bg-BG.rc b/base/applications/mspaint/lang/bg-BG.rc index 8f829673e75..283268f5f52 100644 --- a/base/applications/mspaint/lang/bg-BG.rc +++ b/base/applications/mspaint/lang/bg-BG.rc @@ -1,9 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * Превод на Български/ Bulgarian translation - * https://reactos.org/wiki/Bulgarian_translation - * LOCATION: base/applications/mspaint/lang + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Bulgarian resource file + * TRANSLATORS: Copyright 2009-2012 S. Stanev (CCTAHEB) <sstpr(a)narod.ru> + * Copyright 2022 Nikolay Dimitrov <delphipro(a)gmail.com> */ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/cs-CZ.rc b/base/applications/mspaint/lang/cs-CZ.rc index 82cfb95c87a..e148a49bb3f 100644 --- a/base/applications/mspaint/lang/cs-CZ.rc +++ b/base/applications/mspaint/lang/cs-CZ.rc @@ -1,9 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/cs-CZ.rc - * PURPOSE: Czech Language resource file - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Czech resource file + * TRANSLATORS: Copyright 2009-2010 Radek Liška aka Black_Fox <radekliska(a)gmail.com> + * Copyright 2011 Kamil Hornicek <kamil.hornicek(a)reactos.org> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/de-DE.rc b/base/applications/mspaint/lang/de-DE.rc index 4ac9271762b..5b841d75b40 100644 --- a/base/applications/mspaint/lang/de-DE.rc +++ b/base/applications/mspaint/lang/de-DE.rc @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/de-DE.rc - * PURPOSE: German Language resource file (reference language file) - * TRANSLATOR: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: German resource file + * TRANSLATOR: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index f60d1580bfb..b745e5f5404 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/en-GB.rc - * PURPOSE: British English Language resource file - * TRANSLATOR: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: English (United Kingdom) resource file + * TRANSLATOR: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK diff --git a/base/applications/mspaint/lang/en-US.rc b/base/applications/mspaint/lang/en-US.rc index 2db7b63f035..ffefc4a5f43 100644 --- a/base/applications/mspaint/lang/en-US.rc +++ b/base/applications/mspaint/lang/en-US.rc @@ -1,9 +1,9 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/en-US.rc - * PURPOSE: US-English Language resource file - * TRANSLATORS: first times touched from en-GB.rc file by Mario Kacmar + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATORS: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2009 Mário Kačmár aka Kario <kario(a)szm.sk> */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US diff --git a/base/applications/mspaint/lang/es-ES.rc b/base/applications/mspaint/lang/es-ES.rc index 85fc44b03b9..741e38e135d 100644 --- a/base/applications/mspaint/lang/es-ES.rc +++ b/base/applications/mspaint/lang/es-ES.rc @@ -1,11 +1,11 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/es-ES.rc - * PURPOSE: Spanish Language resource file - * TRANSLATORS: Gabriel Ilardi - * Ismael Ferreras Morezuelas - * Catalin Gabriel Draghita + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Spanish (Spain) resource file + * TRANSLATORS: Copyright 2009 Gabriel Ilardi <gabrielilardi(a)hotmail.it> + * Copyright 2009 Javier Remacha <remialdo(a)gmail.com> + * Copyright 2014-2016 Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Copyright 2020 Catalin Gabriel Draghita <catalingabriel.reactos(a)outlook.com> */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/applications/mspaint/lang/et-EE.rc b/base/applications/mspaint/lang/et-EE.rc index 2f49611d46a..0355917e163 100644 --- a/base/applications/mspaint/lang/et-EE.rc +++ b/base/applications/mspaint/lang/et-EE.rc @@ -1,9 +1,8 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/mspaint/lang/et-EE.rc - * PURPOSE: Estonian Language resource file - * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Estonian resource file + * TRANSLATOR: Copyright 2018 Joann Mõndresku <joannmondresku(a)gmail.com> */ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/eu-ES.rc b/base/applications/mspaint/lang/eu-ES.rc index 782c29f274f..4b0a412c008 100644 --- a/base/applications/mspaint/lang/eu-ES.rc +++ b/base/applications/mspaint/lang/eu-ES.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Spanish (Basque) resource file + * TRANSLATORS: Copyright 2009 Javier Remacha <remialdo(a)gmail.com> + * Copyright 2020 Julen Urizar Compains <julenuri(a)hotmail.com> + */ + LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT //IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-eu-ES.bmp" diff --git a/base/applications/mspaint/lang/fr-FR.rc b/base/applications/mspaint/lang/fr-FR.rc index 9067efb323c..9603956a2f1 100644 --- a/base/applications/mspaint/lang/fr-FR.rc +++ b/base/applications/mspaint/lang/fr-FR.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: French resource file + * TRANSLATORS: Copyright 2010-2014 Pierre Schweitzer <pierre(a)reactos.org> + * Copyright 2020 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + LANGUAGE LANG_FRENCH, SUBLANG_FRENCH //IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-fr-FR.bmp" diff --git a/base/applications/mspaint/lang/he-IL.rc b/base/applications/mspaint/lang/he-IL.rc index 1ef77c72fe9..d1471dde612 100644 --- a/base/applications/mspaint/lang/he-IL.rc +++ b/base/applications/mspaint/lang/he-IL.rc @@ -1,3 +1,10 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Hebrew resource file + * TRANSLATOR: Copyright 2013-2018 Baruch Rutman <peterooch(a)gmail.com> + */ + LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT //IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-he-IL.bmp" diff --git a/base/applications/mspaint/lang/hu-HU.rc b/base/applications/mspaint/lang/hu-HU.rc index 913b4aa4c08..025a0144f79 100644 --- a/base/applications/mspaint/lang/hu-HU.rc +++ b/base/applications/mspaint/lang/hu-HU.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Hungarian resource file + * TRANSLATORS: Copyright 2009 Gábor Balogh (xxxx00) <xxxx_0000(a)freemail.hu> + * Copyright 2020 Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> + */ + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT //IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-hu-HU.bmp" diff --git a/base/applications/mspaint/lang/id-ID.rc b/base/applications/mspaint/lang/id-ID.rc index 134bd6cc6a1..6f00d16791a 100644 --- a/base/applications/mspaint/lang/id-ID.rc +++ b/base/applications/mspaint/lang/id-ID.rc @@ -1,9 +1,8 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/id-ID.rc - * PURPOSE: Indonesian Language resource file - * TRANSLATORS: Mas Ahmad Muhammad + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Indonesian resource file + * TRANSLATOR: Copyright 2019 Mas Ahmad Muhammad <m.charly81(a)gmail.com> */ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/it-IT.rc b/base/applications/mspaint/lang/it-IT.rc index 72978cacb4e..c3157a419cb 100644 --- a/base/applications/mspaint/lang/it-IT.rc +++ b/base/applications/mspaint/lang/it-IT.rc @@ -1,9 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/it-IT.rc - * PURPOSE: Italian Language resource file - * TRANSLATOR: Gabriel Ilardi + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Italian resource file + * TRANSLATORS: Copyright 2009 Gabriel Ilardi <gabrielilardi(a)hotmail.it> + * Copyright 2009-2010 Paolo Devoti <devotip(a)tiscali.it> */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/base/applications/mspaint/lang/ja-JP.rc b/base/applications/mspaint/lang/ja-JP.rc index f3d77b11507..78725c05798 100644 --- a/base/applications/mspaint/lang/ja-JP.rc +++ b/base/applications/mspaint/lang/ja-JP.rc @@ -1,9 +1,10 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/ja-JP.rc - * PURPOSE: Japanese Language resource file - * TRANSLATORS: pcds90net, Tomoya Kitagawa, Katayama Hirofumi MZ + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Japanese resource file + * TRANSLATORS: Copyright 2009 pcds90net <ds200xnet-ros(a)yahoo.co.jp> + * Copyright 2009-2010 Tomoya Kitagawa <jptomoya(a)yahoo.co.jp> + * Copyright 2020-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/nl-NL.rc b/base/applications/mspaint/lang/nl-NL.rc index aabc54497c9..986ffef3742 100644 --- a/base/applications/mspaint/lang/nl-NL.rc +++ b/base/applications/mspaint/lang/nl-NL.rc @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/nl-NL.rc - * PURPOSE: Dutch Language resource file - * TRANSLATOR: Wouter De Vlieger + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Dutch resource file + * TRANSLATOR: Copyright 2009 Wouter De Vlieger (reFly) <wouterdevlieger(a)gmail.com> */ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/base/applications/mspaint/lang/no-NO.rc b/base/applications/mspaint/lang/no-NO.rc index c8e12864b8f..94a19c3a5ac 100644 --- a/base/applications/mspaint/lang/no-NO.rc +++ b/base/applications/mspaint/lang/no-NO.rc @@ -1,9 +1,8 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: unknown (LGPL assumed) - * FILE: base/applications/mspaint/lang/no-NO.rc - * PURPOSE: NO-Norwegian Language resource file - * TRANSLATORS: first times touched from no-NO.rc file by Lars Martin Hambro + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Norwegian resource file + * TRANSLATOR: Copyright 2009 Lars Martin Hambro (LMH1) <lars_martin4(a)hotmail.com> */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL diff --git a/base/applications/mspaint/lang/pl-PL.rc b/base/applications/mspaint/lang/pl-PL.rc index 34213677b47..5df781bee4a 100644 --- a/base/applications/mspaint/lang/pl-PL.rc +++ b/base/applications/mspaint/lang/pl-PL.rc @@ -1,10 +1,10 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/pl-PL.rc - * PURPOSE: Polish Language resource file - * TRANSLATOR: Caemyr - Olaf Siejka (May, 2009), Use ReactOS forum PM or IRC to contact me - * UTF-8 conversion by Caemyr (May, 2011) + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Polish resource file + * TRANSLATORS: Copyright 2009 Olaf Siejka <caemyr(a)gmail.com> + * Copyright 2015 Adam Stachowicz <saibamenppl(a)gmail.com> + * Copyright 2017 Adam Słaboń <asaillen456esx(a)gmail.com> */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/pt-BR.rc b/base/applications/mspaint/lang/pt-BR.rc index b6e462d741e..b5f2ed03dc4 100644 --- a/base/applications/mspaint/lang/pt-BR.rc +++ b/base/applications/mspaint/lang/pt-BR.rc @@ -1,9 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/pt-BR.rc - * PURPOSE: Portuguese Brazilian Language resource file - * TRANSLATOR: Wagner Leandro Bueno Angelo + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Portuguese (Brazilian) resource file + * TRANSLATORS: Copyright 2009 Wagner Leandro Bueno Angelo <wagner.snake(a)gmail.com> + * Copyright 2011 Matheus Macabu <mkbu95(a)gmail.com> */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index 9921db6a996..66582d2fd60 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -1,9 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/pt-PT.rc - * PURPOSE: Portuguese Language resource file - * TRANSLATOR: Manuel D V Silva + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Portuguese (Portugal) resource file + * TRANSLATORS: Copyright 2009 Manuel D V Silva (mds) <manueldulcidio(a)gmail.com> + * Copyright 2023 Jose Carlos Jesus <zecarlos1957(a)hotmail.com> */ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 42c9e2a4169..38bec55e4a8 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -1,6 +1,6 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> diff --git a/base/applications/mspaint/lang/ru-RU.rc b/base/applications/mspaint/lang/ru-RU.rc index 940044ff0a2..2fd79828213 100644 --- a/base/applications/mspaint/lang/ru-RU.rc +++ b/base/applications/mspaint/lang/ru-RU.rc @@ -1,3 +1,14 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2009 Dmitry Chapyshev <dmitry(a)reactos.org> + * Copyright 2013 Yaroslav Denisov (jperm) <jaroslaff111(a)mail.ru> + * Copyright 2013 Alexey Gorgurov <leha-bot(a)ya.ru> + * Copyright 2016 Alexey Shaltsin (BinaryTree) <lexa2011_98(a)mail.ru> + * Copyright 2016 Sergey Stopkin <stopkin.sergey(a)gmail.com> + */ + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT //IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-ru-RU.bmp" diff --git a/base/applications/mspaint/lang/sk-SK.rc b/base/applications/mspaint/lang/sk-SK.rc index 58ac2345492..dd2de3bafc7 100644 --- a/base/applications/mspaint/lang/sk-SK.rc +++ b/base/applications/mspaint/lang/sk-SK.rc @@ -1,10 +1,8 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/sk-SK.rc - * PURPOSE: Slovak Language resource file - * TRANSLATORS: Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * LastChanged: 21-10-2009 + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Slovak resource file + * TRANSLATOR: Copyright 2009 Mário Kačmár aka Kario <kario(a)szm.sk> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/sq-AL.rc b/base/applications/mspaint/lang/sq-AL.rc index ad639839f2c..eb7c38ce763 100644 --- a/base/applications/mspaint/lang/sq-AL.rc +++ b/base/applications/mspaint/lang/sq-AL.rc @@ -1,9 +1,8 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/sq-AL.rc - * PURPOSE: AL-Albanian Language resource file - * TRANSLATORS: Ardit Dani + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Albanian resource file + * TRANSLATOR: Copyright 2013 Ardit Dani (ard1t) <ardit.dani(a)gmail.com> */ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index 0aef5bdd6d9..252debedee9 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -1,3 +1,11 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Swedish resource file + * TRANSLATORS: Copyright 2011 Michael Wu (Witch) <im.allergic.2.mailing.lists(a)gmail.com> + * Copyright 2017 Markus Gothe <nietzsche(a)lysator.liu.se> + */ + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL //IDB_FONTSTOOLBAR BITMAP "icons/fontstoolbar-sv-SE.bmp" diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index d8f0d9e0953..296383fc1af 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS Paint - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/tr-TR.rc - * PURPOSE: Turkish Resource file for ReactOS Paint - * TRANSLATOR: 2013-2014, 2016, 2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Turkish resource file + * TRANSLATORS: Copyright 2013-2016, 2019 Erdem Ersoy (eersoy93) <erdemersoy(a)erdemersoy.net> + * Copyright 2021-2022 Süleyman Poyraz <zaryob.dev(a)gmail.com> */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/uk-UA.rc b/base/applications/mspaint/lang/uk-UA.rc index 7a0eafc3873..764bb50a8e8 100644 --- a/base/applications/mspaint/lang/uk-UA.rc +++ b/base/applications/mspaint/lang/uk-UA.rc @@ -1,9 +1,10 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/uk-UA.rc - * PURPOSE: Ukraianian Language File for Paint - * TRANSLATORS: Artem Reznikov, Sakara Yevhen, igor Paliychuk + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Ukrainian resource file + * TRANSLATORS: Copyright 2009 Artem Reznikov <temarez(a)yandex.ru> + * Copyright 2009 Sakara Yevhen <eresid(a)gmail.com> + * Copyright 2010-2011 Igor Paliychuk <mansonigor(a)gmail.com> */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/base/applications/mspaint/lang/vi-VN.rc b/base/applications/mspaint/lang/vi-VN.rc index aa1df3c5488..b041e5faae2 100644 --- a/base/applications/mspaint/lang/vi-VN.rc +++ b/base/applications/mspaint/lang/vi-VN.rc @@ -1,9 +1,8 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/lang/vi-VN.rc - * PURPOSE: VN-Vietnamese Language resource file - * TRANSLATORS: first times touched from en-US.rc file by Dummynosrev (Nguyễn Thanh Sơn) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Vietnamese (Vietnam) resource file + * TRANSLATOR: Copyright 2018 Nguyễn Thanh Sơn <dummynosrev(a)gmail.com> */ LANGUAGE LANG_VIETNAMESE, SUBLANG_VIETNAMESE_VIETNAM diff --git a/base/applications/mspaint/lang/zh-CN.rc b/base/applications/mspaint/lang/zh-CN.rc index 896cfd81663..9251a1e6bb4 100644 --- a/base/applications/mspaint/lang/zh-CN.rc +++ b/base/applications/mspaint/lang/zh-CN.rc @@ -1,6 +1,6 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Simplified) resource file * TRANSLATORS: Copyright 2011 Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> * Copyright 2014-2015 Henry Tang Ih <henrytang2(a)hotmail.com> diff --git a/base/applications/mspaint/lang/zh-HK.rc b/base/applications/mspaint/lang/zh-HK.rc index d200513e5d7..7a3cfc086d4 100644 --- a/base/applications/mspaint/lang/zh-HK.rc +++ b/base/applications/mspaint/lang/zh-HK.rc @@ -1,6 +1,6 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Hong Kong) resource file * TRANSLATORS: Copyright 2021 Chan Chilung <eason066(a)gmail.com> * REFERENCES: Chinese (Traditional) resource file diff --git a/base/applications/mspaint/lang/zh-TW.rc b/base/applications/mspaint/lang/zh-TW.rc index f266ba59d9d..12917131d2c 100644 --- a/base/applications/mspaint/lang/zh-TW.rc +++ b/base/applications/mspaint/lang/zh-TW.rc @@ -1,6 +1,6 @@ /* * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Chinese (Traditional) resource file * TRANSLATORS: Copyright 2011 Elton Chung <elton328(a)gmail.com> * Copyright 2021 Chan Chilung <eason066(a)gmail.com> diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index cbe3574698d..90d9fe50f50 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/main.cpp - * PURPOSE: Initializing everything - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Initializing everything + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index ab10814e5bf..459f8322a53 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -1,11 +1,10 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/miniature.cpp - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index 9c01f1b9091..e08b7a49c2a 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/miniature.h - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 0bb4607ad05..afa7628c496 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/mouse.cpp - * PURPOSE: Things which should not be in the mouse event handler itself - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Things which should not be in the mouse event handler itself + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ /* INCLUDES *********************************************************/ diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index 39346fd5e8a..29670ce3e62 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/palette.cpp - * PURPOSE: Window procedure of the palette window - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the palette window + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/palette.h b/base/applications/mspaint/palette.h index 63f3c4caf2b..2b708841c14 100644 --- a/base/applications/mspaint/palette.h +++ b/base/applications/mspaint/palette.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/palette.h - * PURPOSE: Window procedure of the palette window - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the palette window + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index a07825e4762..1708397e021 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/palettemodel.cpp - * PURPOSE: Keep track of palette data, notify listeners - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Keep track of palette data, notify listeners + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/palettemodel.h b/base/applications/mspaint/palettemodel.h index b2a8c40631d..5ba93cd6526 100644 --- a/base/applications/mspaint/palettemodel.h +++ b/base/applications/mspaint/palettemodel.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/palettemodel.h - * PURPOSE: Keep track of palette data, notify listeners - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Keep track of palette data, notify listeners + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index ecff8a5df30..71a6b946017 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/registry.cpp - * PURPOSE: Offering functions dealing with registry values - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Offering functions dealing with registry values + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2020 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index bc77c4b4423..9c270f32c70 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/registry.h - * PURPOSE: Offering functions dealing with registry values - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Offering functions dealing with registry values + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/resource.h b/base/applications/mspaint/resource.h index ce91b33238b..3b9f530a6e5 100644 --- a/base/applications/mspaint/resource.h +++ b/base/applications/mspaint/resource.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/resource.h - * PURPOSE: Defines the resource IDs - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Defines the resource IDs + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 1f9219d9b7b..4bca40c0a6f 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/rsrc.rc - * PURPOSE: Managing the resources - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Managing the resources + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ /* INCLUDES *********************************************************/ diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 13546bc790c..71001937dc7 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/selectionmodel.cpp - * PURPOSE: Keep track of selection parameters, notify listeners - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Keep track of selection parameters, notify listeners + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 248ae03f0d6..3711879a614 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/selectionmodel.h - * PURPOSE: Keep track of selection parameters, notify listeners - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Keep track of selection parameters, notify listeners + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2019-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index 8f3c5022e6b..66b3e5a8d08 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/sizebox.cpp - * PURPOSE: Window procedure of the size boxes - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the size boxes + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/sizebox.h b/base/applications/mspaint/sizebox.h index 9a6e4234418..b274d47873c 100644 --- a/base/applications/mspaint/sizebox.h +++ b/base/applications/mspaint/sizebox.h @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/sizebox.h - * PURPOSE: Window procedure of the size boxes - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the size boxes + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2017-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #pragma once diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index dcc21ab2a66..126da04d14a 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/textedit.cpp - * PURPOSE: Text editor and font chooser for the text tool - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Text editor and font chooser for the text tool + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 798ae1951fb..183dd9df3a8 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/textedit.h - * PURPOSE: Text editor and font chooser for the text tool - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Text editor and font chooser for the text tool + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 236ab9a4ba5..fd7ec4a1f31 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/toolbox.cpp - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 33cfe5eb702..a94c1f21615 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/toolbox.h - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 97008c07563..13039246a21 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -1,11 +1,10 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/toolsettings.cpp - * PURPOSE: Window procedure of the tool settings window - * PROGRAMMERS: Benedikt Freisen - * Stanislav Motylkov - * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the tool settings window + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2018 Stanislav Motylkov <x86corez(a)gmail.com> + * Copyright 2021-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ /* INCLUDES *********************************************************/ diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index 6ad02e22e09..c885081aa85 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/toolsettings.h - * PURPOSE: Window procedure of the tool settings window - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the tool settings window + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 7593bc964c4..cb82a256524 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/toolsmodel.cpp - * PURPOSE: Keep track of tool parameters, notify listeners - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Keep track of tool parameters, notify listeners + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #include "precomp.h" diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index f7d29c28a0e..81ccdcce68b 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -1,9 +1,8 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/toolsmodel.h - * PURPOSE: Keep track of tool parameters, notify listeners - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Keep track of tool parameters, notify listeners + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index b07f44da4bb..6477d865e1f 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -1,12 +1,11 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/winproc.cpp - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * PROGRAMMERS: Benedikt Freisen - * Katayama Hirofumi MZ - * Stanislav Motylkov + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> + * Copyright 2017-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2018 Stanislav Motylkov <x86corez(a)gmail.com> */ #include "precomp.h" diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index 075c0735ba7..71fb13c4b5a 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -1,10 +1,9 @@ /* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL - * FILE: base/applications/mspaint/winproc.h - * PURPOSE: Window procedure of the main window and all children apart from - * hPalWin, hToolSettings and hSelection - * PROGRAMMERS: Benedikt Freisen + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Window procedure of the main window and all children apart from + * hPalWin, hToolSettings and hSelection + * COPYRIGHT: Copyright 2009 Benedikt Freisen <b.freisen(a)gmx.net> */ #pragma once

1 0

[reactos] 01/01: [IPCONFIG] Improve the German translation
by Eric Kohl 23 Jun '23

23 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c63489f1e893cd05055f7… commit c63489f1e893cd05055f75bce251237170b26862 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Jun 23 12:24:26 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Jun 23 12:24:26 2023 +0200 [IPCONFIG] Improve the German translation --- base/applications/network/ipconfig/lang/de-DE.rc | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index 2788460232f..1ea6e8f0e96 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -57,7 +57,7 @@ END STRINGTABLE BEGIN - IDS_UNKNOWNADAPTER "Unknown Adapter" + IDS_UNKNOWNADAPTER "Unbekannter Adapter" IDS_OTHER "Anderer Adapter" IDS_ETH "Ethernet-Adapter" IDS_TOKEN "Token-Ring-Adapter" @@ -65,30 +65,30 @@ BEGIN IDS_PPP "PPP-Adapter" IDS_LOOP "Loopback-Adapter" IDS_SLIP "SLIP-Adapter" - IDS_WIFI "Wireless Network Adapter" + IDS_WIFI "Drahtlos-LAN-Adapter" END STRINGTABLE BEGIN IDS_DNSNAME "\t%ls\n" IDS_DNSLINE "\t----------------------------------------\n" - IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" - IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" - IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" - IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" - IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" - IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" - IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" - IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" - IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" - IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" - IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" - IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" - IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" - IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" - IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" - IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" - IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" + IDS_DNSRECORDNAME "\tEintragsname. . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tEintragstyp . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tGültigkeitsdauer. . . : %lu\n" + IDS_DNSRECORDLENGTH "\tDatenlänge. . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tAbschnitt . . . . . . : Frage\n" + IDS_DNSSECTIONANSWER "\tAbschnitt . . . . . . : Antwort\n" + IDS_DNSSECTIONAUTHORITY "\tAbschnitt . . . . . . : Autorität\n" + IDS_DNSSECTIONADDITIONAL "\tAbschnitt . . . . . . : Weiteres\n" + IDS_DNSTYPEA "\t(Host-)A-Eintrag. . . : %ls\n" + IDS_DNSTYPENS "\tNS-Eintrag. . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME-Eintrag . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA-Eintrag . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR-Eintrag . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX-Eintrag. . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA-Eintrag. . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA-Eintrag. . . . . : \n" + IDS_DNSTYPESRV "\tSRV-Eintrag . . . . . : \n" END STRINGTABLE

1 0

[reactos] 01/01: [NET] Add the net session command
by Eric Kohl 22 Jun '23

22 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a38b133dd1379417889ad… commit a38b133dd1379417889ad165650748e01add7dd1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 22 12:40:46 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 22 12:40:46 2023 +0200 [NET] Add the net session command --- base/applications/network/net/CMakeLists.txt | 1 + base/applications/network/net/cmdSession.c | 154 +++++++++++++++++++++++++++ base/applications/network/net/main.c | 2 +- base/applications/network/net/net.h | 3 + 4 files changed, 159 insertions(+), 1 deletion(-) diff --git a/base/applications/network/net/CMakeLists.txt b/base/applications/network/net/CMakeLists.txt index bac107000f2..a990a9c2f6f 100644 --- a/base/applications/network/net/CMakeLists.txt +++ b/base/applications/network/net/CMakeLists.txt @@ -14,6 +14,7 @@ list(APPEND SOURCE cmdHelpMsg.c cmdLocalGroup.c cmdPause.c + cmdSession.c cmdShare.c cmdStart.c cmdStatistics.c diff --git a/base/applications/network/net/cmdSession.c b/base/applications/network/net/cmdSession.c new file mode 100644 index 00000000000..90763b31ac6 --- /dev/null +++ b/base/applications/network/net/cmdSession.c @@ -0,0 +1,154 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: base/applications/network/net/cmdSession.c + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#include "net.h" + +static +VOID +SecondsToDurationString( + _Out_ PWSTR DurationString, + _In_ size_t DurationStringSize, + _In_ DWORD dwDuration) +{ + DWORD dwHours, dwRemainingSeconds, dwMinutes, dwSeconds; + + dwHours = dwDuration / 3600; + dwRemainingSeconds = dwDuration % 3600; + dwMinutes = dwRemainingSeconds / 60; + dwSeconds = dwRemainingSeconds % 60; + + StringCchPrintfW(DurationString, DurationStringSize, L"%02lu:%02lu:%02lu", dwHours, dwMinutes, dwSeconds); +} + + +NET_API_STATUS +EnumSessions( + _In_ PWSTR pszComputerName, + _In_ BOOL bList) +{ + PSESSION_INFO_2 pBuffer = NULL; + WCHAR DurationBuffer[10]; + DWORD dwRead = 0, dwTotal = 0, i; + DWORD ResumeHandle = 0; + NET_API_STATUS Status; + + Status = NetSessionEnum(pszComputerName, + NULL, + NULL, + 2, + (LPBYTE*)&pBuffer, + MAX_PREFERRED_LENGTH, + &dwRead, + &dwTotal, + &ResumeHandle); + if ((Status != NERR_Success) && (Status != ERROR_MORE_DATA)) + { +// PrintMessageStringV(3502, Status); + ConPrintf(StdOut, L"System error %lu has occurred.\n\n", Status); + return Status; + } + + if (dwTotal == 0) + { + PrintMessageString(3683); + } + else + { + ConPuts(StdOut, L"\n"); + PrintMessageString(4750); + PrintPadding(L'-', 79); + ConPuts(StdOut, L"\n"); + + for (i = 0; i < dwRead; i++) + { + if (pBuffer[i].sesi2_cname) + { + SecondsToDurationString(DurationBuffer, + ARRAYSIZE(DurationBuffer), + pBuffer[i].sesi2_idle_time); + + ConPrintf(StdOut, L"%-22.22s %-20.20s %-17.17s %-5lu %-8.8s\n", + pBuffer[i].sesi2_cname, + pBuffer[i].sesi2_username, + pBuffer[i].sesi2_cltype_name, + pBuffer[i].sesi2_num_opens, + DurationBuffer); + } + } + } + + NetApiBufferFree(pBuffer); + + return NERR_Success; +} + + +INT +cmdSession( + _In_ INT argc, + _In_ WCHAR **argv) +{ + PWSTR pszComputerName = NULL; + BOOL bList = FALSE; + BOOL bDelete = FALSE; + INT i = 0; + NET_API_STATUS Status; + INT result = 0; + + for (i = 2; i < argc; i++) + { + if (argv[i][0] == L'\\' && argv[i][1] == L'\\' && pszComputerName == NULL) + { + pszComputerName = argv[i]; + i++; + } + else if (_wcsicmp(argv[i], L"/list") == 0) + { + bList = TRUE; + continue; + } + else if (_wcsicmp(argv[i], L"/delete") == 0) + { + bDelete = TRUE; + continue; + } + else if (_wcsicmp(argv[i], L"/help") == 0) + { + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); + PrintNetMessage(MSG_SESSION_SYNTAX); + PrintNetMessage(MSG_SESSION_HELP); + return 0; + } + else + { + PrintMessageString(4381); + ConPuts(StdOut, L"\n"); + PrintNetMessage(MSG_SESSION_SYNTAX); + return 1; + } + } + + if (bDelete) + Status = NetSessionDel(pszComputerName, NULL, NULL); + else + Status = EnumSessions(pszComputerName, bList); + + if (Status == NERR_Success) + { + PrintErrorMessage(ERROR_SUCCESS); + } + else + { + PrintErrorMessage(Status); + result = 1; + } + + return result; +} + +/* EOF */ diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index af56a0cbc2d..2da58adf5d8 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -30,7 +30,7 @@ COMMAND cmds[] = {L"helpmsg", cmdHelpMsg}, {L"localgroup", cmdLocalGroup}, {L"pause", cmdPause}, - {L"session", unimplemented}, + {L"session", cmdSession}, {L"share", cmdShare}, {L"start", cmdStart}, {L"statistics", cmdStatistics}, diff --git a/base/applications/network/net/net.h b/base/applications/network/net/net.h index 7840027bd1a..a3659f73b33 100644 --- a/base/applications/network/net/net.h +++ b/base/applications/network/net/net.h @@ -22,6 +22,8 @@ #include <lm.h> #include <ndk/rtlfuncs.h> +#include <strsafe.h> + #include <conutils.h> #include <net_msg.h> @@ -82,6 +84,7 @@ INT cmdHelp(INT argc, WCHAR **argv); INT cmdHelpMsg(INT argc, WCHAR **argv); INT cmdLocalGroup(INT argc, WCHAR **argv); INT cmdPause(INT argc, WCHAR **argv); +INT cmdSession(INT argc, WCHAR **argv); INT cmdShare(INT argc, WCHAR **argv); INT cmdStart(INT argc, WCHAR **argv); INT cmdStatistics(INT argc, WCHAR **argv);

1 0

[reactos] 01/01: [IPCONFIG] Convert more strings to resources
by Eric Kohl 22 Jun '23

22 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0b40ce52074cb2e03ac0… commit b0b40ce52074cb2e03ac0028d9cbfd9731442a0e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Jun 22 10:19:01 2023 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Jun 22 10:19:01 2023 +0200 [IPCONFIG] Convert more strings to resources --- base/applications/network/ipconfig/ipconfig.c | 44 +++++++++++------------- base/applications/network/ipconfig/lang/bg-BG.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/de-DE.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/el-GR.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/en-US.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/es-ES.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/fr-FR.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/id-ID.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/it-IT.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/no-NO.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/pl-PL.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/ro-RO.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/ru-RU.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/sk-SK.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/sq-AL.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/sv-SE.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/tr-TR.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/uk-UA.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/zh-CN.rc | 23 +++++++++++++ base/applications/network/ipconfig/lang/zh-TW.rc | 23 +++++++++++++ base/applications/network/ipconfig/resource.h | 22 +++++++++++- 21 files changed, 478 insertions(+), 25 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index 7a151f2559f..584ca887e94 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -908,6 +908,9 @@ DisplayDnsRecord( IN6_ADDR Addr6; DNS_STATUS Status; + ConResPrintf(StdOut, IDS_DNSNAME, pszName); + ConResPrintf(StdOut, IDS_DNSLINE); + pQueryResults = NULL; Status = DnsQuery_W(pszName, wType, @@ -919,48 +922,41 @@ DisplayDnsRecord( { if (Status == DNS_ERROR_RCODE_NAME_ERROR) { - _tprintf(_T("\t%ls\n"), pszName); - _tprintf(_T("\t----------------------------------------\n")); _tprintf(_T("\tName does not exist\n\n")); } else if (Status == DNS_INFO_NO_RECORDS) { - _tprintf(_T("\t%ls\n"), pszName); - _tprintf(_T("\t----------------------------------------\n")); _tprintf(_T("\tNo records of type %s\n\n"), GetRecordTypeName(wType)); } return; } - _tprintf(_T("\t%ls\n"), pszName); - _tprintf(_T("\t----------------------------------------\n")); - pThisRecord = pQueryResults; while (pThisRecord != NULL) { pNextRecord = pThisRecord->pNext; - _tprintf(_T("\tRecord Name . . . . . : %ls\n"), pThisRecord->pName); - _tprintf(_T("\tRecord Type . . . . . : %hu\n"), pThisRecord->wType); - _tprintf(_T("\tTime To Live. . . . . : %lu\n"), pThisRecord->dwTtl); - _tprintf(_T("\tData Length . . . . . : %hu\n"), pThisRecord->wDataLength); + ConResPrintf(StdOut, IDS_DNSRECORDNAME, pThisRecord->pName); + ConResPrintf(StdOut, IDS_DNSRECORDTYPE, pThisRecord->wType); + ConResPrintf(StdOut, IDS_DNSRECORDTTL, pThisRecord->dwTtl); + ConResPrintf(StdOut, IDS_DNSRECORDLENGTH, pThisRecord->wDataLength); switch (pThisRecord->Flags.S.Section) { case DnsSectionQuestion: - _tprintf(_T("\tSection . . . . . . . : Question\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONQUESTION); break; case DnsSectionAnswer: - _tprintf(_T("\tSection . . . . . . . : Answer\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONANSWER); break; case DnsSectionAuthority: - _tprintf(_T("\tSection . . . . . . . : Authority\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONAUTHORITY); break; case DnsSectionAdditional: - _tprintf(_T("\tSection . . . . . . . : Additional\n")); + ConResPrintf(StdOut, IDS_DNSSECTIONADDITIONAL); break; } @@ -969,41 +965,41 @@ DisplayDnsRecord( case DNS_TYPE_A: Addr4.S_un.S_addr = pThisRecord->Data.A.IpAddress; RtlIpv4AddressToStringW(&Addr4, szBuffer); - _tprintf(_T("\tA (Host) Record . . . : %ls\n"), szBuffer); + ConResPrintf(StdOut, IDS_DNSTYPEA, szBuffer); break; case DNS_TYPE_NS: - _tprintf(_T("\tNS Record . . . . . . : %ls\n"), pThisRecord->Data.NS.pNameHost); + ConResPrintf(StdOut, IDS_DNSTYPENS, pThisRecord->Data.NS.pNameHost); break; case DNS_TYPE_CNAME: - _tprintf(_T("\tCNAME Record. . . . . : %ls\n"), pThisRecord->Data.CNAME.pNameHost); + ConResPrintf(StdOut, IDS_DNSTYPECNAME, pThisRecord->Data.CNAME.pNameHost); break; case DNS_TYPE_SOA: - _tprintf(_T("\tSOA Record. . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPESOA); break; case DNS_TYPE_PTR: - _tprintf(_T("\tPTR Record. . . . . . : %ls\n"), pThisRecord->Data.PTR.pNameHost); + ConResPrintf(StdOut, IDS_DNSTYPEPTR, pThisRecord->Data.PTR.pNameHost); break; case DNS_TYPE_MX: - _tprintf(_T("\tMX Record . . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPEMX); break; case DNS_TYPE_AAAA: RtlCopyMemory(&Addr6, &pThisRecord->Data.AAAA.Ip6Address, sizeof(IN6_ADDR)); RtlIpv6AddressToStringW(&Addr6, szBuffer); - _tprintf(_T("\tAAAA Record . . . . . : %ls\n"), szBuffer); + ConResPrintf(StdOut, IDS_DNSTYPEAAAA, szBuffer); break; case DNS_TYPE_ATMA: - _tprintf(_T("\tATMA Record . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPEATMA); break; case DNS_TYPE_SRV: - _tprintf(_T("\tSRV Record. . . . . . : \n")); + ConResPrintf(StdOut, IDS_DNSTYPESRV); break; } _tprintf(_T("\n\n")); diff --git a/base/applications/network/ipconfig/lang/bg-BG.rc b/base/applications/network/ipconfig/lang/bg-BG.rc index cfa706418a1..67fcab7c545 100644 --- a/base/applications/network/ipconfig/lang/bg-BG.rc +++ b/base/applications/network/ipconfig/lang/bg-BG.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/de-DE.rc b/base/applications/network/ipconfig/lang/de-DE.rc index b7136810f79..2788460232f 100644 --- a/base/applications/network/ipconfig/lang/de-DE.rc +++ b/base/applications/network/ipconfig/lang/de-DE.rc @@ -68,6 +68,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN IDS_USAGE diff --git a/base/applications/network/ipconfig/lang/el-GR.rc b/base/applications/network/ipconfig/lang/el-GR.rc index d7e7a1585a3..44a9ce651cf 100644 --- a/base/applications/network/ipconfig/lang/el-GR.rc +++ b/base/applications/network/ipconfig/lang/el-GR.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/en-US.rc b/base/applications/network/ipconfig/lang/en-US.rc index 8d33d506eb0..69ea5958ae8 100644 --- a/base/applications/network/ipconfig/lang/en-US.rc +++ b/base/applications/network/ipconfig/lang/en-US.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/es-ES.rc b/base/applications/network/ipconfig/lang/es-ES.rc index bdb3e1dfa9c..48e73d3bfea 100644 --- a/base/applications/network/ipconfig/lang/es-ES.rc +++ b/base/applications/network/ipconfig/lang/es-ES.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/fr-FR.rc b/base/applications/network/ipconfig/lang/fr-FR.rc index 88d297a961d..78223397e4b 100644 --- a/base/applications/network/ipconfig/lang/fr-FR.rc +++ b/base/applications/network/ipconfig/lang/fr-FR.rc @@ -68,6 +68,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/id-ID.rc b/base/applications/network/ipconfig/lang/id-ID.rc index f442fae3711..31bece7980e 100644 --- a/base/applications/network/ipconfig/lang/id-ID.rc +++ b/base/applications/network/ipconfig/lang/id-ID.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/it-IT.rc b/base/applications/network/ipconfig/lang/it-IT.rc index 45b57227c72..4d7b83b882c 100644 --- a/base/applications/network/ipconfig/lang/it-IT.rc +++ b/base/applications/network/ipconfig/lang/it-IT.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/no-NO.rc b/base/applications/network/ipconfig/lang/no-NO.rc index c907d5e658e..1b1f933e8b6 100644 --- a/base/applications/network/ipconfig/lang/no-NO.rc +++ b/base/applications/network/ipconfig/lang/no-NO.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/pl-PL.rc b/base/applications/network/ipconfig/lang/pl-PL.rc index 8c2c462ba7f..abc25ad6e5b 100644 --- a/base/applications/network/ipconfig/lang/pl-PL.rc +++ b/base/applications/network/ipconfig/lang/pl-PL.rc @@ -68,6 +68,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/ro-RO.rc b/base/applications/network/ipconfig/lang/ro-RO.rc index 6c5acb0bdeb..5acd0ba3182 100644 --- a/base/applications/network/ipconfig/lang/ro-RO.rc +++ b/base/applications/network/ipconfig/lang/ro-RO.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/ru-RU.rc b/base/applications/network/ipconfig/lang/ru-RU.rc index aac83b8b48b..1885f431762 100644 --- a/base/applications/network/ipconfig/lang/ru-RU.rc +++ b/base/applications/network/ipconfig/lang/ru-RU.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sk-SK.rc b/base/applications/network/ipconfig/lang/sk-SK.rc index 4b8731c998c..ce93ddd2cd5 100644 --- a/base/applications/network/ipconfig/lang/sk-SK.rc +++ b/base/applications/network/ipconfig/lang/sk-SK.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sq-AL.rc b/base/applications/network/ipconfig/lang/sq-AL.rc index edbe6c993ea..7c0428eed2c 100644 --- a/base/applications/network/ipconfig/lang/sq-AL.rc +++ b/base/applications/network/ipconfig/lang/sq-AL.rc @@ -66,6 +66,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index bdc504bef09..f87b63858ac 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/tr-TR.rc b/base/applications/network/ipconfig/lang/tr-TR.rc index 49a28b2b5de..ec3886819c5 100644 --- a/base/applications/network/ipconfig/lang/tr-TR.rc +++ b/base/applications/network/ipconfig/lang/tr-TR.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/uk-UA.rc b/base/applications/network/ipconfig/lang/uk-UA.rc index 36284eb5983..a0b1f03afc9 100644 --- a/base/applications/network/ipconfig/lang/uk-UA.rc +++ b/base/applications/network/ipconfig/lang/uk-UA.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/zh-CN.rc b/base/applications/network/ipconfig/lang/zh-CN.rc index a10faa26b45..d816fb3c454 100644 --- a/base/applications/network/ipconfig/lang/zh-CN.rc +++ b/base/applications/network/ipconfig/lang/zh-CN.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/lang/zh-TW.rc b/base/applications/network/ipconfig/lang/zh-TW.rc index 70c9e3d5bfe..23eaf9ea424 100644 --- a/base/applications/network/ipconfig/lang/zh-TW.rc +++ b/base/applications/network/ipconfig/lang/zh-TW.rc @@ -67,6 +67,29 @@ BEGIN IDS_WIFI "Wireless Network Adapter" END +STRINGTABLE +BEGIN + IDS_DNSNAME "\t%ls\n" + IDS_DNSLINE "\t----------------------------------------\n" + IDS_DNSRECORDNAME "\tRecord Name . . . . . : %ls\n" + IDS_DNSRECORDTYPE "\tRecord Type . . . . . : %hu\n" + IDS_DNSRECORDTTL "\tTime To Live. . . . . : %lu\n" + IDS_DNSRECORDLENGTH "\tData Length . . . . . : %hu\n" + IDS_DNSSECTIONQUESTION "\tSection . . . . . . . : Question\n" + IDS_DNSSECTIONANSWER "\tSection . . . . . . . : Answer\n" + IDS_DNSSECTIONAUTHORITY "\tSection . . . . . . . : Authority\n" + IDS_DNSSECTIONADDITIONAL "\tSection . . . . . . . : Additional\n" + IDS_DNSTYPEA "\tA (Host) Record . . . : %ls\n" + IDS_DNSTYPENS "\tNS Record . . . . . . : %ls\n" + IDS_DNSTYPECNAME "\tCNAME Record. . . . . : %ls\n" + IDS_DNSTYPESOA "\tSOA Record. . . . . . : \n" + IDS_DNSTYPEPTR "\tPTR Record. . . . . . : %ls\n" + IDS_DNSTYPEMX "\tMX Record . . . . . . : \n" + IDS_DNSTYPEAAAA "\tAAAA Record . . . . . : %ls\n" + IDS_DNSTYPEATMA "\tATMA Record . . . . . : \n" + IDS_DNSTYPESRV "\tSRV Record. . . . . . : \n" +END + STRINGTABLE BEGIN /* Please keep the spacing/formatting as per En.rc when translating */ diff --git a/base/applications/network/ipconfig/resource.h b/base/applications/network/ipconfig/resource.h index 73750c0caa5..39bed5ca353 100644 --- a/base/applications/network/ipconfig/resource.h +++ b/base/applications/network/ipconfig/resource.h @@ -48,4 +48,24 @@ #define IDS_SLIP 152 #define IDS_WIFI 153 -#define IDS_USAGE 160 +#define IDS_DNSNAME 160 +#define IDS_DNSLINE 161 +#define IDS_DNSRECORDNAME 162 +#define IDS_DNSRECORDTYPE 163 +#define IDS_DNSRECORDTTL 164 +#define IDS_DNSRECORDLENGTH 165 +#define IDS_DNSSECTIONQUESTION 166 +#define IDS_DNSSECTIONANSWER 167 +#define IDS_DNSSECTIONAUTHORITY 168 +#define IDS_DNSSECTIONADDITIONAL 169 +#define IDS_DNSTYPEA 170 +#define IDS_DNSTYPENS 171 +#define IDS_DNSTYPECNAME 172 +#define IDS_DNSTYPESOA 173 +#define IDS_DNSTYPEPTR 174 +#define IDS_DNSTYPEMX 175 +#define IDS_DNSTYPEAAAA 176 +#define IDS_DNSTYPEATMA 177 +#define IDS_DNSTYPESRV 178 + +#define IDS_USAGE 180

1 0

[reactos] 01/01: [MSPAINT] s/Bound/Clamp/
by Katayama Hirofumi MZ 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d04e049284a934aea538b… commit d04e049284a934aea538b3f0a2defd6d1ac4c55f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 22 07:57:36 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 22 07:57:36 2023 +0900 [MSPAINT] s/Bound/Clamp/ CORE-18867 --- base/applications/mspaint/history.cpp | 2 +- base/applications/mspaint/history.h | 2 +- base/applications/mspaint/mouse.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 46a7341ff1c..91cc1736614 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -254,7 +254,7 @@ void ImageModel::RotateNTimes90Degrees(int iN) NotifyImageChanged(); } -void ImageModel::Bound(POINT& pt) const +void ImageModel::Clamp(POINT& pt) const { pt.x = max(0, min(pt.x, GetWidth())); pt.y = max(0, min(pt.y, GetHeight())); diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 2b74f306248..321680236c7 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -36,7 +36,7 @@ public: void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); - void Bound(POINT& pt) const; + void Clamp(POINT& pt) const; void NotifyImageChanged(); protected: diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index dad03d9fc0a..0bb4607ad05 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -159,7 +159,7 @@ struct FreeSelTool : ToolBase if (bLeftButton) { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.PushToPtStack(pt); imageModel.NotifyImageChanged(); } @@ -247,7 +247,7 @@ struct RectSelTool : ToolBase if (bLeftButton) { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } @@ -258,7 +258,7 @@ struct RectSelTool : ToolBase POINT pt = { x, y }; if (bLeftButton) { - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); selectionModel.m_bShow = !selectionModel.m_rc.IsRectEmpty(); imageModel.NotifyImageChanged(); @@ -528,7 +528,7 @@ struct TextTool : ToolBase void UpdatePoint(LONG x, LONG y) { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); imageModel.NotifyImageChanged(); } @@ -572,7 +572,7 @@ struct TextTool : ToolBase void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { POINT pt = { x, y }; - imageModel.Bound(pt); + imageModel.Clamp(pt); selectionModel.SetRectFromPoints(g_ptStart, pt); BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow);

1 0

[reactos] 01/01: [MSPAINT] s/pointSP/s_pointSP/ and s/pointStack/s_pointStack/
by Katayama Hirofumi MZ 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec53d4227807256ae0359… commit ec53d4227807256ae0359810430c072840acf888 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 22 07:28:15 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 22 07:28:15 2023 +0900 [MSPAINT] s/pointSP/s_pointSP/ and s/pointStack/s_pointStack/ CORE-18867 --- base/applications/mspaint/mouse.cpp | 90 +++++++++++++++++----------------- base/applications/mspaint/toolsmodel.h | 4 +- base/applications/mspaint/winproc.cpp | 8 +-- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 29959f1bb38..dad03d9fc0a 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -11,8 +11,8 @@ #include "precomp.h" -INT ToolBase::pointSP = 0; -POINT ToolBase::pointStack[256] = { { 0 } }; +INT ToolBase::s_pointSP = 0; +POINT ToolBase::s_pointStack[256] = { { 0 } }; /* FUNCTIONS ********************************************************/ @@ -65,7 +65,7 @@ void updateLast(LONG x, LONG y) void ToolBase::reset() { - pointSP = 0; + s_pointSP = 0; g_ptStart.x = g_ptStart.y = g_ptEnd.x = g_ptEnd.y = -1; selectionModel.ResetPtStack(); if (selectionModel.m_bShow) @@ -675,17 +675,17 @@ struct BezierTool : ToolBase return; COLORREF rgb = (m_bLeftButton ? m_fg : m_bg); - switch (pointSP) + switch (s_pointSP) { case 1: - Line(hdc, pointStack[0].x, pointStack[0].y, pointStack[1].x, pointStack[1].y, rgb, + Line(hdc, s_pointStack[0].x, s_pointStack[0].y, s_pointStack[1].x, s_pointStack[1].y, rgb, toolsModel.GetLineWidth()); break; case 2: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[2], pointStack[1], rgb, toolsModel.GetLineWidth()); + Bezier(hdc, s_pointStack[0], s_pointStack[2], s_pointStack[2], s_pointStack[1], rgb, toolsModel.GetLineWidth()); break; case 3: - Bezier(hdc, pointStack[0], pointStack[2], pointStack[3], pointStack[1], rgb, toolsModel.GetLineWidth()); + Bezier(hdc, s_pointStack[0], s_pointStack[2], s_pointStack[3], s_pointStack[1], rgb, toolsModel.GetLineWidth()); break; } } @@ -697,15 +697,15 @@ struct BezierTool : ToolBase if (!m_bDrawing) { m_bDrawing = TRUE; - pointStack[pointSP].x = pointStack[pointSP + 1].x = x; - pointStack[pointSP].y = pointStack[pointSP + 1].y = y; - ++pointSP; + s_pointStack[s_pointSP].x = s_pointStack[s_pointSP + 1].x = x; + s_pointStack[s_pointSP].y = s_pointStack[s_pointSP + 1].y = y; + ++s_pointSP; } else { - ++pointSP; - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + ++s_pointSP; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; } imageModel.NotifyImageChanged(); @@ -713,16 +713,16 @@ struct BezierTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); } void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; - if (pointSP >= 3) + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; + if (s_pointSP >= 3) { OnFinishDraw(); return; @@ -777,13 +777,13 @@ struct ShapeTool : ToolBase void OnDrawOverlayOnImage(HDC hdc) { - if (pointSP <= 0) + if (s_pointSP <= 0) return; if (m_bLeftButton) - Poly(hdc, pointStack, pointSP + 1, m_fg, m_bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); + Poly(hdc, s_pointStack, s_pointSP + 1, m_fg, m_bg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); else - Poly(hdc, pointStack, pointSP + 1, m_bg, m_fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); + Poly(hdc, s_pointStack, s_pointSP + 1, m_bg, m_fg, toolsModel.GetLineWidth(), toolsModel.GetShapeStyle(), m_bClosed, FALSE); } void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) override @@ -791,23 +791,23 @@ struct ShapeTool : ToolBase m_bLeftButton = bLeftButton; m_bClosed = FALSE; - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) - roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; - if (pointSP && bDoubleClick) + if (s_pointSP && bDoubleClick) { OnFinishDraw(); return; } - if (pointSP == 0) + if (s_pointSP == 0) { - pointSP++; - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointSP++; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; } imageModel.NotifyImageChanged(); @@ -815,35 +815,35 @@ struct ShapeTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) - roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; imageModel.NotifyImageChanged(); } void OnButtonUp(BOOL bLeftButton, LONG x, LONG y) override { - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) - roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + if ((s_pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(s_pointStack[s_pointSP - 1].x, s_pointStack[s_pointSP - 1].y, x, y); m_bClosed = FALSE; - if (nearlyEqualPoints(x, y, pointStack[0].x, pointStack[0].y)) + if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { OnFinishDraw(); return; } else { - pointSP++; - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; + s_pointSP++; + s_pointStack[s_pointSP].x = x; + s_pointStack[s_pointSP].y = y; } - if (pointSP == _countof(pointStack)) - pointSP--; + if (s_pointSP == _countof(s_pointStack)) + s_pointSP--; imageModel.NotifyImageChanged(); } @@ -855,9 +855,9 @@ struct ShapeTool : ToolBase void OnFinishDraw() override { - if (pointSP) + if (s_pointSP) { - --pointSP; + --s_pointSP; m_bClosed = TRUE; imageModel.PushImageForUndo(); @@ -865,7 +865,7 @@ struct ShapeTool : ToolBase } m_bClosed = FALSE; - pointSP = 0; + s_pointSP = 0; ToolBase::OnFinishDraw(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index b31183b3584..f7d29c28a0e 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -36,8 +36,8 @@ struct ToolBase TOOLTYPE m_tool; HDC m_hdc; COLORREF m_fg, m_bg; - static INT pointSP; - static POINT pointStack[256]; + static INT s_pointSP; + static POINT s_pointStack[256]; ToolBase(TOOLTYPE tool) : m_tool(tool), m_hdc(NULL) { } virtual ~ToolBase() { } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 41829b84b8f..b07f44da4bb 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -422,7 +422,7 @@ BOOL CMainWindow::CanUndo() const return (BOOL)textEditWindow.SendMessage(EM_CANUNDO); if (selectionModel.m_bShow && toolsModel.IsSelection()) return TRUE; - if (ToolBase::pointSP != 0) + if (ToolBase::s_pointSP != 0) return TRUE; return imageModel.CanUndo(); } @@ -431,7 +431,7 @@ BOOL CMainWindow::CanRedo() const { if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow)) return FALSE; // There is no "WM_REDO" in EDIT control - if (ToolBase::pointSP != 0) + if (ToolBase::s_pointSP != 0) return TRUE; return imageModel.CanRedo(); } @@ -696,7 +696,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } } - if (ToolBase::pointSP != 0) // drawing something? + if (ToolBase::s_pointSP != 0) // drawing something? { canvasWindow.cancelDrawing(); break; @@ -709,7 +709,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH // There is no "WM_REDO" in EDIT control break; } - if (ToolBase::pointSP != 0) // drawing something? + if (ToolBase::s_pointSP != 0) // drawing something? { canvasWindow.finishDrawing(); break;

1 0

[reactos] 01/01: [MSPAINT] Fix ShapeTool with Shift key (#5358)
by Katayama Hirofumi MZ 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa6d74a01c149355633f… commit 3fa6d74a01c149355633fc41c4d955098bea4d95 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 22 07:19:48 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 22 07:19:48 2023 +0900 [MSPAINT] Fix ShapeTool with Shift key (#5358) Fix the behavior of the ShapeTool in pressing Shift key. CORE-18867 --- base/applications/mspaint/mouse.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 2ba45a2d0e2..29959f1bb38 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -791,6 +791,9 @@ struct ShapeTool : ToolBase m_bLeftButton = bLeftButton; m_bClosed = FALSE; + if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) + roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + pointStack[pointSP].x = x; pointStack[pointSP].y = y; @@ -812,12 +815,12 @@ struct ShapeTool : ToolBase void OnMouseMove(BOOL bLeftButton, LONG x, LONG y) override { - pointStack[pointSP].x = x; - pointStack[pointSP].y = y; - if ((pointSP > 0) && (GetAsyncKeyState(VK_SHIFT) < 0)) roundTo8Directions(pointStack[pointSP - 1].x, pointStack[pointSP - 1].y, x, y); + pointStack[pointSP].x = x; + pointStack[pointSP].y = y; + imageModel.NotifyImageChanged(); }

1 0

[reactos] 01/01: [WIN32SS][NTDDRAW] Don't startup DirectX graphics each time on DirectDraw object creation (#5329)
by Oleg Dubinskiy 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7ccb36b9babef32fb9ed… commit e7ccb36b9babef32fb9ed050bfe54f45164e642c Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jun 21 18:03:27 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 21 18:03:27 2023 +0200 [WIN32SS][NTDDRAW] Don't startup DirectX graphics each time on DirectDraw object creation (#5329) CORE-17561, CORE-17932, CORE-18221 Do it at each system startup instead: Remove old DirectX initialization code. It's now outdated and not needed anymore. Previously, the corresponding hackish intEnableReactXDriver() function did two things: load dxg.sys and enable DirectDraw. Now loading DirectX graphics is done during WINSRV initialization, and enabling DirectDraw is called during each (and also first) display mode switch, as in Windows. As debug analysis proves, there are no any other calls in NtGdiDdCreateDirectDrawObject, besides the corresponding DXG function. --- win32ss/reactx/ntddraw/ddraw.c | 89 --------------------------------------- win32ss/reactx/ntddraw/intddraw.h | 1 - 2 files changed, 90 deletions(-) diff --git a/win32ss/reactx/ntddraw/ddraw.c b/win32ss/reactx/ntddraw/ddraw.c index 4bd290ed986..76e32179182 100644 --- a/win32ss/reactx/ntddraw/ddraw.c +++ b/win32ss/reactx/ntddraw/ddraw.c @@ -26,88 +26,6 @@ ULONG gdwDirectDrawContext = 0; #define DXDBG 1 -/************************************************************************/ -/* DirectX graphic/video driver enable start here */ -/************************************************************************/ -BOOL -intEnableReactXDriver(HDC hdc) -{ - NTSTATUS Status; - PEPROCESS Proc = NULL; - PDC pDC = NULL; - PPDEVOBJ pDev = NULL; - PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; - BOOL success = FALSE; - - /* FIXME: Get the process data */ - - /* Do not try load dxg.sys when it have already been load once */ - if (gpfnStartupDxGraphics == NULL) - { - Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Warning: Failed to create the directx interface\n"); - return FALSE; - } - } - - pDC = DC_LockDc(hdc); - if (pDC == NULL) - { - DPRINT1("Warning: Failed to lock hdc\n"); - return FALSE; - } - - pDev = pDC->ppdev; - - /* Test and see if drv got a DX interface or not */ - if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || - ( pDev->DriverFunctions.EnableDirectDraw == NULL)) - { - DPRINT1("Warning : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); - } - else - { - - /* Check and see if DX has been enabled or not */ - if ( pDev->pEDDgpl->pvmList == NULL) - { - pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); - pDev->pEDDgpl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); - pDev->pEDDgpl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); - - pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; - if (pfnDdEnableDirectDraw == NULL) - { - DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); - } - else - { - DPRINT1(" call to pfnDdEnableDirectDraw \n "); - - /* Note: it is the hdev struct it wants, not the drv hPDev aka pdc->PDev */ - success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE); - } - } - else - { - DPRINT1(" The dxg.sys and graphic card driver interface is enabled \n "); - success = TRUE; - } - } - - - DPRINT1("Return value : 0x%08x\n",success); - DC_UnlockDc(pDC); - DPRINT1(" end call to pfnDdEnableDirectDraw \n "); - return success; -} - -/************************************************************************/ -/* DirectX graphic/video driver enable ends here */ -/************************************************************************/ - /************************************************************************/ /* DirectX graphic/video driver loading and cleanup starts here */ /************************************************************************/ @@ -219,13 +137,6 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) return 0; } - /* FIXME: This should be alloc for each drv and use it from each drv, not global for whole win32k */ - if (intEnableReactXDriver(hdc) == FALSE) - { - DPRINT1("Warning: Failed to start the DirectX interface from the graphic driver\n"); - return DDHAL_DRIVER_NOTHANDLED; - } - /* Get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; diff --git a/win32ss/reactx/ntddraw/intddraw.h b/win32ss/reactx/ntddraw/intddraw.h index 5dcf1d28774..c592ea08a51 100644 --- a/win32ss/reactx/ntddraw/intddraw.h +++ b/win32ss/reactx/ntddraw/intddraw.h @@ -8,7 +8,6 @@ #include <reactos/drivers/directx/dxeng.h> /* From ddraw.c */ -BOOL intEnableReactXDriver(HDC); NTSTATUS APIENTRY DxDdStartupDxGraphics(ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); extern DRVFN gpDxFuncs[];

1 0

[reactos] 01/01: [WIN32SS][ENG][NTDDRAW] Manage DirectDraw instances when switching display mode (#4519)
by Oleg Dubinskiy 21 Jun '23

21 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e034377b51a11e6894ba3… commit e034377b51a11e6894ba3b558b1990342cac681c Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jun 21 18:00:24 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jun 21 18:00:24 2023 +0200 [WIN32SS][ENG][NTDDRAW] Manage DirectDraw instances when switching display mode (#4519) CORE-17932 [ENG] Implement DirectDraw management in switch display mode functions (e.g. resolution change, color depth, display frequency etc.): - Switch DirectDraw instances between the two PDEVs (the current one and the new one allocated by ourselves) by calling dxg!DxDdDynamicModeChange function. - Suspend them before and resume after the display mode switch, by calling dxg!DxDdsuspendDirectDraw and dxg!DxDdResumeDirectDraw appropriately. We currently don't have these functions implemented, but MS DXG has, so it allows to properly manage DirectDraw PDEVs using this driver, similarly to Windows. My analysis confirms that these functions are always called in XP/2k3 on display mode switch, even when there is no any DirectX app running at the moment. Analyzing their prototypes show that my guesses are correct. - Initialize hDev and dhpdev members for EDD_DIRECTDRAW_GLOBAL for newly created surfaces, switch them during mode change and re-initialize after it also. They are commonly used by DirectDraw stack. In addition, enable DirectDraw for old and new PDEVs, by calling dxg!DxDdEnableDirectDraw function. [NTDDRAW] Additionally, fix usage of DirectDraw lock count in the PDEVOBJ structure. - Enable cDirectDrawDisableLocks member for storing its value, instead of DxDd_nCount, which is marked as ROS-specific. - Use it in win32k!DxEngGet/SetHdevData for getting/setting DirectDraw count appropriately. My analysis also shows that in Windows, the PDEVOBJ::cDirectDrawDisableLocks method calls DxEngGetHdevData with type 8, which corresponds to our DxDd_nCount. So there are no doubts that this member is used there. - Rename DxEngGetHdevData_dd_count alias of type 8 to DxEngGetHdevData_dd_locks, to match more accurately an actual member name. Update the enumeration and fix all code parts appropriately. All these changes allow to properly change display mode during executing DirectDraw applications, when they try to switch in full-screen mode. At least a bugcheck that happened before my changes, does no longer appear. There are still some games that don't run correctly, as if there is no 3D acceleration (which actually exists). This requires further investigations. --- sdk/include/reactos/drivers/directx/dxeng.h | 2 +- sdk/include/reactos/drivers/directx/dxg.h | 2 +- win32ss/gdi/eng/pdevobj.c | 85 +++++++++++++++++++++++++++-- win32ss/gdi/eng/pdevobj.h | 3 +- win32ss/reactx/dxg/ddraw.c | 2 +- win32ss/reactx/ntddraw/dxeng.c | 11 ++-- win32ss/reactx/ntddraw/intddraw.h | 5 ++ 7 files changed, 94 insertions(+), 16 deletions(-) diff --git a/sdk/include/reactos/drivers/directx/dxeng.h b/sdk/include/reactos/drivers/directx/dxeng.h index 8a349ce6507..fa2f248e7cf 100644 --- a/sdk/include/reactos/drivers/directx/dxeng.h +++ b/sdk/include/reactos/drivers/directx/dxeng.h @@ -57,7 +57,7 @@ typedef enum _DXEGSHDEVDATA DxEGShDevData_DrvFuncs, DxEGShDevData_dhpdev, DxEGShDevData_eddg, - DxEGShDevData_dd_nCount, + DxEGShDevData_dd_locks, DxEGShDevData_dd_flags, DxEGShDevData_disable, DxEGShDevData_metadev, diff --git a/sdk/include/reactos/drivers/directx/dxg.h b/sdk/include/reactos/drivers/directx/dxg.h index 33a815a2a61..470597ad1de 100644 --- a/sdk/include/reactos/drivers/directx/dxg.h +++ b/sdk/include/reactos/drivers/directx/dxg.h @@ -197,7 +197,7 @@ typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, //typedef x (NTAPI *PGD_DxDdHeapVidMemAllocAligned)( //typedef x (NTAPI *PGD_DxDdHeapVidMemFree)( typedef BOOLEAN (NTAPI *PGD_DXDDENABLEDIRECTDRAW)(PVOID, BOOLEAN); -//typedef x (NTAPI *PGD_DxDdDisableDirectDraw)( +typedef VOID (NTAPI *PGD_DXDDDISABLEDIRECTDRAW)(PVOID, BOOLEAN); //typedef x (NTAPI *PGD_DxDdSuspendDirectDraw)( //typedef x (NTAPI *PGD_DxDdResumeDirectDraw)( //typedef x (NTAPI *PGD_DxDdDynamicModeChange)( diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index c8af5c7e9c3..ed6fc630e76 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS kernel * PURPOSE: Support for physical devices * FILE: win32ss/gdi/eng/pdevobj.c - * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * PROGRAMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Oleg Dubinskiy (oleg.dubinskij30(a)gmail.com) */ #include <win32k.h> @@ -336,6 +337,55 @@ PDEVOBJ_pSurface( return ppdev->pSurface; } +BOOL +PDEVOBJ_bEnableDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; + BOOL Success; + + /* Enable DirectDraw */ + TRACE("DxDdEnableDirectDraw(ppdev %p)\n", ppdev); + Success = pfnDdEnableDirectDraw((HDEV)ppdev, TRUE); + TRACE("DxDdEnableDirectDraw(ppdev %p) => %d\n", ppdev, Success); + + return Success; +} + +VOID +PDEVOBJ_vResumeDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDRESUMEDIRECTDRAW pfnDdResumeDirectDraw = (PGD_DXDDRESUMEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdResumeDirectDraw].pfn; + + /* Resume DirectDraw after mode change */ + TRACE("DxDdResumeDirectDraw(ppdev %p)\n", ppdev); + pfnDdResumeDirectDraw((HDEV)ppdev, 0); +} + +VOID +PDEVOBJ_vSuspendDirectDraw( + _Inout_ PPDEVOBJ ppdev) +{ + PGD_DXDDSUSPENDDIRECTDRAW pfnDdSuspendDirectDraw = (PGD_DXDDSUSPENDDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdSuspendDirectDraw].pfn; + + /* Suspend DirectDraw for mode change */ + TRACE("DxDdSuspendDirectDraw(ppdev %p)\n", ppdev); + pfnDdSuspendDirectDraw((HDEV)ppdev, 0); +} + +VOID +PDEVOBJ_vSwitchDirectDraw( + _Inout_ PPDEVOBJ ppdev, + _Inout_ PPDEVOBJ ppdev2) +{ + PGD_DXDDDYNAMICMODECHANGE pfnDdDynamicModeChange = (PGD_DXDDDYNAMICMODECHANGE)gpDxFuncs[DXG_INDEX_DxDdDynamicModeChange].pfn; + + /* Switch DirectDraw instances between the PDEVs */ + TRACE("DxDdDynamicModeChange(ppdev %p, ppdev2 %p)\n", ppdev, ppdev2); + pfnDdDynamicModeChange((HDEV)ppdev, (HDEV)ppdev2, 0); +} + VOID PDEVOBJ_vEnableDisplay( _Inout_ PPDEVOBJ ppdev) @@ -365,6 +415,8 @@ PDEVOBJ_bDisableDisplay( if (ppdev->flFlags & PDEV_DISABLED) return TRUE; + PDEVOBJ_vSuspendDirectDraw(ppdev); + TRACE("DrvAssertMode(dhpdev %p, FALSE)\n", ppdev->dhpdev); assertVal = ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE); TRACE("DrvAssertMode(dhpdev %p, FALSE) => %d\n", ppdev->dhpdev, assertVal); @@ -548,6 +600,15 @@ PDEVOBJ_Create( return NULL; } + /* Enable DirectDraw */ + if (!PDEVOBJ_bEnableDirectDraw(ppdev)) + { + ERR("Failed to enable DirectDraw\n"); + PDEVOBJ_vRelease(ppdev); + EngUnloadImage(pldev); + return NULL; + } + /* Remove some acceleration capabilities from driver */ PDEVOBJ_vFilterDriverHooks(ppdev); @@ -631,6 +692,9 @@ PDEVOBJ_bDynamicModeChange( ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); + /* Switch DirectDraw mode */ + PDEVOBJ_vSwitchDirectDraw(ppdev, ppdev2); + return TRUE; } @@ -660,6 +724,8 @@ PDEVOBJ_bSwitchMode( if (!PDEVOBJ_bDisableDisplay(ppdev)) { DPRINT1("PDEVOBJ_bDisableDisplay() failed\n"); + /* Resume DirectDraw in case of failure */ + PDEVOBJ_vResumeDirectDraw(ppdev); goto leave; } @@ -680,11 +746,11 @@ PDEVOBJ_bSwitchMode( goto leave2; } - /* 4. Get DirectDraw information */ - /* 5. Enable DirectDraw Not traced */ - /* 6. Copy old PDEV state to new PDEV instance */ + /* 4. Temporarily suspend DirectDraw for mode change */ + PDEVOBJ_vSuspendDirectDraw(ppdev); + PDEVOBJ_vSuspendDirectDraw(ppdevTmp); - /* 7. Switch the PDEVs */ + /* 5. Switch the PDEVs */ if (!PDEVOBJ_bDynamicModeChange(ppdev, ppdevTmp)) { DPRINT1("PDEVOBJ_bDynamicModeChange() failed\n"); @@ -692,10 +758,17 @@ PDEVOBJ_bSwitchMode( goto leave2; } - /* 8. Disable DirectDraw */ + /* 6. Resume DirectDraw */ + PDEVOBJ_vResumeDirectDraw(ppdev); + PDEVOBJ_vResumeDirectDraw(ppdevTmp); + /* Release temp PDEV */ PDEVOBJ_vRelease(ppdevTmp); + /* Re-initialize DirectDraw data */ + ppdev->pEDDgpl->hDev = (HDEV)ppdev; + ppdev->pEDDgpl->dhpdev = ppdev->dhpdev; + /* Update primary display capabilities */ if (ppdev == gpmdev->ppdevGlobal) { diff --git a/win32ss/gdi/eng/pdevobj.h b/win32ss/gdi/eng/pdevobj.h index b9d439d3dda..a58eb1aa2ab 100644 --- a/win32ss/gdi/eng/pdevobj.h +++ b/win32ss/gdi/eng/pdevobj.h @@ -101,7 +101,7 @@ typedef struct _PDEVOBJ // RFONT * prfntInactive; // ULONG cInactive; // BYTE ajbo[0x5C]; -// ULONG cDirectDrawDisableLocks; + ULONG cDirectDrawDisableLocks; // PVOID TypeOneInfo; PVOID pvGammaRamp; /* Gamma ramp pointer. */ PVOID RemoteTypeOne; @@ -140,7 +140,6 @@ typedef struct _PDEVOBJ }; /* ros specific */ - ULONG DxDd_nCount; GDIPOINTER Pointer; /* Stuff to keep track of software cursors; win32k gdi part */ UINT SafetyRemoveLevel; /* at what level was the cursor removed? diff --git a/win32ss/reactx/dxg/ddraw.c b/win32ss/reactx/dxg/ddraw.c index 1a639a39ef1..12ed339367d 100644 --- a/win32ss/reactx/dxg/ddraw.c +++ b/win32ss/reactx/dxg/ddraw.c @@ -563,7 +563,7 @@ DxDdReenableDirectDrawObject( gpEngFuncs.DxEngGetDCState(hDC, 2) != 1 && !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_OpenRefs)) && !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_disable)) && - !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_nCount)) && + !(gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_dd_locks)) && gpEngFuncs.DxEngGetHdevData(peDdGl->hDev, DxEGShDevData_DitherFmt) >= BMF_8BPP) { // reset acceleration and suspend flags diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index a096bf5f350..bcd0db67e26 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -324,9 +324,9 @@ DxEngGetHdevData(HDEV hDev, DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); retVal = (DWORD_PTR) PDev->pEDDgpl; break; - case DxEGShDevData_dd_nCount: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_nCount\n"); - retVal = (DWORD_PTR) PDev->DxDd_nCount; + case DxEGShDevData_dd_locks: + DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_locks\n"); + retVal = (DWORD_PTR) PDev->cDirectDrawDisableLocks; break; case DxEGShDevData_dd_flags: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); @@ -413,9 +413,10 @@ DxEngSetHdevData(HDEV hDev, DPRINT1("ReactX Calling : DxEngSetHdevData DXEGSHDEVDATA : %ld\n", Type); - if ( Type == DxEGShDevData_dd_nCount ) + if (Type == DxEGShDevData_dd_locks) { - ((PPDEVOBJ)hDev)->DxDd_nCount = Data; + DPRINT1("Assigning value %d\n", Data); + ((PPDEVOBJ)hDev)->cDirectDrawDisableLocks = Data; retVal = TRUE; // Set } return retVal; diff --git a/win32ss/reactx/ntddraw/intddraw.h b/win32ss/reactx/ntddraw/intddraw.h index c1ab8c945b0..5dcf1d28774 100644 --- a/win32ss/reactx/ntddraw/intddraw.h +++ b/win32ss/reactx/ntddraw/intddraw.h @@ -108,6 +108,11 @@ typedef VOID (APIENTRY *PGD_ENGFREEPRIVATEUSERMEM)(PDD_SURFACE_LOCAL, PVOID); typedef PDD_SURFACE_LOCAL (APIENTRY *PGD_ENGLOCKDIRECTDRAWSURFACE)(HANDLE); typedef BOOL (APIENTRY *PGD_ENGUNLOCKDIRECTDRAWSURFACE)(PDD_SURFACE_LOCAL); +/* Other internal functions */ +typedef VOID (APIENTRY *PGD_DXDDDYNAMICMODECHANGE)(HDEV, HDEV, ULONG_PTR); +typedef VOID (APIENTRY *PGD_DXDDRESUMEDIRECTDRAW)(HDEV, ULONG_PTR); +typedef VOID (APIENTRY *PGD_DXDDSUSPENDDIRECTDRAW)(HDEV, ULONG_PTR); + /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL);

1 0

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