Ros-diffs December 2018

ros-diffs@reactos.org

26 participants
322 discussions

[reactos] 01/01: [NTOS:LPC] Add a number of DPRINTs on failure

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=431643b9b36301ad398fc… commit 431643b9b36301ad398fc18be89b607826248b6c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 21:52:18 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Dec 9 03:16:19 2018 +0100 [NTOS:LPC] Add a number of DPRINTs on failure --- ntoskrnl/lpc/connect.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ntoskrnl/lpc/connect.c b/ntoskrnl/lpc/connect.c index a45468b343..d1f2426ef7 100644 --- a/ntoskrnl/lpc/connect.c +++ b/ntoskrnl/lpc/connect.c @@ -253,6 +253,8 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, /* This has to be a connection port */ if ((Port->Flags & LPCP_PORT_TYPE_MASK) != LPCP_CONNECTION_PORT) { + DPRINT1("Port '%wZ' is not a connection port (Flags: 0x%lx)\n", PortName, Port->Flags); + /* It isn't, so fail */ ObDereferenceObject(Port); @@ -280,6 +282,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!RtlEqualSid(CapturedServerSid, TokenUserInfo->User.Sid)) { /* Fail */ + DPRINT1("Port '%wZ': server SID mismatch\n", PortName); Status = STATUS_SERVER_SID_MISMATCH; } @@ -290,6 +293,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, else { /* Invalid SID */ + DPRINT1("Port '%wZ': server SID mismatch\n", PortName); Status = STATUS_SERVER_SID_MISMATCH; } @@ -319,6 +323,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!NT_SUCCESS(Status)) { /* Failed, dereference the server port and return */ + DPRINT1("Failed to create Port object: 0x%lx\n", Status); ObDereferenceObject(Port); return Status; } @@ -351,6 +356,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!NT_SUCCESS(Status)) { /* Security failed, dereference and return */ + DPRINT1("SeCreateClientSecurity failed: 0x%lx\n", Status); ObDereferenceObject(ClientPort); return Status; } @@ -361,6 +367,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!NT_SUCCESS(Status)) { /* Failed */ + DPRINT1("LpcpInitializePortQueue failed: 0x%lx\n", Status); ObDereferenceObject(ClientPort); return Status; } @@ -379,6 +386,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!NT_SUCCESS(Status)) { /* Fail */ + DPRINT1("Failed to reference port section handle: 0x%lx\n", Status); ObDereferenceObject(ClientPort); return Status; } @@ -405,6 +413,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!NT_SUCCESS(Status)) { /* Fail */ + DPRINT1("Failed to map port section: 0x%lx\n", Status); ObDereferenceObject(SectionToMap); ObDereferenceObject(ClientPort); return Status; @@ -435,6 +444,7 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, if (!Message) { /* Fail if we couldn't allocate a message */ + DPRINT1("LpcpAllocateFromPortZone failed\n"); if (SectionToMap) ObDereferenceObject(SectionToMap); ObDereferenceObject(ClientPort); return STATUS_NO_MEMORY; @@ -486,6 +496,9 @@ NtSecureConnectPort(OUT PHANDLE PortHandle, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + DPRINT1("Exception 0x%lx when copying connection info to user mode\n", + _SEH2_GetExceptionCode()); + /* Cleanup and return the exception code */ /* Free the message we have */

6 years

[reactos] 01/01: [OSK] Add the minimize button (#1102)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3493992e7a91f4dd4dbe7… commit 3493992e7a91f4dd4dbe757810ca02df9c760531 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Dec 8 23:44:42 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 23:44:42 2018 +0100 [OSK] Add the minimize button (#1102) --- base/applications/osk/lang/ar-DZ.rc | 3 ++- base/applications/osk/lang/cs-CZ.rc | 3 ++- base/applications/osk/lang/de-DE.rc | 3 ++- base/applications/osk/lang/en-GB.rc | 3 ++- base/applications/osk/lang/en-US.rc | 3 ++- base/applications/osk/lang/es-ES.rc | 3 ++- base/applications/osk/lang/et-EE.rc | 3 ++- base/applications/osk/lang/fr-CA.rc | 3 ++- base/applications/osk/lang/fr-FR.rc | 3 ++- base/applications/osk/lang/he-IL.rc | 3 ++- base/applications/osk/lang/it-IT.rc | 3 ++- base/applications/osk/lang/pl-PL.rc | 3 ++- base/applications/osk/lang/ro-RO.rc | 3 ++- base/applications/osk/lang/ru-RU.rc | 3 ++- base/applications/osk/lang/tr-TR.rc | 3 ++- base/applications/osk/lang/zh-CN.rc | 3 ++- base/applications/osk/lang/zh-TW.rc | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) diff --git a/base/applications/osk/lang/ar-DZ.rc b/base/applications/osk/lang/ar-DZ.rc index 3fc9a277c2..c11d82844b 100644 --- a/base/applications/osk/lang/ar-DZ.rc +++ b/base/applications/osk/lang/ar-DZ.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/cs-CZ.rc b/base/applications/osk/lang/cs-CZ.rc index f3d03f7d5b..316efe7de7 100644 --- a/base/applications/osk/lang/cs-CZ.rc +++ b/base/applications/osk/lang/cs-CZ.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klávesnice na obrazovce" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/de-DE.rc b/base/applications/osk/lang/de-DE.rc index 02f714ec32..f3faa31e19 100644 --- a/base/applications/osk/lang/de-DE.rc +++ b/base/applications/osk/lang/de-DE.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Bildschirmtastatur" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/en-GB.rc b/base/applications/osk/lang/en-GB.rc index 03572dd06c..01d02c599b 100644 --- a/base/applications/osk/lang/en-GB.rc +++ b/base/applications/osk/lang/en-GB.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Ech",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/en-US.rc b/base/applications/osk/lang/en-US.rc index 890894b09f..c9dacb2b10 100644 --- a/base/applications/osk/lang/en-US.rc +++ b/base/applications/osk/lang/en-US.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 diff --git a/base/applications/osk/lang/es-ES.rc b/base/applications/osk/lang/es-ES.rc index aa8c6a3e0c..f7f138e47a 100644 --- a/base/applications/osk/lang/es-ES.rc +++ b/base/applications/osk/lang/es-ES.rc @@ -12,7 +12,8 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Teclado en pantalla" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc index e1bdf1b738..d1f770b90b 100644 --- a/base/applications/osk/lang/et-EE.rc +++ b/base/applications/osk/lang/et-EE.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Ekraaniklaviatuur" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 diff --git a/base/applications/osk/lang/fr-CA.rc b/base/applications/osk/lang/fr-CA.rc index faa3b5cdfc..008420fb70 100644 --- a/base/applications/osk/lang/fr-CA.rc +++ b/base/applications/osk/lang/fr-CA.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Clavier visuel" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "ech",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/fr-FR.rc b/base/applications/osk/lang/fr-FR.rc index 5c490481bd..4aecda50c1 100644 --- a/base/applications/osk/lang/fr-FR.rc +++ b/base/applications/osk/lang/fr-FR.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Clavier visuel" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "ech",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/he-IL.rc b/base/applications/osk/lang/he-IL.rc index 7be0c0278f..3b1d67eead 100644 --- a/base/applications/osk/lang/he-IL.rc +++ b/base/applications/osk/lang/he-IL.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "לוח מקשים על התצוגה" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/it-IT.rc b/base/applications/osk/lang/it-IT.rc index 6a7a34e8bf..6448871909 100644 --- a/base/applications/osk/lang/it-IT.rc +++ b/base/applications/osk/lang/it-IT.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastiera visivo" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 diff --git a/base/applications/osk/lang/pl-PL.rc b/base/applications/osk/lang/pl-PL.rc index 8e97f9877b..c3b57072d0 100644 --- a/base/applications/osk/lang/pl-PL.rc +++ b/base/applications/osk/lang/pl-PL.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klawiatura Ekranowa" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/ro-RO.rc b/base/applications/osk/lang/ro-RO.rc index 7a4d358ac7..d02d41f5e9 100644 --- a/base/applications/osk/lang/ro-RO.rc +++ b/base/applications/osk/lang/ro-RO.rc @@ -12,7 +12,8 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Tastatură virtuală" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 diff --git a/base/applications/osk/lang/ru-RU.rc b/base/applications/osk/lang/ru-RU.rc index a551634828..bf99916de2 100644 --- a/base/applications/osk/lang/ru-RU.rc +++ b/base/applications/osk/lang/ru-RU.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115 CAPTION "Экранная клавиатура" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,15,15 PUSHBUTTON "F1",SCAN_CODE_112,43,3,15,15 diff --git a/base/applications/osk/lang/tr-TR.rc b/base/applications/osk/lang/tr-TR.rc index 1d1f16ca4f..4c3ea733bd 100644 --- a/base/applications/osk/lang/tr-TR.rc +++ b/base/applications/osk/lang/tr-TR.rc @@ -11,7 +11,8 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Ekran Klavyesi" FONT 8, "MS Shell Dlg" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/zh-CN.rc b/base/applications/osk/lang/zh-CN.rc index 4fcbdac06f..48f9e42892 100644 --- a/base/applications/osk/lang/zh-CN.rc +++ b/base/applications/osk/lang/zh-CN.rc @@ -14,7 +14,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "屏幕键盘" FONT 9, "宋体" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 diff --git a/base/applications/osk/lang/zh-TW.rc b/base/applications/osk/lang/zh-TW.rc index e38779503d..d200a53f3a 100644 --- a/base/applications/osk/lang/zh-TW.rc +++ b/base/applications/osk/lang/zh-TW.rc @@ -13,7 +13,8 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "螢幕鍵盤" FONT 9, "新細明體" -EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE +STYLE WS_SYSMENU | WS_MINIMIZEBOX +EXSTYLE WS_EX_TOPMOST | WS_EX_NOACTIVATE | WS_EX_APPWINDOW BEGIN PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22

6 years

[reactos] 03/03: [USETUP] Update russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f851b8257050d57652c1e… commit f851b8257050d57652c1e83cd536985508d10867 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Dec 9 00:24:26 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 23:36:06 2018 +0100 [USETUP] Update russian translation Addendum to 03b7e13, 29ace9c and a5bcd95. --- base/setup/usetup/lang/ru-RU.h | 74 ++++++++++++++++++++++++++---------------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index ca472f84a1..6e99c8f38c 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -75,7 +75,7 @@ static MUI_ENTRY ruRUWelcomePageEntries[] = { 8, 15, - "\x07 Press ENTER to install or upgrade ReactOS.", + "\x07 �� ENTER �� ⠭�� ReactOS.", TEXT_STYLE_NORMAL }, { @@ -127,61 +127,79 @@ static MUI_ENTRY ruRUIntroPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ��⠭�� ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { 6, 8, - "ReactOS Version Status", + "��ﭨ� ��ᨨ ReactOS", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "ReactOS is in Alpha stage, meaning it is not feature-complete", + "�� ReactOS ��室�� -�⠤�� ࠧࠡ�⪨,", TEXT_STYLE_NORMAL }, { 6, 12, - "and is under heavy development. It is recommended to use it only for", + "��⢮ �㭪権 � ��⥩ �� ⮢��,", TEXT_STYLE_NORMAL }, { 6, 13, - "evaluation and testing purposes and not as your daily-usage OS.", + "� ࠧࠡ�⪠ �� 室��. �� ᯮ�짮�� ", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "⮫쪮 � 楫�� ஢��, � �� 砥 ��", TEXT_STYLE_NORMAL }, { 6, 15, - "Backup your data or test on a secondary computer if you attempt", + "�� ᥤ�� ᯮ�짮��.", TEXT_STYLE_NORMAL }, { 6, - 16, - "to run ReactOS on real hardware.", + 17, + "�᫨ �� ᮡ�ࠥ�� ⠭�� ReactOS �� 䨧��᪨� ��,", TEXT_STYLE_NORMAL }, { - 8, + 6, + 18, + "��易⥫쭮 ᤥ�� १�ࢭ�� , ��", + TEXT_STYLE_NORMAL + }, + { + 6, 19, - "\x07 Press ENTER to continue ReactOS Setup.", + "�ᯮ�� ⤥�� , �뤥�� ஢��.", TEXT_STYLE_NORMAL }, { 8, - 21, - "\x07 Press F3 to quit without installing ReactOS.", + 22, + "\x07 �� ENTER �� த�� ⠭��.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "\x07 �� F3 ��室� �� ⠭��.", TEXT_STYLE_NORMAL }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = �த�� F3 = ��室", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -432,7 +450,7 @@ static MUI_ENTRY ruRURepairPageEntries[] = { 6, 12, - "�㭪�� ⠭�� .", + "�㭪�� ⠭�� .", TEXT_STYLE_NORMAL }, { @@ -478,61 +496,61 @@ static MUI_ENTRY ruRUUpgradePageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ��⠭�� ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { 6, 8, - "The ReactOS Setup can upgrade one of the available ReactOS installations", + "��⠭��騪 ReactOS �� ࠭�� ⠭�� ,", TEXT_STYLE_NORMAL }, { 6, 9, - "listed below, or, if a ReactOS installation is damaged, the Setup program", + "��᫥�� , �� ᫨ ��⠭�� ReactOS ��०��, ��⠭��騪", TEXT_STYLE_NORMAL }, { 6, 10, - "can attempt to repair it.", + "�� ⠭�� .", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not all implemented yet.", + "�㭪�� ⠭�� .", TEXT_STYLE_HIGHLIGHT }, { 8, 15, - "\x07 Press UP or DOWN to select an OS installation.", + "\x07 �� 롮� �०�� ⠭�� .", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press U for upgrading the selected OS installation.", + "\x07 �� U �� ࠭�� ⠭�� .", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to continue with a new installation.", + "\x07 �� ESC �� ⮩ ��⠭�� ⥬�.", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 �� F3 ��室� �� ⠭��.", TEXT_STYLE_NORMAL }, { 0, 0, - "U = Upgrade ESC = Do not upgrade F3 = Quit", + "U = �� ESC = �ய�� F3 = ��室", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1818,11 +1836,11 @@ MUI_STRING ruRUStrings[] = {STRING_REBOOTCOMPUTER, "ENTER = ��१��㧪�"}, {STRING_DELETING, - " Deleting file: %S"}, + " �� 䠩��: %S"}, {STRING_MOVING, - " Moving file: %S to: %S"}, + " ��६�饭�� 䠩��: %S �: %S"}, {STRING_RENAMING, - " Renaming file: %S to: %S"}, + " ��२�� 䠩��: %S �: %S"}, {STRING_COPYING, " ��஢�� 䠩��: %S"}, {STRING_SETUPCOPYINGFILES,

6 years

[reactos] 02/03: [USER32] Update russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c7094acb89d2d8067992… commit 6c7094acb89d2d806799288af93b9412408a3cfb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Dec 8 22:27:49 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 23:36:06 2018 +0100 [USER32] Update russian translation Addendum to 6a944b5. --- win32ss/user/user32/lang/ru-RU.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/user/user32/lang/ru-RU.rc b/win32ss/user/user32/lang/ru-RU.rc index 517c503c3f..63d2e394f4 100644 --- a/win32ss/user/user32/lang/ru-RU.rc +++ b/win32ss/user/user32/lang/ru-RU.rc @@ -58,9 +58,9 @@ END STRINGTABLE BEGIN IDS_ERROR "Ошибка" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" - IDS_HUNG_UP_TITLE "Hung up!" + IDS_NOT_RESPONDING " (Не отвечает)" + IDS_ASK_TERMINATE "Похоже, это приложение зависло и не отвечает системе. Завершить его сейчас?" + IDS_HUNG_UP_TITLE "Приложение не отвечает" IDS_OK "OK" IDS_CANCEL "Отмена" IDS_ABORT "Пр&ервать"

6 years

[reactos] 01/03: [NOTEPAD] Update russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c60c4886d9b1e031fcf2f… commit c60c4886d9b1e031fcf2f7d1171fbabe4f94eb47 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Dec 8 22:19:36 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 23:36:06 2018 +0100 [NOTEPAD] Update russian translation Addendum to 60e9fcc. --- base/applications/notepad/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 7bd48ae2f2..731ade335a 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -62,7 +62,7 @@ BEGIN BEGIN MENUITEM "&Содержание", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&О программе Блокнот", CMD_HELP_ABOUT_NOTEPAD END END

6 years

[reactos] 01/01: [NOTEPAD] Addendum to 60e9fcc (#610)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca7181336128fadf59610… commit ca7181336128fadf59610dba20f83ba0477c902f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 8 20:11:26 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 20:11:26 2018 +0100 [NOTEPAD] Addendum to 60e9fcc (#610) --- base/applications/notepad/lang/hi-IN.rc | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index f6040bb1ea..6faffaf3f3 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -69,8 +69,7 @@ BEGIN BEGIN MENUITEM "&मदद देखें", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&नोटपैड के बारे में", CMD_ABOUT - MENUITEM "&जानकारी", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -135,23 +134,6 @@ BEGIN PUSHBUTTON "रद्द करें", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "रिऐक्ट ओएस नोटपैड के बारे में" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "रिऐक्ट ओएस नोटपैड v1.0\r\nकॉपीराइट 1997,98 Marcel Baur\r\nकॉपीराइट 2000 Mike McCormack\r\nकॉपीराइट 2002 Sylvain Petreolle\r\nकॉपीराइट 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "बंद करे", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -190,4 +172,5 @@ BEGIN STRING_PRINTERROR "फ़ाइल '%s' मुद्रित नहीं कर सकता।\n\n सुनिश्चित करें कि प्रिंटर चालू है और ठीक से कॉन्फ़िगर किया गया है।" STRING_TEXT_DOCUMENT "टेक्स्ट डॉक्यूमॅन्ट" + STRING_NOTEPAD_AUTHORS "कॉपीराइट 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END

6 years

[reactos] 01/01: [NTOSKRNL] Don't dereference VACB when allocating its memory area fails

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=182cc5c5ab027790276c1… commit 182cc5c5ab027790276c1c06c587d7b9057612a0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 8 19:51:30 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Dec 8 19:56:03 2018 +0100 [NTOSKRNL] Don't dereference VACB when allocating its memory area fails This avoids performing a double-free (even though that's hidden by the fact we use lookaside allocations for VACB), and it avoids freeing a memory address at an uninitialized address. We don't care about references here, the VACB was just allocated, never linked and we're its only user. CORE-15413 --- ntoskrnl/cc/view.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index b9c4930986..d7dcfe1ff7 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -833,7 +833,6 @@ Retry: goto Retry; } - CcRosVacbDecRefCount(current); ExFreeToNPagedLookasideList(&VacbLookasideList, current); return Status; }

6 years

[reactos] 01/01: [NOTEPAD] Improve the "About" dialog status. (#610)

by Erdem Ersoy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60e9fcc8f0c5d23eba5e2… commit 60e9fcc8f0c5d23eba5e2757ee5abebccdb75379 Author: Erdem Ersoy <erdemersoy(a)erdemersoy.net> AuthorDate: Tue Jun 12 10:03:12 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 19:35:16 2018 +0100 [NOTEPAD] Improve the "About" dialog status. (#610) - Remove the non-standard "About" dialog. - Move the authors copyright info into the shell "About "dialog. --- base/applications/notepad/dialog.c | 41 ++++----------------------------- base/applications/notepad/lang/bg-BG.rc | 21 ++--------------- base/applications/notepad/lang/cs-CZ.rc | 21 ++--------------- base/applications/notepad/lang/da-DK.rc | 21 ++--------------- base/applications/notepad/lang/de-DE.rc | 21 ++--------------- base/applications/notepad/lang/el-GR.rc | 21 ++--------------- base/applications/notepad/lang/en-US.rc | 21 ++--------------- base/applications/notepad/lang/es-ES.rc | 21 ++--------------- base/applications/notepad/lang/et-EE.rc | 21 ++--------------- base/applications/notepad/lang/eu-ES.rc | 21 ++--------------- base/applications/notepad/lang/fi-FI.rc | 21 ++--------------- base/applications/notepad/lang/fr-FR.rc | 21 ++--------------- base/applications/notepad/lang/he-IL.rc | 22 ++---------------- base/applications/notepad/lang/hu-HU.rc | 21 ++--------------- base/applications/notepad/lang/hy-AM.rc | 21 ++--------------- base/applications/notepad/lang/id-ID.rc | 21 ++--------------- base/applications/notepad/lang/it-IT.rc | 21 ++--------------- base/applications/notepad/lang/ja-JP.rc | 21 ++--------------- base/applications/notepad/lang/lt-LT.rc | 21 ++--------------- base/applications/notepad/lang/ms-MY.rc | 21 ++--------------- base/applications/notepad/lang/nl-NL.rc | 21 ++--------------- base/applications/notepad/lang/no-NO.rc | 21 ++--------------- base/applications/notepad/lang/pl-PL.rc | 21 ++--------------- base/applications/notepad/lang/pt-BR.rc | 21 ++--------------- base/applications/notepad/lang/pt-PT.rc | 21 ++--------------- base/applications/notepad/lang/ro-RO.rc | 21 ++--------------- base/applications/notepad/lang/ru-RU.rc | 21 ++--------------- base/applications/notepad/lang/sk-SK.rc | 21 ++--------------- base/applications/notepad/lang/sl-SI.rc | 21 ++--------------- base/applications/notepad/lang/sq-AL.rc | 21 ++--------------- base/applications/notepad/lang/sv-SE.rc | 21 ++--------------- base/applications/notepad/lang/th-TH.rc | 21 ++--------------- base/applications/notepad/lang/tr-TR.rc | 21 ++--------------- base/applications/notepad/lang/uk-UA.rc | 21 ++--------------- base/applications/notepad/lang/uz-UZ.rc | 21 ++--------------- base/applications/notepad/lang/zh-CN.rc | 21 ++--------------- base/applications/notepad/lang/zh-TW.rc | 21 ++--------------- base/applications/notepad/main.c | 8 ------- base/applications/notepad/notepad_res.h | 9 ++++---- 39 files changed, 81 insertions(+), 734 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index d92e11a94f..a07a71d3f7 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -1191,46 +1191,15 @@ VOID DIALOG_HelpContents(VOID) VOID DIALOG_HelpAboutNotepad(VOID) { TCHAR szNotepad[MAX_STRING_LEN]; + TCHAR szNotepadAuthors[MAX_STRING_LEN]; + HICON notepadIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NPICON)); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, ARRAY_SIZE(szNotepad)); - ShellAbout(Globals.hMainWnd, szNotepad, 0, notepadIcon); - DeleteObject(notepadIcon); -} + LoadString(Globals.hInstance, STRING_NOTEPAD_AUTHORS, szNotepadAuthors, ARRAY_SIZE(szNotepadAuthors)); -INT_PTR -CALLBACK -AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - HWND hLicenseEditWnd; - TCHAR *strLicense; - - switch (message) - { - case WM_INITDIALOG: - - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE); - - /* 0x1000 should be enough */ - strLicense = (TCHAR *)_alloca(0x1000); - LoadString(GetModuleHandle(NULL), STRING_LICENSE, strLicense, 0x1000); - - SetWindowText(hLicenseEditWnd, strLicense); - - return TRUE; - - case WM_COMMAND: - - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) - { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - - break; - } - - return 0; + ShellAbout(Globals.hMainWnd, szNotepad, szNotepadAuthors, notepadIcon); + DeleteObject(notepadIcon); } /*********************************************************************** diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 32da959269..7d63a030e0 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Съдържание", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&За", CMD_ABOUT - MENUITEM "С&ведения", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "За Бележника на РеактОС" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Бележник на РеактОС, в1,0\r\nВъзпроизводствено право 1997,98 Marcel Baur\r\nВъзпроизводствено право 2000 Mike McCormack\r\nВъзпроизводствено право 2002 Sylvain Petreolle\r\nВъзпроизводствено право 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Затваряне", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Възпроизводствено право 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 2bcd73b378..d148ca7381 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "Zobrazit &nápovědu", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&O programu...", CMD_ABOUT - MENUITEM "&Informace...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "O aplikaci ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Zavřít", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ paměti." STRING_PRINTERROR "Soubor '%s' nebylo možné vytisknout.\n\nZkontrolujte, zda je tiskárna zapnutá a správně nastavená." STRING_TEXT_DOCUMENT "Textový dokument" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index 9817b318d0..b9609eeddf 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Indhold", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "&Om Notesblok", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ hukommelse, og prøv så igen." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 94042e0f34..1577a11998 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Inhalt", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Über", CMD_ABOUT - MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Über ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Schließen", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Dieses Programm ist Freie Software: Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation, Version 2.1 der Lizenz oder (nach Ihrer Wahl) jeder neueren veröffentlichten Version, weiterverbreiten und/oder modifizieren.\r\n\r\nDieses Programm wird in der Hoffnung, dass es nützlich sein wird, aber OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BE [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -185,4 +167,5 @@ um diese Funktion \nabzuschließen. Beenden Sie eine oder mehrere \ STRING_PRINTERROR "Die Datei '%s' kann nicht gedruckt werden.\n\nStellen Sie sicher, dass der Drucker angeschlossen und richtig konfiguriert ist." STRING_TEXT_DOCUMENT "Textdokument" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 26a0bc20d5..41d48606d5 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Περιεχόμενα", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "Πληρο&φορίες", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Ακύρωση", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index c4168b1ec1..96650ae710 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "View &Help", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_ABOUT - MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ task. \nClose one or more applications to increase the amount of \nfree memory." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index a4dd07cfde..6c573df297 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -64,8 +64,7 @@ BEGIN BEGIN MENUITEM "Í&ndice", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Acerca de", CMD_ABOUT - MENUITEM "&Información...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -130,23 +129,6 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Acerca de Bloc de notas de ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Bloc de notas de ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Cerrar", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Par [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -186,4 +168,5 @@ aumentar la cantidad \nde memoria libre." STRING_PRINTERROR "No se puede imprimir el archivo '%s'.\n\nAsegúrese de que la impresora esté encendida y configurada correctamente." STRING_TEXT_DOCUMENT "Documento de texto" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 4852d82bee..f302044f19 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -70,8 +70,7 @@ BEGIN BEGIN MENUITEM "&Vaata abi", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Teave Notepad'ist", CMD_ABOUT - MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -136,23 +135,6 @@ BEGIN PUSHBUTTON "Loobu", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Teave ReactOS Notepad'ist" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nAutoriõigus 1997,98 Marcel Baur\r\nAutoriõigus 2000 Mike McCormack\r\nAutoriõigus 2002 Sylvain Petreolle\r\nAutoriõigus 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Sule", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -191,4 +173,5 @@ käsu lõpetamiseks. \nSulge üks või enam rakendust, et suurendada \nvaba mäl STRING_PRINTERROR "Ei suuda printida faili '%s'.\n\nVeendu et printer on sisse lülitatud ja korralikult sättestatud." STRING_TEXT_DOCUMENT "Tekstidokument" + STRING_NOTEPAD_AUTHORS "Autoriõigus 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index 7ea3c6b8bb..8b5f5eb30c 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "Í&ndizea", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Ohar-blokari buruz", CMD_ABOUT - MENUITEM "&Informazioa...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Utzi", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS ohar-blokari buruz" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS-en ohar-bloka v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Itxi", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ memoria librearen \nkopurua handitzeko." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index 345dbb756b..7f678c1c04 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Sisältö", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ muistia." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index cbaafb0f16..8efefc2714 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Sommaire", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&À propos", CMD_ABOUT - MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Fermer", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ de la mémoire." STRING_PRINTERROR "Impossible d'imprimer le fichier '%s'.\n\nVérifiez que l'imprimante est allumée et correctement configurée." STRING_TEXT_DOCUMENT "Document Texte" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index 249697caf8..e2dda2e80d 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "תוכן העניינים", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "אודות", CMD_ABOUT - MENUITEM "מידע", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -131,24 +130,6 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_LAYOUTRTL -CAPTION "אודות פנקס הרשימות של ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "סגור", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -187,4 +168,5 @@ task. \nClose one or more applications to increase the amount of \nfree memory." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 60412d042e..1b3949dee0 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Témakörök", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&ormáció...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ Szeretné menteni a változásokat?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index 8bdb567643..2c5b06c90a 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Բովանդակություն", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Ծրագրի մասին", CMD_ABOUT - MENUITEM "&Տեղեկություն...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Չնդունել", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Ծածկել", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ Would you like to save the changes ?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index d0497826b3..cc0c13eb07 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Daftar Isi", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Tentang", CMD_ABOUT - MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Tentang ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nHak Cipta 1997,98 Marcel Baur\r\nHak Cipta 2000 Mike McCormack\r\nHak Cipta 2002 Sylvain Petreolle\r\nHak Cipta 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ bebas." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Hak Cipta 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index 3ae45a3e2d..3e7fdafd53 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Guida in linea", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Informazioni &su blocco note", CMD_ABOUT - MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni su blocco note ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Chiudi", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Questo programma è software libero; può redistribuirlo e/o modificarlo sotto\ni termini della licenza pubblica GNU come pubblicata dalla Free Software Foundation; sia la versione 2 sia una versione successiva (a sua scelta).\r\n\r\nQuesto programma è distribuito\nnella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza neanche la garanzia implicita\ndi NEGOZIABILITA' o APPLICABILITA' per un particolare scopo. Si veda la licenza generale pubblica GNU per maggiori [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ di memoria libera." STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente." STRING_TEXT_DOCUMENT "Documento di testo" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index 5f5393ab50..44c353b559 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "目次(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "バージョン情報(&A)", CMD_ABOUT - MENUITEM "情報(&O)", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS メモ帳について" -FONT 9, "MS UI Gothic" -BEGIN - CONTROL "ReactOS メモ帳 v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "閉じる", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 9128280cee..5d6b68ae63 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Turinys", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Apie Notepad", CMD_ABOUT - MENUITEM "Apie &ReactOS", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 290, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Apie ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\n(C) 1997,98 Marcel Baur\r\n(C) 2000 Mike McCormack\r\n(C) 2002 Sylvain Petreolle\r\n(C) 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 238, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Užverti", IDOK, 123, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 275, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ Ar norite išsaugoti pakeitimus?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "(C) 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index a0718ee10b..ac3968794a 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -64,8 +64,7 @@ BEGIN BEGIN MENUITEM "Kandungan(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Tent&ang", CMD_ABOUT - MENUITEM "Maklumat(&O)", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -130,23 +129,6 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Tentang ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Tutup", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -185,4 +167,5 @@ tugas ini. \nTutup satu atau lebih aplikasi untuk menambah jumlah \ningatan koso STRING_PRINTERROR "Tidak boleh mencetak fail '%s'.\n\nPastikan pencetak dihidupkan dan dikonfigurasikan dengan betul." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index fa5f47e105..d2ef396f29 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&o...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ Wilt u de wijzigingen opslaan?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index 3c822f41a6..3d33461bcd 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Emner i hjelp", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Om", CMD_ABOUT - MENUITEM "&Infomasjon", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Om ReactOS Notisblokk" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notisblokk v1.0\r\nEnerett 1997,98 Marcel Baur\r\nEnerett 2000 Mike McCormack\r\nEnerett 2002 Sylvain Petreolle\r\nEnerett 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Avslutt", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for me [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ minne." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Enerett 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index cbaca4f47b..7569701a57 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Tematy pomocy", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Notatnik - informacje", CMD_ABOUT - MENUITEM "&ReactOS - informacje", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Notatnik ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Notatnik ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Zamknij", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji 2 tej Licencji lub (według twojego wyboru) którejś z późniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OK [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -178,4 +160,5 @@ BEGIN STRING_PRINTERROR "Nie można wydrukować pliku '%s'.\n\nUpewnij się, że drukarka jest włączona i poprawnie skonfigurowana." STRING_TEXT_DOCUMENT "Dokument tekstowy" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 408d575a5e..c53be7640f 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Sobre", CMD_ABOUT - MENUITEM "&Informações...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Sobre Notepad ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Fechar", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ tarefa. \nFeche uma ou mais aplicações para aumentar a quantidade de memória STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 408d575a5e..c53be7640f 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Conteúdo", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Sobre", CMD_ABOUT - MENUITEM "&Informações...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Sobre Notepad ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Fechar", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ tarefa. \nFeche uma ou mais aplicações para aumentar a quantidade de memória STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index ff981d0516..6d47346207 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -67,8 +67,7 @@ BEGIN BEGIN MENUITEM "&Manual…", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Despre…", CMD_ABOUT - MENUITEM "I&nfo…", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -133,23 +132,6 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 294, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Despre Carnețelul ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Carnețelul ReactOS v1.0\r\nDrept de autor 1997,98 Marcel Baur\r\nDrept de autor 2000 Mike McCormack\r\nDrept de autor 2002 Sylvain Petreolle\r\nDrept de autor 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 242, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Î&nchide", IDOK, 119, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 282, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Tradus în limba română de Petru Dimitriu.\r\nAceastă aplicație este publică; fiind permisă modificarea și/sau (re)distribuția sa în termenii Licenței Publice Generale GNU publicată de Free Software Foundation; sau versiunea 2 a Licenței, sau (la alegere) a oricărei versiuni ulterioare.\r\n\r\nAceastă aplicație este distribuită doar în speranța de a fi utilă, FĂRĂ însă NICI O GARANȚIE; nici măcar cu garanția implicită a VANDABILITĂȚII sau a UTILITĂȚII ÎNTR-UN SCOP ANUM [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -188,4 +170,5 @@ Păstrați modificările aduse?" STRING_PRINTERROR "Fișierul „%s” nu a putut fi imprimat.\n\nAsigurați-vă că imprimanta este pornită și configurată corespunzător." STRING_TEXT_DOCUMENT "Document text" + STRING_NOTEPAD_AUTHORS "Drept de autor 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index a04c1653d2..7bd48ae2f2 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Содержание", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&О программе...", CMD_ABOUT - MENUITEM "&Сведения...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "О программе Блокнот ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Блокнот ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Закрыть", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Эта программа является свободно распространяемой; Вы можете распространять ее повторно и (или) изменять, соблюдая условия Открытого лицензионного соглашения GNU, опубликованного Фондом свободно распространяемого программного обеспечения; либо редакции 2 Соглашения, либо (на ваше усмотрение) любой редакции, выпущенной позже.\r\n\r\nЭта программа распространяется в надежде на то, что она окажется полезной, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, включая подразумеваемую гарантию КАЧ [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ BEGIN STRING_PRINTERROR "Невозможно распечатать файл '%s'.\n\nПроверьте, включен ли принтер, и настроен ли он правильно." STRING_TEXT_DOCUMENT "Текстовый документ" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 1e89852277..87718194d1 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -70,8 +70,7 @@ BEGIN BEGIN MENUITEM "&Témy Pomocníka", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Č&o je Poznámkový blok", CMD_ABOUT - MENUITEM "Čo je &Víno (Wine)", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -136,23 +135,6 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Čo je Poznámkový blok systému ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Poznámkový blok systému ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Zavrieť", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Tento program je voľný softvér; môžete ho šíriť a/alebo modifikovať podľa podmienok GNU Všeobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buď verzie 2 tejto licencie, alebo (podľa Vášho uváženia) niektorej neskoršej verzie.\r\n\r\nTento program je distribuovaný v nádeji, že bude užitočný, avšak BEZ AKEJKOĽVEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URČITÝ ÚČEL. Pre viac detailov si pozri [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -191,4 +173,5 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index cb786f2b02..412ccad46a 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Teme pomoèi", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "Inf&ormacije ...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ operacijo. \nÈe ga želite sprostiti, konèajte enega ali veè programov in pos STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index d24276a9e7..222d9a3b7a 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -66,8 +66,7 @@ BEGIN BEGIN MENUITEM "përmbajtje", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Rreth", CMD_ABOUT - MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -132,23 +131,6 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Rreth ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Mbyll", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Ky program është software falas, ju mund ta shpërndani dhe/ose modifikoni sipas kushteve të GNU General Public License të publikuar nga Fondacioni Free Software;. Sipas versionit 2 të Liçencës, ose (sipas opinionit tuaj) çdo versioni të mëvonshëm\r\n\r\nKy program shpërndahet me shpresën që do t'ju jetë i dobishëm, por PA ASNJË GARANCI; madje edhe pa garancinë preçize të SHITJES apo PËRDORIMIT PËR NJË QËLLIM TË CAKTUAR. Shiko Liçencën Publike të Përgjithshme GNU për h [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -187,4 +169,5 @@ detyrë. \nMbyll nje ose me shume programe te rrisesh shumën e \nmemories." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index d03deb5199..d9806ccd2e 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Innehåll", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Om &Anteckningar", CMD_ABOUT - MENUITEM "Inf&ormation...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Om ReactOS Anteckningar" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Anteckningar v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Stäng", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" @@ -183,4 +165,5 @@ den här åtgärden. \nAvsluta ett eller flera program för att frigöra mer min STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index 842590e008..a87748ffe7 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "เนื้อหา", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About", CMD_ABOUT - MENUITEM "รายละเอียด...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Notepad" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Close", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -178,4 +160,5 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index b6ca27f3d1..9f2cd4c00b 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -64,8 +64,7 @@ BEGIN BEGIN MENUITEM "Yardım'ı &Görüntüle", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Not Defteri &Hakkında...", CMD_ABOUT - MENUITEM "&Bilgi...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Not Defteri &Hakkında...", CMD_HELP_ABOUT_NOTEPAD END END @@ -130,23 +129,6 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Not Defteri Hakkında" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Not Defteri - Sürüm: 1.0\r\nTelif Hakları:\r\n1997,98 - Marcel Baur\r\n2000 - Mike McCormack\r\n2002 - Sylvain Petreolle\r\n2002 - Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Kapat", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu program özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Genel Kamu Lisansı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veya değiştirebilirsiniz.\r\n\r\nBu program, kullanışlı olabileceği beklentisiyle dağıtılmışt [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -180,4 +162,5 @@ BEGIN STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." STRING_TEXT_DOCUMENT "Metin Belgesi" + STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index c8bdf3403a..2fde8230b6 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "Змі&ст", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&Про", CMD_ABOUT - MENUITEM "Про програм&у", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Про Блокнот ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Блокнот ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Закрити", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Це вільне програмне забезпечення; Ви можете розповсюджувати її та змінювати, дотримуючись умови Відкритої ліцензійної угоди GNU, опублікованої Фондом вільного програмного забезпечення; або редакції 2 Угоди, або будь-якої редакції, випущеної пізніше.\r\n\r\nЦя програма розповсюджується в надії на те, що вона виявиться корисною, але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ, включаючи УЯВНОЮ ГАРАНТІЄЮ ЯКОСТІ або ПРИДАТНОСТІ для певних цілей. Подробиці містяться у Відкритій ліцензійній уго [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index 99c5080788..afeee56ac6 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "&Содержание", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "Bloknot h&aqida", CMD_ABOUT - MENUITEM "&Сведения...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "Bekor qilmoq", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "О программе Bloknot ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Bloknot ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur\r\nCopyright 2000 Mike McCormack\r\nCopyright 2002 Sylvain Petreolle\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "Закрыть", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "Эта программа является свободно распространяемой; Вы можете распространять ее повторно и (или) изменять, соблюдая условия Открытого лицензионного соглашения GNU, опубликованного Фондом свободно распространяемого программного обеспечения; либо редакции 2 Соглашения, либо (на ваше усмотрение) любой редакции, выпущенной позже.\r\n\r\nЭта программа распространяется в надежде на то, что она окажется полезной, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, включая подразумеваемую гарантию КАЧ [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -183,4 +165,5 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index b09b2daa41..759f70e152 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -64,8 +64,7 @@ BEGIN BEGIN MENUITEM "内容(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "关于(&A)", CMD_ABOUT - MENUITEM "系统信息(&O)...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "About Notepad (&A)", CMD_HELP_ABOUT_NOTEPAD END END @@ -130,23 +129,6 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "关于 ReactOS 记事本" -FONT 9, "宋体" -BEGIN - CONTROL "ReactOS 记事本 v1.0\r\n版权所有 1997,98 Marcel Baur\r\n版权所有 2000 Mike McCormack\r\n版权所有 2002 Sylvain Petreolle\r\n版权所有 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "关闭", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "本程序为自由软件; 您可以根据自由软件基金会发布的 GNU 通用公共许可证许可证的第 2 版，或（根据您的选择）任何更高版本的条款进行重新分发和修改它。\r\n\r\n本程序的发布是希望它有用，但没有任何担保; 甚至没有适销性或特定用途适用性的暗示保证。有关详细信息，请参阅 GNU 通用公共许可证。\r\n\r\n您应该已收到 GNU 通用公共许可证的副本以及本程序; 如果没有，请写信给 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA。" -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -185,4 +167,5 @@ BEGIN STRING_PRINTERROR "无法打印文件 '%s'。\n\n请确保打印机已打开，并且已正确配置。" STRING_TEXT_DOCUMENT "文本文档" + STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index ab4c3747a9..5a75df2e6f 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -62,8 +62,7 @@ BEGIN BEGIN MENUITEM "內容(&C)", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "關於(&A)", CMD_ABOUT - MENUITEM "資訊(&O)", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD END END @@ -128,23 +127,6 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP END -IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "關於 ReactOS 記事本" -FONT 9, "新細明體" -BEGIN - CONTROL "ReactOS 記事本 v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 - DEFPUSHBUTTON "關閉", IDOK, 114, 149, 44, 15, WS_GROUP - ICON IDI_NPICON, -1, 12, 9, 20, 30 - EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - -STRINGTABLE -BEGIN - STRING_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more [...] -END - STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ @@ -184,4 +166,5 @@ BEGIN 請檢查印表機是否已經開機和正確設定。" STRING_TEXT_DOCUMENT "Text Document" + STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 1540b73635..c424449a33 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -87,14 +87,6 @@ static int NOTEPAD_MenuCommand(WPARAM wParam) case CMD_STATUSBAR: DIALOG_ViewStatusBar(); break; case CMD_HELP_CONTENTS: DIALOG_HelpContents(); break; - - case CMD_ABOUT: - DialogBox(GetModuleHandle(NULL), - MAKEINTRESOURCE(IDD_ABOUTBOX), - Globals.hMainWnd, - AboutDialogProc); - break; - case CMD_HELP_ABOUT_NOTEPAD: DIALOG_HelpAboutNotepad(); break; default: diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index 5fa2ea2d10..9fa9817e44 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -30,8 +30,7 @@ #define DIALOG_GOTO 0x207 #define ID_LINENUMBER 0x208 #define IDI_NPICON 0x209 -#define IDD_ABOUTBOX 0x20A -#define IDC_LICENSE 0x20B +#define IDC_LICENSE 0x20A /* Commands */ #define CMD_NEW 0x100 @@ -62,8 +61,7 @@ #define CMD_STATUSBAR_WND_ID 0x151 #define CMD_HELP_CONTENTS 0x130 -#define CMD_ABOUT 0x135 -#define CMD_HELP_ABOUT_NOTEPAD 0x137 +#define CMD_HELP_ABOUT_NOTEPAD 0x135 /* Strings */ #define STRING_PAGESETUP_HEADERVALUE 0x160 @@ -98,8 +96,9 @@ #define STRING_LF 0x183 #define STRING_CR 0x184 -#define STRING_LICENSE 0x185 #define STRING_LINE_COLUMN 0x186 #define STRING_PRINTERROR 0x187 #define STRING_TEXT_DOCUMENT 0x200 + +#define STRING_NOTEPAD_AUTHORS 0x300

6 years

[reactos] 04/04: [BOOTDATA][SETUPLIB] Setup the Romanian Stdandard Keyboard layout. (#861)

by Ștefan Fulea

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0ab61e6c346c66a9ed5a… commit b0ab61e6c346c66a9ed5a480245a293f5e0ee727 Author: Ștefan Fulea <stefan.fulea(a)mail.com> AuthorDate: Sat Sep 15 21:02:49 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 18:53:18 2018 +0100 [BOOTDATA][SETUPLIB] Setup the Romanian Stdandard Keyboard layout. (#861) Adjust the miscellaneous files to activate the Romanian Standard Keyboard layout in the OS and set it as default for Romanian. CORE-15056 --- base/setup/lib/lang/ro-RO.h | 2 +- boot/bootdata/hivesys.inf | 15 +++++++++++---- boot/bootdata/txtsetup.sif | 4 +++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/base/setup/lib/lang/ro-RO.h b/base/setup/lib/lang/ro-RO.h index f8f17441a2..ae7f1acbea 100644 --- a/base/setup/lib/lang/ro-RO.h +++ b/base/setup/lib/lang/ro-RO.h @@ -2,7 +2,7 @@ MUI_LAYOUTS roROLayouts[] = { - { L"0418", L"00000418" }, + { L"0418", L"00010418" }, { L"0409", L"00000409" }, { NULL, NULL } }; diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 41da57681e..aa85d6ccdb 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -617,9 +617,13 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Text", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000816","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5019" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout File",0x00000000,"kbdro.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout Text",0x00000000,%ROMANIAN% +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout Text",0x00000000,%ROMANIAN_LEGACY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000418","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5037" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010418","Layout File",0x00000000,"kbdrost.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010418","Layout Text",0x00000000,%ROMANIAN_STANDARD% +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010418","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5175" + HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout File",0x00000000,"kbdru.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Text",0x00000000,%RUSSIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000419","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5055" @@ -2275,7 +2279,8 @@ POLISH_214 = "Polish (214)" POLISH_PROGRAMMERS = "Polish (Programmers)" PORTUGESE = "Portuguese (Portugal)" PORTUGESE_BRAZILIAN% = "Portuguese (Brazilian ABNT2)" -ROMANIAN = "Romanian" +ROMANIAN_LEGACY = "Romanian (Legacy)" +ROMANIAN_STANDARD = "Romanian (Standard)" RUSSIAN = "Russian" RUSSIAN_TYPEWRITER = "Russian (Typewriter)" SERBIAN_CYRILLIC = "Serbian (Cyrillic)" @@ -2413,7 +2418,8 @@ POLISH_214 = "Polski (214)" POLISH_PROGRAMMERS = "Polski (Programisty)" PORTUGESE = "Portugalski" PORTUGESE_BRAZILIAN% = "Portugalski (Brazylijski ABNT2)" -ROMANIAN = "Rumuński" +ROMANIAN_LEGACY = "Rumuński (Legacy)" +ROMANIAN_STANDARD = "Rumuński (Standard)" RUSSIAN = "Rosyjski" RUSSIAN_TYPEWRITER = "Rosyjski (Maszynisty)" SERBIAN_CYRILLIC = "Serbski (Cyrylica)" @@ -2551,7 +2557,8 @@ POLISH_214 = "Poloneză (214)" POLISH_PROGRAMMERS = "Poloneză (programatori)" PORTUGESE = "Portugheză (Portugalia)" PORTUGESE_BRAZILIAN% = "Portugheză (Braziliană ABNT2)" -ROMANIAN = "Română" +ROMANIAN_LEGACY = "Română (moștenire)" +ROMANIAN_STANDARD = "Română (standard)" RUSSIAN = "Rusă" RUSSIAN_TYPEWRITER = "Rusă (dactilografiere)" SERBIAN_CYRILLIC = "Sârbă (alfabet chirilic)" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 03609d2fcf..e86b59f6a3 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -489,7 +489,8 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00010415 = "Polish (214)" 00010416 = "Portuguese (Brazilian ABNT2)" 00000816 = "Portuguese (Portugal)" -00000418 = "Romanian" +00000418 = "Romanian (Legacy)" +00010418 = "Romanian (Standard)" 00000419 = "Russian" 00010419 = "Russian (Typewriter)" 00000C1A = "Serbian (Cyrillic)" @@ -559,6 +560,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00000816 = kbdpo.dll 00010416 = kbdbr.dll 00000418 = kbdro.dll +00010418 = kbdrost.dll 00000419 = kbdru.dll 00010419 = kbdru1.dll 0000041A = kbdcr.dll

6 years

[reactos] 03/04: [CPL:INPUT] Update Input's existing localized information. (#861)

by Ștefan Fulea

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a333e68458eb1c8d76cd… commit 8a333e68458eb1c8d76cd7d221600af542d88935 Author: Ștefan Fulea <stefan.fulea(a)mail.com> AuthorDate: Sat Sep 15 21:02:05 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 8 18:52:56 2018 +0100 [CPL:INPUT] Update Input's existing localized information. (#861) Update the name of the Romanian Keyboard layout in localized resources by renaming the existing one as legacy and adding the new one as standard. Use the same resource string ID as the one used in input.cpl from later versions of Windows that do have kbdrost. This improves the Windows binary compatibility of kbrost's setup. CORE-15056 --- dll/cpl/input/lang/bg-BG.rc | 3 ++- dll/cpl/input/lang/cs-CZ.rc | 3 ++- dll/cpl/input/lang/de-DE.rc | 3 ++- dll/cpl/input/lang/el-GR.rc | 3 ++- dll/cpl/input/lang/en-US.rc | 3 ++- dll/cpl/input/lang/es-ES.rc | 3 ++- dll/cpl/input/lang/fr-FR.rc | 3 ++- dll/cpl/input/lang/he-IL.rc | 3 ++- dll/cpl/input/lang/it-IT.rc | 3 ++- dll/cpl/input/lang/ja-JP.rc | 3 ++- dll/cpl/input/lang/no-NO.rc | 3 ++- dll/cpl/input/lang/pl-PL.rc | 3 ++- dll/cpl/input/lang/pt-BR.rc | 3 ++- dll/cpl/input/lang/ro-RO.rc | 3 ++- dll/cpl/input/lang/ru-RU.rc | 3 ++- dll/cpl/input/lang/sk-SK.rc | 3 ++- dll/cpl/input/lang/sq-AL.rc | 3 ++- dll/cpl/input/lang/tr-TR.rc | 3 ++- dll/cpl/input/lang/uk-UA.rc | 3 ++- dll/cpl/input/lang/zh-CN.rc | 3 ++- dll/cpl/input/lang/zh-TW.rc | 3 ++- dll/cpl/input/resource.h | 3 ++- 22 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index ff4765ffc9..41dd8bb86f 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portuguese (Brazilian ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portuguese (Brazilian ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Romanian" + IDS_ROMANIAN_LEGACY_LAYOUT "Romanian (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Romanian (Standard)" IDS_RUSSIAN_LAYOUT "Russian" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russian (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbian (Cyrillic)" diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 54e97bff60..c419a0b358 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -219,7 +219,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugalština (Brazilská ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugalština (Brazilská ABNT2)" IDS_PUNJABI_LAYOUT "Paňdžábština" - IDS_ROMANIAN_LAYOUT "Rumunština" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumunština (Staré)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumunština (Standard)" IDS_RUSSIAN_LAYOUT "Ruština" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Ruština (Psací stroj)" IDS_SERBIAN_CYRILLIC_LAYOUT "Srbština (Cyrilice)" diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 705148ac87..3ed70ae107 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugiesisch (Brasilianisch, ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugiesisch (Brasilianisch, ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Rumänisch" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumänisch (herkömmlich)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumänisch (Standard)" IDS_RUSSIAN_LAYOUT "Russisch" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russisch (Schreibmaschine)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbisch (Kyrillisch)" diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index 332277b89d..ee3f853ade 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portuguese (Brazilian ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Πορτογαλικά (Brazilian ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Ρουμάνικα" + IDS_ROMANIAN_LEGACY_LAYOUT "Ρουμάνικα (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Ρουμάνικα (Standard)" IDS_RUSSIAN_LAYOUT "Ρώσικα" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Ρώσικα (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Σέρβικα (Κυριλλικά)" diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 4d734791c6..fc38485460 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portuguese (Brazilian ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portuguese (Brazilian ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Romanian" + IDS_ROMANIAN_LEGACY_LAYOUT "Romanian (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Romanian (Standard)" IDS_RUSSIAN_LAYOUT "Russian" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russian (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbian (Cyrillic)" diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index 091459faec..b7a75faa18 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -223,7 +223,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugués (brasileño ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugués (brasileño ABNT2)" IDS_PUNJABI_LAYOUT "Panyabí" - IDS_ROMANIAN_LAYOUT "Rumano" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumano (heredado)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumano (Standard)" IDS_RUSSIAN_LAYOUT "Ruso" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Ruso (mecanografiado)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbio (cirílico)" diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 0bc0e2036c..35c84450c1 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -215,7 +215,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugais(Brésilien ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugais (Brésilien ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Roumain" + IDS_ROMANIAN_LEGACY_LAYOUT "Roumain (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Roumain (Standard)" IDS_RUSSIAN_LAYOUT "Russe" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russe (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbe (Cyrillic)" diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index 076ba17295..4b88559d9c 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -216,7 +216,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "פורטוגזית (ברזילאית ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "פורטוגזית (ברזלאית ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "רומנית" + IDS_ROMANIAN_LEGACY_LAYOUT "רומנית (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "רומנית (Standard)" IDS_RUSSIAN_LAYOUT "רוסית" IDS_RUSSIAN_TYPEWRITER_LAYOUT "רוסית (מכונת כתיבה)" IDS_SERBIAN_CYRILLIC_LAYOUT "סרבית (קירילית)" diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index dd6314f320..2d00b07d79 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portoghese (brasiliano ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portoghese (brasiliano ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Rumeno" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumeno (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumeno (Standard)" IDS_RUSSIAN_LAYOUT "Russo" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russo (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbo (cirillico)" diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 8952da839f..5456447899 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -213,7 +213,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "ポルトガル語 (ブラジルABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "ポルトガル語 (ブラジルABNT2)" IDS_PUNJABI_LAYOUT "パンジャブ語" - IDS_ROMANIAN_LAYOUT "ルーマニア語" + IDS_ROMANIAN_LEGACY_LAYOUT "ルーマニア語 (レガシー)" + IDS_ROMANIAN_STANDARD_LAYOUT "ルーマニア語 (標準)" IDS_RUSSIAN_LAYOUT "ロシア語" IDS_RUSSIAN_TYPEWRITER_LAYOUT "ロシア語 (タイプライター)" IDS_SERBIAN_CYRILLIC_LAYOUT "セルビア語 (キリル)" diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index e860a6798b..1121937fef 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portuguese (Brazilian ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portuguese (Brazilian ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Romanian" + IDS_ROMANIAN_LEGACY_LAYOUT "Romanian (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Romanian (Standard)" IDS_RUSSIAN_LAYOUT "Russian" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russian (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbian (Cyrillic)" diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index 70998e2305..4b96bf762b 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -222,7 +222,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugalski (Brazylijski ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugalski (Brazylijski ABNT2)" IDS_PUNJABI_LAYOUT "Pendżabski" - IDS_ROMANIAN_LAYOUT "Rumuński" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumuński (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumuński (Standard)" IDS_RUSSIAN_LAYOUT "Rosyjski" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Rosyjski (Maszynisty)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbski (Cyrylica)" diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 36a281b6aa..18b1c70f0e 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Português (Brasil ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Português (Brasil ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Romeno" + IDS_ROMANIAN_LEGACY_LAYOUT "Romeno (legado)" + IDS_ROMANIAN_STANDARD_LAYOUT "Romeno (padrão)" IDS_RUSSIAN_LAYOUT "Russo" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Russo (typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Sérvio (cirílico)" diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index 4e56bdc364..a51b5868d3 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -216,7 +216,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugheză (Braziliană ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portuguese (Braziliană ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Română" + IDS_ROMANIAN_LEGACY_LAYOUT "Română (moștenire)" + IDS_ROMANIAN_STANDARD_LAYOUT "Română (standard)" IDS_RUSSIAN_LAYOUT "Rusă" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Rusă (dactilografică)" IDS_SERBIAN_CYRILLIC_LAYOUT "Sârbă (grafie chirilică)" diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index bf4b21ad87..b71ce0530c 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -214,7 +214,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Португальская (Бразильская ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Португальская (Бразилия)" IDS_PUNJABI_LAYOUT "Пенджабская" - IDS_ROMANIAN_LAYOUT "Румынская" + IDS_ROMANIAN_LEGACY_LAYOUT "Румынская (традиционная)" + IDS_ROMANIAN_STANDARD_LAYOUT "Румынская (стандартная)" IDS_RUSSIAN_LAYOUT "Русская" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Русская (машинопись)" IDS_SERBIAN_CYRILLIC_LAYOUT "Сербская (кириллица)" diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 4adb1391ec..0f36c4b79e 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -219,7 +219,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugalské (brazílske ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugalské (brazílske ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Rumunské" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumunské (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumunské (Standard)" IDS_RUSSIAN_LAYOUT "Ruské" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Ruské (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Srbské (Cyrillic)" diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index 02566a80de..b4ad5728a0 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -218,7 +218,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portugeze (Brazilian ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portugeze (Brazilian ABNT2)" IDS_PUNJABI_LAYOUT "Punjabi" - IDS_ROMANIAN_LAYOUT "Romane" + IDS_ROMANIAN_LEGACY_LAYOUT "Romane (Legacy)" + IDS_ROMANIAN_STANDARD_LAYOUT "Romane (Standard)" IDS_RUSSIAN_LAYOUT "Ruse" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Ruse (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT "Serbe (Cyrillic)" diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 3135e36827..5e8500a4f0 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -216,7 +216,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Portekizce (Brezilya ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Portekizce (Brezilya ABNT2)" IDS_PUNJABI_LAYOUT "Pencapça" - IDS_ROMANIAN_LAYOUT "Rumence" + IDS_ROMANIAN_LEGACY_LAYOUT "Rumence (Eski)" + IDS_ROMANIAN_STANDARD_LAYOUT "Rumence (Ölçün)" IDS_RUSSIAN_LAYOUT "Rusça" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Rusça (Yazı Makinesi)" IDS_SERBIAN_CYRILLIC_LAYOUT "Sırpça (Kiril)" diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index 56c55d5190..990d29aa8b 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -222,7 +222,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "Португальська (Бразилія ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "Португальська (Бразилія ABNT2)" IDS_PUNJABI_LAYOUT "Панджабі" - IDS_ROMANIAN_LAYOUT "Румунська" + IDS_ROMANIAN_LEGACY_LAYOUT "Румунська (традиційна)" + IDS_ROMANIAN_STANDARD_LAYOUT "Румунська (стандартна)" IDS_RUSSIAN_LAYOUT "Російська" IDS_RUSSIAN_TYPEWRITER_LAYOUT "Російська (друкарська машинка)" IDS_SERBIAN_CYRILLIC_LAYOUT "Сербська (кирилиця)" diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index dbdf55b1ed..935909185c 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -216,7 +216,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "葡萄牙文(巴西 ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "葡萄牙文(巴西 ABNT2)" IDS_PUNJABI_LAYOUT "旁遮普文" - IDS_ROMANIAN_LAYOUT "罗马尼亚文" + IDS_ROMANIAN_LEGACY_LAYOUT "罗马尼亚文 (传统)" + IDS_ROMANIAN_STANDARD_LAYOUT "罗马尼亚文 (标准)" IDS_RUSSIAN_LAYOUT "俄文" IDS_RUSSIAN_TYPEWRITER_LAYOUT "俄文(打字机)" IDS_SERBIAN_CYRILLIC_LAYOUT "塞尔维亚西里尔文" diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index 981176ea5c..8cbd9378e7 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -216,7 +216,8 @@ BEGIN IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT "葡萄牙文(巴西 ABNT)" IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT "葡萄牙文(巴西 ABNT2)" IDS_PUNJABI_LAYOUT "旁遮普文" - IDS_ROMANIAN_LAYOUT "羅馬尼亞文" + IDS_ROMANIAN_LEGACY_LAYOUT "羅馬尼亞文 (傳統)" + IDS_ROMANIAN_STANDARD_LAYOUT "羅馬尼亞文 (標準)" IDS_RUSSIAN_LAYOUT "俄文" IDS_RUSSIAN_TYPEWRITER_LAYOUT "俄文(打字機)" IDS_SERBIAN_CYRILLIC_LAYOUT "塞爾維亞西里爾文" diff --git a/dll/cpl/input/resource.h b/dll/cpl/input/resource.h index fee7e9cda9..3e41eab1ca 100644 --- a/dll/cpl/input/resource.h +++ b/dll/cpl/input/resource.h @@ -96,7 +96,7 @@ #define IDS_HUNGARIAN_101_KEY_LAYOUT 5034 #define IDS_POLISH_LAYOUT 5035 #define IDS_POLISH_214_LAYOUT 5036 -#define IDS_ROMANIAN_LAYOUT 5037 +#define IDS_ROMANIAN_LEGACY_LAYOUT 5037 #define IDS_SERBIAN_LATIN_LAYOUT 5038 #define IDS_SLOVAK_LAYOUT 5039 #define IDS_SLOVAK_QWERTY_LAYOUT 5040 @@ -199,3 +199,4 @@ #define IDS_BURMESE_LAYOUT 5140 #define IDS_UKRAINIAN_STUDENT_LAYOUT 5141 #define IDS_ESPERANTO_LAYOUT 5142 +#define IDS_ROMANIAN_STANDARD_LAYOUT 5175

6 years

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2018