David Nordenberg: Swedish translation, proofread by Andreas Bjerkeholt
Added: trunk/reactos/lib/userenv/Sv.rc
Modified: trunk/reactos/lib/userenv/userenv.rc
_____
Added: trunk/reactos/lib/userenv/Sv.rc
--- trunk/reactos/lib/userenv/Sv.rc 2005-05-01 13:58:30 UTC (rev
14912)
+++ trunk/reactos/lib/userenv/Sv.rc 2005-05-01 14:39:01 UTC (rev
14913)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2005 David Nordenberg
+ *
+ * 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.
+ *
+ * This 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 details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+ IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings"
+ IDS_APPDATA "Application Data"
+ IDS_DESKTOP "Skrivbord"
+ IDS_FAVORITES "Favoriter"
+ IDS_STARTMENU "Start-meny"
+ IDS_PROGRAMS "Start-meny\\Program"
+ IDS_ADMINTOOLS "Start-meny\\Program\\Administrativa verktyg"
+ IDS_STARTUP "Start-meny\\Program\\Autostart"
+ IDS_MYDOCUMENTS "Mina dokument"
+ IDS_MYPICTURES "Mina dokument\\Mina bilder"
+ IDS_MYMUSIC "Mina dokument\\Min musik"
+ IDS_MYVIDEOS "Mina dokument\\Mina videoklipp"
+ IDS_TEMPLATES "Mallar"
+ IDS_RECENT "Tidigare"
+ IDS_SENDTO "SendTo"
+ IDS_PRINTHOOD "Skrivare"
+ IDS_NETHOOD "Nõtverket"
+ IDS_LOCALSETTINGS "Lokala instõllningar"
+ IDS_LOCALAPPDATA "Lokala instõllningar\\Application Data"
+ IDS_TEMP "Lokala instõllningar\\Temp"
+ IDS_CACHE "Lokala instõllningar\\Temporary Internet Files"
+ IDS_HISTORY "Lokala instõllningar\\Tidigare"
+ IDS_COOKIES "Cookies"
+ IDS_PROGRAMFILES "%SystemDrive%\\Program files"
+END
_____
Modified: trunk/reactos/lib/userenv/userenv.rc
--- trunk/reactos/lib/userenv/userenv.rc 2005-05-01 13:58:30 UTC
(rev 14912)
+++ trunk/reactos/lib/userenv/userenv.rc 2005-05-01 14:39:01 UTC
(rev 14913)
@@ -38,3 +38,4 @@
#include "En.rc"
#include "De.rc"
+#include "Sv.rc"
- Use fixed message buffer size.
- Don't translate command options.
- Only use _one_ message buffer per function.
- Fix indentation mess.
Modified: trunk/reactos/subsys/system/cmd/En.rc
Modified: trunk/reactos/subsys/system/cmd/alias.c
Modified: trunk/reactos/subsys/system/cmd/attrib.c
Modified: trunk/reactos/subsys/system/cmd/batch.c
Modified: trunk/reactos/subsys/system/cmd/beep.c
Modified: trunk/reactos/subsys/system/cmd/call.c
Modified: trunk/reactos/subsys/system/cmd/chcp.c
Modified: trunk/reactos/subsys/system/cmd/choice.c
Modified: trunk/reactos/subsys/system/cmd/cls.c
Modified: trunk/reactos/subsys/system/cmd/cmd.c
Modified: trunk/reactos/subsys/system/cmd/cmd.h
Modified: trunk/reactos/subsys/system/cmd/cmd.rc
Modified: trunk/reactos/subsys/system/cmd/cmdinput.c
Modified: trunk/reactos/subsys/system/cmd/color.c
Modified: trunk/reactos/subsys/system/cmd/console.c
Modified: trunk/reactos/subsys/system/cmd/copy.c
Modified: trunk/reactos/subsys/system/cmd/date.c
Modified: trunk/reactos/subsys/system/cmd/del.c
Modified: trunk/reactos/subsys/system/cmd/delay.c
Modified: trunk/reactos/subsys/system/cmd/dir.c
Modified: trunk/reactos/subsys/system/cmd/dirstack.c
Modified: trunk/reactos/subsys/system/cmd/echo.c
Modified: trunk/reactos/subsys/system/cmd/error.c
Modified: trunk/reactos/subsys/system/cmd/for.c
Modified: trunk/reactos/subsys/system/cmd/free.c
Modified: trunk/reactos/subsys/system/cmd/goto.c
Modified: trunk/reactos/subsys/system/cmd/history.c
Modified: trunk/reactos/subsys/system/cmd/if.c
Modified: trunk/reactos/subsys/system/cmd/internal.c
Modified: trunk/reactos/subsys/system/cmd/label.c
Modified: trunk/reactos/subsys/system/cmd/locale.c
Modified: trunk/reactos/subsys/system/cmd/memory.c
Modified: trunk/reactos/subsys/system/cmd/misc.c
Modified: trunk/reactos/subsys/system/cmd/move.c
Modified: trunk/reactos/subsys/system/cmd/msgbox.c
Modified: trunk/reactos/subsys/system/cmd/path.c
Modified: trunk/reactos/subsys/system/cmd/pause.c
Modified: trunk/reactos/subsys/system/cmd/prompt.c
Modified: trunk/reactos/subsys/system/cmd/ren.c
Modified: trunk/reactos/subsys/system/cmd/resource.h
Modified: trunk/reactos/subsys/system/cmd/screen.c
Modified: trunk/reactos/subsys/system/cmd/set.c
Modified: trunk/reactos/subsys/system/cmd/shift.c
Modified: trunk/reactos/subsys/system/cmd/start.c
Modified: trunk/reactos/subsys/system/cmd/strtoclr.c
Modified: trunk/reactos/subsys/system/cmd/time.c
Modified: trunk/reactos/subsys/system/cmd/timer.c
Modified: trunk/reactos/subsys/system/cmd/title.c
Modified: trunk/reactos/subsys/system/cmd/type.c
Modified: trunk/reactos/subsys/system/cmd/ver.c
Modified: trunk/reactos/subsys/system/cmd/verify.c
Modified: trunk/reactos/subsys/system/cmd/vol.c
Modified: trunk/reactos/subsys/system/cmd/where.c
Modified: trunk/reactos/subsys/system/cmd/window.c
_____
Modified: trunk/reactos/subsys/system/cmd/En.rc
--- trunk/reactos/subsys/system/cmd/En.rc 2005-05-01 12:56:25 UTC
(rev 14911)
+++ trunk/reactos/subsys/system/cmd/En.rc 2005-05-01 13:58:30 UTC
(rev 14912)
@@ -1,5 +1,6 @@
#include "resource.h"
-/* Start move all hard code string to En.rc
+/*
+ * Moved all hardcoded strings to En.rc.
* By Magnus Olsen 2005
*/
@@ -7,60 +8,60 @@
STRINGTABLE DISCARDABLE
{
-STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n \
-ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n \
- [/S [/D]]\n\n \
- + Sets an attribute\n \
- - Clears an attribute\n \
- R Read-only file attribute\n \
- A Archive file attribute\n \
- S System file attribute\n \
- H Hidden file attribute\n \
- /S Processes matching files in the current directory\n \
- and all subdirectories\n \
- /D Processes direcories as well\n\n \
+STRING_ATTRIB_HELP, "Displays or changes file attributes.\n\n\
+ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\
+ [/S [/D]]\n\n\
+ + Sets an attribute\n\
+ - Clears an attribute\n\
+ R Read-only file attribute\n\
+ A Archive file attribute\n\
+ S System file attribute\n\
+ H Hidden file attribute\n\
+ /S Processes matching files in the current directory\n\
+ and all subdirectories\n\
+ /D Processes direcories as well\n\n\
Type ATTRIB without a parameter to display the attributes of all
files."
-STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n \
-ALIAS [alias=[command]]\n\n \
- alias Name for an alias.\n \
- command Text to be substituted for an alias.\n\n \
-To list all aliases:\n \
- ALIAS\n\n \
-To set a new or replace an existing alias:\n \
- ALIAS da=dir a:\n\n \
-To remove an alias from the alias list:\n \
+STRING_ALIAS_HELP, "Sets, removes or shows aliases.\n\n\
+ALIAS [alias=[command]]\n\n\
+ alias Name for an alias.\n\
+ command Text to be substituted for an alias.\n\n\
+To list all aliases:\n\
+ ALIAS\n\n\
+To set a new or replace an existing alias:\n\
+ ALIAS da=dir a:\n\n\
+To remove an alias from the alias list:\n\
ALIAS da="
STRING_BEEP_HELP, "Beep the speaker.\n\nBEEP"
-STRING_CALL_HELP, "Calls one batch program from another.\n\n \
-CALL [drive:][path]filename [batch-parameter]\n\n \
- batch-parameter Specifies any command-line information required by
the\n \
+STRING_CALL_HELP, "Calls one batch program from another.\n\n\
+CALL [drive:][path]filename [batch-parameter]\n\n\
+ batch-parameter Specifies any command-line information required by
the\n\
batch program."
-STRING_CD_HELP, "Changes the current directory or displays it's
name\n\n \
-CHDIR [drive:][path]\n \
-CHDIR[..|-]\n \
-CD [drive:][path]\n \
-CD[..|-]\n\n \
- .. parent directory\n \
- - previous directory\n\n \
-Type CD drive: to display the current directory on the specified
drive.\n \
-Type CD without a parameter to display the current drive and directory.
"
+STRING_CD_HELP, "Changes the current directory or displays it's
name\n\n\
+CHDIR [drive:][path]\n\
+CHDIR[..|-]\n\
+CD [drive:][path]\n\
+CD[..|-]\n\n\
+ .. parent directory\n\
+ - previous directory\n\n\
+Type CD drive: to display the current directory on the specified
drive.\n\
+Type CD without a parameter to display the current drive and
directory."
-STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n
\
-CHCP [nnn]\n\n \
- nnn Specifies the active code page number.\n\n \
+STRING_CHCP_HELP, "Displays or sets the active code page number.\n\n\
+CHCP [nnn]\n\n\
+ nnn Specifies the active code page number.\n\n\
Type CHCP without a parameter to display the active code page number."
-STRING_CHOICE_HELP, "Waits for the user to choose one of a set of
choices.\n\n \
-CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n \
- /C[:]choices Specifies allowable keys. Default is YN.\n \
- /N Do not display choices and ? at the end of the prompt
string.\n \
- /S Treat choice keys as case sensitive.\n \
- /T[:]c,nn Default choice to c after nn seconds.\n \
- text Prompt string to display.\n\n \
+STRING_CHOICE_HELP, "Waits for the user to choose one of a set of
choices.\n\n\
+CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\
+ /C[:]choices Specifies allowable keys. Default is YN.\n\
+ /N Do not display choices and ? at the end of the prompt
string.\n\
+ /S Treat choice keys as case sensitive.\n\
+ /T[:]c,nn Default choice to c after nn seconds.\n\
+ text Prompt string to display.\n\n\
ERRORLEVEL is set to offset of key user presses in choices."
STRING_CLS_HELP, "Clears the screen.\n\nCLS"
@@ -79,48 +80,48 @@
STRING_CMD_HELP7," [redirections and piping]"
-STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line
interpreter.\n\n \
-CMD [/[C|K] command][/P][/Q][/T:bf]\n\n \
- /C command Runs the specified command and terminates.\n \
- /K command Runs the specified command and remains.\n \
- /P CMD becomes permanent and runs autoexec.bat\n \
- (cannot be terminated).\n \
+STRING_CMD_HELP8, "Starts a new instance of the ReactOS command line
interpreter.\n\n\
+CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\
+ /C command Runs the specified command and terminates.\n\
+ /K command Runs the specified command and remains.\n\
+ /P CMD becomes permanent and runs autoexec.bat\n\
+ (cannot be terminated).\n\
/T:bf Sets the background/foreground color (see COLOR
command)."
-STRING_COLOR_HELP1, "Sets the default foreground and background
colors.\n\n \
-COLOR [attr [/F]] \n\n \
- attr Specifies color attribute of console output\n \
- /F fill the console with color attribute\n\n \
-There are three ways to specify the colors:\n \
-1) [bright] name on [bright] name (only the first three letters are
required)\n \
-2) decimal on decimal\n \
-3) two hex digits\n\n \
-Colors are:\n \
-dec hex name dec hex name\n \
-0 0 Black 8 8 Gray(Bright black)\n \
-1 1 Blue 9 9 Bright Blue\n \
-2 2 Green 10 A Bright Green\n \
-3 3 Cyan 11 B Bright Cyan\n \
-4 4 Red 12 C Bright Red\n \
-5 5 Magenta 13 D Bright Magenta\n \
-6 6 Yellow 14 E Bright Yellow\n \
+STRING_COLOR_HELP1, "Sets the default foreground and background
colors.\n\n\
+COLOR [attr [/F]] \n\n\
+ attr Specifies color attribute of console output\n\
+ /F fill the console with color attribute\n\n\
+There are three ways to specify the colors:\n\
+1) [bright] name on [bright] name (only the first three letters are
required)\n\
+2) decimal on decimal\n\
+3) two hex digits\n\n\
+Colors are:\n\
+dec hex name dec hex name\n\
+0 0 Black 8 8 Gray(Bright black)\n\
+1 1 Blue 9 9 Bright Blue\n\
+2 2 Green 10 A Bright Green\n\
+3 3 Cyan 11 B Bright Cyan\n\
+4 4 Red 12 C Bright Red\n\
+5 5 Magenta 13 D Bright Magenta\n\
+6 6 Yellow 14 E Bright Yellow\n\
7 7 White 15 F Bright White"
STRING_COPY_HELP1, "Overwrite %s (Yes/No/All)? "
-STRING_COPY_HELP2, "Copies one or more files to another location.\n\n \
-COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n \
- [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n \
- source Specifies the file or files to be copied.\n \
- /A Indicates an ASCII text file.\n \
- /B Indicates a binary file.\n \
- destination Specifies the directory and/or filename for the new
file(s).\n \
- /V Verifies that new files are written correctly.\n \
- /Y Suppresses prompting to confirm you want to overwrite
an\n \
- existing destination file.\n \
- /-Y Causes prompting to confirm you want to overwrite an\n \
- existing destination file.\n\n \
-The switch /Y may be present in the COPYCMD environment variable.\n \
+STRING_COPY_HELP2, "Copies one or more files to another location.\n\n\
+COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\
+ [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\
+ source Specifies the file or files to be copied.\n\
+ /A Indicates an ASCII text file.\n\
+ /B Indicates a binary file.\n\
+ destination Specifies the directory and/or filename for the new
file(s).\n\
+ /V Verifies that new files are written correctly.\n\
+ /Y Suppresses prompting to confirm you want to overwrite
an\n\
+ existing destination file.\n\
+ /-Y Causes prompting to confirm you want to overwrite an\n\
+ existing destination file.\n\n\
+The switch /Y may be present in the COPYCMD environment variable.\n\
..."
STRING_DATE_HELP1, "\nEnter new date (mm%cdd%cyyyy): "
@@ -129,67 +130,67 @@
STRING_DATE_HELP3, "\nEnter new date (yyyy%cmm%cdd): "
-STRING_DATE_HELP4, "Displays or sets the date.\n\n \
-DATE [/T][date]\n\n \
- /T display only\n\n \
-Type DATE without parameters to display the current date setting and\n
\
+STRING_DATE_HELP4, "Displays or sets the date.\n\n\
+DATE [/T][date]\n\n\
+ /T display only\n\n\
+Type DATE without parameters to display the current date setting and\n\
a prompt for a new one. Press ENTER to keep the same date."
-STRING_DEL_HELP1, "Deletes one or more files.\n\n \
-DEL [/%c /%c /%c /%c /%c /%c /%c] file ...\n \
-DELETE [/%c /%c /%c /%c /%c /%c /%c] file ...\n \
-ERASE [/%c /%c /%c /%c /%c /%c /%c] file ...\n\n \
- file Specifies the file(s) to delete.\n\n \
- /%c Nothing.\n \
- /%c Prompt. Ask before deleting each file.\n \
- /%c Total. Display total number of deleted files and freed disk
space.\n \
- /%c Quiet.\n \
- /%c Wipe. Overwrite the file with random numbers before deleting
it.\n \
- /%c Yes. Kill even *.* without asking.\n \
- /%c Zap. Delete hidden, read-only and system files).\n"
+STRING_DEL_HELP1, "Deletes one or more files.\n\n\
+DEL [/N /P /T /Q /W /Y /Z] file ...\n\
+DELETE [/N /P /T /Q /W /Y /Z] file ...\n\
+ERASE [/N /P /T /Q /W /Y /Z] file ...\n\n\
+ file Specifies the file(s) to delete.\n\n\
+ /N Nothing.\n\
+ /P Prompt. Ask before deleting each file.\n\
+ /T Total. Display total number of deleted files and freed disk
space.\n\
+ /Q Quiet.\n\
+ /W Wipe. Overwrite the file with random numbers before deleting
it.\n\
+ /Y Yes. Kill even *.* without asking.\n\
+ /Z Zap. Delete hidden, read-only and system files.\n"
STRING_DEL_HELP2, "All files in the directory will be deleted!\nAre you
sure (Y/N)?"
STRING_DEL_HELP3, " %lu file deleted\n"
STRING_DEL_HELP4, " %lu files deleted\n"
-STRING_DELAY_HELP, "pause for n seconds or milliseconds\n \
-DELAY [/m]n\n\n \
- /m specifiy than n are milliseconds\n \
+STRING_DELAY_HELP, "pause for n seconds or milliseconds\n\
+DELAY [/m]n\n\n\
+ /m specifiy than n are milliseconds\n\
otherwise n are seconds"
-STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]]
[/B] [/C] [/D] [/L] [/N]\n \
- [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X]
[/4]\n\n \
- [drive:][path][filename]\n \
- Specifies drive, directory, and/or files to list.\n\n \
- /A Displays files with specified attributes.\n \
- attributes D Directories R Read-only files\n \
- H Hidden files A Files ready for
archiving\n \
- S System files - Prefix meaning not\n \
- /B Uses bare format (no heading information or summary).\n \
- /C Display the thousand separator in file sizes. This is
the\n \
- default. Use /-C to disable display of separator.\n \
- /D Same as wide but files are list sorted by column.\n \
- /L Uses lowercase.\n \
- /N New long list format where filenames are on the far
right.\n \
- /O List by files in sorted order.\n \
- sortorder N By name (alphabetic) S By size (smallest
first)\n \
- E By extension (alphabetic) D By date/time (oldest
first)\n \
- G Group directories first - Prefix to reverse
order\n \
- /P Pauses after each screenful of information.\n \
- /Q Display the owner of the file.\n \
- /S Displays files in specified directory and all
subdirectories.\n \
- /T Controls which time field displayed or used for sorting\n
\
- timefield C Creation\n \
- A Last Access\n \
- W Last Written\n \
- /W Uses wide list format.\n \
- /X This displays the short names generated for non-8dot3
file\n \
- names. The format is that of /N with the short name
inserted\n \
- before the long name. If no short name is present, blanks
are\n \
- displayed in its place.\n \
- /4 Displays four-digit years\n\n \
-Switches may be preset in the DIRCMD environment variable. Override\n
\
-preset switches by prefixing any switch with - (hyphen)--for example,
/-W.\n "
+STRING_DIR_HELP1, "DIR [drive:][path][filename] [/A[[:]attributes]]
[/B] [/C] [/D] [/L] [/N]\n\
+ [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X]
[/4]\n\n\
+ [drive:][path][filename]\n\
+ Specifies drive, directory, and/or files to list.\n\n\
+ /A Displays files with specified attributes.\n\
+ attributes D Directories R Read-only files\n\
+ H Hidden files A Files ready for
archiving\n\
+ S System files - Prefix meaning not\n\
+ /B Uses bare format (no heading information or summary).\n\
+ /C Display the thousand separator in file sizes. This is
the\n\
+ default. Use /-C to disable display of separator.\n\
+ /D Same as wide but files are list sorted by column.\n\
+ /L Uses lowercase.\n\
+ /N New long list format where filenames are on the far
right.\n\
+ /O List by files in sorted order.\n\
+ sortorder N By name (alphabetic) S By size (smallest
first)\n\
+ E By extension (alphabetic) D By date/time (oldest
first)\n\
+ G Group directories first - Prefix to reverse
order\n\
+ /P Pauses after each screenful of information.\n\
+ /Q Display the owner of the file.\n\
+ /S Displays files in specified directory and all
subdirectories.\n\
+ /T Controls which time field displayed or used for
sorting\n\
+ timefield C Creation\n\
+ A Last Access\n\
+ W Last Written\n\
+ /W Uses wide list format.\n\
+ /X This displays the short names generated for non-8dot3
file\n\
+ names. The format is that of /N with the short name
inserted\n\
+ before the long name. If no short name is present, blanks
are\n\
+ displayed in its place.\n\
+ /4 Displays four-digit years\n\n\
+Switches may be preset in the DIRCMD environment variable. Override\n\
+preset switches by prefixing any switch with - (hyphen)--for example,
/-W.\n"
STRING_DIR_HELP2, " Volume in drive %c is %s"
STRING_DIR_HELP3, " Volume in drive %c has no label"
@@ -199,9 +200,9 @@
STRING_DIR_HELP7, "\n Directory of %s\n\n"
STRING_DIR_HELP8, "%16i Dir(s)% 14s bytes\n"
-STRING_DIRSTACK_HELP1, "Stores the current directory for use by the
POPD command, then\n \
-changes to the specified directory.\n\n \
-PUSHD [path | ..]\n\n \
+STRING_DIRSTACK_HELP1, "Stores the current directory for use by the
POPD command, then\n\
+changes to the specified directory.\n\n\
+PUSHD [path | ..]\n\n\
path Specifies the directory to make the current directory"
STRING_DIRSTACK_HELP2, "Changes to the directory stored by the PUSHD
command.\n\nPOPD"
@@ -210,61 +211,61 @@
STRING_DIRSTACK_HELP4, "Directory stack empty"
-STRING_ECHO_HELP1, "Display a messages without trailing carridge
return and line feed.\n\n \
+STRING_ECHO_HELP1, "Display a messages without trailing carridge
return and line feed.\n\n\
ECHOS message"
-STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n \
- ECHOERR message\n \
+STRING_ECHO_HELP2, "Displays a message to the standard error.\n\n\
+ ECHOERR message\n\
ECHOERR. prints an empty line"
-STRING_ECHO_HELP3, "Prints a messages to standard error output without
trailing carridge return and line feed.\n\n \
+STRING_ECHO_HELP3, "Prints a messages to standard error output without
trailing carridge return and line feed.\n\n\
ECHOSERR message"
-STRING_ECHO_HELP4, "Displays a message or switches command echoing on
or off.\n\n \
- ECHO [ON | OFF]\n \
- ECHO [message]\n \
- ECHO. prints an empty line\n\n \
+STRING_ECHO_HELP4, "Displays a message or switches command echoing on
or off.\n\n\
+ ECHO [ON | OFF]\n\
+ ECHO [message]\n\
+ ECHO. prints an empty line\n\n\
Type ECHO without a parameter to display the current ECHO setting."
STRING_ECHO_HELP5, "ECHO is %s\n"
STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT"
-STRING_FOR_HELP1, "Runs a specified command for each file in a set of
files\n\n \
-FOR %variable IN (set) DO command [parameters]\n\n \
- %variable Specifies a replaceable parameter.\n \
- (set) Specifies a set of one or more files. Wildcards may be
used.\n \
- command Specifies the command to carry out for each file.\n \
- parameters Specifies parameters or switches for the specified
command.\n\n \
-To user the FOR comamnd in a batch program, specify %%variable instead
of\n \
+STRING_FOR_HELP1, "Runs a specified command for each file in a set of
files\n\n\
+FOR %variable IN (set) DO command [parameters]\n\n\
+ %variable Specifies a replaceable parameter.\n\
+ (set) Specifies a set of one or more files. Wildcards may be
used.\n\
+ command Specifies the command to carry out for each file.\n\
+ parameters Specifies parameters or switches for the specified
command.\n\n\
+To user the FOR comamnd in a batch program, specify %%variable instead
of\n\
%variable."
-STRING_FREE_HELP1, "\n Volume in drive %s is %-11s Serial number is
%s\n \
- %16s bytes total disk space\n \
- %16s bytes used\n \
+STRING_FREE_HELP1, "\n Volume in drive %s is %-11s Serial number is
%s\n\
+ %16s bytes total disk space\n\
+ %16s bytes used\n\
%16s bytes free\n"
STRING_FREE_HELP2, "Displays drive information.\n\nFREE [drive: ...]"
-STRING_IF_HELP1, "Performs conditional processing in batch
programs.\n\n \
- IF [NOT] ERRORLEVEL number command\n \
- IF [NOT] string1==string2 command\n \
- IF [NOT] EXIST filename command\n \
- IF [NOT] DEFINED variable command\n\n \
-NOT Specifies that CMD should carry out the command only
if\n \
- the condition is false\n \
-ERRORLEVEL number Specifies a true condition if the last program run
returned\n \
- an exit code equal or greater than the number
specified.\n \
-command Specifies the command to carry out if the condition
is met.\n \
-string1==string2 Specifies a true condition if the specified text
strings\n \
- match.\n \
-EXIST filename Specifies a true condition if the specified filename
exists.\n \
-DEFINED variable Specifies a true condition if the specified variable
is\n \
+STRING_IF_HELP1, "Performs conditional processing in batch
programs.\n\n\
+ IF [NOT] ERRORLEVEL number command\n\
+ IF [NOT] string1==string2 command\n\
+ IF [NOT] EXIST filename command\n\
+ IF [NOT] DEFINED variable command\n\n\
+NOT Specifies that CMD should carry out the command only
if\n\
+ the condition is false\n\
+ERRORLEVEL number Specifies a true condition if the last program run
returned\n\
+ an exit code equal or greater than the number
specified.\n\
+command Specifies the command to carry out if the condition
is met.\n\
+string1==string2 Specifies a true condition if the specified text
strings\n\
+ match.\n\
+EXIST filename Specifies a true condition if the specified filename
exists.\n\
+DEFINED variable Specifies a true condition if the specified variable
is\n\
defined."
-
-STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch
script.\n\n \
-GOTO label\n\n \
- label Specifies a text string used in a batch script as a label.\n\n
\
+
+STRING_GOTO_HELP1, "Directs CMD to a labeled line in a batch
script.\n\n\
+GOTO label\n\n\
+ label Specifies a text string used in a batch script as a
label.\n\n\
You type a label on a line by itself, beginning with a colon."
STRING_LABEL_HELP1, "Displays or changes drive label.\n\nLABEL
[drive:][label]"
@@ -276,74 +277,74 @@
STRING_LOCALE_HELP1, "Current time is"
-STRING_MKDIR_HELP, "Creates a directory.\n\n \
+STRING_MKDIR_HELP, "Creates a directory.\n\n\
MKDIR [drive:]path\nMD [drive:]path"
STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY"
-STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n \
- %13s bytes total physical RAM.\n \
- %13s bytes available physical RAM.\n\n \
- %13s bytes total page file.\n \
- %13s bytes available page file.\n\n \
- %13s bytes total virtual memory.\n \
+STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\
+ %13s bytes total physical RAM.\n\
+ %13s bytes available physical RAM.\n\n\
+ %13s bytes total page file.\n\
+ %13s bytes available page file.\n\n\
+ %13s bytes total virtual memory.\n\
%13s bytes available virtual memory.\n"
STRING_MISC_HELP1, "Press a key to continue...\n"
STRING_MOVE_HELP1, "Overwrite %s (Yes/No/All)? "
-STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n
\
-To move one or more files:\n \
-MOVE [/N][drive:][path]filename1[,...] destination\n\n \
-To rename a directory:\n \
-MOVE [/N][drive:][path]dirname1 dirname2\n\n \
- [drive:][path]filename1 Specifies the location and name of the
file\n \
- or files you want to move.\n \
- /N Nothing. Don everthing but move files or
direcories.\n\n \
-Current limitations:\n \
+STRING_MOVE_HELP2, "Moves files and renames files and directories.\n\n\
+To move one or more files:\n\
+MOVE [/N][drive:][path]filename1[,...] destination\n\n\
+To rename a directory:\n\
+MOVE [/N][drive:][path]dirname1 dirname2\n\n\
+ [drive:][path]filename1 Specifies the location and name of the
file\n\
+ or files you want to move.\n\
+ /N Nothing. Do everything but move files or
direcories.\n\n\
+Current limitations:\n\
- You can't move a file or directory from one drive to another.\n"
-STRING_MSGBOX_HELP, "display a message box and return user responce\n\n
\
-MSGBOX type ['title'] prompt\n\n \
-type button displayed\n \
- possible values are: OK, OKCANCEL,\n \
- YESNO, YESNOCANCEL\n \
-title title of message box\n \
-prompt text displayed by the message box\n\n\n \
-ERRORLEVEL is set according the button pressed:\n\n \
-YES : 10 | NO : 11\n \
+STRING_MSGBOX_HELP, "display a message box and return user
responce\n\n\
+MSGBOX type ['title'] prompt\n\n\
+type button displayed\n\
+ possible values are: OK, OKCANCEL,\n\
+ YESNO, YESNOCANCEL\n\
+title title of message box\n\
+prompt text displayed by the message box\n\n\n\
+ERRORLEVEL is set according the button pressed:\n\n\
+YES : 10 | NO : 11\n\
OK : 10 | CANCEL : 12\n"
-STRING_PATH_HELP1, "Displays or sets a search path for executable
files.\n\n \
-PATH [[drive:]path[;...]]\nPATH ;\n\n \
-Type PATH ; to clear all search-path settings and direct the command
shell\n \
-to search only in the current directory.\n \
+STRING_PATH_HELP1, "Displays or sets a search path for executable
files.\n\n\
+PATH [[drive:]path[;...]]\nPATH ;\n\n\
+Type PATH ; to clear all search-path settings and direct the command
shell\n\
+to search only in the current directory.\n\
Type PATH without parameters to display the current path.\n"
-STRING_PROMPT_HELP1, "Changes the command prompt.\n\n \
-PROMPT [text]\n\n \
- text Specifies a new command prompt.\n\n \
-Prompt can be made up of normal characters and the following special
codes:\n\n \
- $A & (Ampersand)\n \
- $B | (pipe)\n \
- $C ( (Left parenthesis)\n \
- $D Current date\n \
- $E Escape code (ASCII code 27)\n \
- $F ) (Right parenthesis)\n \
- $G > (greater-than sign)\n \
- $H Backspace (erases previous character)\n \
- $L < (less-than sign)\n \
- $N Current drive\n \
- $P Current drive and path\n \
- $Q = (equal sign)\n \
- $T Current time\n \
- $V OS version number\n \
- $_ Carriage return and linefeed\n \
+STRING_PROMPT_HELP1, "Changes the command prompt.\n\n\
+PROMPT [text]\n\n\
+ text Specifies a new command prompt.\n\n\
+Prompt can be made up of normal characters and the following special
codes:\n\n\
+ $A & (Ampersand)\n\
+ $B | (pipe)\n\
+ $C ( (Left parenthesis)\n\
+ $D Current date\n\
+ $E Escape code (ASCII code 27)\n\
+ $F ) (Right parenthesis)\n\
+ $G > (greater-than sign)\n\
+ $H Backspace (erases previous character)\n\
+ $L < (less-than sign)\n\
+ $N Current drive\n\
+ $P Current drive and path\n\
+ $Q = (equal sign)\n\
+ $T Current time\n\
+ $V OS version number\n\
+ $_ Carriage return and linefeed\n\
$$ $ (dollar sign)"
-STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the
following message:\n \
-'Press any key to continue...' or a user defined message.\n\n \
+STRING_PAUSE_HELP1, "Stops the execution of a batch file and shows the
following message:\n\
+'Press any key to continue...' or a user defined message.\n\n\
PAUSE [message]"
STRING_PROMPT_HELP2, " $+ Displays the current depth of the
directory stack"
@@ -352,53 +353,53 @@
STRING_REM_HELP, "Starts a comment line in a batch file.\n\nREM
[Comment]"
-STRING_RMDIR_HELP, "Removes a directory.\n\n \
-RMDIR [drive:]path\nRD [drive:]path"
+STRING_RMDIR_HELP, "Removes a directory.\n\n\
+RMDIR [drive:]path\nRD [drive:]path"
-STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n \
-RENAME [/E /N /P /Q /S /T] old_name ... new_name\n \
-REN [/E /N /P /Q /S /T] old_name ... new_name\n\n \
- /E No eror messages.\n \
- /N Nothing.\n \
- /P Prompts for confirmation before renaming each file.\n \
- (Not implemented yet!)\n \
- /Q Quiet.\n \
- /S Rename subdirectories.\n \
- /T Display total number of renamed files.\n\n \
-Note that you cannot specify a new drive or path for your destination.
Use\n \
+STRING_REN_HELP1, "Renames a file/directory or files/directories.\n\n\
+RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\
+REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\
+ /E No eror messages.\n\
+ /N Nothing.\n\
+ /P Prompts for confirmation before renaming each file.\n\
+ (Not implemented yet!)\n\
+ /Q Quiet.\n\
+ /S Rename subdirectories.\n\
+ /T Display total number of renamed files.\n\n\
+Note that you cannot specify a new drive or path for your destination.
Use\n\
the MOVE command for that purpose."
STRING_REN_HELP2, " %lu file renamed\n"
STRING_REN_HELP3, " %lu files renamed\n"
-STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a
batch file.\n\n \
+STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a
batch file.\n\n\
SHIFT [DOWN]"
-STRING_SCREEN_HELP, "move cursor and optionally print text\n\n \
-SCREEN row col [text]\n\n \
- row row to wich move the cursor\n \
+STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\
+SCREEN row col [text]\n\n\
+ row row to wich move the cursor\n\
col column to wich move the cursor"
-STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n
\
-SET [variable[=][string]]\n\n \
- variable Specifies the environment-variable name.\n \
- string Specifies a series of characters to assign to the
variable.\n\n \
+STRING_SET_HELP, "Displays, sets, or removes environment
variables.\n\n\
+SET [variable[=][string]]\n\n\
+ variable Specifies the environment-variable name.\n\
+ string Specifies a series of characters to assign to the
variable.\n\n\
Type SET without parameters to display the current environment
variables.\n"
-STRING_START_HELP1, "Starts a command.\n\n \
-START command \n\n \
- command Specifies the command to run.\n\n \
+STRING_START_HELP1, "Starts a command.\n\n\
+START command\n\n\
+ command Specifies the command to run.\n\n\
At the moment all commands are started asynchronously.\n"
-STRING_TITLE_HELP, "Sets the window title for the command prompt
window.\n\n \
-TITLE [string]\n\n \
+STRING_TITLE_HELP, "Sets the window title for the command prompt
window.\n\n\
+TITLE [string]\n\n\
string Specifies the title for the command prompt window."
-STRING_TIME_HELP1, "Displays or sets the system time.\n\n \
-TIME [/T][time]\n\n \
- /T display only\n\n \
-Type TIME with no parameters to display the current time setting and a
prompt\n \
+STRING_TIME_HELP1, "Displays or sets the system time.\n\n\
+TIME [/T][time]\n\n\
+ /T display only\n\n\
+Type TIME with no parameters to display the current time setting and a
prompt\n\
for a new one. Press ENTER to keep the same time."
STRING_TIME_HELP2, "Enter new time: "
@@ -407,88 +408,88 @@
STRING_TIMER_HELP2, "Elapsed %02d%c%02d%c%02d%c%02d\n"
-STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n \
-TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n \
- ON set stopwach ON\n \
- OFF set stopwach OFF\n \
- /S Split time. Return stopwach split\n \
- time without changing its value\n \
- /n Specifiy the stopwach number.\n \
- Stopwaches avaliable are 0 to 10\n \
- If it is not specified default is 1\n \
- /Fn Format for output\n \
- n can be:\n \
- 0 milliseconds\n \
- 1 hh%cmm%css%cdd\n\n \
-if none of ON, OFF or /S is specified the command\n \
+STRING_TIMER_HELP3, "allow the use of ten stopwaches.\n\n\
+TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\
+ ON set stopwach ON\n\
+ OFF set stopwach OFF\n\
+ /S Split time. Return stopwach split\n\
+ time without changing its value\n\
+ /n Specifiy the stopwach number.\n\
+ Stopwaches avaliable are 0 to 10\n\
+ If it is not specified default is 1\n\
+ /Fn Format for output\n\
+ n can be:\n\
+ 0 milliseconds\n\
+ 1 hh%cmm%css%cdd\n\n\
+if none of ON, OFF or /S is specified the command\n\
will toggle stopwach state\n\n"
-
+
STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE
[drive:][path]filename"
-STRING_VERIFY_HELP1, "This command is just a dummy!!\n \
-Sets whether to verify that your files are written correctly to a\n \
-disk.\n\n \
-VERIFY [ON | OFF]\n\n \
+STRING_VERIFY_HELP1, "This command is just a dummy!!\n\
+Sets whether to verify that your files are written correctly to a\n\
+disk.\n\n\
+VERIFY [ON | OFF]\n\n\
Type VERIFY without a parameter to display the current VERIFY setting."
STRING_VERIFY_HELP2, "VERIFY is %s.\n"
STRING_VERIFY_HELP3, "Must specify ON or OFF."
-STRING_VERSION_HELP1, "Displays shell version information\n\n \
-VER [/C][/R][/W]\n\n \
- /C Displays credits.\n \
- /R Displays redistribution information.\n \
+STRING_VERSION_HELP1, "Displays shell version information\n\n\
+VER [/C][/R][/W]\n\n\
+ /C Displays credits.\n\
+ /R Displays redistribution information.\n\
/W Displays warranty information."
-STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for
details\n \
-type: `ver /w'. This is free software, and you are welcome to
redistribute\n \
-it under certain conditions; type `ver /r' for details. Type `ver /c'
for a\n \
+STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for
details\n\
+type: `ver /w'. This is free software, and you are welcome to
redistribute\n\
+it under certain conditions; type `ver /r' for details. Type `ver /c'
for a\n\
listing of credits."
-STRING_VERSION_HELP3, "\n This program is distributed in the hope that
it will be useful,\n \
- but WITHOUT ANY WARRANTY; without even the implied warranty of\n \
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n \
+STRING_VERSION_HELP3, "\n This program is distributed in the hope that
it will be useful,\n\
+ but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
GNU General Public License for more details."
- STRING_VERSION_HELP4, "\n This program is free software; you can
redistribute it and/or modify\n \
- it under the terms of the GNU General Public License as published by\n
\
- the Free Software Foundation; either version 2 of the License, or\n \
+STRING_VERSION_HELP4, "\n This program is free software; you can
redistribute it and/or modify\n\
+ it under the terms of the GNU General Public License as published
by\n\
+ the Free Software Foundation; either version 2 of the License, or\n\
(at your option) any later version."
-STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n \
+STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n\
Updates are available at: http://www.reactos.com"
-STRING_VERSION_HELP6, "FreeDOS version written by:\n%s\nReactOS version
written by:\n%s\n"
+STRING_VERSION_HELP6, "\nFreeDOS version written by:\n"
+STRING_VERSION_HELP7, "\nReactOS version written by:\n"
+
STRING_VOL_HELP1, " Volume in drive %c: is %s"
STRING_VOL_HELP2, " Volume in drive %c: has no label"
STRING_VOL_HELP3, " Volume Serial Number is %04X-%04X\n"
STRING_VOL_HELP4, "Displays the disk volume label and serial number, if
they exist.\n\nVOL [drive:]"
-STRING_WINDOW_HELP1, "change console window aspect\n\n \
-WINDOW [/POS[=]left,top,width,heigth]\n \
- [MIN|MAX|RESTORE] ['title']\n\n \
-/POS specify window placement and dimensions\n \
-MIN minimize the window\n \
-MAX maximize the window\n \
+STRING_WINDOW_HELP1, "change console window aspect\n\n\
+WINDOW [/POS[=]left,top,width,heigth]\n\
+ [MIN|MAX|RESTORE] ['title']\n\n\
+/POS specify window placement and dimensions\n\
+MIN minimize the window\n\
+MAX maximize the window\n\
RESTORE restore the window"
-STRING_WINDOW_HELP2, "change console window aspect\n\n \
-ACTIAVTE 'window' [/POS[=]left,top,width,heigth]\n \
- [MIN|MAX|RESTORE] ['title']\n\n \
-window tile of window on wich perform actions\n \
-/POS specify window placement and dimensions\n \
-MIN minimize the window\n \
-MAX maximize the window\n \
-RESTORE restore the window\n \
-title new title"
+STRING_WINDOW_HELP2, "change console window aspect\n\n\
+ACTIAVTE 'window' [/POS[=]left,top,width,heigth]\n\
+ [MIN|MAX|RESTORE] ['title']\n\n\
+window tile of window on wich perform actions\n\
+/POS specify window placement and dimensions\n\
+MIN minimize the window\n\
+MAX maximize the window\n\
+RESTORE restore the window\n\
+title new title"
-
STRING_CHOICE_OPTION, "YN"
STRING_COPY_OPTION, "YNA"
-STRING_DEL_OPTION, "AENPQSTWXYZ"
STRING_ALIAS_ERROR, "Command line too long after alias
expansion!\n"
@@ -515,20 +516,15 @@
STRING_COPY_ERROR3, "Error writing destination!\n"
STRING_COPY_ERROR4, "Error: Not implemented yet!\n"
STRING_DATE_ERROR, "Invalid date."
-STRING_DEL_ERROR1, "Wildcards!\n\n"
-STRING_DEL_ERROR2, "Full path: %s\n"
-STRING_DEL_ERROR3, "File part: %s\n"
-STRING_DEL_ERROR4, "Full filename: %s\n"
STRING_DEL_ERROR5, "The file %s will be deleted! "
STRING_DEL_ERROR6, "Are you sure (Y/N)?"
STRING_DEL_ERROR7, "Deleting: %s\n"
-STRING_DEL_ERROR8, "No Wildcards!\n"
STRING_ERROR_ERROR1, "Unknown error! Error code: 0x%lx\n"
STRING_ERROR_ERROR2, "Syntax error"
STRING_FOR_ERROR1, "'in' missing in for statement."
STRING_FOR_ERROR2, "no brackets found."
STRING_FOR_ERROR3, "'do' missing."
-STRING_FOR_ERROR4, "no command after 'do'."
+STRING_FOR_ERROR4, "no command after 'do'."
STRING_FREE_ERROR1, "Invalid drive"
STRING_FREE_ERROR2, "unlabeled"
STRING_GOTO_ERROR1, "No label specified for GOTO"
@@ -552,18 +548,17 @@
STRING_WINDOW_ERROR1, "window not found"
-STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n"
+STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct -
%c\n"
STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n"
STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n"
-STRING_ERROR_PATH_NOT_FOUND, "Path not found\n"
-STRING_ERROR_FILE_NOT_FOUND, "File not found\n"
-STRING_ERROR_REQ_PARAM_MISSING, "Required parameter
missing\n"
-STRING_ERROR_INVALID_DRIVE, "Invalid drive
specification\n"
+STRING_ERROR_PATH_NOT_FOUND, "Path not found\n"
+STRING_ERROR_FILE_NOT_FOUND, "File not found\n"
+STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n"
+STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n"
STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n"
-STRING_ERROR_BADCOMMAND, "Bad command or filename\n"
-STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n"
-STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot
open temporary file!\n"
-STRING_ERROR_D_PAUSEMSG, "Press any key to continue .
. ."
-STRING_ERROR_DRIVER_NOT_READY "Drive not ready"
-
+STRING_ERROR_BADCOMMAND, "Bad command or filename\n"
+STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n"
+STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open
temporary file!\n"
+STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ."
+STRING_ERROR_DRIVER_NOT_READY "Drive not ready"
}
_____
Modified: trunk/reactos/subsys/system/cmd/alias.c
--- trunk/reactos/subsys/system/cmd/alias.c 2005-05-01 12:56:25 UTC
(rev 14911)
+++ trunk/reactos/subsys/system/cmd/alias.c 2005-05-01 13:58:30 UTC
(rev 14912)
@@ -281,8 +281,9 @@
m = _tcslen (ptr->lpSubst);
if ((int)(_tcslen (cmd) - len + m - n) >
maxlen)
{
- LoadString(
GetModuleHandle(NULL), STRING_ALIAS_ERROR,
szMsg,sizeof(szMsg)/sizeof(TCHAR));
- ConErrPrintf (szMsg);
+
LoadString(GetModuleHandle(NULL), STRING_ALIAS_ERROR, szMsg,
RC_STRING_MAX_SIZE);
+ ConErrPrintf(szMsg);
+
/* the parser won't cause any
problems with an empty line */
cmd[0] = _T('\0');
}
@@ -305,13 +306,13 @@
INT CommandAlias (LPTSTR cmd, LPTSTR param)
{
+ TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR ptr;
- TCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2))
{
- LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP,
szMsg,sizeof(szMsg)/sizeof(TCHAR));
- ConOutPuts (szMsg);
+ LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP,
szMsg, RC_STRING_MAX_SIZE);
+ ConOutPuts(szMsg);
return 0;
}
_____
Modified: trunk/reactos/subsys/system/cmd/attrib.c
--- trunk/reactos/subsys/system/cmd/attrib.c 2005-05-01 12:56:25 UTC
(rev 14911)
+++ trunk/reactos/subsys/system/cmd/attrib.c 2005-05-01 13:58:30 UTC
(rev 14912)
@@ -44,7 +44,7 @@
WIN32_FIND_DATA findData;
HANDLE hFind;
TCHAR szFullName[MAX_PATH];
- LPTSTR pszFileName;
+ LPTSTR pszFileName;
/* prepare full file name buffer */
_tcscpy (szFullName, pszPath);
@@ -112,7 +112,7 @@
static VOID
ChangeAttribute (LPTSTR pszPath, LPTSTR pszFile, DWORD dwMask,
- DWORD dwAttrib, BOOL bRecurse, BOOL
bDirectories)
+ DWORD dwAttrib, BOOL bRecurse, BOOL bDirectories)
{
WIN32_FIND_DATA findData;
HANDLE hFind;
@@ -143,7 +143,7 @@
if (findData.dwFileAttributes &
FILE_ATTRIBUTE_DIRECTORY)
{
if (!_tcscmp (findData.cFileName,
_T(".")) ||
- !_tcscmp (findData.cFileName,
_T("..")))
+ !_tcscmp (findData.cFileName,
_T("..")))
continue;
_tcscpy (pszFileName,
findData.cFileName);
@@ -189,6 +189,7 @@
INT CommandAttrib (LPTSTR cmd, LPTSTR param)
{
+ TCHAR szMsg[RC_STRING_MAX_SIZE];
LPTSTR *arg;
INT argc, i;
TCHAR szPath[MAX_PATH];
@@ -197,7 +198,6 @@
BOOL bDirectories = FALSE;
DWORD dwAttrib = 0;
DWORD dwMask = 0;
- TCHAR szMsg[RC_STRING_MAX_SIZE];
/* initialize strings */
szPath[0] = _T('\0');
@@ -206,8 +206,8 @@
/* print help */
if (!_tcsncmp (param, _T("/?"), 2))
{
- LoadString( GetModuleHandle(NULL), STRING_ATTRIB_HELP,
szMsg,sizeof(szMsg)/sizeof(TCHAR));
- ConOutPuts (szMsg);
+ LoadString(GetModuleHandle(NULL), STRING_ATTRIB_HELP,
szMsg, RC_STRING_MAX_SIZE);
+ ConOutPuts(szMsg);
return 0;
}
@@ -321,7 +321,7 @@
/* get full file name */
for (i = 0; i < argc; i++)
{
- if ((*arg[i] != _T('+')) && (*arg[i] != _T('-')) &&
(*arg[i] != _T('/')))
+ if ((*arg[i] != _T('+')) && (*arg[i] != _T('-')) &&
(*arg[i] != _T('/')))
{
LPTSTR p;
GetFullPathName (arg[i], MAX_PATH, szPath,
NULL);
@@ -333,7 +333,7 @@
PrintAttribute (szPath, szFileName,
bRecurse);
else
ChangeAttribute (szPath, szFileName,
dwMask,
-
dwAttrib, bRecurse, bDirectories);
+ dwAttrib, bRecurse,
bDirectories);
}
}
_____
Modified: trunk/reactos/subsys/system/cmd/batch.c
--- trunk/reactos/subsys/system/cmd/batch.c 2005-05-01 12:56:25 UTC
(rev 14911)
+++ trunk/reactos/subsys/system/cmd/batch.c 2005-05-01 13:58:30 UTC
(rev 14912)
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* BATCH.C - batch file processor for CMD.EXE.
*
*
@@ -218,12 +217,12 @@
BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
{
- HANDLE hFile;
TCHAR szMsg[RC_STRING_MAX_SIZE];
+ HANDLE hFile;
hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_READ,
NULL,
- OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL |
-
FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+ OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL |
+ FILE_FLAG_SEQUENTIAL_SCAN, NULL);
#ifdef _DEBUG
DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile =
%x\n"),
@@ -232,8 +231,8 @@
if (hFile == INVALID_HANDLE_VALUE)
{
- LoadString( GetModuleHandle(NULL), STRING_BATCH_ERROR,
szMsg,sizeof(szMsg)/sizeof(TCHAR));
- ConErrPrintf (szMsg);
+ LoadString(GetModuleHandle(NULL), STRING_BATCH_ERROR,
szMsg, RC_STRING_MAX_SIZE);
+ ConErrPrintf(szMsg);
return FALSE;
}
_____
Modified: trunk/reactos/subsys/system/cmd/beep.c
--- trunk/reactos/subsys/system/cmd/beep.c 2005-05-01 12:56:25 UTC
(rev 14911)
+++ trunk/reactos/subsys/system/cmd/beep.c 2005-05-01 13:58:30 UTC
(rev 14912)
@@ -36,8 +36,8 @@
if (_tcsncmp (param, _T("/?"), 2) == 0)
{
- LoadString( GetModuleHandle(NULL), STRING_ALIAS_HELP,
szMsg,sizeof(szMsg)/sizeof(TCHAR));
- ConOutPuts ((LPTSTR)szMsg);
+ LoadString(GetModuleHandle(NULL), STRING_ALIAS_HELP,
szMsg, RC_STRING_MAX_SIZE);
+ ConOutPuts(szMsg);
return 0;
}
_____
Modified: trunk/reactos/subsys/system/cmd/call.c
--- trunk/reactos/subsys/system/cmd/call.c 2005-05-01 12:56:25 UTC
(rev 14911)
+++ trunk/reactos/subsys/system/cmd/call.c 2005-05-01 13:58:30 UTC
(rev 14912)
@@ -1,5 +1,4 @@
-/* $Id$
[truncated at 1000 lines; 5579 more skipped]