1 Mar
2007
1 Mar
'07
10:37 a.m.
Author: fireball
Date: Thu Mar 1 13:37:19 2007
New Revision: 25933
URL: http://svn.reactos.org/svn/reactos?rev=25933&view=rev
Log:
Merge 25895, 25896
Modified:
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/cs-CZ.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/da-DK.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/de-DE.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/el-GR.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/en-US.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/es-ES.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fi-FI.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fr-FR.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/hu-HU.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/it-IT.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ja-JP.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nb-NO.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nl-NL.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pl-PL.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pt-PT.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ru-RU.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sk-SK.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sl-SI.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sv-SE.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/th-TH.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/uk-UA.rc
branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/zh-CN.rc
branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.c
branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmdinput.c
branches/ros-branch-0_3_1/reactos/base/shell/cmd/filecomp.c
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/cs-CZ.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/cs-CZ.rc Thu Mar 1
13:37:19 2007
@@ -105,9 +105,9 @@
LTEXT "&Dolní:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Storno", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Nápovìda", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Storno", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Nápovìda", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/da-DK.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/da-DK.rc Thu Mar 1
13:37:19 2007
@@ -103,9 +103,9 @@
LTEXT "&Bund:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Annuller", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Hjælp", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Annuller", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Hjælp", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/de-DE.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/de-DE.rc Thu Mar 1
13:37:19 2007
@@ -114,7 +114,7 @@
DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
PUSHBUTTON "Abbrechen", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
-PUSHBUTTON "&Hilfe", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Hilfe", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog 'Gehe zu...' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/el-GR.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/el-GR.rc Thu Mar 1
13:37:19 2007
@@ -110,9 +110,9 @@
LTEXT "&ÊÜôù:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Áêýñùóç", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&ÂïÞèåéá", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Áêýñùóç", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&ÂïÞèåéá", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog `Encoding' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/en-US.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/en-US.rc Thu Mar 1
13:37:19 2007
@@ -114,7 +114,7 @@
DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
-PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog `Encoding' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/es-ES.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/es-ES.rc Thu Mar 1
13:37:19 2007
@@ -106,9 +106,9 @@
LTEXT "Aba&jo:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "Aceptar", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Cancelar", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Ayuda", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "Aceptar", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Ayuda", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fi-FI.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fi-FI.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fi-FI.rc Thu Mar 1
13:37:19 2007
@@ -101,9 +101,9 @@
LTEXT "&Ala:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Peruuta", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Apua", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Peruuta", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Apua", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fr-FR.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/fr-FR.rc Thu Mar 1
13:37:19 2007
@@ -113,9 +113,9 @@
LTEXT "&Bas :", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Annuler", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Aide", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Annuler", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Aide", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog `Encoding' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/hu-HU.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/hu-HU.rc Thu Mar 1
13:37:19 2007
@@ -104,9 +104,9 @@
LTEXT "&Alsó:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Mégse", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Súgó", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Mégse", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON "&Súgó", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/it-IT.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/it-IT.rc Thu Mar 1
13:37:19 2007
@@ -107,9 +107,9 @@
LTEXT "In&feriore:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Annulla", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Aiuto", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Annulla", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Aiuto", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ja-JP.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ja-JP.rc Thu Mar 1
13:37:19 2007
@@ -112,9 +112,9 @@
LTEXT "º(&B):", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "LZ", 0x152, 180, 21, 40, 15,
WS_TABSTOP
-PUSHBUTTON "wv(&H)", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "LZ", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "wv(&H)", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog `Encoding' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nb-NO.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nb-NO.rc Thu Mar 1
13:37:19 2007
@@ -114,7 +114,7 @@
DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
-PUSHBUTTON "&Hjelp", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Hjelp", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog `Encoding' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nl-NL.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/nl-NL.rc Thu Mar 1
13:37:19 2007
@@ -102,9 +102,9 @@
LTEXT "&Onder:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP
-PUSHBUTTON "Annuleren", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP
+PUSHBUTTON "Annuleren", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pl-PL.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pl-PL.rc Thu Mar 1
13:37:19 2007
@@ -105,9 +105,9 @@
LTEXT "&Dolny:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Anuluj", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Pomoc", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Anuluj", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Pomoc", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pt-PT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pt-PT.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/pt-PT.rc Thu Mar 1
13:37:19 2007
@@ -105,9 +105,9 @@
LTEXT "&Inferior:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Cancelar", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Ajuda", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Cancelar", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Ajuda", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ru-RU.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/ru-RU.rc Thu Mar 1
13:37:19 2007
@@ -100,9 +100,9 @@
LTEXT "&Íèæíåå:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Îòìåíà", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Ñïðàâêà", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Îòìåíà", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Ñïðàâêà", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sk-SK.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sk-SK.rc Thu Mar 1
13:37:19 2007
@@ -107,9 +107,9 @@
LTEXT "&Bottom:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Cancel", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Help", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Cancel", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Help", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sl-SI.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sl-SI.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sl-SI.rc Thu Mar 1
13:37:19 2007
@@ -101,9 +101,9 @@
LTEXT "&Spodaj:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "V redu", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Preklièi", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Pomoè", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "V redu", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Preklièi", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Pomoè", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sv-SE.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/sv-SE.rc Thu Mar 1
13:37:19 2007
@@ -103,9 +103,9 @@
LTEXT "&Nederkant:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Avbryt", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "&Hjälp", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Avbryt", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Hjälp", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/th-TH.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/th-TH.rc Thu Mar 1
13:37:19 2007
@@ -102,9 +102,9 @@
LTEXT "ÅèÒ§:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "µ¡Å§", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "¡àÅÔ¡", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "ªèÇÂàËÅÕÍ", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "µ¡Å§", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "¡àÅÔ¡", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/uk-UA.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/uk-UA.rc Thu Mar 1
13:37:19 2007
@@ -105,9 +105,9 @@
LTEXT "&Íèæíº:", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "Ñêàñóâàòè", 0x152, 180, 21, 40, 15,
WS_TABSTOP
-PUSHBUTTON "&Äîâ³äêà", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 180, 21, 40, 15,
WS_TABSTOP
+PUSHBUTTON "&Äîâ³äêà", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
/* Dialog `Encoding' */
Modified: branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/zh-CN.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/applications/notepad/lang/zh-CN.rc Thu Mar 1
13:37:19 2007
@@ -101,9 +101,9 @@
LTEXT "Ï£¨&B£©£º", 0x14E,100, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD |
WS_BORDER | WS_TABSTOP
-DEFPUSHBUTTON "È·¶¨", 0x151, 180, 3, 40, 15,
WS_TABSTOP
-PUSHBUTTON "È¡Ïû", 0x152, 180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON "°ïÖú£¨&£©", 0x153, 180, 39, 40, 15,
WS_TABSTOP
+DEFPUSHBUTTON "È·¶¨", IDOK, 180, 3, 40, 15,
WS_TABSTOP
+PUSHBUTTON "È¡Ïû", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP
+PUSHBUTTON "°ïÖú£¨&£©", IDHELP, 180, 39, 40, 15,
WS_TABSTOP
}
IDD_ABOUTBOX DIALOG DISCARDABLE 22,16,284,170
Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.c (original)
+++ branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.c Thu Mar 1 13:37:19 2007
@@ -1172,7 +1172,7 @@
GetSystemTime(&t);
_sntprintf ( ret, retlen, _T("%02d%c%02d%c%02d%c%02d"),
t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator,
- t.wSecond, cDecimalSeparator, t.wMilliseconds );
+ t.wSecond, cDecimalSeparator, t.wMilliseconds / 10);
return ret;
}
/* %DATE% */
Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmdinput.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmdinput.c (original)
+++ branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmdinput.c Thu Mar 1 13:37:19 2007
@@ -139,8 +139,10 @@
TCHAR ch;
BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/
BOOL bReturn = FALSE;
- TCHAR szPath[MAX_PATH];
BOOL bCharInput;
+ #ifdef FEATURE_4NT_FILENAME_COMPLETION
+ TCHAR szPath[MAX_PATH];
+ #endif
/* get screen size */
GetScreenSize (&maxx, &maxy);
Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/filecomp.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/shell/cmd/filecomp.c (original)
+++ branches/ros-branch-0_3_1/reactos/base/shell/cmd/filecomp.c Thu Mar 1 13:37:19 2007
@@ -43,7 +43,7 @@
LPCOMMAND cmds_ptr;
/* expand current file name */
- count = charcount - 1;
+ count = charcount - 1;
if (count < 0)
count = 0;
@@ -89,6 +89,7 @@
_tcscpy (path, directory);
while (curplace >= 0 && directory[curplace] != _T('\\') &&
+ directory[curplace] != _T('/') &&
directory[curplace] != _T(':'))
{
directory[curplace] = 0;
@@ -205,7 +206,7 @@
BOOL found_dot = FALSE;
INT curplace = 0;
INT start;
- UINT count;
+ INT count;
TCHAR path[MAX_PATH];
TCHAR fname[MAX_PATH];
TCHAR directory[MAX_PATH];
@@ -361,6 +362,7 @@
TCHAR * szSearch;
TCHAR * szSearch1;
TCHAR * szSearch2;
+ TCHAR * szSearch3;
/* number of quotes in the string */
INT nQuotes = 0;
/* used in for loops */
@@ -394,9 +396,12 @@
_tcscpy(szSuffix,szSearch);
/* Find the one closest to end */
szSearch1 = _tcsrchr(str, _T('\"'));
- szSearch2 = _tcsrchr(str, _T('\\'));
+ szSearch2 = _tcsrchr(str, _T('\\'));
+ szSearch3 = _tcsrchr(str, _T('.'));
if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2))
szSearch = szSearch2;
+ else if(szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3))
+ szSearch = szSearch3;
else
szSearch = szSearch1;
/* Move one char past */
@@ -436,9 +441,12 @@
/* Find the closest to the end space or \ */
_tcscpy(str,strIN);
szSearch1 = _tcsrchr(str, _T(' '));
- szSearch2 = _tcsrchr(str, _T('\\'));
+ szSearch2 = _tcsrchr(str, _T('\\'));
+ szSearch3 = _tcsrchr(str, _T('/'));
if(szSearch2 != NULL && _tcslen(szSearch1) > _tcslen(szSearch2))
szSearch = szSearch2;
+ else if(szSearch3 != NULL && _tcslen(szSearch1) > _tcslen(szSearch3))
+ szSearch = szSearch3;
else
szSearch = szSearch1;
szSearch++;