diff --git a/reactos/Doxyfile b/reactos/Doxyfile index 824f1f79358..0fdd22ff8cb 100644 --- a/reactos/Doxyfile +++ b/reactos/Doxyfile @@ -1,4 +1,4 @@ -# Doxyfile 1.5.3 +# Doxyfile 1.5.8 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,11 +14,11 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of -# possible encodings. +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. DOXYFILE_ENCODING = UTF-8 @@ -31,14 +31,14 @@ PROJECT_NAME = ReactOS # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = "0.4-SVN r?????" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = doxy-doc +OUTPUT_DIRECTORY = Doxygen # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -47,17 +47,18 @@ OUTPUT_DIRECTORY = doxy-doc # source files, where putting all generated files in the same directory would # otherwise cause performance problems for the file system. -CREATE_SUBDIRS = NO +CREATE_SUBDIRS = YES # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. # The default language is English, other supported languages are: # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. +# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, +# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, +# Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English @@ -146,7 +147,7 @@ SHORT_NAMES = NO # comments will behave just like regular Qt-style comments # (thus requiring an explicit @brief command for a brief description.) -JAVADOC_AUTOBRIEF = YES +JAVADOC_AUTOBRIEF = NO # If the QT_AUTOBRIEF tag is set to YES then Doxygen will # interpret the first line (until the first dot) of a Qt-style @@ -164,13 +165,6 @@ QT_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented # member inherits the documentation from any documented member that it # re-implements. @@ -186,7 +180,7 @@ SEPARATE_MEMBER_PAGES = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. # Doxygen uses this value to replace tabs by spaces in code fragments. -TAB_SIZE = 8 +TAB_SIZE = 4 # This tag can be used to specify a number of aliases that acts # as commands in the documentation. An alias has the form "name=value". @@ -205,14 +199,37 @@ ALIASES = OPTIMIZE_OUTPUT_FOR_C = YES # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should # set this tag to YES in order to let doxygen match functions declarations and # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. # func(std::string) {}). This also make the inheritance and collaboration @@ -220,11 +237,26 @@ OPTIMIZE_OUTPUT_JAVA = NO BUILTIN_STL_SUPPORT = NO -# If you use Microsoft's C++/CLI language, you should set this option to YES to +# If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. CPP_CLI_SUPPORT = NO +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC # tag is set to YES, then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default @@ -240,6 +272,32 @@ DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = YES + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -274,10 +332,11 @@ EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be extracted -# and appear in the documentation as a namespace called 'anonymous_namespace{file}', -# where file will be replaced with the base name of the file that contains the anonymous -# namespace. By default anonymous namespace are hidden. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. EXTRACT_ANON_NSPACES = NO @@ -315,7 +374,7 @@ HIDE_IN_BODY_DOCS = NO # to NO (the default) then the documentation will be excluded. # Set it to YES to include the internal documentation. -INTERNAL_DOCS = YES +INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate # file names in lower-case letters. If set to YES upper-case letters are also @@ -356,11 +415,17 @@ SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be # sorted by fully-qualified names, including namespaces. If set to # NO (the default), the class list will be sorted only by class name, # not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. # Note: This option applies only to the class list, not to the # alphabetical list. @@ -370,25 +435,25 @@ SORT_BY_SCOPE_NAME = NO # disable (NO) the todo list. This list is created by putting \todo # commands in the documentation. -GENERATE_TODOLIST = YES +GENERATE_TODOLIST = NO # The GENERATE_TESTLIST tag can be used to enable (YES) or # disable (NO) the test list. This list is created by putting \test # commands in the documentation. -GENERATE_TESTLIST = YES +GENERATE_TESTLIST = NO # The GENERATE_BUGLIST tag can be used to enable (YES) or # disable (NO) the bug list. This list is created by putting \bug # commands in the documentation. -GENERATE_BUGLIST = YES +GENERATE_BUGLIST = NO # The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or # disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. -GENERATE_DEPRECATEDLIST= YES +GENERATE_DEPRECATEDLIST= NO # The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. @@ -415,11 +480,23 @@ SHOW_USED_FILES = YES # then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy # in the documentation. The default is NO. -SHOW_DIRECTORIES = NO +SHOW_DIRECTORIES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = NO # The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via # popen()) the command , where is the value of # the FILE_VERSION_FILTER tag, and is the name of an input file # provided by doxygen. Whatever the program writes to standard output @@ -427,6 +504,15 @@ SHOW_DIRECTORIES = NO FILE_VERSION_FILTER = +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -470,7 +556,7 @@ WARN_NO_PARAMDOC = NO # $version, which will be replaced by the version of the file (if it could # be obtained via FILE_VERSION_FILTER) -WARN_FORMAT = "$file:$line: $text " +WARN_FORMAT = "$file:$line: $text" # The WARN_LOGFILE tag can be used to specify a file to which warning # and error messages should be written. If left blank the output is written @@ -487,12 +573,13 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = +INPUT = -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. -# See http://www.gnu.org/software/libiconv for the list of possible encodings. +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. INPUT_ENCODING = UTF-8 @@ -501,13 +588,16 @@ INPUT_ENCODING = UTF-8 # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.c \ - *.h \ + *.cxx \ *.cpp \ - *.cc \ - *.cx + *.c++ \ + *.h \ + *.hh \ + *.hpp \ + *.idl # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -519,8 +609,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = subsystems/win32/win32k \ - base/shell/explorer +EXCLUDE = # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded @@ -534,12 +623,13 @@ EXCLUDE_SYMLINKS = NO # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = +EXCLUDE_PATTERNS = */.svn # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, -# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test EXCLUDE_SYMBOLS = @@ -561,7 +651,7 @@ EXAMPLE_PATTERNS = # commands irrespective of the value of the RECURSIVE tag. # Possible values are YES and NO. If left blank NO is used. -EXAMPLE_RECURSIVE = YES +EXAMPLE_RECURSIVE = NO # The IMAGE_PATH tag can be used to specify one or more files or # directories that contain image that are included in the documentation (see @@ -601,9 +691,7 @@ FILTER_SOURCE_FILES = NO # If the SOURCE_BROWSER tag is set to YES then a list of source files will # be generated. Documented entities will be cross-referenced with these sources. # Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH -# then you must also enable this option. If you don't then doxygen will produce -# a warning and turn it on anyway +# VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = YES @@ -618,22 +706,22 @@ INLINE_SOURCES = YES STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# If the REFERENCED_BY_RELATION tag is set to YES # then for each documented function all documented # functions referencing it will be listed. -REFERENCED_BY_RELATION = YES +REFERENCED_BY_RELATION = NO -# If the REFERENCES_RELATION tag is set to YES (the default) +# If the REFERENCES_RELATION tag is set to YES # then for each documented function all documented entities # called/used by that function will be listed. -REFERENCES_RELATION = YES +REFERENCES_RELATION = NO -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES @@ -722,20 +810,46 @@ HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. For this to work a browser that supports # JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox # Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). -HTML_DYNAMIC_SECTIONS = NO +HTML_DYNAMIC_SECTIONS = YES + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You @@ -757,6 +871,12 @@ HHC_LOCATION = GENERATE_CHI = NO +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag # controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. @@ -768,6 +888,55 @@ BINARY_TOC = NO TOC_EXPAND = NO +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + # The DISABLE_INDEX tag can be used to turn on/off the condensed index at # top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. @@ -779,14 +948,22 @@ DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to FRAME, a side panel will be generated +# containing a tree-like index structure (just like the one that # is generated for HTML Help). For this to work a browser that supports # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +# probably better off using the HTML help feature. Other possible values +# for this tag are: HIERARCHIES, which will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list; +# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which +# disables this behavior completely. For backwards compatibility with previous +# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE +# respectively. -GENERATE_TREEVIEW = NO +GENERATE_TREEVIEW = NONE # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree @@ -794,6 +971,14 @@ GENERATE_TREEVIEW = NO TREEVIEW_WIDTH = 250 +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -849,13 +1034,13 @@ LATEX_HEADER = # contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. -PDF_HYPERLINKS = NO +PDF_HYPERLINKS = YES # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of # plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. -USE_PDFLATEX = NO +USE_PDFLATEX = YES # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. # command to the generated LaTeX files. This will instruct LaTeX to keep @@ -890,7 +1075,7 @@ RTF_OUTPUT = rtf # RTF documents. This may be useful for small projects and may help to # save some trees in general. -COMPACT_RTF = YES +COMPACT_RTF = NO # If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated # will contain hyperlink fields. The RTF file will @@ -899,7 +1084,7 @@ COMPACT_RTF = YES # programs which support those fields. # Note: wordpad (write) and others do not support links. -RTF_HYPERLINKS = YES +RTF_HYPERLINKS = NO # Load stylesheet definitions from file. Syntax is similar to doxygen's # config file, i.e. a series of assignments. You only have to provide @@ -948,7 +1133,7 @@ MAN_LINKS = NO # generate an XML file that captures the structure of # the code including all documentation. -GENERATE_XML = YES +GENERATE_XML = NO # The XML_OUTPUT tag is used to specify where the XML pages will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be @@ -1052,14 +1237,14 @@ SEARCH_INCLUDES = YES # contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = include +INCLUDE_PATH = # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the # directories. If left blank, the patterns specified with FILE_PATTERNS will # be used. -INCLUDE_FILE_PATTERNS = *.h +INCLUDE_FILE_PATTERNS = # The PREDEFINED tag can be used to specify one or more macro names that # are defined before the preprocessor is started (similar to the -D option of @@ -1099,9 +1284,9 @@ SKIP_FUNCTION_MACROS = YES # TAGFILES = file1=loc1 "file2 = loc2" ... # where "loc1" and "loc2" can be relative or absolute paths or # URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) # If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. @@ -1143,10 +1328,11 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = NO # You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to -# be found in the default search path. +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. MSCGEN_PATH = @@ -1154,7 +1340,7 @@ MSCGEN_PATH = # inheritance and usage relations if the target is undocumented # or is not a class. -HIDE_UNDOC_RELATIONS = NO +HIDE_UNDOC_RELATIONS = YES # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is # available from the path. This tool is part of Graphviz, a graph visualization @@ -1163,6 +1349,29 @@ HIDE_UNDOC_RELATIONS = NO HAVE_DOT = NO +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and # indirect inheritance relations. Setting this tag to YES will force the @@ -1207,19 +1416,19 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. -CALL_GRAPH = YES +CALL_GRAPH = NO -# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. CALLER_GRAPH = NO @@ -1230,13 +1439,13 @@ GRAPHICAL_HIERARCHY = YES # If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES # then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include +# in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif +# generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png @@ -1252,12 +1461,12 @@ DOT_PATH = DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of # nodes that will be shown in the graph. If the number of nodes in a graph # becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the number -# of direct children of the root node in a graph is already larger than -# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 @@ -1270,13 +1479,13 @@ DOT_GRAPH_MAX_NODES = 50 # code bases. Also note that the size of a graph can be further restricted by # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. -MAX_DOT_GRAPH_DEPTH = 0 +MAX_DOT_GRAPH_DEPTH = 1000 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). DOT_TRANSPARENT = NO @@ -1300,7 +1509,7 @@ GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Options related to the search engine #--------------------------------------------------------------------------- # The SEARCHENGINE tag specifies whether or not a search engine should be diff --git a/reactos/base/applications/calc/convert.c b/reactos/base/applications/calc/convert.c index d281d444603..159a3bf792c 100644 --- a/reactos/base/applications/calc/convert.c +++ b/reactos/base/applications/calc/convert.c @@ -142,6 +142,7 @@ static const conv_t conv_CURRENCY[] = { DECLARE_CONV_UNIT(CURRENCY, LUXEMBOURG_FRANC, "$/40,3399", "$*40,3399") DECLARE_CONV_UNIT(CURRENCY, MALTESE_LIRA, "$/0.42930", "$*0.42930") DECLARE_CONV_UNIT(CURRENCY, PORTOGUESE_ESCUDO, "$/200,482", "$*200,482") + DECLARE_CONV_UNIT(CURRENCY, SLOVAK_KORUNA, "$/30,126", "$*30,126") DECLARE_CONV_UNIT(CURRENCY, SLOVENIAN_TOLAR, "$/239,640", "$*239,640") DECLARE_CONV_UNIT(CURRENCY, SPANISH_PESETA, "$/166,386", "$*166,386") DECLARE_CONV_END diff --git a/reactos/base/applications/calc/lang/bg-BG.rc b/reactos/base/applications/calc/lang/bg-BG.rc index 3379a174dcd..6d2c7cc4615 100644 --- a/reactos/base/applications/calc/lang/bg-BG.rc +++ b/reactos/base/applications/calc/lang/bg-BG.rc @@ -522,6 +522,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" END diff --git a/reactos/base/applications/calc/lang/cs-CZ.rc b/reactos/base/applications/calc/lang/cs-CZ.rc index fca7a7d8f77..ad64f9d1c69 100644 --- a/reactos/base/applications/calc/lang/cs-CZ.rc +++ b/reactos/base/applications/calc/lang/cs-CZ.rc @@ -1,6 +1,6 @@ /* FILE: base/applications/calc/lang/cs-CZ.rc * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-07-27 + * UPDATED: 2008-12-29 */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -523,6 +523,7 @@ BEGIN IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalsk escudo" IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakousk ilink" IDS_CURRENCY_GREEK_DRACHMA "eck drachma" + IDS_CURRENCY_SLOVAK_KORUNA "Slovensk koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinsk tolar" IDS_CURRENCY_SPANISH_PESETA "panlsk peseta" END diff --git a/reactos/base/applications/calc/lang/de-DE.rc b/reactos/base/applications/calc/lang/de-DE.rc index dd5f2795647..5b1ad7d8038 100644 --- a/reactos/base/applications/calc/lang/de-DE.rc +++ b/reactos/base/applications/calc/lang/de-DE.rc @@ -521,6 +521,7 @@ BEGIN IDS_CURRENCY_DUTCH_GUILDER "Niederlndische Guilder" IDS_CURRENCY_AUSTRIAN_SCHILLING "sterreichische Schilling" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugiesische Escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slowakische Krone" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenische Tolar" IDS_CURRENCY_SPANISH_PESETA "Spanische Peseta" IDS_CURRENCY_CYPRIOT_POUND "Zypriotische Pfund" diff --git a/reactos/base/applications/calc/lang/en-US.rc b/reactos/base/applications/calc/lang/en-US.rc index b723bba4b0c..bbe62c6256d 100644 --- a/reactos/base/applications/calc/lang/en-US.rc +++ b/reactos/base/applications/calc/lang/en-US.rc @@ -517,6 +517,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" END diff --git a/reactos/base/applications/calc/lang/es-ES.rc b/reactos/base/applications/calc/lang/es-ES.rc index 0c9db5a28b9..7d4ffe036c7 100644 --- a/reactos/base/applications/calc/lang/es-ES.rc +++ b/reactos/base/applications/calc/lang/es-ES.rc @@ -1,5 +1,5 @@ /* - *Spanish Language resource file + * Spanish Language resource file * Traducido por: Javier Remacha 2008 */ @@ -527,6 +527,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Luxemburgus" IDS_CURRENCY_MALTESE_LIRA "Lira Maltesa" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo Portugus" + IDS_CURRENCY_SLOVAK_KORUNA "Corona Eslovaca" IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar Esloveno" IDS_CURRENCY_SPANISH_PESETA "Peseta Espaola" END diff --git a/reactos/base/applications/calc/lang/it-IT.rc b/reactos/base/applications/calc/lang/it-IT.rc index bc5f07f46e6..36cf824974c 100644 --- a/reactos/base/applications/calc/lang/it-IT.rc +++ b/reactos/base/applications/calc/lang/it-IT.rc @@ -517,6 +517,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Franco Lussemburghese" IDS_CURRENCY_MALTESE_LIRA "Lira maltese" IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portoghese" + IDS_CURRENCY_SLOVAK_KORUNA "Corona slovacca" IDS_CURRENCY_SLOVENIAN_TOLAR "Tallero sloveno" IDS_CURRENCY_SPANISH_PESETA "Peseta spagnola" END diff --git a/reactos/base/applications/calc/lang/ko-KR.rc b/reactos/base/applications/calc/lang/ko-KR.rc index 2f4db083980..ba32958e893 100644 --- a/reactos/base/applications/calc/lang/ko-KR.rc +++ b/reactos/base/applications/calc/lang/ko-KR.rc @@ -1,11 +1,13 @@ /* - *Korean translation by manatails007(www.manatails007.org) Seungju Kim + * Korean translation by manatails007 (www.manatails007.org) Seungju Kim */ + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + // Dialog IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS " MENU IDR_MENU_SCIENTIFIC_1 FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -151,7 +153,7 @@ BEGIN 42,10 CONTROL "Radians",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, 24,42,10 - CONTROL "Grads",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + CONTROL "Gradians",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, 236,24,44,10 PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP @@ -165,7 +167,7 @@ BEGIN END IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 -STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS " MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 @@ -231,13 +233,91 @@ BEGIN DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE END +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS " +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Convert",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Category:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Convert from:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "Convert to:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Back",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK",IDOK,105,148,52,16 - CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 LTEXT "ReactOS ",IDC_STATIC,120,12,132,8, SS_CENTERIMAGE @@ -251,7 +331,7 @@ BEGIN END IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 -STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" FONT 8, "MS Shell Dlg" BEGIN @@ -265,7 +345,6 @@ BEGIN SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -365,3 +444,260 @@ BEGIN IDS_QUICKHELP " " END +// types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_AREA "Area" + IDS_CONV_CONSUMPTION "Consumption (engines)" + IDS_CONV_CURRENCY "Currencies" + IDS_CONV_ENERGY "Energy" + IDS_CONV_LENGTH "Lenghts" + IDS_CONV_POWER "Power" + IDS_CONV_PRESSURE "Pressure" + IDS_CONV_TEMPERATURE "Temperature" + IDS_CONV_VELOCITY "Velocity" + IDS_CONV_VOLUME "Volume" + IDS_CONV_WEIGHT "Weights" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "Acres" + IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" + IDS_AREA_ACRES_FRANCE "Acres (France)" + IDS_AREA_ACRES_SCOTS "Acres (Scots)" + IDS_AREA_ACRES_US "Acres (US)" + IDS_AREA_ARES "Ares" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "Hectares" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MU "Mu" + IDS_AREA_PING "Ping" + IDS_AREA_PYEONG "Pyeong" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "Rai" + IDS_AREA_SE "Se" + IDS_AREA_SQUARE_CENTIMETERS "Square centimeters" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "Square fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" + IDS_AREA_SQUARE_FEET "Square feet" + IDS_AREA_SQUARE_INCHES "Square inches" + IDS_AREA_SQUARE_KILOMETERS "Square kilometers" + IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_METER "Square meter" + IDS_AREA_SQUARE_MILES "Square miles" + IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" + IDS_AREA_SQUARE_SHAKU "Square shaku" + IDS_AREA_SQUARE_TSUEN "Square tsuen" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Tsubo" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" + IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" + IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" + IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" + IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" + IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" + IDS_CURRENCY_FRENCH_FRANC "French franc" + IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" + IDS_CURRENCY_IRISH_POUND "Irish pound" + IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" + IDS_CURRENCY_MALTESE_LIRA "Maltese lira" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovak koruna" + IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" + IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" + IDS_ENERGY_TH_CALORIES "Thermochemical calorie" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "Angstroms" + IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_BARLEYCORNS "Barleycorns" + IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_CHAINS_UK "Chains (UK)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "Fathoms" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" + IDS_LENGTH_FEET "Feet" + IDS_LENGTH_FURLONGS "Furlongs" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MILES "Miles" + IDS_LENGTH_MILLIMETERS "Millimeters" + IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "Ri (Japan)" + IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Shaku" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "Sun" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_HORSEPOWER "Horsepower" + IDS_POWER_KILOWATTS "Kilowatts" + IDS_POWER_MEGAWATTS "Megawatts" + IDS_POWER_WATTS "Watts" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "Atmospheres" + IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PSI "Pounds-force per square inch" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "Celsius" + IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" + IDS_TEMPERATURE_KELVIN "Kelvin" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_FEET_HOUR "Feet/hour" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometers/hour" + IDS_VELOCITY_KNOTS "Knots" + IDS_VELOCITY_MACH "Mach" + IDS_VELOCITY_METERS_SECOND "Meters/second" + IDS_VELOCITY_MILES_HOUR "Miles/hour" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "Barrels (UK)" + IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "Bushels (UK)" + IDS_VOLUME_BUSHELS_US "Bushels (US)" + IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" + IDS_VOLUME_CUBIC_FEET "Cubic feet" + IDS_VOLUME_CUBIC_INCHES "Cubic inches" + IDS_VOLUME_CUBIC_METERS "Cubic meters" + IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" + IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" + IDS_VOLUME_GALLONS_UK "Gallons (UK)" + IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" + IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "Milliliters" + IDS_VOLUME_PINTS_UK "Pints (UK)" + IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" + IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" + IDS_VOLUME_QUARTS_UK "Quarts (UK)" + IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" + IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "Grams" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin (China)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "Kilograms" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang (China)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Ounces, troy" + IDS_WEIGHT_POUNDS "Pounds" + IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "Tonnes" + IDS_WEIGHT_TONS_UK "Tons (UK)" + IDS_WEIGHT_TONS_US "Tons (US)" +END diff --git a/reactos/base/applications/calc/lang/nl-NL.rc b/reactos/base/applications/calc/lang/nl-NL.rc index 4c8e427c796..f62e0bf6e64 100644 --- a/reactos/base/applications/calc/lang/nl-NL.rc +++ b/reactos/base/applications/calc/lang/nl-NL.rc @@ -1,4 +1,3 @@ - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL // Dialog @@ -523,6 +522,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slowaakse kroon" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" END diff --git a/reactos/base/applications/calc/lang/no-NO.rc b/reactos/base/applications/calc/lang/no-NO.rc index 32714c919b0..bb2937daa4e 100644 --- a/reactos/base/applications/calc/lang/no-NO.rc +++ b/reactos/base/applications/calc/lang/no-NO.rc @@ -518,6 +518,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" END diff --git a/reactos/base/applications/calc/lang/pl-PL.rc b/reactos/base/applications/calc/lang/pl-PL.rc index b5f73ff1550..4ddd2e9a974 100644 --- a/reactos/base/applications/calc/lang/pl-PL.rc +++ b/reactos/base/applications/calc/lang/pl-PL.rc @@ -529,6 +529,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luksemburski frank" IDS_CURRENCY_MALTESE_LIRA "Maltaskie liry" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalskie escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Sowacka korona" IDS_CURRENCY_SLOVENIAN_TOLAR "Soveski tolar" IDS_CURRENCY_SPANISH_PESETA "Hiszpaska peseta" END diff --git a/reactos/base/applications/calc/lang/ru-RU.rc b/reactos/base/applications/calc/lang/ru-RU.rc index 41f94b469a2..2b0a5896224 100644 --- a/reactos/base/applications/calc/lang/ru-RU.rc +++ b/reactos/base/applications/calc/lang/ru-RU.rc @@ -522,6 +522,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC " " IDS_CURRENCY_MALTESE_LIRA " " IDS_CURRENCY_PORTOGUESE_ESCUDO " " + IDS_CURRENCY_SLOVAK_KORUNA " " IDS_CURRENCY_SLOVENIAN_TOLAR " " IDS_CURRENCY_SPANISH_PESETA " " END diff --git a/reactos/base/applications/calc/lang/sk-SK.rc b/reactos/base/applications/calc/lang/sk-SK.rc index 2081cd13899..9ba44c32023 100644 --- a/reactos/base/applications/calc/lang/sk-SK.rc +++ b/reactos/base/applications/calc/lang/sk-SK.rc @@ -1,6 +1,6 @@ /* TRANSLATOR : Mrio Kamr /Mario Kacmar/ aka Kario (kario@szm.sk) * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 30-08-2008 + * LAST CHANGE: 29-12-2008 * --------------------------------------- * TODO: * 1. treba usporiada jednotky poda abecedy @@ -350,7 +350,6 @@ BEGIN SS_SUNKEN END - // Menus IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE @@ -531,6 +530,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovensk koruna" IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinsk toliar" IDS_CURRENCY_SPANISH_PESETA "panielska peseta" END diff --git a/reactos/base/applications/calc/lang/uk-UA.rc b/reactos/base/applications/calc/lang/uk-UA.rc index fcc7e7f6344..dd133c2ab6f 100644 --- a/reactos/base/applications/calc/lang/uk-UA.rc +++ b/reactos/base/applications/calc/lang/uk-UA.rc @@ -530,6 +530,7 @@ BEGIN IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltese lira" IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVAK_KORUNA " " IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" END diff --git a/reactos/base/applications/calc/resource.h b/reactos/base/applications/calc/resource.h index d49db7a96c7..add3f985576 100644 --- a/reactos/base/applications/calc/resource.h +++ b/reactos/base/applications/calc/resource.h @@ -173,8 +173,9 @@ #define IDS_CURRENCY_LUXEMBOURG_FRANC 2311 #define IDS_CURRENCY_MALTESE_LIRA 2312 #define IDS_CURRENCY_PORTOGUESE_ESCUDO 2313 -#define IDS_CURRENCY_SLOVENIAN_TOLAR 2314 -#define IDS_CURRENCY_SPANISH_PESETA 2315 +#define IDS_CURRENCY_SLOVAK_KORUNA 2314 +#define IDS_CURRENCY_SLOVENIAN_TOLAR 2315 +#define IDS_CURRENCY_SPANISH_PESETA 2316 /* TYPES OF ENERGIES */ #define IDS_ENERGY_15_C_CALORIES 2400 diff --git a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c index 451c7af72c5..87ab64f1a1c 100644 --- a/reactos/base/applications/cmdutils/dbgprint/dbgprint.c +++ b/reactos/base/applications/cmdutils/dbgprint/dbgprint.c @@ -31,7 +31,7 @@ int _tmain(int argc, TCHAR ** argv) return -1; } - if (_tcsstr(argv[1], "--winetest") && (argc == 3)) + if (_tcsstr(argv[1], "--winetest") && (argc == 3)) { char psBuffer[128]; char psBuffer2[128]; @@ -63,6 +63,7 @@ int _tmain(int argc, TCHAR ** argv) char *nlptr2 = strchr(psBuffer2, '\n'); if (nlptr2) *nlptr2 = '\0'; + puts(psBuffer2); OutputDebugStringA(psBuffer2); } _pclose(pPipe2); @@ -72,7 +73,7 @@ int _tmain(int argc, TCHAR ** argv) _pclose(pPipe); } } - else if (_tcsstr(argv[1], "--process") && (argc == 3)) + else if (_tcsstr(argv[1], "--process") && (argc == 3)) { char psBuffer[128]; FILE *pPipe; @@ -82,6 +83,7 @@ int _tmain(int argc, TCHAR ** argv) { while(fgets(psBuffer, 128, pPipe)) { + puts(psBuffer); OutputDebugStringA(psBuffer); } _pclose(pPipe); @@ -112,6 +114,7 @@ int _tmain(int argc, TCHAR ** argv) } offset++; } + _putts(buf); OutputDebugString(buf); HeapFree(GetProcessHeap(), 0, buf); } diff --git a/reactos/base/applications/games/solitaire/lang/bg-BG.rc b/reactos/base/applications/games/solitaire/lang/bg-BG.rc index 31f802846bc..190e2c2bab0 100644 --- a/reactos/base/applications/games/solitaire/lang/bg-BG.rc +++ b/reactos/base/applications/games/solitaire/lang/bg-BG.rc @@ -50,7 +50,7 @@ BEGIN IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT " ?" IDS_SOL_WIN ", !!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL " ?" END diff --git a/reactos/base/applications/network/telnet/src/tmapldr.cpp b/reactos/base/applications/network/telnet/src/tmapldr.cpp index e642fc56e80..18e2d621a60 100644 --- a/reactos/base/applications/network/telnet/src/tmapldr.cpp +++ b/reactos/base/applications/network/telnet/src/tmapldr.cpp @@ -588,7 +588,7 @@ int TMapLoader::Load(const char * filename, const char * szActiveEmul) { #ifdef KEYDEBUG printit("\r \r"); #endif - AllOk = SA.Add(temps);; + AllOk = SA.Add(temps); if ( !AllOk ) break; } else { // cerr << "Unexpected line '" << buf << "'\n"; diff --git a/reactos/base/applications/network/telnet/src/tnmain.cpp b/reactos/base/applications/network/telnet/src/tnmain.cpp index 5cbb66995fc..011686baa78 100644 --- a/reactos/base/applications/network/telnet/src/tnmain.cpp +++ b/reactos/base/applications/network/telnet/src/tnmain.cpp @@ -143,7 +143,7 @@ struct cmdHistory * cfgets (char *buf, unsigned int length, struct cmdHistory *c MustRefresh = 1; break; case VK_RIGHT: //crn@ozemail.com.au (added ctrl+arrow) - if (cursor < current) + if (cursor < current) { if (InputRecord.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { unsigned int j, k; @@ -159,8 +159,9 @@ struct cmdHistory * cfgets (char *buf, unsigned int length, struct cmdHistory *c cursor++; MustRefresh = 1; break; + } case VK_LEFT: //crn@ozemail.com.au (added ctrl+arrow) - if (cursor > 0) + if (cursor > 0) { if(InputRecord.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) { int j, k; @@ -176,6 +177,7 @@ struct cmdHistory * cfgets (char *buf, unsigned int length, struct cmdHistory *c cursor--; MustRefresh = 1; break; + } case VK_HOME: if (cursor>0) cursor = 0; MustRefresh = 1; diff --git a/reactos/base/applications/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c index 7dc02ce291c..1c35b5416db 100644 --- a/reactos/base/applications/notepad/dialog.c +++ b/reactos/base/applications/notepad/dialog.c @@ -676,16 +676,15 @@ VOID DIALOG_EditTimeDate(VOID) { SYSTEMTIME st; TCHAR szDate[MAX_STRING_LEN]; - static const TCHAR space[] = _T(" "); + TCHAR szText[MAX_STRING_LEN * 2 + 2]; GetLocalTime(&st); GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); - - SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)space); - + _tcscpy(szText, szDate); + _tcscat(szText, _T(" ")); GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &st, NULL, szDate, MAX_STRING_LEN); + _tcscat(szText, szDate); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); } diff --git a/reactos/base/applications/notepad/lang/bg-BG.rc b/reactos/base/applications/notepad/lang/bg-BG.rc index 20aa32c5103..39ed8e5f279 100644 --- a/reactos/base/applications/notepad/lang/bg-BG.rc +++ b/reactos/base/applications/notepad/lang/bg-BG.rc @@ -29,7 +29,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -40,54 +42,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&" - BEGIN - MENUITEM "&...", CMD_NEW - MENUITEM "&\tCtrl+O", CMD_OPEN - MENUITEM "&\tCtrl+S", CMD_SAVE - MENUITEM " &...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM " ...", CMD_PAGE_SETUP - MENUITEM "&", CMD_PRINT - MENUITEM " ...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&", CMD_EXIT - END - POPUP "&" - BEGIN - MENUITEM "&\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&\tCtrl+X", CMD_CUT - MENUITEM "&\tCtrl+C", CMD_COPY - MENUITEM "&\tCtrl+V", CMD_PASTE - MENUITEM "&\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&...\tCtrl+F", CMD_SEARCH - MENUITEM " &\tF3", CMD_SEARCH_NEXT - MENUITEM "\tCtrl+H", CMD_REPLACE - MENUITEM " ...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM " &\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&/\tF5", CMD_TIME_DATE - END - POPUP "&" - BEGIN - MENUITEM "& ", CMD_WRAP - MENUITEM "&...", CMD_FONT - END - POPUP "&" - BEGIN - MENUITEM " &", CMD_STATUSBAR - END - POPUP "&" - BEGIN - MENUITEM "&", CMD_HELP_CONTENTS - MENUITEM "&...", CMD_HELP_SEARCH - MENUITEM "& ", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&" CMD_ABOUT - MENUITEM "&", CMD_ABOUT_WINE - END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+N", CMD_NEW + MENUITEM "&\tCtrl+O", CMD_OPEN + MENUITEM "&\tCtrl+S", CMD_SAVE + MENUITEM " &...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM " ...", CMD_PAGE_SETUP + MENUITEM "&\tCtrl+P", CMD_PRINT + MENUITEM " ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&", CMD_EXIT + END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&\tCtrl+X", CMD_CUT + MENUITEM "&\tCtrl+C", CMD_COPY + MENUITEM "&\tCtrl+V", CMD_PASTE + MENUITEM "&\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&...\tCtrl+F", CMD_SEARCH + MENUITEM " &\tF3", CMD_SEARCH_NEXT + MENUITEM "\tCtrl+H", CMD_REPLACE + MENUITEM " ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM " &\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&/\tF5", CMD_TIME_DATE + END + POPUP "&" + BEGIN + MENUITEM "& ", CMD_WRAP + MENUITEM "&...", CMD_FONT + END + POPUP "&" + BEGIN + MENUITEM " &", CMD_STATUSBAR + END + POPUP "&" + BEGIN + MENUITEM "&", CMD_HELP_CONTENTS + MENUITEM "&...", CMD_HELP_SEARCH + MENUITEM "& ", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&" CMD_ABOUT + MENUITEM "&", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ @@ -201,5 +203,5 @@ STRING_UTF8, "UTF-8" STRING_CRLF, "" STRING_LF, "" STRING_CR, "" -STRING_LINE_COLUMN, "Line %d, column %d" +STRING_LINE_COLUMN, " %d, %d" END diff --git a/reactos/base/applications/notepad/lang/cs-CZ.rc b/reactos/base/applications/notepad/lang/cs-CZ.rc index 065f051157b..4a46efa404e 100644 --- a/reactos/base/applications/notepad/lang/cs-CZ.rc +++ b/reactos/base/applications/notepad/lang/cs-CZ.rc @@ -31,7 +31,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -42,54 +44,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Soubor" - BEGIN - MENUITEM "&Nov...", CMD_NEW - MENUITEM "&Otevt\tCtrl+O", CMD_OPEN - MENUITEM "&Uloit\tCtrl+S", CMD_SAVE - MENUITEM "Uloit j&ako...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Tisk", CMD_PRINT - MENUITEM "Nas&taven strnky...", CMD_PAGE_SETUP - MENUITEM "Nastaven tisk&rny...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Konec", CMD_EXIT - END - POPUP "U&pravit" - BEGIN - MENUITEM "&Zpt\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT - MENUITEM "&Koprovat\tCtrl+C", CMD_COPY - MENUITEM "&Vloit\tCtrl+V", CMD_PASTE - MENUITEM "&Smazat\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH - MENUITEM "&Najdi dal\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Vybrat v&e\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&as/Datum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "Zalo&mit dlouh dky", CMD_WRAP - MENUITEM "&Psmo...", CMD_FONT - END - POPUP "&Zobrazit" - BEGIN - MENUITEM "&Stavov dek", CMD_STATUSBAR - END - POPUP "&Npovda" - BEGIN - MENUITEM "&Obsah", CMD_HELP_CONTENTS - MENUITEM "&Najt...", CMD_HELP_SEARCH - MENUITEM "&Pomoc k npovd", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&O programu" CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END + POPUP "&Soubor" + BEGIN + MENUITEM "&Nov\tCtrl+N", CMD_NEW + MENUITEM "&Otevt\tCtrl+O", CMD_OPEN + MENUITEM "&Uloit\tCtrl+S", CMD_SAVE + MENUITEM "Uloit j&ako...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Tisk\tCtrl+P", CMD_PRINT + MENUITEM "Nas&taven strnky...", CMD_PAGE_SETUP + MENUITEM "Nastaven tisk&rny...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Konec", CMD_EXIT + END + POPUP "U&pravit" + BEGIN + MENUITEM "&Zpt\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Vyjmou&t\tCtrl+X", CMD_CUT + MENUITEM "&Koprovat\tCtrl+C", CMD_COPY + MENUITEM "&Vloit\tCtrl+V", CMD_PASTE + MENUITEM "&Smazat\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Hledej\tCtrl+F", CMD_SEARCH + MENUITEM "&Najdi dal\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Vybrat v&e\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&as/Datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "Zalo&mit dlouh dky", CMD_WRAP + MENUITEM "&Psmo...", CMD_FONT + END + POPUP "&Zobrazit" + BEGIN + MENUITEM "&Stavov dek", CMD_STATUSBAR + END + POPUP "&Npovda" + BEGIN + MENUITEM "&Obsah", CMD_HELP_CONTENTS + MENUITEM "&Najt...", CMD_HELP_SEARCH + MENUITEM "&Pomoc k npovd", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&O programu" CMD_ABOUT + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/da-DK.rc b/reactos/base/applications/notepad/lang/da-DK.rc index 44ecfbc917a..9f029605c29 100644 --- a/reactos/base/applications/notepad/lang/da-DK.rc +++ b/reactos/base/applications/notepad/lang/da-DK.rc @@ -28,7 +28,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -39,54 +41,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Fil" - BEGIN - MENUITEM "&Ny...", CMD_NEW - MENUITEM "&bn\tEnter", CMD_OPEN - MENUITEM "&Gem", CMD_SAVE - MENUITEM "Gem so&m...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Side&opstning...", CMD_PAGE_SETUP - MENUITEM "&Udskriv", CMD_PRINT - MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afslut", CMD_EXIT - END - POPUP "&Rediger" - BEGIN - MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Klip\tCtrl+X", CMD_CUT - MENUITEM "K&opier\tCtrl+C", CMD_COPY - MENUITEM "St &ind\tCtrl+V", CMD_PASTE - MENUITEM "&Slet\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Sg...", CMD_SEARCH - MENUITEM "&Find nste\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Marker &alt", CMD_SELECT_ALL - MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE - END - POPUP "&Sg" - BEGIN - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR + POPUP "&Fil" + BEGIN + MENUITEM "&Ny\tCtrl+N", CMD_NEW + MENUITEM "&bn\tEnter", CMD_OPEN + MENUITEM "&Gem", CMD_SAVE + MENUITEM "Gem so&m...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Side&opstning...", CMD_PAGE_SETUP + MENUITEM "&Udskriv\tCtrl+P", CMD_PRINT + MENUITEM "&Indstil printer...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Afslut", CMD_EXIT + END + POPUP "&Rediger" + BEGIN + MENUITEM "&Fortryd\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Klip\tCtrl+X", CMD_CUT + MENUITEM "K&opier\tCtrl+C", CMD_COPY + MENUITEM "St &ind\tCtrl+V", CMD_PASTE + MENUITEM "&Slet\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Sg...", CMD_SEARCH + MENUITEM "&Find nste\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Marker &alt", CMD_SELECT_ALL + MENUITEM "&Dato/tid\tF5", CMD_TIME_DATE + END + POPUP "&Sg" + BEGIN + MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR END - POPUP "&Hjlp" - BEGIN - MENUITEM "&Indhold", CMD_HELP_CONTENTS - MENUITEM "&Sg efter hjlp om...", CMD_HELP_SEARCH - MENUITEM "&Brug af Hjlp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "&Om Notesblok", CMD_ABOUT_WINE - END + POPUP "&Hjlp" + BEGIN + MENUITEM "&Indhold", CMD_HELP_CONTENTS + MENUITEM "&Sg efter hjlp om...", CMD_HELP_SEARCH + MENUITEM "&Brug af Hjlp", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "&Om Notesblok", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/de-DE.rc b/reactos/base/applications/notepad/lang/de-DE.rc index e64bd1c85ab..34ae54e7410 100644 --- a/reactos/base/applications/notepad/lang/de-DE.rc +++ b/reactos/base/applications/notepad/lang/de-DE.rc @@ -29,7 +29,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -40,54 +42,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Datei" - BEGIN - MENUITEM "&Neu...", CMD_NEW - MENUITEM "&ffnen...", CMD_OPEN - MENUITEM "&Speichern", CMD_SAVE - MENUITEM "Speichern &unter...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP - MENUITEM "&Drucken", CMD_PRINT - MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Beenden", CMD_EXIT - END - POPUP "&Bearbeiten" - BEGIN - MENUITEM "&Rckgngig\tStrg+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT - MENUITEM "&Kopieren\tStrg+C", CMD_COPY - MENUITEM "&Einfgen\tStrg+V", CMD_PASTE - MENUITEM "&Lschen\tEntf", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Suchen...", CMD_SEARCH - MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT - MENUITEM "&Ersetzen\tCtrl+H", CMD_REPLACE - MENUITEM "Gehe zu...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Alles &markieren", CMD_SELECT_ALL - MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Zeilenumbruch", CMD_WRAP - MENUITEM "&Schriftart...", CMD_FONT - END - POPUP "&Ansicht" - BEGIN - MENUITEM "Status&leiste", CMD_STATUSBAR - END - POPUP "&Hilfe" - BEGIN - MENUITEM "&Inhalt", CMD_HELP_CONTENTS - MENUITEM "&Suchen...", CMD_HELP_SEARCH - MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&ber" CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE - END + POPUP "&Datei" + BEGIN + MENUITEM "&Neu\tStrg+N", CMD_NEW + MENUITEM "&ffnen\tStrg+O", CMD_OPEN + MENUITEM "&Speichern\tStrg+S", CMD_SAVE + MENUITEM "Speichern &unter...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Seite ein&richten...", CMD_PAGE_SETUP + MENUITEM "&Drucken\tStrg+P", CMD_PRINT + MENUITEM "Drucker&einrichtung...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Beenden", CMD_EXIT + END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "&Rckgngig\tStrg+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Ausschneiden\tStrg+X", CMD_CUT + MENUITEM "&Kopieren\tStrg+C", CMD_COPY + MENUITEM "&Einfgen\tStrg+V", CMD_PASTE + MENUITEM "&Lschen\tEntf", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Suchen...", CMD_SEARCH + MENUITEM "&Weitersuchen\tF3", CMD_SEARCH_NEXT + MENUITEM "&Ersetzen\tStrg+H", CMD_REPLACE + MENUITEM "Gehe zu...\tStrg+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Alles &markieren", CMD_SELECT_ALL + MENUITEM "&Uhrzeit/Datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Zeilenumbruch", CMD_WRAP + MENUITEM "&Schriftart...", CMD_FONT + END + POPUP "&Ansicht" + BEGIN + MENUITEM "Status&leiste", CMD_STATUSBAR + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&Inhalt", CMD_HELP_CONTENTS + MENUITEM "&Suchen...", CMD_HELP_SEARCH + MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&ber" CMD_ABOUT + MENUITEM "Inf&o", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/el-GR.rc b/reactos/base/applications/notepad/lang/el-GR.rc index 8be10f85472..fece828a9f1 100644 --- a/reactos/base/applications/notepad/lang/el-GR.rc +++ b/reactos/base/applications/notepad/lang/el-GR.rc @@ -27,7 +27,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -38,54 +40,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&" - BEGIN - MENUITEM "&...", CMD_NEW - MENUITEM "&\tCtrl+O", CMD_OPEN - MENUITEM "&\tCtrl+S", CMD_SAVE - MENUITEM " &...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "& ...", CMD_PAGE_SETUP - MENUITEM "&", CMD_PRINT - MENUITEM " & ...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&", CMD_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&\tCtrl+X", CMD_CUT - MENUITEM "&\tCtrl+C", CMD_COPY - MENUITEM "&\tCtrl+V", CMD_PASTE - MENUITEM "&\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&...\tCtrl+F", CMD_SEARCH - MENUITEM " &\tF3", CMD_SEARCH_NEXT - MENUITEM "\tCtrl+H", CMD_REPLACE - MENUITEM "& ...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM " &\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&/\tF5", CMD_TIME_DATE - END - POPUP "&" - BEGIN - MENUITEM "& ", CMD_WRAP - MENUITEM "&...", CMD_FONT - END - POPUP "&" - BEGIN - MENUITEM " &", CMD_STATUSBAR - END - POPUP "&" - BEGIN - MENUITEM "&", CMD_HELP_CONTENTS - MENUITEM "&...", CMD_HELP_SEARCH - MENUITEM "& ", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "&", CMD_ABOUT_WINE - END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+N", CMD_NEW + MENUITEM "&\tCtrl+O", CMD_OPEN + MENUITEM "&\tCtrl+S", CMD_SAVE + MENUITEM " &...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "& ...", CMD_PAGE_SETUP + MENUITEM "&\tCtrl+P", CMD_PRINT + MENUITEM " & ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&\tCtrl+X", CMD_CUT + MENUITEM "&\tCtrl+C", CMD_COPY + MENUITEM "&\tCtrl+V", CMD_PASTE + MENUITEM "&\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&...\tCtrl+F", CMD_SEARCH + MENUITEM " &\tF3", CMD_SEARCH_NEXT + MENUITEM "\tCtrl+H", CMD_REPLACE + MENUITEM "& ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM " &\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&/\tF5", CMD_TIME_DATE + END + POPUP "&" + BEGIN + MENUITEM "& ", CMD_WRAP + MENUITEM "&...", CMD_FONT + END + POPUP "&" + BEGIN + MENUITEM " &", CMD_STATUSBAR + END + POPUP "&" + BEGIN + MENUITEM "&", CMD_HELP_CONTENTS + MENUITEM "&...", CMD_HELP_SEARCH + MENUITEM "& ", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "&", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/en-US.rc b/reactos/base/applications/notepad/lang/en-US.rc index c4c56075497..8e364df907e 100644 --- a/reactos/base/applications/notepad/lang/en-US.rc +++ b/reactos/base/applications/notepad/lang/en-US.rc @@ -29,7 +29,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -40,54 +42,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "&New...", CMD_NEW - MENUITEM "&Open\tCtrl+O", CMD_OPEN - MENUITEM "&Save\tCtrl+S", CMD_SAVE - MENUITEM "Save &as...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Page Se&tup...", CMD_PAGE_SETUP - MENUITEM "&Print", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "E&xit", CMD_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Delete\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Find...\tCtrl+F", CMD_SEARCH - MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Time/Date\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Wrap long lines", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Help" - BEGIN - MENUITEM "&Contents", CMD_HELP_CONTENTS - MENUITEM "&Search...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE - END + POPUP "&File" + BEGIN + MENUITEM "&New\tCtrl+N", CMD_NEW + MENUITEM "&Open...\tCtrl+O", CMD_OPEN + MENUITEM "&Save\tCtrl+S", CMD_SAVE + MENUITEM "Save &as...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Page Se&tup...", CMD_PAGE_SETUP + MENUITEM "&Print\tCtrl+P", CMD_PRINT + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "E&xit", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Delete\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Find...\tCtrl+F", CMD_SEARCH + MENUITEM "Find &next\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Time/Date\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Wrap long lines", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Help" + BEGIN + MENUITEM "&Contents", CMD_HELP_CONTENTS + MENUITEM "&Search...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "Inf&o", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/es-ES.rc b/reactos/base/applications/notepad/lang/es-ES.rc index 16e8f8bd406..e89296ba1f9 100644 --- a/reactos/base/applications/notepad/lang/es-ES.rc +++ b/reactos/base/applications/notepad/lang/es-ES.rc @@ -31,7 +31,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -42,54 +44,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Archivo" - BEGIN - MENUITEM "&Nuevo...", CMD_NEW - MENUITEM "&Abrir\tCtrl+O", CMD_OPEN - MENUITEM "&Guardar\tCtrl+S", CMD_SAVE - MENUITEM "Guardar &como...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "Configurar &pgina...", CMD_PAGE_SETUP - MENUITEM "Configuracin &impresora...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Salir", CMD_EXIT - END - POPUP "&Edicin" - BEGIN - MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cor&tar\tCtrl+X", CMD_CUT - MENUITEM "&Copiar\tCtrl+C", CMD_COPY - MENUITEM "&Pegar\tCtrl+V", CMD_PASTE - MENUITEM "&Eliminar\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH - MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT - MENUITEM "Reemplazar\tCtrl+H", CMD_REPLACE - MENUITEM "Ir a...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE - END - POPUP "F&ormato" - BEGIN - MENUITEM "&Ajuste de lnea", CMD_WRAP - MENUITEM "Tipo de &letra...", CMD_FONT - END - POPUP "&Ver" - BEGIN - MENUITEM "Barra d&e estado", CMD_STATUSBAR + POPUP "&Archivo" + BEGIN + MENUITEM "&Nuevo\tCtrl+N", CMD_NEW + MENUITEM "&Abrir\tCtrl+O", CMD_OPEN + MENUITEM "&Guardar\tCtrl+S", CMD_SAVE + MENUITEM "Guardar &como...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imprimir\tCtrl+P", CMD_PRINT + MENUITEM "Configurar &pgina...", CMD_PAGE_SETUP + MENUITEM "Configuracin &impresora...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Salir", CMD_EXIT + END + POPUP "&Edicin" + BEGIN + MENUITEM "&Deshacer\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cor&tar\tCtrl+X", CMD_CUT + MENUITEM "&Copiar\tCtrl+C", CMD_COPY + MENUITEM "&Pegar\tCtrl+V", CMD_PASTE + MENUITEM "&Eliminar\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Buscar\tCtrl+F", CMD_SEARCH + MENUITEM "Buscar &siguiente\tF3", CMD_SEARCH_NEXT + MENUITEM "Reemplazar\tCtrl+H", CMD_REPLACE + MENUITEM "Ir a...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Seleccionar t&odo\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Hora y fecha\tF5", CMD_TIME_DATE + END + POPUP "F&ormato" + BEGIN + MENUITEM "&Ajuste de lnea", CMD_WRAP + MENUITEM "Tipo de &letra...", CMD_FONT + END + POPUP "&Ver" + BEGIN + MENUITEM "Barra d&e estado", CMD_STATUSBAR END - POPUP "A&yuda" - BEGIN - MENUITEM "&ndice", CMD_HELP_CONTENTS - MENUITEM "&Buscar...", CMD_HELP_SEARCH - MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Acerca de" CMD_ABOUT - MENUITEM "&Informacin...", CMD_ABOUT_WINE - END + POPUP "A&yuda" + BEGIN + MENUITEM "&ndice", CMD_HELP_CONTENTS + MENUITEM "&Buscar...", CMD_HELP_SEARCH + MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Acerca de" CMD_ABOUT + MENUITEM "&Informacin...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/eu-ES.rc b/reactos/base/applications/notepad/lang/eu-ES.rc index 819c1db0d30..80bd6b4ca8a 100644 --- a/reactos/base/applications/notepad/lang/eu-ES.rc +++ b/reactos/base/applications/notepad/lang/eu-ES.rc @@ -7,7 +7,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -18,54 +20,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Fitxategia" - BEGIN - MENUITEM "&Berria...", CMD_NEW - MENUITEM "&Ireki\tCtrl+O", CMD_OPEN - MENUITEM "&Gorde\tCtrl+S", CMD_SAVE - MENUITEM "Gorde &honela...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Inprimatu", CMD_PRINT - MENUITEM "Prestatu &orrialdea...", CMD_PAGE_SETUP - MENUITEM "Inprimatzeko &aurrebista...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Irten", CMD_EXIT - END - POPUP "&Edizioa" - BEGIN - MENUITEM "&Desegin\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Ebaki\tCtrl+X", CMD_CUT - MENUITEM "&Kopiatu\tCtrl+C", CMD_COPY - MENUITEM "&Itsasi\tCtrl+V", CMD_PASTE - MENUITEM "&Ezabatu\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Bilatu\tCtrl+F", CMD_SEARCH - MENUITEM "Bilatu &hurrengoa\tF3", CMD_SEARCH_NEXT - MENUITEM "Ordeztu\tCtrl+H", CMD_REPLACE - MENUITEM "Joan...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Hautatu dena\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Ordua eta data\tF5", CMD_TIME_DATE - END - POPUP "Formatua" - BEGIN - MENUITEM "&Lerrokatu", CMD_WRAP - MENUITEM "Letra-tipoa...", CMD_FONT - END - POPUP "&Ikusi" - BEGIN - MENUITEM "Egoera-barra", CMD_STATUSBAR + POPUP "&Fitxategia" + BEGIN + MENUITEM "&Berria\tCtrl+N", CMD_NEW + MENUITEM "&Ireki\tCtrl+O", CMD_OPEN + MENUITEM "&Gorde\tCtrl+S", CMD_SAVE + MENUITEM "Gorde &honela...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Inprimatu\tCtrl+P", CMD_PRINT + MENUITEM "Prestatu &orrialdea...", CMD_PAGE_SETUP + MENUITEM "Inprimatzeko &aurrebista...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Irten", CMD_EXIT + END + POPUP "&Edizioa" + BEGIN + MENUITEM "&Desegin\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Ebaki\tCtrl+X", CMD_CUT + MENUITEM "&Kopiatu\tCtrl+C", CMD_COPY + MENUITEM "&Itsasi\tCtrl+V", CMD_PASTE + MENUITEM "&Ezabatu\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Bilatu\tCtrl+F", CMD_SEARCH + MENUITEM "Bilatu &hurrengoa\tF3", CMD_SEARCH_NEXT + MENUITEM "Ordeztu\tCtrl+H", CMD_REPLACE + MENUITEM "Joan...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Hautatu dena\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Ordua eta data\tF5", CMD_TIME_DATE + END + POPUP "Formatua" + BEGIN + MENUITEM "&Lerrokatu", CMD_WRAP + MENUITEM "Letra-tipoa...", CMD_FONT + END + POPUP "&Ikusi" + BEGIN + MENUITEM "Egoera-barra", CMD_STATUSBAR END - POPUP "Laguntza" - BEGIN - MENUITEM "&ndizea", CMD_HELP_CONTENTS - MENUITEM "&Bilatu...", CMD_HELP_SEARCH - MENUITEM "Laguntzari buruz laguntza", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Ohar-blokari buruz" CMD_ABOUT - MENUITEM "&Informazioa...", CMD_ABOUT_WINE - END + POPUP "Laguntza" + BEGIN + MENUITEM "&ndizea", CMD_HELP_CONTENTS + MENUITEM "&Bilatu...", CMD_HELP_SEARCH + MENUITEM "Laguntzari buruz laguntza", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Ohar-blokari buruz" CMD_ABOUT + MENUITEM "&Informazioa...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/fi-FI.rc b/reactos/base/applications/notepad/lang/fi-FI.rc index 13378c43e40..8cbe9ed21d6 100644 --- a/reactos/base/applications/notepad/lang/fi-FI.rc +++ b/reactos/base/applications/notepad/lang/fi-FI.rc @@ -28,7 +28,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -39,54 +41,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Tiedosto" - BEGIN - MENUITEM "&Uusi...", CMD_NEW - MENUITEM "&Avaa", CMD_OPEN - MENUITEM "Ta&lleta", CMD_SAVE - MENUITEM "Talleta &nimell...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "T&ulosta", CMD_PRINT - MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP - MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Poistu", CMD_EXIT - END - POPUP "&Muokkaa" - BEGIN - MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT - MENUITEM "&Kopioi\tCtrl+C", CMD_COPY - MENUITEM "L&iit\tCtrl+V", CMD_PASTE - MENUITEM "P&oista\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Etsi...", CMD_SEARCH - MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "&Valitse kaikki", CMD_SELECT_ALL - MENUITEM "&Aika/Pivmr\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "Ka&tkaise pitk rivi", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Apua" - BEGIN - MENUITEM "&Sislt", CMD_HELP_CONTENTS - MENUITEM "&Etsi...", CMD_HELP_SEARCH - MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END + POPUP "&Tiedosto" + BEGIN + MENUITEM "&Uusi\tCtrl+N", CMD_NEW + MENUITEM "&Avaa\tCtrl+O", CMD_OPEN + MENUITEM "Ta&lleta\tCtrl+S", CMD_SAVE + MENUITEM "Talleta &nimell...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "T&ulosta\tCtrl+P", CMD_PRINT + MENUITEM "&Sivun asetukset...", CMD_PAGE_SETUP + MENUITEM "&Kirjoittimen asetukset...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Poistu", CMD_EXIT + END + POPUP "&Muokkaa" + BEGIN + MENUITEM "&Palauta\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Leikkaa\tCtrl+X", CMD_CUT + MENUITEM "&Kopioi\tCtrl+C", CMD_COPY + MENUITEM "L&iit\tCtrl+V", CMD_PASTE + MENUITEM "P&oista\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Etsi...", CMD_SEARCH + MENUITEM "Etsi &seuraava\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "&Valitse kaikki", CMD_SELECT_ALL + MENUITEM "&Aika/Pivmr\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "Ka&tkaise pitk rivi", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Apua" + BEGIN + MENUITEM "&Sislt", CMD_HELP_CONTENTS + MENUITEM "&Etsi...", CMD_HELP_SEARCH + MENUITEM "Apua &Opastuksesta", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ @@ -163,33 +165,33 @@ END STRINGTABLE DISCARDABLE BEGIN -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Sivu &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Sivu &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "VIRHE" -STRING_WARNING, "VAROITUS" -STRING_INFO, "Tiedoitus" +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "VIRHE" +STRING_WARNING, "VAROITUS" +STRING_INFO, "Tiedoitus" -STRING_UNTITLED, "(otsikoimaton)" +STRING_UNTITLED, "(otsikoimaton)" -STRING_ALL_FILES, "Kaikki tiedostot (*.*)" -STRING_TEXT_FILES_TXT, "Teksti tiedostot (*.txt)" +STRING_ALL_FILES, "Kaikki tiedostot (*.*)" +STRING_TEXT_FILES_TXT, "Teksti tiedostot (*.txt)" -STRING_TOOLARGE, "Tiedosto '%s' on liian suuri.\n \ +STRING_TOOLARGE, "Tiedosto '%s' on liian suuri.\n \ Please use a different editor." -STRING_NOTEXT, "Et syttnyt lainkaan teksti. \ +STRING_NOTEXT, "Et syttnyt lainkaan teksti. \ \nKirjoita jotain ja yrit uudelleen" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ Would you like to save the changes ?" -STRING_NOTFOUND, "'%s' ei lydy." -STRING_OUT_OF_MEMORY, "Muistia ei ole riittvsti tmn \ +STRING_NOTFOUND, "'%s' ei lydy." +STRING_OUT_OF_MEMORY, "Muistia ei ole riittvsti tmn \ \ntehtvn tekemiseksi. Sulje jokin sovellus vapauttaaksesi\n \ muistia." STRING_CANNOTFIND "Cannot find '%s'" diff --git a/reactos/base/applications/notepad/lang/fr-FR.rc b/reactos/base/applications/notepad/lang/fr-FR.rc index 0e8eaaac47a..455ec47e2a3 100644 --- a/reactos/base/applications/notepad/lang/fr-FR.rc +++ b/reactos/base/applications/notepad/lang/fr-FR.rc @@ -29,7 +29,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -40,54 +42,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Fichier" - BEGIN - MENUITEM "&Nouveau...", CMD_NEW - MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN - MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE - MENUITEM "Enregistrer &sous...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Im&primer", CMD_PRINT - MENUITEM "&Mise en page...", CMD_PAGE_SETUP - MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Quitter", CMD_EXIT - END - POPUP "&Edition" - BEGIN - MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Co&uper\tCtrl+X", CMD_CUT - MENUITEM "&Copier\tCtrl+C", CMD_COPY - MENUITEM "C&oller\tCtrl+V", CMD_PASTE - MENUITEM "&Effacer\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH - MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT - MENUITEM "Remplacer\tCtrl+H", CMD_REPLACE - MENUITEM "Atteindre...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Tout &slectionner\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE - END - POPUP "&Format" - BEGIN - MENUITEM "&Retour la ligne", CMD_WRAP - MENUITEM "&Police...", CMD_FONT - END - POPUP "Affichage" - BEGIN - MENUITEM "Barre d'tat", CMD_STATUSBAR - END - POPUP "&Aide" - BEGIN - MENUITEM "&Sommaire", CMD_HELP_CONTENTS - MENUITEM "&Rechercher...", CMD_HELP_SEARCH - MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "& propos" CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END + POPUP "&Fichier" + BEGIN + MENUITEM "&Nouveau\tCtrl+N", CMD_NEW + MENUITEM "&Ouvrir\tCtrl+O", CMD_OPEN + MENUITEM "&Enregistrer\tCtrl+S", CMD_SAVE + MENUITEM "Enregistrer &sous...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Im&primer\tCtrl+P", CMD_PRINT + MENUITEM "&Mise en page...", CMD_PAGE_SETUP + MENUITEM "&Configuration de l'imprimante...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Quitter", CMD_EXIT + END + POPUP "&Edition" + BEGIN + MENUITEM "&Annuler\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Co&uper\tCtrl+X", CMD_CUT + MENUITEM "&Copier\tCtrl+C", CMD_COPY + MENUITEM "C&oller\tCtrl+V", CMD_PASTE + MENUITEM "&Effacer\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Rechercher\tCtrl+F", CMD_SEARCH + MENUITEM "&Suivant\tF3", CMD_SEARCH_NEXT + MENUITEM "Remplacer\tCtrl+H", CMD_REPLACE + MENUITEM "Atteindre...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Tout &slectionner\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Heure/Date\tF5", CMD_TIME_DATE + END + POPUP "&Format" + BEGIN + MENUITEM "&Retour la ligne", CMD_WRAP + MENUITEM "&Police...", CMD_FONT + END + POPUP "Affichage" + BEGIN + MENUITEM "Barre d'tat", CMD_STATUSBAR + END + POPUP "&Aide" + BEGIN + MENUITEM "&Sommaire", CMD_HELP_CONTENTS + MENUITEM "&Rechercher...", CMD_HELP_SEARCH + MENUITEM "&Utiliser l'aide", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "& propos" CMD_ABOUT + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/hu-HU.rc b/reactos/base/applications/notepad/lang/hu-HU.rc index 86ba21d0648..643587137e9 100644 --- a/reactos/base/applications/notepad/lang/hu-HU.rc +++ b/reactos/base/applications/notepad/lang/hu-HU.rc @@ -30,7 +30,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -41,54 +43,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Fjl" - BEGIN - MENUITEM "&j", CMD_NEW - MENUITEM "Meg&nyits...", CMD_OPEN - MENUITEM "&Ments", CMD_SAVE - MENUITEM "Ments m&sknt...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Oldalbellts...", CMD_PAGE_SETUP - MENUITEM "Nyom&tats...", CMD_PRINT - MENUITEM "Nyomtat &bellts...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Kilps", CMD_EXIT - END - POPUP "S&zerkeszts" - BEGIN - MENUITEM "&Visszavons\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Kiv&gs\tCtrl+X", CMD_CUT - MENUITEM "&Msols\tCtrl+C", CMD_COPY - MENUITEM "&Beilleszts\tCtrl+V", CMD_PASTE - MENUITEM "Tr&ls\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Keress...", CMD_SEARCH - MENUITEM "Kve&tkez keresse\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "&Az sszes kijellse", CMD_SELECT_ALL - MENUITEM "&Id/dtum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Hossz sorok trdelse", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Sg" - BEGIN - MENUITEM "&Tmakrk", CMD_HELP_CONTENTS - MENUITEM "&Keress...", CMD_HELP_SEARCH - MENUITEM "&Hasznlat", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "Inf&ormci...", CMD_ABOUT_WINE - END + POPUP "&Fjl" + BEGIN + MENUITEM "&j\tCtrl+N", CMD_NEW + MENUITEM "Meg&nyits\tCtrl+O", CMD_OPEN + MENUITEM "&Ments\tCtrl+S", CMD_SAVE + MENUITEM "Ments m&sknt...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Oldalbellts...", CMD_PAGE_SETUP + MENUITEM "Nyom&tats\tCtrl+P", CMD_PRINT + MENUITEM "Nyomtat &bellts...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Kilps", CMD_EXIT + END + POPUP "S&zerkeszts" + BEGIN + MENUITEM "&Visszavons\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Kiv&gs\tCtrl+X", CMD_CUT + MENUITEM "&Msols\tCtrl+C", CMD_COPY + MENUITEM "&Beilleszts\tCtrl+V", CMD_PASTE + MENUITEM "Tr&ls\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Keress...", CMD_SEARCH + MENUITEM "Kve&tkez keresse\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "&Az sszes kijellse", CMD_SELECT_ALL + MENUITEM "&Id/dtum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Hossz sorok trdelse", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Sg" + BEGIN + MENUITEM "&Tmakrk", CMD_HELP_CONTENTS + MENUITEM "&Keress...", CMD_HELP_SEARCH + MENUITEM "&Hasznlat", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "Inf&ormci...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/id-ID.rc b/reactos/base/applications/notepad/lang/id-ID.rc index 59b5ef7f6a8..95011bf3dbd 100644 --- a/reactos/base/applications/notepad/lang/id-ID.rc +++ b/reactos/base/applications/notepad/lang/id-ID.rc @@ -29,8 +29,10 @@ BEGIN "^C", CMD_COPY "^F", CMD_SEARCH "^G", CMD_GOTO - "H", CMD_REPLACE, VIRTKEY, CONTROL + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -41,54 +43,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "Bar&u...", CMD_NEW - MENUITEM "&Buka\tCtrl+O", CMD_OPEN - MENUITEM "&Simpan\tCtrl+S", CMD_SAVE - MENUITEM "Simpan seb&agai...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Se&tup Halaman...", CMD_PAGE_SETUP - MENUITEM "&Cetak", CMD_PRINT - MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Keluar", CMD_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Undo\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", CMD_CUT - MENUITEM "&Copy\tCtrl+C", CMD_COPY - MENUITEM "&Paste\tCtrl+V", CMD_PASTE - MENUITEM "&Hapus\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Ca&ri...\tCtrl+F", CMD_SEARCH - MENUITEM "Cari berikut&nya\tF3", CMD_SEARCH_NEXT - MENUITEM "Ganti\tCtrl+H", CMD_REPLACE - MENUITEM "Pergi Ke...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Pilih semu&a\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Jam/Tanggal\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Gulung baris panjang", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&Lihat" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Bantuan" - BEGIN - MENUITEM "&Daftar Isi", CMD_HELP_CONTENTS - MENUITEM "&Cari...", CMD_HELP_SEARCH - MENUITEM "&Bantuan pada bantuan", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Tentang" CMD_ABOUT - MENUITEM "Inf&o", CMD_ABOUT_WINE - END + POPUP "&File" + BEGIN + MENUITEM "Bar&u\tCtrl+N", CMD_NEW + MENUITEM "&Buka\tCtrl+O", CMD_OPEN + MENUITEM "&Simpan\tCtrl+S", CMD_SAVE + MENUITEM "Simpan seb&agai...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Se&tup Halaman...", CMD_PAGE_SETUP + MENUITEM "&Cetak\tCtrl+P", CMD_PRINT + MENUITEM "P&rinter Setup...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Keluar", CMD_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Undo\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", CMD_CUT + MENUITEM "&Copy\tCtrl+C", CMD_COPY + MENUITEM "&Paste\tCtrl+V", CMD_PASTE + MENUITEM "&Hapus\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Ca&ri...\tCtrl+F", CMD_SEARCH + MENUITEM "Cari berikut&nya\tF3", CMD_SEARCH_NEXT + MENUITEM "Ganti\tCtrl+H", CMD_REPLACE + MENUITEM "Pergi Ke...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Pilih semu&a\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Jam/Tanggal\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Gulung baris panjang", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&Lihat" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Bantuan" + BEGIN + MENUITEM "&Daftar Isi", CMD_HELP_CONTENTS + MENUITEM "&Cari...", CMD_HELP_SEARCH + MENUITEM "&Bantuan pada bantuan", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Tentang" CMD_ABOUT + MENUITEM "Inf&o", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/it-IT.rc b/reactos/base/applications/notepad/lang/it-IT.rc index 542f27de158..df964a17f38 100644 --- a/reactos/base/applications/notepad/lang/it-IT.rc +++ b/reactos/base/applications/notepad/lang/it-IT.rc @@ -32,7 +32,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -43,54 +45,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&File" - BEGIN - MENUITEM "&Nuovo", CMD_NEW - MENUITEM "&Apri...\tCtrl+O", CMD_OPEN - MENUITEM "&Salva\tCtrl+S", CMD_SAVE - MENUITEM "Sal&va con nome...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "S&tampa", CMD_PRINT - MENUITEM "I&mposta pagina...", CMD_PAGE_SETUP - MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Esci", CMD_EXIT - END - POPUP "&Modifica" - BEGIN - MENUITEM "&Annulla\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Taglia\tCtrl+X", CMD_CUT - MENUITEM "&Copia\tCtrl+C", CMD_COPY - MENUITEM "I&ncolla\tCtrl+V", CMD_PASTE - MENUITEM "E&limina\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Tr&ova\tCtrl+F", CMD_SEARCH - MENUITEM "T&rova successivo\tF3", CMD_SEARCH_NEXT - MENUITEM "Sostituisci\tCtrl+H", CMD_REPLACE - MENUITEM "Vai a...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Sele&ziona tutto\tCtrl+A", CMD_SELECT_ALL - MENUITEM "Ora/&Data\tF5", CMD_TIME_DATE - END - POPUP "F&ormato" - BEGIN - MENUITEM "&A capo automatico", CMD_WRAP - MENUITEM "&Imposta carattere...", CMD_FONT - END - POPUP "&Visualizza" - BEGIN - MENUITEM "&Barra di stato", CMD_STATUSBAR - END - POPUP "&?" - BEGIN - MENUITEM "&Guida in linea", CMD_HELP_CONTENTS - MENUITEM "&Trova...", CMD_HELP_SEARCH - MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "Informazioni &su blocco note" CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END + POPUP "&File" + BEGIN + MENUITEM "&Nuovo\tCtrl+N", CMD_NEW + MENUITEM "&Apri...\tCtrl+O", CMD_OPEN + MENUITEM "&Salva\tCtrl+S", CMD_SAVE + MENUITEM "Sal&va con nome...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "S&tampa\tCtrl+P", CMD_PRINT + MENUITEM "I&mposta pagina...", CMD_PAGE_SETUP + MENUITEM "&Configurazione stampante...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Esci", CMD_EXIT + END + POPUP "&Modifica" + BEGIN + MENUITEM "&Annulla\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Taglia\tCtrl+X", CMD_CUT + MENUITEM "&Copia\tCtrl+C", CMD_COPY + MENUITEM "I&ncolla\tCtrl+V", CMD_PASTE + MENUITEM "E&limina\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Tr&ova\tCtrl+F", CMD_SEARCH + MENUITEM "T&rova successivo\tF3", CMD_SEARCH_NEXT + MENUITEM "Sostituisci\tCtrl+H", CMD_REPLACE + MENUITEM "Vai a...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Sele&ziona tutto\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Ora/&Data\tF5", CMD_TIME_DATE + END + POPUP "F&ormato" + BEGIN + MENUITEM "&A capo automatico", CMD_WRAP + MENUITEM "&Imposta carattere...", CMD_FONT + END + POPUP "&Visualizza" + BEGIN + MENUITEM "&Barra di stato", CMD_STATUSBAR + END + POPUP "&?" + BEGIN + MENUITEM "&Guida in linea", CMD_HELP_CONTENTS + MENUITEM "&Trova...", CMD_HELP_SEARCH + MENUITEM "&Aiuto sulla Guida", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Informazioni &su blocco note" CMD_ABOUT + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/ja-JP.rc b/reactos/base/applications/notepad/lang/ja-JP.rc index 03536de14b4..a1a077b5dfd 100644 --- a/reactos/base/applications/notepad/lang/ja-JP.rc +++ b/reactos/base/applications/notepad/lang/ja-JP.rc @@ -29,7 +29,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -40,54 +42,54 @@ END MAIN_MENU MENU BEGIN - POPUP "t@C(&F)" - BEGIN - MENUITEM "VK쐬(&N)...", CMD_NEW - MENUITEM "J(&O)\tCtrl+O", CMD_OPEN - MENUITEM "ۑ(&S)\tCtrl+S", CMD_SAVE - MENUITEM "Otĕۑ(&A)...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "y[Wݒ(&T)...", CMD_PAGE_SETUP - MENUITEM "(&P)", CMD_PRINT - MENUITEM "v^̐ݒ(&R)...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "I(&X)", CMD_EXIT - END - POPUP "ҏW(&E)" - BEGIN - MENUITEM "ɖ߂(&U)\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "؂(&T)\tCtrl+X", CMD_CUT - MENUITEM "Rs[(&C)\tCtrl+C", CMD_COPY - MENUITEM "y[Xg(&P)\tCtrl+V", CMD_PASTE - MENUITEM "폜(&D)\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "(&S)\tCtrl+F", CMD_SEARCH - MENUITEM "̌(&S)\tF3", CMD_SEARCH_NEXT - MENUITEM "u\tCtrl+H", CMD_REPLACE - MENUITEM "sֈړ...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "SđI(&A)\tCtrl+A", CMD_SELECT_ALL - MENUITEM "tƎ̑}(&T)\tF5", CMD_TIME_DATE - END - POPUP "(&O)" - BEGIN - MENUITEM "s܂Ԃ(&W)", CMD_WRAP - MENUITEM "tHg(&F)...", CMD_FONT - END - POPUP "\\(&V)" - BEGIN - MENUITEM "Xe[^X o[(&B)", CMD_STATUSBAR - END - POPUP "wv(&H)" - BEGIN - MENUITEM "ڎ(&C)", CMD_HELP_CONTENTS - MENUITEM "(&S)...", CMD_HELP_SEARCH - MENUITEM "wv̎g(&H)", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "(&O)" CMD_ABOUT_WINE - END + POPUP "t@C(&F)" + BEGIN + MENUITEM "VK쐬(&N)\tCtrl+N", CMD_NEW + MENUITEM "J(&O)\tCtrl+O", CMD_OPEN + MENUITEM "ۑ(&S)\tCtrl+S", CMD_SAVE + MENUITEM "Otĕۑ(&A)...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "y[Wݒ(&T)...", CMD_PAGE_SETUP + MENUITEM "(&P)\tCtrl+P", CMD_PRINT + MENUITEM "v^̐ݒ(&R)...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "I(&X)", CMD_EXIT + END + POPUP "ҏW(&E)" + BEGIN + MENUITEM "ɖ߂(&U)\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "؂(&T)\tCtrl+X", CMD_CUT + MENUITEM "Rs[(&C)\tCtrl+C", CMD_COPY + MENUITEM "y[Xg(&P)\tCtrl+V", CMD_PASTE + MENUITEM "폜(&D)\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "(&S)\tCtrl+F", CMD_SEARCH + MENUITEM "̌(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "u\tCtrl+H", CMD_REPLACE + MENUITEM "sֈړ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "SđI(&A)\tCtrl+A", CMD_SELECT_ALL + MENUITEM "tƎ̑}(&T)\tF5", CMD_TIME_DATE + END + POPUP "(&O)" + BEGIN + MENUITEM "s܂Ԃ(&W)", CMD_WRAP + MENUITEM "tHg(&F)...", CMD_FONT + END + POPUP "\\(&V)" + BEGIN + MENUITEM "Xe[^X o[(&B)", CMD_STATUSBAR + END + POPUP "wv(&H)" + BEGIN + MENUITEM "ڎ(&C)", CMD_HELP_CONTENTS + MENUITEM "(&S)...", CMD_HELP_SEARCH + MENUITEM "wv̎g(&H)", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "(&O)" CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/lt-LT.rc b/reactos/base/applications/notepad/lang/lt-LT.rc index 07d0b8d9995..03613e3f204 100644 --- a/reactos/base/applications/notepad/lang/lt-LT.rc +++ b/reactos/base/applications/notepad/lang/lt-LT.rc @@ -31,7 +31,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -42,54 +44,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Byla" - BEGIN - MENUITEM "&Nauja...", CMD_NEW - MENUITEM "&Atverti\tCtrl+O", CMD_OPEN - MENUITEM "&rayti\tCtrl+S", CMD_SAVE - MENUITEM "rayti &kaip...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "P&uslapio nuostatos...", CMD_PAGE_SETUP - MENUITEM "&Spausdinti", CMD_PRINT - MENUITEM "S&pausdintuvo nuostatos...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Baigti", CMD_EXIT - END - POPUP "&Redaguoti" - BEGIN - MENUITEM "&Ataukti\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Ikirpti\tCtrl+X", CMD_CUT - MENUITEM "&Kopijuoti\tCtrl+C", CMD_COPY - MENUITEM "&dti\tCtrl+V", CMD_PASTE - MENUITEM "&Trinti\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "I&ekoti...\tCtrl+F", CMD_SEARCH - MENUITEM "Iek&oti toliau\tF3", CMD_SEARCH_NEXT - MENUITEM "Pakeisti\tCtrl+H", CMD_REPLACE - MENUITEM "Eiti ...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Paymti &visk\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Laikas ir data\tF5", CMD_TIME_DATE - END - POPUP "&Formatas" - BEGIN - MENUITEM "&Lauyti eilutes", CMD_WRAP - MENUITEM "&riftas...", CMD_FONT - END - POPUP "R&odymas" - BEGIN - MENUITEM "&Bsenos juosta", CMD_STATUSBAR - END - POPUP "&Pagalba" - BEGIN - MENUITEM "&Turinys", CMD_HELP_CONTENTS - MENUITEM "&Iekoti...", CMD_HELP_SEARCH - MENUITEM "&Pagalba", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Apie Notepad" CMD_ABOUT - MENUITEM "Apie &Wine", CMD_ABOUT_WINE - END + POPUP "&Byla" + BEGIN + MENUITEM "&Nauja\tCtrl+N", CMD_NEW + MENUITEM "&Atverti\tCtrl+O", CMD_OPEN + MENUITEM "&rayti\tCtrl+S", CMD_SAVE + MENUITEM "rayti &kaip...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "P&uslapio nuostatos...", CMD_PAGE_SETUP + MENUITEM "&Spausdinti\tCtrl+P", CMD_PRINT + MENUITEM "S&pausdintuvo nuostatos...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Baigti", CMD_EXIT + END + POPUP "&Redaguoti" + BEGIN + MENUITEM "&Ataukti\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Ikirpti\tCtrl+X", CMD_CUT + MENUITEM "&Kopijuoti\tCtrl+C", CMD_COPY + MENUITEM "&dti\tCtrl+V", CMD_PASTE + MENUITEM "&Trinti\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "I&ekoti...\tCtrl+F", CMD_SEARCH + MENUITEM "Iek&oti toliau\tF3", CMD_SEARCH_NEXT + MENUITEM "Pakeisti\tCtrl+H", CMD_REPLACE + MENUITEM "Eiti ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Paymti &visk\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Laikas ir data\tF5", CMD_TIME_DATE + END + POPUP "&Formatas" + BEGIN + MENUITEM "&Lauyti eilutes", CMD_WRAP + MENUITEM "&riftas...", CMD_FONT + END + POPUP "R&odymas" + BEGIN + MENUITEM "&Bsenos juosta", CMD_STATUSBAR + END + POPUP "&Pagalba" + BEGIN + MENUITEM "&Turinys", CMD_HELP_CONTENTS + MENUITEM "&Iekoti...", CMD_HELP_SEARCH + MENUITEM "&Pagalba", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Apie Notepad" CMD_ABOUT + MENUITEM "Apie &Wine", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/nl-NL.rc b/reactos/base/applications/notepad/lang/nl-NL.rc index da4c8ad8108..93c4c6d44c6 100644 --- a/reactos/base/applications/notepad/lang/nl-NL.rc +++ b/reactos/base/applications/notepad/lang/nl-NL.rc @@ -27,7 +27,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -38,54 +40,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Bestand" - BEGIN - MENUITEM "&Nieuw...", CMD_NEW - MENUITEM "&Openen\tCtrl+O", CMD_OPEN - MENUITEM "O&pslaan\tCtrl+p", CMD_SAVE - MENUITEM "Ops&laan als...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Afdrukken", CMD_PRINT - MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP - MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Afsluiten", CMD_EXIT - END - POPUP "Be&werken" - BEGIN - MENUITEM "&Ongedaan maken\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "K&nippen\tCtrl+X", CMD_CUT - MENUITEM "&Kopiren\tCtrl+C", CMD_COPY - MENUITEM "&Plakken\tCtrl+V", CMD_PASTE - MENUITEM "&Verwijderen\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH - MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "&Alles selecteren\tCtrl+A", CMD_SELECT_ALL - MENUITEM "Tijd/&datum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "A&utomatische terugloop", CMD_WRAP - MENUITEM "&Lettertype instellen...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Help" - BEGIN - MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS - MENUITEM "&Zoeken...", CMD_HELP_SEARCH - MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "Inf&o...", CMD_ABOUT_WINE - END + POPUP "&Bestand" + BEGIN + MENUITEM "&Nieuw\tCtrl+N", CMD_NEW + MENUITEM "&Openen\tCtrl+O", CMD_OPEN + MENUITEM "O&pslaan\tCtrl+S", CMD_SAVE + MENUITEM "Ops&laan als...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Afdrukken\tCtrl+P", CMD_PRINT + MENUITEM "Pagina-in&stelling...", CMD_PAGE_SETUP + MENUITEM "Printerinstellingen...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", CMD_EXIT + END + POPUP "Be&werken" + BEGIN + MENUITEM "&Ongedaan maken\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "K&nippen\tCtrl+X", CMD_CUT + MENUITEM "&Kopiren\tCtrl+C", CMD_COPY + MENUITEM "&Plakken\tCtrl+V", CMD_PASTE + MENUITEM "&Verwijderen\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Zoeken\tCtrl+Z", CMD_SEARCH + MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "&Alles selecteren\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Tijd/&datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "A&utomatische terugloop", CMD_WRAP + MENUITEM "&Lettertype instellen...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Help" + BEGIN + MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS + MENUITEM "&Zoeken...", CMD_HELP_SEARCH + MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "Inf&o...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/no-NO.rc b/reactos/base/applications/notepad/lang/no-NO.rc index 53046579e80..42161e64877 100644 --- a/reactos/base/applications/notepad/lang/no-NO.rc +++ b/reactos/base/applications/notepad/lang/no-NO.rc @@ -28,8 +28,10 @@ BEGIN "^C", CMD_COPY "^F", CMD_SEARCH "^G", CMD_GOTO - "H", CMD_REPLACE, VIRTKEY, CONTROL + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -40,54 +42,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Fil" - BEGIN - MENUITEM "&Ny...", CMD_NEW - MENUITEM "&pne\tCtrl+O", CMD_OPEN - MENUITEM "&Lagre\tCtrl+S", CMD_SAVE - MENUITEM "Lagre &som...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Side &Innstillinger...", CMD_PAGE_SETUP - MENUITEM "&Utskrift", CMD_PRINT - MENUITEM "U&tskrift innstillinger...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "A&vslutt", CMD_EXIT - END - POPUP "&Rediger" - BEGIN - MENUITEM "&Angre\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Klipp &ut\tCtrl+X", CMD_CUT - MENUITEM "&Kopier\tCtrl+C", CMD_COPY - MENUITEM "&Lim inn\tCtrl+V", CMD_PASTE - MENUITEM "&Slett\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Finn...\tCtrl+F", CMD_SEARCH - MENUITEM "Finn &neste\tF3", CMD_SEARCH_NEXT - MENUITEM "Erstatt\tCtrl+H", CMD_REPLACE - MENUITEM "G til...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Merk &alt\tCtrl+A", CMD_SELECT_ALL - MENUITEM "&Klokkeslett/dato\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Tekstbryting", CMD_WRAP - MENUITEM "&Skrift...", CMD_FONT - END - POPUP "&Vis" - BEGIN - MENUITEM "Status&linje", CMD_STATUSBAR - END - POPUP "&Hjelp" - BEGIN - MENUITEM "&Emner i hjelp", CMD_HELP_CONTENTS - MENUITEM "&Sk", CMD_HELP_SEARCH - MENUITEM "&Hjelp om hjelp", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Om" CMD_ABOUT - MENUITEM "&Infomasjon", CMD_ABOUT_WINE - END + POPUP "&Fil" + BEGIN + MENUITEM "&Ny\tCtrl+N", CMD_NEW + MENUITEM "&pne\tCtrl+O", CMD_OPEN + MENUITEM "&Lagre\tCtrl+S", CMD_SAVE + MENUITEM "Lagre &som...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Side &Innstillinger...", CMD_PAGE_SETUP + MENUITEM "&Utskrift\tCtrl+P", CMD_PRINT + MENUITEM "U&tskrift innstillinger...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "A&vslutt", CMD_EXIT + END + POPUP "&Rediger" + BEGIN + MENUITEM "&Angre\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Klipp &ut\tCtrl+X", CMD_CUT + MENUITEM "&Kopier\tCtrl+C", CMD_COPY + MENUITEM "&Lim inn\tCtrl+V", CMD_PASTE + MENUITEM "&Slett\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Finn...\tCtrl+F", CMD_SEARCH + MENUITEM "Finn &neste\tF3", CMD_SEARCH_NEXT + MENUITEM "Erstatt\tCtrl+H", CMD_REPLACE + MENUITEM "G til...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Merk &alt\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&Klokkeslett/dato\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Tekstbryting", CMD_WRAP + MENUITEM "&Skrift...", CMD_FONT + END + POPUP "&Vis" + BEGIN + MENUITEM "Status&linje", CMD_STATUSBAR + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Emner i hjelp", CMD_HELP_CONTENTS + MENUITEM "&Sk", CMD_HELP_SEARCH + MENUITEM "&Hjelp om hjelp", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Om" CMD_ABOUT + MENUITEM "&Infomasjon", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/pl-PL.rc b/reactos/base/applications/notepad/lang/pl-PL.rc index a8355ffaed0..8202812b5bd 100644 --- a/reactos/base/applications/notepad/lang/pl-PL.rc +++ b/reactos/base/applications/notepad/lang/pl-PL.rc @@ -36,7 +36,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -47,54 +49,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Plik" - BEGIN - MENUITEM "&Nowy...", CMD_NEW - MENUITEM "&Otwrz\tCtrl+O", CMD_OPEN - MENUITEM "&Zapisz\tCtrl+S", CMD_SAVE - MENUITEM "Z&apisz jako...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Drukuj", CMD_PRINT - MENUITEM "&Ustawienia strony...", CMD_PAGE_SETUP - MENUITEM "Ustawienia &drukarki...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "Zako&cz", CMD_EXIT - END - POPUP "&Edycja" - BEGIN - MENUITEM "&Cofnij\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Wytnij\tCtrl+X", CMD_CUT - MENUITEM "&Kopiuj\tCtrl+C", CMD_COPY - MENUITEM "Wkl&ej\tCtrl+V", CMD_PASTE - MENUITEM "&Usu\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Znajd\tCtrl+F", CMD_SEARCH - MENUITEM "Z&najd nastpny\tF3", CMD_SEARCH_NEXT - MENUITEM "Zamie\tCtrl+H", CMD_REPLACE - MENUITEM "Id do...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Zaznacz w&szystko\tCtrl+A", CMD_SELECT_ALL - MENUITEM "Godzina/&Data\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Zawijanie wierszy", CMD_WRAP - MENUITEM "Czci&onka...", CMD_FONT - END - POPUP "P&odgld" - BEGIN - MENUITEM "Pasek &stanu", CMD_STATUSBAR - END - POPUP "Pomo&c" - BEGIN - MENUITEM "&Tematy pomocy", CMD_HELP_CONTENTS - MENUITEM "&Szukaj...", CMD_HELP_SEARCH - MENUITEM "Pomo&c", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&Notatnik - informacje" CMD_ABOUT - MENUITEM "&ReactOS - informacje", CMD_ABOUT_WINE - END + POPUP "&Plik" + BEGIN + MENUITEM "&Nowy\tCtrl+N", CMD_NEW + MENUITEM "&Otwrz\tCtrl+O", CMD_OPEN + MENUITEM "&Zapisz\tCtrl+S", CMD_SAVE + MENUITEM "Z&apisz jako...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Drukuj\tCtrl+P", CMD_PRINT + MENUITEM "&Ustawienia strony...", CMD_PAGE_SETUP + MENUITEM "Ustawienia &drukarki...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Zako&cz", CMD_EXIT + END + POPUP "&Edycja" + BEGIN + MENUITEM "&Cofnij\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Wytnij\tCtrl+X", CMD_CUT + MENUITEM "&Kopiuj\tCtrl+C", CMD_COPY + MENUITEM "Wkl&ej\tCtrl+V", CMD_PASTE + MENUITEM "&Usu\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Znajd\tCtrl+F", CMD_SEARCH + MENUITEM "Z&najd nastpny\tF3", CMD_SEARCH_NEXT + MENUITEM "Zamie\tCtrl+H", CMD_REPLACE + MENUITEM "Id do...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Zaznacz w&szystko\tCtrl+A", CMD_SELECT_ALL + MENUITEM "Godzina/&Data\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Zawijanie wierszy", CMD_WRAP + MENUITEM "Czci&onka...", CMD_FONT + END + POPUP "P&odgld" + BEGIN + MENUITEM "Pasek &stanu", CMD_STATUSBAR + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Tematy pomocy", CMD_HELP_CONTENTS + MENUITEM "&Szukaj...", CMD_HELP_SEARCH + MENUITEM "Pomo&c", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&Notatnik - informacje" CMD_ABOUT + MENUITEM "&ReactOS - informacje", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/pt-PT.rc b/reactos/base/applications/notepad/lang/pt-PT.rc index 4a5cae4edeb..5aa4a3f5f0f 100644 --- a/reactos/base/applications/notepad/lang/pt-PT.rc +++ b/reactos/base/applications/notepad/lang/pt-PT.rc @@ -30,7 +30,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -41,54 +43,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Arquivo" - BEGIN - MENUITEM "&Novo...", CMD_NEW - MENUITEM "A&brir", CMD_OPEN - MENUITEM "&Salvar", CMD_SAVE - MENUITEM "Salvar &como...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Imprimir", CMD_PRINT - MENUITEM "C&onfigurar pgina...", CMD_PAGE_SETUP - MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "Sai&r", CMD_EXIT - END - POPUP "&Editar" - BEGIN - MENUITEM "&Desfazer\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Recortar\tCtrl+X", CMD_CUT - MENUITEM "&Copiar\tCtrl+C", CMD_COPY - MENUITEM "C&olar\tCtrl+V", CMD_PASTE - MENUITEM "E&xcluir\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Localizar...", CMD_SEARCH - MENUITEM "Localizar &prxima\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Selecionar &tudo", CMD_SELECT_ALL - MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Quebrar automtica de linha", CMD_WRAP - MENUITEM "&Fonte...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Ajuda" - BEGIN - MENUITEM "&Contedo", CMD_HELP_CONTENTS - MENUITEM "&Procurar...", CMD_HELP_SEARCH - MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "&Informaes...", CMD_ABOUT_WINE - END + POPUP "&Arquivo" + BEGIN + MENUITEM "&Novo\tCtrl+N", CMD_NEW + MENUITEM "A&brir\tCtrl+O", CMD_OPEN + MENUITEM "&Salvar\tCtrl+S", CMD_SAVE + MENUITEM "Salvar &como...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imprimir\tCtrl+P", CMD_PRINT + MENUITEM "C&onfigurar pgina...", CMD_PAGE_SETUP + MENUITEM "Configurar i&mpressora...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Sai&r", CMD_EXIT + END + POPUP "&Editar" + BEGIN + MENUITEM "&Desfazer\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Recortar\tCtrl+X", CMD_CUT + MENUITEM "&Copiar\tCtrl+C", CMD_COPY + MENUITEM "C&olar\tCtrl+V", CMD_PASTE + MENUITEM "E&xcluir\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Localizar...", CMD_SEARCH + MENUITEM "Localizar &prxima\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Selecionar &tudo", CMD_SELECT_ALL + MENUITEM "&Data/Hora\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Quebrar automtica de linha", CMD_WRAP + MENUITEM "&Fonte...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Ajuda" + BEGIN + MENUITEM "&Contedo", CMD_HELP_CONTENTS + MENUITEM "&Procurar...", CMD_HELP_SEARCH + MENUITEM "&Ajuda na ajuda", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "&Informaes...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ @@ -164,33 +166,33 @@ BEGIN END STRINGTABLE DISCARDABLE BEGIN -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Pgina &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Pgina &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ -STRING_NOTEPAD, "Notepad" -STRING_ERROR, "ERRO" -STRING_WARNING, "AVISO" -STRING_INFO, "Informao" +STRING_NOTEPAD, "Notepad" +STRING_ERROR, "ERRO" +STRING_WARNING, "AVISO" +STRING_INFO, "Informao" -STRING_UNTITLED, "(sem nome)" +STRING_UNTITLED, "(sem nome)" -STRING_ALL_FILES, "Todos os arquivos (*.*)" -STRING_TEXT_FILES_TXT, "Arquivos texto (*.txt)" +STRING_ALL_FILES, "Todos os arquivos (*.*)" +STRING_TEXT_FILES_TXT, "Arquivos texto (*.txt)" -STRING_TOOLARGE, "Arquivo '%s' muito longo para o notepad.\n \ +STRING_TOOLARGE, "Arquivo '%s' muito longo para o notepad.\n \ Por favor use um editor diferente." -STRING_NOTEXT, "Voc no digitou nenhum texto. \ +STRING_NOTEXT, "Voc no digitou nenhum texto. \ \nPor favor digite alguma coisa e tente novamente" -STRING_DOESNOTEXIST, "Arquivo '%s'\nno existe\n\n \ +STRING_DOESNOTEXIST, "Arquivo '%s'\nno existe\n\n \ Voc deseja criar um novo arquivo?" -STRING_NOTSAVED, "Arquivo '%s'\nfoi modificado\n\n \ +STRING_NOTSAVED, "Arquivo '%s'\nfoi modificado\n\n \ Gostaria de salvar as alteraes?" -STRING_NOTFOUND, "'%s' no pode ser encontrado." -STRING_OUT_OF_MEMORY, "No h memria suficiente para completar essa \ +STRING_NOTFOUND, "'%s' no pode ser encontrado." +STRING_OUT_OF_MEMORY, "No h memria suficiente para completar essa \ tarefa. \nFeche uma ou mais aplicaes para aumentar a quantidade de memria livre." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI, "ANSI" diff --git a/reactos/base/applications/notepad/lang/ru-RU.rc b/reactos/base/applications/notepad/lang/ru-RU.rc index 186d37a69f7..c19efa2c291 100644 --- a/reactos/base/applications/notepad/lang/ru-RU.rc +++ b/reactos/base/applications/notepad/lang/ru-RU.rc @@ -27,7 +27,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -38,54 +40,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&" - BEGIN - MENUITEM "&", CMD_NEW - MENUITEM "&...", CMD_OPEN - MENUITEM "&", CMD_SAVE - MENUITEM " &...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "& ...", CMD_PAGE_SETUP - MENUITEM "&", CMD_PRINT - MENUITEM "& ...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&", CMD_EXIT - END - POPUP "&" - BEGIN - MENUITEM "&\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&\tCtrl+X", CMD_CUT - MENUITEM "&\tCtrl+C", CMD_COPY - MENUITEM "&\tCtrl+V", CMD_PASTE - MENUITEM "&\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&", CMD_SEARCH - MENUITEM " &\tF3", CMD_SEARCH_NEXT - MENUITEM "\tCtrl+H", CMD_REPLACE - MENUITEM " ...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM " &", CMD_SELECT_ALL - MENUITEM "& \tF5", CMD_TIME_DATE - END - POPUP "&" - BEGIN - MENUITEM "& ", CMD_WRAP - MENUITEM "&...", CMD_FONT - END - POPUP "&" - BEGIN - MENUITEM " &", CMD_STATUSBAR - END - POPUP "&" - BEGIN - MENUITEM "&", CMD_HELP_CONTENTS - MENUITEM "&...", CMD_HELP_SEARCH - MENUITEM "& ", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "& " CMD_ABOUT - MENUITEM "&...", CMD_ABOUT_WINE - END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+N", CMD_NEW + MENUITEM "&\tCtrl+O", CMD_OPEN + MENUITEM "&\tCtrl+S", CMD_SAVE + MENUITEM " &...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "& ...", CMD_PAGE_SETUP + MENUITEM "&\tCtrl+P", CMD_PRINT + MENUITEM "& ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&", CMD_EXIT + END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&\tCtrl+X", CMD_CUT + MENUITEM "&\tCtrl+C", CMD_COPY + MENUITEM "&\tCtrl+V", CMD_PASTE + MENUITEM "&\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&", CMD_SEARCH + MENUITEM " &\tF3", CMD_SEARCH_NEXT + MENUITEM "\tCtrl+H", CMD_REPLACE + MENUITEM " ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM " &", CMD_SELECT_ALL + MENUITEM "& \tF5", CMD_TIME_DATE + END + POPUP "&" + BEGIN + MENUITEM "& ", CMD_WRAP + MENUITEM "&...", CMD_FONT + END + POPUP "&" + BEGIN + MENUITEM " &", CMD_STATUSBAR + END + POPUP "&" + BEGIN + MENUITEM "&", CMD_HELP_CONTENTS + MENUITEM "&...", CMD_HELP_SEARCH + MENUITEM "& ", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "& " CMD_ABOUT + MENUITEM "&...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/sk-SK.rc b/reactos/base/applications/notepad/lang/sk-SK.rc index 04411c45a8e..e1f48d4e2f7 100644 --- a/reactos/base/applications/notepad/lang/sk-SK.rc +++ b/reactos/base/applications/notepad/lang/sk-SK.rc @@ -7,7 +7,7 @@ * Translation: * TRANSLATOR : Mrio Kamr /Mario Kacmar/ aka Kario (kario@szm.sk) * DATE OF TR.: xx-xx-2007 - * LAST CHANGE: 04-11-2008 + * LAST CHANGE: 27-12-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -19,7 +19,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -30,54 +32,53 @@ END MAIN_MENU MENU BEGIN - POPUP "&Sbor" - BEGIN - MENUITEM "&Nov...", CMD_NEW - MENUITEM "&Otvori", CMD_OPEN - MENUITEM "&Uloi", CMD_SAVE - MENUITEM "Uloi &ako...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "&Tlai", CMD_PRINT - MENUITEM "Nasta&venie strany...", CMD_PAGE_SETUP - MENUITEM "Nastavenie tlaia&rne...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Skoni", CMD_EXIT + POPUP "&Sbor" + BEGIN + MENUITEM "&Nov\tCtrl+N", CMD_NEW + MENUITEM "&Otvori...\tCtrl+O", CMD_OPEN + MENUITEM "&Uloi\tCtrl+S", CMD_SAVE + MENUITEM "Uloi &ako...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Tlai\tCtrl+P", CMD_PRINT + MENUITEM "Nasta&venie strany...", CMD_PAGE_SETUP + MENUITEM "Nastavenie tlaia&rne...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Skoni", CMD_EXIT END - POPUP "pr&avy" - BEGIN - MENUITEM "&Sp\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Vystrihn\tCtrl+X", CMD_CUT - MENUITEM "&Koprova\tCtrl+C", CMD_COPY - MENUITEM "Pri&lepi\tCtrl+V", CMD_PASTE - MENUITEM "&Odstrni\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Hada", CMD_SEARCH - MENUITEM "Ha&da alej\tF3", CMD_SEARCH_NEXT - MENUITEM "&Nahradi\tCtrl+H", CMD_REPLACE - MENUITEM "Pr&ejs na...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Vy&bra vetko", CMD_SELECT_ALL - MENUITEM "as alebo dtu&m\tF5", CMD_TIME_DATE - END - POPUP "F&ormt" - BEGIN - MENUITEM "&Zalomi text", CMD_WRAP - MENUITEM "&Psmo...", CMD_FONT + POPUP "pr&avy" + BEGIN + MENUITEM "&Sp\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Vystrihn\tCtrl+X", CMD_CUT + MENUITEM "&Koprova\tCtrl+C", CMD_COPY + MENUITEM "Pri&lepi\tCtrl+V", CMD_PASTE + MENUITEM "&Odstrni\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Hada", CMD_SEARCH + MENUITEM "Ha&da alej\tF3", CMD_SEARCH_NEXT + MENUITEM "&Nahradi\tCtrl+H", CMD_REPLACE + MENUITEM "Pr&ejs na...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Vy&bra vetko", CMD_SELECT_ALL + MENUITEM "as alebo dtu&m\tF5", CMD_TIME_DATE + END + POPUP "F&ormt" + BEGIN + MENUITEM "&Zalomi text", CMD_WRAP + MENUITEM "&Psmo...", CMD_FONT END - POPUP "&Zobrazi" - BEGIN - MENUITEM "Stavov &riadok", CMD_STATUSBAR - END - POPUP "&Pomocnk" - BEGIN - MENUITEM "&Tmy Pomocnka", CMD_HELP_CONTENTS - MENUITEM "&Hada...", CMD_HELP_SEARCH - MENUITEM "&Pomoc", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM SEPARATOR - MENUITEM "&o je Poznmkov blok" CMD_ABOUT - MENUITEM "o je &Vno (Wine)", CMD_ABOUT_WINE + POPUP "&Zobrazi" + BEGIN + MENUITEM "Stavov &riadok", CMD_STATUSBAR + END + POPUP "&Pomocnk" + BEGIN + MENUITEM "&Tmy Pomocnka", CMD_HELP_CONTENTS + MENUITEM "&Hada...", CMD_HELP_SEARCH + MENUITEM "&Pomoc", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&o je Poznmkov blok" CMD_ABOUT + MENUITEM "o je &Vno (Wine)", CMD_ABOUT_WINE END END @@ -155,33 +156,33 @@ END STRINGTABLE DISCARDABLE BEGIN -STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ -STRING_PAGESETUP_FOOTERVALUE, "Strana &s" /* FIXME */ -STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ -STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ -STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Strana &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 mm" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 mm" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 mm" /* FIXME */ -STRING_NOTEPAD, "Poznmkov blok" -STRING_ERROR, "CHYBA" -STRING_WARNING, "UPOZORNENIE" -STRING_INFO, "Informcie" +STRING_NOTEPAD, "Poznmkov blok" +STRING_ERROR, "CHYBA" +STRING_WARNING, "UPOZORNENIE" +STRING_INFO, "Informcie" -STRING_UNTITLED, "(bez nzvu)" +STRING_UNTITLED, "(bez nzvu)" -STRING_ALL_FILES, "Vetky sbory (*.*)" -STRING_TEXT_FILES_TXT, "Textov sbory (*.txt)" +STRING_ALL_FILES, "Vetky sbory (*.*)" +STRING_TEXT_FILES_TXT, "Textov sbory (*.txt)" -STRING_TOOLARGE, "Sbor '%s' je pre Poznmkov blok prli vek.\n \ +STRING_TOOLARGE, "Sbor '%s' je pre Poznmkov blok prli vek.\n \ Na otvorenie sboru pouite in editor." -STRING_NOTEXT, "Nevloili ste iadny text. \ +STRING_NOTEXT, "Nevloili ste iadny text. \ \nProsm, napte nieo a skste to znova." -STRING_DOESNOTEXIST, "Nie je mon njs sbor '%s'\n\n \ +STRING_DOESNOTEXIST, "Nie je mon njs sbor '%s'\n\n \ Chcete vytvori nov sbor?" -STRING_NOTSAVED, "Text sboru '%s'\nsa zmenil.\n\n \ +STRING_NOTSAVED, "Text sboru '%s'\nsa zmenil.\n\n \ Chcete uloi zmeny?" -STRING_NOTFOUND, "Nie je mon njs '%s' ." -STRING_OUT_OF_MEMORY, "Nedostatok pamte na dokonenie tejto opercie. Zatvorte jednu \n \ +STRING_NOTFOUND, "Nie je mon njs '%s' ." +STRING_OUT_OF_MEMORY, "Nedostatok pamte na dokonenie tejto opercie. Zatvorte jednu \n \ alebo viac aplikci, aby sa uvonila pam a skste to znova." STRING_CANNOTFIND "Nemono njs '%s'" STRING_ANSI, "ANSI" diff --git a/reactos/base/applications/notepad/lang/sl-SI.rc b/reactos/base/applications/notepad/lang/sl-SI.rc index 8c3c3a8cc4f..2ea6d05f3b3 100644 --- a/reactos/base/applications/notepad/lang/sl-SI.rc +++ b/reactos/base/applications/notepad/lang/sl-SI.rc @@ -27,7 +27,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -38,54 +40,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Datoteka" - BEGIN - MENUITEM "&Nova", CMD_NEW - MENUITEM "&Odpri ...", CMD_OPEN - MENUITEM "&Shrani", CMD_SAVE - MENUITEM "Shrani &kot ...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Na&tisni", CMD_PRINT - MENUITEM "P&riprava strani ...", CMD_PAGE_SETUP - MENUITEM "&Tiskalnik ...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "Iz&hod", CMD_EXIT - END - POPUP "&Urejanje" - BEGIN - MENUITEM "&Razveljavi\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Izrei\tCtrl+X", CMD_CUT - MENUITEM "&Kopiraj\tCtrl+C", CMD_COPY - MENUITEM "&Prilepi\tCtrl+V", CMD_PASTE - MENUITEM "Izbri&i\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&Najdi ...", CMD_SEARCH - MENUITEM "Na&daljuj iskanje\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Izberi &vse", CMD_SELECT_ALL - MENUITEM "as/&Datum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "Pr&elom vrstice", CMD_WRAP - MENUITEM "&Font...", CMD_FONT + POPUP "&Datoteka" + BEGIN + MENUITEM "&Nova\tCtrl+N", CMD_NEW + MENUITEM "&Odpri\tCtrl+O", CMD_OPEN + MENUITEM "&Shrani\tCtrl+S", CMD_SAVE + MENUITEM "Shrani &kot ...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Na&tisni\tCtrl+P", CMD_PRINT + MENUITEM "P&riprava strani ...", CMD_PAGE_SETUP + MENUITEM "&Tiskalnik ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Iz&hod", CMD_EXIT + END + POPUP "&Urejanje" + BEGIN + MENUITEM "&Razveljavi\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Izrei\tCtrl+X", CMD_CUT + MENUITEM "&Kopiraj\tCtrl+C", CMD_COPY + MENUITEM "&Prilepi\tCtrl+V", CMD_PASTE + MENUITEM "Izbri&i\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Najdi ...", CMD_SEARCH + MENUITEM "Na&daljuj iskanje\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Izberi &vse", CMD_SELECT_ALL + MENUITEM "as/&Datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "Pr&elom vrstice", CMD_WRAP + MENUITEM "&Font...", CMD_FONT END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Pomo" - BEGIN - MENUITEM "&Teme pomoi", CMD_HELP_CONTENTS - MENUITEM "&Najdi ...", CMD_HELP_SEARCH - MENUITEM "&O pomoi", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "Inf&ormacije ...", CMD_ABOUT_WINE - END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Pomo" + BEGIN + MENUITEM "&Teme pomoi", CMD_HELP_CONTENTS + MENUITEM "&Najdi ...", CMD_HELP_SEARCH + MENUITEM "&O pomoi", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "Inf&ormacije ...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/sv-SE.rc b/reactos/base/applications/notepad/lang/sv-SE.rc index 4b54bbc75ae..d3713ac3d55 100644 --- a/reactos/base/applications/notepad/lang/sv-SE.rc +++ b/reactos/base/applications/notepad/lang/sv-SE.rc @@ -30,7 +30,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -41,54 +43,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&Arkiv" - BEGIN - MENUITEM "&Ny...", CMD_NEW - MENUITEM "&ppna", CMD_OPEN - MENUITEM "&Spara", CMD_SAVE - MENUITEM "Spara so&m...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "Skriv &ut...", CMD_PRINT - MENUITEM "Utskrifts&format...", CMD_PAGE_SETUP - MENUITEM "Skrivar&instllningar...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&Avsluta", CMD_EXIT - END - POPUP "&Redigera" - BEGIN - MENUITEM "&ngra\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&Klipp ut\tCtrl+X", CMD_CUT - MENUITEM "K&opiera\tCtrl+C", CMD_COPY - MENUITEM "K&listra in\tCtrl+V", CMD_PASTE - MENUITEM "&Ta bort\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "Sk...", CMD_SEARCH - MENUITEM "&Sk nsta\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "Markera &allt", CMD_SELECT_ALL - MENUITEM "&Tid/datum\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "&Automatiskt radbyte", CMD_WRAP - MENUITEM "&Font...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "&Hjlp" - BEGIN - MENUITEM "&Innehll", CMD_HELP_CONTENTS - MENUITEM "&Sk...", CMD_HELP_SEARCH - MENUITEM "Anvisningar fr hjlpen", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "Inf&ormation...", CMD_ABOUT_WINE - END + POPUP "&Arkiv" + BEGIN + MENUITEM "&Ny\tCtrl+N", CMD_NEW + MENUITEM "&ppna\tCtrl+O", CMD_OPEN + MENUITEM "&Spara\tCtrl+S", CMD_SAVE + MENUITEM "Spara so&m...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Skriv &ut\tCtrl+P", CMD_PRINT + MENUITEM "Utskrifts&format...", CMD_PAGE_SETUP + MENUITEM "Skrivar&instllningar...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&Avsluta", CMD_EXIT + END + POPUP "&Redigera" + BEGIN + MENUITEM "&ngra\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&Klipp ut\tCtrl+X", CMD_CUT + MENUITEM "K&opiera\tCtrl+C", CMD_COPY + MENUITEM "K&listra in\tCtrl+V", CMD_PASTE + MENUITEM "&Ta bort\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Sk...", CMD_SEARCH + MENUITEM "&Sk nsta\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "Markera &allt", CMD_SELECT_ALL + MENUITEM "&Tid/datum\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "&Automatiskt radbyte", CMD_WRAP + MENUITEM "&Font...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "&Hjlp" + BEGIN + MENUITEM "&Innehll", CMD_HELP_CONTENTS + MENUITEM "&Sk...", CMD_HELP_SEARCH + MENUITEM "Anvisningar fr hjlpen", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "Inf&ormation...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ @@ -191,7 +193,7 @@ Vill du skapa en ny fil?" STRING_NOTSAVED, "Filen '%s'\nhar ndrats.\n\n \ Vill du spara ndringarna?" STRING_NOTFOUND, "'%s' hittades inte." -STRING_OUT_OF_MEMORY, "Det finns inte tillrckligt med minne fr att kunna slutfra \ +STRING_OUT_OF_MEMORY, "Det finns inte tillrckligt med minne fr att kunna slutfra \ den hr tgrden. \nAvsluta ett eller flera program fr att frigra mer minne." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI, "ANSI" diff --git a/reactos/base/applications/notepad/lang/th-TH.rc b/reactos/base/applications/notepad/lang/th-TH.rc index bdb359e2ee8..9e8c2ce967f 100644 --- a/reactos/base/applications/notepad/lang/th-TH.rc +++ b/reactos/base/applications/notepad/lang/th-TH.rc @@ -27,7 +27,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -38,54 +40,54 @@ END MAIN_MENU MENU BEGIN - POPUP "" - BEGIN - MENUITEM "ҧ...", CMD_NEW - MENUITEM "Դ...\tCtrl+O", CMD_OPEN - MENUITEM "ѹס\tCtrl+S", CMD_SAVE - MENUITEM "ѹס...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "", CMD_PRINT - MENUITEM "Ѻ˹...", CMD_PAGE_SETUP - MENUITEM "Ѻͧ...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "͡", CMD_EXIT + POPUP "" + BEGIN + MENUITEM "ҧ\tCtrl+N", CMD_NEW + MENUITEM "Դ...\tCtrl+O", CMD_OPEN + MENUITEM "ѹס\tCtrl+S", CMD_SAVE + MENUITEM "ѹס...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "\tCtrl+P", CMD_PRINT + MENUITEM "Ѻ˹...", CMD_PAGE_SETUP + MENUITEM "Ѻͧ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "͡", CMD_EXIT + END + POPUP "" + BEGIN + MENUITEM "¡׹\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Ѵ\tCtrl+X", CMD_CUT + MENUITEM "Ѵ͡\tCtrl+C", CMD_COPY + MENUITEM "ҧ\tCtrl+V", CMD_PASTE + MENUITEM "ź\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "\tCtrl+F", CMD_SEARCH + MENUITEM "ҵ\tF3", CMD_SEARCH_NEXT + MENUITEM "Replace\tCtrl+H", CMD_REPLACE + MENUITEM "Go To...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "͡\tCtrl+A", CMD_SELECT_ALL + MENUITEM "ѹ/\tF5", CMD_TIME_DATE + END + POPUP "F&ormat" + BEGIN + MENUITEM "ͺ÷Ѵ", CMD_WRAP + MENUITEM "ٻẺѡ...", CMD_FONT + END + POPUP "&View" + BEGIN + MENUITEM "Status&bar", CMD_STATUSBAR + END + POPUP "" + BEGIN + MENUITEM "", CMD_HELP_CONTENTS + MENUITEM "...", CMD_HELP_SEARCH + MENUITEM "ǡѺ", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&About" CMD_ABOUT + MENUITEM "´...", CMD_ABOUT_WINE END - POPUP "" - BEGIN - MENUITEM "¡׹\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "Ѵ\tCtrl+X", CMD_CUT - MENUITEM "Ѵ͡\tCtrl+C", CMD_COPY - MENUITEM "ҧ\tCtrl+V", CMD_PASTE - MENUITEM "ź\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "\tCtrl+F", CMD_SEARCH - MENUITEM "ҵ\tF3", CMD_SEARCH_NEXT - MENUITEM "Replace\tCtrl+H", CMD_REPLACE - MENUITEM "Go To...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "͡\tCtrl+A", CMD_SELECT_ALL - MENUITEM "ѹ/\tF5", CMD_TIME_DATE - END - POPUP "F&ormat" - BEGIN - MENUITEM "ͺ÷Ѵ", CMD_WRAP - MENUITEM "ٻẺѡ...", CMD_FONT - END - POPUP "&View" - BEGIN - MENUITEM "Status&bar", CMD_STATUSBAR - END - POPUP "" - BEGIN - MENUITEM "", CMD_HELP_CONTENTS - MENUITEM "...", CMD_HELP_SEARCH - MENUITEM "ǡѺ", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&About" CMD_ABOUT - MENUITEM "´...", CMD_ABOUT_WINE - END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/uk-UA.rc b/reactos/base/applications/notepad/lang/uk-UA.rc index 11cc7183771..4a7f194dc57 100644 --- a/reactos/base/applications/notepad/lang/uk-UA.rc +++ b/reactos/base/applications/notepad/lang/uk-UA.rc @@ -27,7 +27,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -38,54 +40,54 @@ END MAIN_MENU MENU BEGIN - POPUP "&" - BEGIN - MENUITEM "&", CMD_NEW - MENUITEM "&³...\tCtrl+O", CMD_OPEN - MENUITEM "&&\tCtrl+S", CMD_SAVE - MENUITEM " &...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "& ...", CMD_PAGE_SETUP - MENUITEM "&", CMD_PRINT - MENUITEM " &...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "&", CMD_EXIT - END -POPUP "&" - BEGIN - MENUITEM "&\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "&\tCtrl+X", CMD_CUT - MENUITEM "&\tCtrl+C", CMD_COPY - MENUITEM "&\tCtrl+V", CMD_PASTE - MENUITEM "&\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "&...\tCtrl+F", CMD_SEARCH - MENUITEM "& \tF3", CMD_SEARCH_NEXT - MENUITEM "&\tCtrl+H", CMD_REPLACE - MENUITEM "&...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "& \tCtrl+A", CMD_SELECT_ALL - MENUITEM "& \tF5", CMD_TIME_DATE - END -POPUP "&" - BEGIN - MENUITEM "& ", CMD_WRAP - MENUITEM "&...", CMD_FONT -END -POPUP "&" - BEGIN - MENUITEM "& ", CMD_STATUSBAR -END -POPUP "&" - BEGIN - MENUITEM "&", CMD_HELP_CONTENTS - MENUITEM "&...", CMD_HELP_SEARCH - MENUITEM "&Help on help", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "&" CMD_ABOUT - MENUITEM "& ", CMD_ABOUT_WINE - END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+N", CMD_NEW + MENUITEM "&³...\tCtrl+O", CMD_OPEN + MENUITEM "&&\tCtrl+S", CMD_SAVE + MENUITEM " &...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "& ...", CMD_PAGE_SETUP + MENUITEM "&\tCtrl+P", CMD_PRINT + MENUITEM " &...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "&", CMD_EXIT + END + POPUP "&" + BEGIN + MENUITEM "&\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&\tCtrl+X", CMD_CUT + MENUITEM "&\tCtrl+C", CMD_COPY + MENUITEM "&\tCtrl+V", CMD_PASTE + MENUITEM "&\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&...\tCtrl+F", CMD_SEARCH + MENUITEM "& \tF3", CMD_SEARCH_NEXT + MENUITEM "&\tCtrl+H", CMD_REPLACE + MENUITEM "&...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "& \tCtrl+A", CMD_SELECT_ALL + MENUITEM "& \tF5", CMD_TIME_DATE + END + POPUP "&" + BEGIN + MENUITEM "& ", CMD_WRAP + MENUITEM "&...", CMD_FONT + END + POPUP "&" + BEGIN + MENUITEM "& ", CMD_STATUSBAR + END + POPUP "&" + BEGIN + MENUITEM "&", CMD_HELP_CONTENTS + MENUITEM "&...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&" CMD_ABOUT + MENUITEM "& ", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/notepad/lang/zh-CN.rc b/reactos/base/applications/notepad/lang/zh-CN.rc index fe179b729a7..53a03bd1650 100644 --- a/reactos/base/applications/notepad/lang/zh-CN.rc +++ b/reactos/base/applications/notepad/lang/zh-CN.rc @@ -28,7 +28,9 @@ BEGIN "^F", CMD_SEARCH "^G", CMD_GOTO "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW "^O", CMD_OPEN + "^P", CMD_PRINT "^S", CMD_SAVE "^V", CMD_PASTE "^X", CMD_CUT @@ -39,54 +41,54 @@ END MAIN_MENU MENU BEGIN - POPUP "ļ(&F)" - BEGIN - MENUITEM "½(&N)...", CMD_NEW - MENUITEM "(&O)", CMD_OPEN - MENUITEM "(&S)", CMD_SAVE - MENUITEM "Ϊ(&A)...", CMD_SAVE_AS - MENUITEM SEPARATOR - MENUITEM "ӡ(&P)", CMD_PRINT - MENUITEM "ҳ(&T)...", CMD_PAGE_SETUP - MENUITEM "ӡ(&R)...", CMD_PRINTER_SETUP - MENUITEM SEPARATOR - MENUITEM "˳(&E)", CMD_EXIT - END - POPUP "༭(&E)" - BEGIN - MENUITEM "(&U)\tCtrl+Z", CMD_UNDO - MENUITEM SEPARATOR - MENUITEM "(&T)\tCtrl+X", CMD_CUT - MENUITEM "(&C)\tCtrl+C", CMD_COPY - MENUITEM "ճ(&P)\tCtrl+V", CMD_PASTE - MENUITEM "ɾ(&D)\tDel", CMD_DELETE - MENUITEM SEPARATOR - MENUITEM "(&S)", CMD_SEARCH - MENUITEM "һ(&S)\tF3", CMD_SEARCH_NEXT - MENUITEM "滻\tCtrl+H", CMD_REPLACE - MENUITEM "ת...\tCtrl+G", CMD_GOTO - MENUITEM SEPARATOR - MENUITEM "ȫѡ(&A)", CMD_SELECT_ALL - MENUITEM "ڡʱ(&T)\tF5", CMD_TIME_DATE - END - POPUP "ʽ(&O)" - BEGIN - MENUITEM "Զ(&W)", CMD_WRAP - MENUITEM "(&F)...", CMD_FONT - END - POPUP "鿴(&V)" - BEGIN - MENUITEM "״̬(&B)", CMD_STATUSBAR - END - POPUP "(&H)" - BEGIN - MENUITEM "(&C)", CMD_HELP_CONTENTS - MENUITEM "(&S)...", CMD_HELP_SEARCH - MENUITEM "ʹð(&H)", CMD_HELP_ON_HELP - MENUITEM SEPARATOR - MENUITEM "(&A)" CMD_ABOUT - MENUITEM "Ϣ(&O)...", CMD_ABOUT_WINE - END + POPUP "ļ(&F)" + BEGIN + MENUITEM "½(&N)...", CMD_NEW + MENUITEM "(&O)", CMD_OPEN + MENUITEM "(&S)", CMD_SAVE + MENUITEM "Ϊ(&A)...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "ӡ(&P)", CMD_PRINT + MENUITEM "ҳ(&T)...", CMD_PAGE_SETUP + MENUITEM "ӡ(&R)...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "˳(&E)", CMD_EXIT + END + POPUP "༭(&E)" + BEGIN + MENUITEM "(&U)\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "(&T)\tCtrl+X", CMD_CUT + MENUITEM "(&C)\tCtrl+C", CMD_COPY + MENUITEM "ճ(&P)\tCtrl+V", CMD_PASTE + MENUITEM "ɾ(&D)\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "(&S)", CMD_SEARCH + MENUITEM "һ(&S)\tF3", CMD_SEARCH_NEXT + MENUITEM "滻\tCtrl+H", CMD_REPLACE + MENUITEM "ת...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "ȫѡ(&A)", CMD_SELECT_ALL + MENUITEM "ڡʱ(&T)\tF5", CMD_TIME_DATE + END + POPUP "ʽ(&O)" + BEGIN + MENUITEM "Զ(&W)", CMD_WRAP + MENUITEM "(&F)...", CMD_FONT + END + POPUP "鿴(&V)" + BEGIN + MENUITEM "״̬(&B)", CMD_STATUSBAR + END + POPUP "(&H)" + BEGIN + MENUITEM "(&C)", CMD_HELP_CONTENTS + MENUITEM "(&S)...", CMD_HELP_SEARCH + MENUITEM "ʹð(&H)", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "(&A)" CMD_ABOUT + MENUITEM "Ϣ(&O)...", CMD_ABOUT_WINE + END END /* Dialog `Page setup' */ diff --git a/reactos/base/applications/taskmgr/lang/da-DK.rc b/reactos/base/applications/taskmgr/lang/da-DK.rc index 476400edb61..6f98a5474fc 100644 --- a/reactos/base/applications/taskmgr/lang/da-DK.rc +++ b/reactos/base/applications/taskmgr/lang/da-DK.rc @@ -198,7 +198,6 @@ END IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN -CAPTION "KMK" FONT 8, "MS Shell Dlg" BEGIN CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | @@ -366,7 +365,7 @@ BEGIN CONTROL "&Billede Navn",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 CONTROL "&PID (Process Identifikation)",IDC_PID,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7, 39, 100, 10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,100,10 CONTROL "&CPU Forbrug",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 CONTROL "CPU &Tid",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | @@ -605,7 +604,71 @@ BEGIN IDS_LICENSE "Dette program er fri software; du kan formidle det og/eller ndre det under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 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 details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END -#endif // English (U.S.) resources + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Applications" + IDS_TAB_PROCESSES "Processes" + IDS_TAB_PERFORMANCE "Performance" + IDS_TAB_TASK "Task" + IDS_TAB_STATUS "Status" + IDS_TAB_IMAGENAME "Image Name" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Username" + IDS_TAB_SESSIONID "Session ID" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "CPU Time" + IDS_TAB_MEMUSAGE "Mem Usage" + IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" + IDS_TAB_MEMDELTA "Mem Delta" + IDS_TAB_PAGEFAULT "Page Faults" + IDS_TAB_PFDELTA "PF Delta" + IDS_TAB_VMSIZE "VM Size" + IDS_TAB_PAGEDPOOL "Paged Pool" + IDS_TAB_NPPOOL "NP Pool" + IDS_TAB_BASEPRI "Base Pri" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "USER Objects" + IDS_TAB_GDIOBJECTS "GDI Objects" + IDS_TAB_IOREADS "I/O Reads" + IDS_TAB_IOWRITES "I/O Writes" + IDS_TAB_IOOTHER "I/O Other" + IDS_TAB_IOREADBYTES "I/O Read Bytes" + IDS_TAB_IOWRITESBYTES "I/O Write Bytes" + IDS_TAB_IOOTHERBYTES "I/O Other Bytes" + IDS_MENU_SELECTCOLUMNS "&Select Columns..." + IDS_MENU_16BITTASK "&Show 16-bit tasks" + IDS_MENU_WINDOWS "&Windows" + IDS_MENU_LARGEICONS "Lar&ge Icons" + IDS_MENU_SMALLICONS "S&mall Icons" + IDS_MENU_DETAILS "&Details" + IDS_MENU_ONEGRAPHALLCPUS "&One Graph, All CPUs" + IDS_MENU_ONEGRAPHPERCPU "One Graph &Per CPU" + IDS_MENU_CPUHISTORY "&CPU History" + IDS_MENU_SHOWKERNELTIMES "&Show Kernel Times" + IDS_CREATENEWTASK "Create New Task" + IDS_CREATENEWTASK_DESC "Type the name of a program, folder, document, or Internet resource, and Task Manager will open it for you." + IDS_MSG_ACCESSPROCESSAFF "Unable to Access or Set Process Affinity" + IDS_MSG_PROCESSONEPRO "The process must have affinity with at least one processor." + IDS_MSG_INVALIDOPTION "Invalid Option" + IDS_MSG_UNABLEDEBUGPROCESS "Unable to Debug Process" + IDS_MSG_WARNINGDEBUG "WARNING: Debugging this process may result in loss of data.\nAre you sure you wish to attach the debugger?" + IDS_MSG_TASKMGRWARNING "Task Manager Warning" + IDS_MSG_WARNINGTERMINATING "WARNING: Terminating a process can cause undesired\nresults including loss of data and system instability. The\nprocess will not be given the chance to save its state or\ndata before it is terminated. Are you sure you want to\nterminate the process?" + IDS_MSG_UNABLETERMINATEPRO "Unable to Terminate Process" + IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" + IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" + IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" + IDS_STATUS_MEMUSAGE "Mem Usage: %dK / %dK" + IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" + IDS_STATUS_PROCESSES "Processes: %d" + IDS_Not_Responding "Not Responding" + IDS_Running "Running" +END + + +#endif // Danish resources ///////////////////////////////////////////////////////////////////////////// diff --git a/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp b/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp index f93fe534f29..80a03b6a379 100644 --- a/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp +++ b/reactos/base/applications/tsclient/porting-tools/rdesktop-core-tester/activex.cpp @@ -4029,7 +4029,7 @@ public: wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wcex.lpszClassName = TEXT("MissTosca_Control"); - return RegisterClassEx(&wcex);; + return RegisterClassEx(&wcex); } static void Shutdown() diff --git a/reactos/base/services/dhcp/compat.c b/reactos/base/services/dhcp/compat.c index ec132ca360a..83c9c12ea8c 100644 --- a/reactos/base/services/dhcp/compat.c +++ b/reactos/base/services/dhcp/compat.c @@ -32,11 +32,36 @@ u_int32_t arc4random() int inet_aton(const char *cp, struct in_addr *inp) +/* inet_addr code from ROS, slightly modified. */ { - inp->S_un.S_addr = inet_addr(cp); - if (INADDR_NONE == inp->S_un.S_addr) + ULONG Octets[4] = {0,0,0,0}; + ULONG i = 0; + + if(!cp) return 0; + while(*cp) + { + CHAR c = *cp; + cp++; + + if(c == '.') + { + i++; + continue; + } + + if(c < '0' || c > '9') + return 0; + + Octets[i] *= 10; + Octets[i] += (c - '0'); + + if(Octets[i] > 255) + return 0; + } + + inp->S_un.S_addr = (Octets[3] << 24) + (Octets[2] << 16) + (Octets[1] << 8) + Octets[0]; return 1; } diff --git a/reactos/base/services/dhcp/dhcp.rbuild b/reactos/base/services/dhcp/dhcp.rbuild index 2c11e7525c4..0953ca88e5a 100644 --- a/reactos/base/services/dhcp/dhcp.rbuild +++ b/reactos/base/services/dhcp/dhcp.rbuild @@ -1,6 +1,6 @@ - + . include ntdll diff --git a/reactos/base/services/dhcp/util.c b/reactos/base/services/dhcp/util.c index 2dd76235b79..fdf30755b22 100644 --- a/reactos/base/services/dhcp/util.c +++ b/reactos/base/services/dhcp/util.c @@ -121,7 +121,7 @@ int read_client_conf(void) { if (lpCompName !=NULL) { memcpy(lpCompName, ComputerName, ComputerNameSize + 1); /* Send our hostname, some dhcpds use this to update DNS */ - config->send_options[DHO_HOST_NAME].data = (u_int8_t*)strlwr(lpCompName); + config->send_options[DHO_HOST_NAME].data = (u_int8_t*)_strlwr(lpCompName); config->send_options[DHO_HOST_NAME].len = ComputerNameSize; debug("Hostname: %s, length: %d", config->send_options[DHO_HOST_NAME].data, diff --git a/reactos/base/services/eventlog/eventlog.c b/reactos/base/services/eventlog/eventlog.c index 8582e9472ad..9a2ddab82b1 100644 --- a/reactos/base/services/eventlog/eventlog.c +++ b/reactos/base/services/eventlog/eventlog.c @@ -271,24 +271,24 @@ VOID SystemTimeToEventTime(SYSTEMTIME * pSystemTime, DWORD * pEventTime) *pEventTime = (Time.ll - u1970.ll) / 10000000; } -VOID PRINT_HEADER(PFILE_HEADER header) +VOID PRINT_HEADER(PEVENTLOGHEADER header) { - DPRINT("SizeOfHeader = %d\n", header->SizeOfHeader); + DPRINT("HeaderSize = %d\n", header->HeaderSize); DPRINT("Signature = 0x%x\n", header->Signature); DPRINT("MajorVersion = %d\n", header->MajorVersion); DPRINT("MinorVersion = %d\n", header->MinorVersion); - DPRINT("FirstRecordOffset = %d\n", header->FirstRecordOffset); - DPRINT("EofOffset = 0x%x\n", header->EofOffset); - DPRINT("NextRecord = %d\n", header->NextRecord); - DPRINT("OldestRecord = %d\n", header->OldestRecord); - DPRINT("unknown1 = 0x%x\n", header->unknown1); - DPRINT("unknown2 = 0x%x\n", header->unknown2); - DPRINT("SizeOfHeader2 = %d\n", header->SizeOfHeader2); + DPRINT("StartOffset = %d\n", header->StartOffset); + DPRINT("EndOffset = 0x%x\n", header->EndOffset); + DPRINT("CurrentRecordNumber = %d\n", header->CurrentRecordNumber); + DPRINT("OldestRecordNumber = %d\n", header->OldestRecordNumber); + DPRINT("MaxSize = 0x%x\n", header->MaxSize); + DPRINT("Retention = 0x%x\n", header->Retention); + DPRINT("EndHeaderSize = %d\n", header->EndHeaderSize); DPRINT("Flags: "); - if (header->Flags & LOGFILE_FLAG1) DPRINT("LOGFILE_FLAG1 "); - if (header->Flags & LOGFILE_FLAG2) DPRINT("| LOGFILE_FLAG2 "); - if (header->Flags & LOGFILE_FLAG3) DPRINT("| LOGFILE_FLAG3 "); - if (header->Flags & LOGFILE_FLAG4) DPRINT("| LOGFILE_FLAG4"); + if (header->Flags & ELF_LOGFILE_HEADER_DIRTY) DPRINT("ELF_LOGFILE_HEADER_DIRTY"); + if (header->Flags & ELF_LOGFILE_HEADER_WRAP) DPRINT("| ELF_LOGFILE_HEADER_WRAP "); + if (header->Flags & ELF_LOGGFILE_LOGFULL_WRITTEN) DPRINT("| ELF_LOGGFILE_LOGFULL_WRITTEN "); + if (header->Flags & ELF_LOGFILE_ARCHIVE_SET) DPRINT("| ELF_LOGFILE_ARCHIVE_SET "); DPRINT("\n"); } diff --git a/reactos/base/services/eventlog/eventlog.h b/reactos/base/services/eventlog/eventlog.h index 54c2b305e90..4cbfe1a9e0e 100644 --- a/reactos/base/services/eventlog/eventlog.h +++ b/reactos/base/services/eventlog/eventlog.h @@ -36,43 +36,41 @@ typedef struct _IO_ERROR_LPC #define LOGFILE_SIGNATURE 0x654c664c /* - * FIXME * Flags used in logfile header */ -#define LOGFILE_FLAG1 1 -#define LOGFILE_FLAG2 2 -#define LOGFILE_FLAG3 4 -#define LOGFILE_FLAG4 8 +#define ELF_LOGFILE_HEADER_DIRTY 1 +#define ELF_LOGFILE_HEADER_WRAP 2 +#define ELF_LOGGFILE_LOGFULL_WRITTEN 4 +#define ELF_LOGFILE_ARCHIVE_SET 8 -typedef struct -{ - DWORD SizeOfHeader; - DWORD Signature; - DWORD MajorVersion; - DWORD MinorVersion; - DWORD FirstRecordOffset; - DWORD EofOffset; - DWORD NextRecord; - DWORD OldestRecord; - DWORD unknown1; - DWORD Flags; - DWORD unknown2; - DWORD SizeOfHeader2; -} FILE_HEADER, *PFILE_HEADER; +/* FIXME: MSDN reads that the following two structs are in winnt.h. Are they? */ +typedef struct _EVENTLOGHEADER { + ULONG HeaderSize; + ULONG Signature; + ULONG MajorVersion; + ULONG MinorVersion; + ULONG StartOffset; + ULONG EndOffset; + ULONG CurrentRecordNumber; + ULONG OldestRecordNumber; + ULONG MaxSize; + ULONG Flags; + ULONG Retention; + ULONG EndHeaderSize; +} EVENTLOGHEADER, *PEVENTLOGHEADER; -typedef struct -{ - DWORD Size1; - DWORD Ones; // Must be 0x11111111 - DWORD Twos; // Must be 0x22222222 - DWORD Threes; // Must be 0x33333333 - DWORD Fours; // Must be 0x44444444 - DWORD StartOffset; - DWORD EndOffset; - DWORD NextRecordNumber; - DWORD OldestRecordNumber; - DWORD Size2; -} EOF_RECORD, *PEOF_RECORD; +typedef struct _EVENTLOGEOF { + ULONG RecordSizeBeginning; + ULONG Ones; + ULONG Twos; + ULONG Threes; + ULONG Fours; + ULONG BeginRecord; + ULONG EndRecord; + ULONG CurrentRecordNumber; + ULONG OldestRecordNumber; + ULONG RecordSizeEnd; +} EVENTLOGEOF, *PEVENTLOGEOF; typedef struct { @@ -83,7 +81,7 @@ typedef struct typedef struct { HANDLE hFile; - FILE_HEADER Header; + EVENTLOGHEADER Header; WCHAR *LogName; WCHAR *FileName; CRITICAL_SECTION cs; @@ -165,7 +163,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize, /* eventlog.c */ extern HANDLE MyHeap; -VOID PRINT_HEADER(PFILE_HEADER header); +VOID PRINT_HEADER(PEVENTLOGHEADER header); VOID PRINT_RECORD(PEVENTLOGRECORD pRec); diff --git a/reactos/base/services/eventlog/file.c b/reactos/base/services/eventlog/file.c index 82dce7cc43a..358895936a4 100644 --- a/reactos/base/services/eventlog/file.c +++ b/reactos/base/services/eventlog/file.c @@ -20,24 +20,24 @@ static CRITICAL_SECTION LogFileListCs; BOOL LogfInitializeNew(PLOGFILE LogFile) { DWORD dwWritten; - EOF_RECORD EofRec; + EVENTLOGEOF EofRec; - ZeroMemory(&LogFile->Header, sizeof(FILE_HEADER)); + ZeroMemory(&LogFile->Header, sizeof(EVENTLOGHEADER)); SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); SetEndOfFile(LogFile->hFile); - LogFile->Header.SizeOfHeader = sizeof(FILE_HEADER); - LogFile->Header.SizeOfHeader2 = sizeof(FILE_HEADER); - LogFile->Header.FirstRecordOffset = sizeof(FILE_HEADER); - LogFile->Header.EofOffset = sizeof(FILE_HEADER); + LogFile->Header.HeaderSize = sizeof(EVENTLOGHEADER); + LogFile->Header.EndHeaderSize = sizeof(EVENTLOGHEADER); + LogFile->Header.StartOffset = sizeof(EVENTLOGHEADER); + LogFile->Header.EndOffset = sizeof(EVENTLOGHEADER); LogFile->Header.MajorVersion = MAJORVER; LogFile->Header.MinorVersion = MINORVER; - LogFile->Header.NextRecord = 1; + LogFile->Header.CurrentRecordNumber = 1; LogFile->Header.Signature = LOGFILE_SIGNATURE; if (!WriteFile(LogFile->hFile, &LogFile->Header, - sizeof(FILE_HEADER), + sizeof(EVENTLOGHEADER), &dwWritten, NULL)) { @@ -49,16 +49,16 @@ BOOL LogfInitializeNew(PLOGFILE LogFile) EofRec.Twos = 0x22222222; EofRec.Threes = 0x33333333; EofRec.Fours = 0x44444444; - EofRec.Size1 = sizeof(EOF_RECORD); - EofRec.Size2 = sizeof(EOF_RECORD); - EofRec.NextRecordNumber = LogFile->Header.NextRecord; - EofRec.OldestRecordNumber = LogFile->Header.OldestRecord; - EofRec.StartOffset = LogFile->Header.FirstRecordOffset; - EofRec.EndOffset = LogFile->Header.EofOffset; + EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF); + EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF); + EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber; + EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber; + EofRec.BeginRecord = LogFile->Header.StartOffset; + EofRec.EndRecord = LogFile->Header.EndOffset; if (!WriteFile(LogFile->hFile, &EofRec, - sizeof(EOF_RECORD), + sizeof(EVENTLOGEOF), &dwWritten, NULL)) { @@ -92,7 +92,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile) if (!ReadFile(LogFile->hFile, &LogFile->Header, - sizeof(FILE_HEADER), + sizeof(EVENTLOGHEADER), &dwRead, NULL)) { @@ -100,14 +100,14 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile) return FALSE; } - if (dwRead != sizeof(FILE_HEADER)) + if (dwRead != sizeof(EVENTLOGHEADER)) { DPRINT("EventLog: Invalid file %S.\n", LogFile->FileName); return LogfInitializeNew(LogFile); } - if (LogFile->Header.SizeOfHeader != sizeof(FILE_HEADER) || - LogFile->Header.SizeOfHeader2 != sizeof(FILE_HEADER)) + if (LogFile->Header.HeaderSize != sizeof(EVENTLOGHEADER) || + LogFile->Header.EndHeaderSize != sizeof(EVENTLOGHEADER)) { DPRINT("EventLog: Invalid header size in %S.\n", LogFile->FileName); return LogfInitializeNew(LogFile); @@ -120,10 +120,10 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile) return LogfInitializeNew(LogFile); } - if (LogFile->Header.EofOffset > GetFileSize(LogFile->hFile, NULL) + 1) + if (LogFile->Header.EndOffset > GetFileSize(LogFile->hFile, NULL) + 1) { DPRINT("EventLog: Invalid eof offset %x in %S.\n", - LogFile->Header.EofOffset, LogFile->FileName); + LogFile->Header.EndOffset, LogFile->FileName); return LogfInitializeNew(LogFile); } @@ -204,7 +204,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile) if (*pdwRecSize2 != dwRecSize) { - DPRINT1("Invalid size2 of record %d (%x) in %S\n", + DPRINT1("Invalid RecordSizeEnd of record %d (%x) in %S\n", dwRecordsNumber, *pdwRecSize2, LogFile->LogName); HeapFree(MyHeap, 0, RecBuf); break; @@ -224,8 +224,8 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile) HeapFree(MyHeap, 0, RecBuf); } // for(;;) - LogFile->Header.NextRecord = dwRecordsNumber + 1; - LogFile->Header.OldestRecord = dwRecordsNumber ? 1 : 0; // FIXME + LogFile->Header.CurrentRecordNumber = dwRecordsNumber + 1; + LogFile->Header.OldestRecordNumber = dwRecordsNumber ? 1 : 0; // FIXME if (!SetFilePointer(LogFile->hFile, 0, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) @@ -236,7 +236,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile) if (!WriteFile(LogFile->hFile, &LogFile->Header, - sizeof(FILE_HEADER), + sizeof(EVENTLOGHEADER), &dwRead, NULL)) { @@ -648,7 +648,7 @@ BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) { DWORD dwWritten; SYSTEMTIME st; - EOF_RECORD EofRec; + EVENTLOGEOF EofRec; if (!Buffer) return FALSE; @@ -659,7 +659,7 @@ BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) EnterCriticalSection(&LogFile->cs); if (SetFilePointer(LogFile->hFile, - LogFile->Header.EofOffset, + LogFile->Header.EndOffset, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { @@ -676,33 +676,33 @@ BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) } if (!LogfAddOffsetInformation(LogFile, - LogFile->Header.NextRecord, - LogFile->Header.EofOffset)) + LogFile->Header.CurrentRecordNumber, + LogFile->Header.EndOffset)) { LeaveCriticalSection(&LogFile->cs); return FALSE; } - LogFile->Header.NextRecord++; - LogFile->Header.EofOffset += dwWritten; + LogFile->Header.CurrentRecordNumber++; + LogFile->Header.EndOffset += dwWritten; - if (LogFile->Header.OldestRecord == 0) - LogFile->Header.OldestRecord = 1; + if (LogFile->Header.OldestRecordNumber == 0) + LogFile->Header.OldestRecordNumber = 1; EofRec.Ones = 0x11111111; EofRec.Twos = 0x22222222; EofRec.Threes = 0x33333333; EofRec.Fours = 0x44444444; - EofRec.Size1 = sizeof(EOF_RECORD); - EofRec.Size2 = sizeof(EOF_RECORD); - EofRec.NextRecordNumber = LogFile->Header.NextRecord; - EofRec.OldestRecordNumber = LogFile->Header.OldestRecord; - EofRec.StartOffset = LogFile->Header.FirstRecordOffset; - EofRec.EndOffset = LogFile->Header.EofOffset; + EofRec.RecordSizeBeginning = sizeof(EVENTLOGEOF); + EofRec.RecordSizeEnd = sizeof(EVENTLOGEOF); + EofRec.CurrentRecordNumber = LogFile->Header.CurrentRecordNumber; + EofRec.OldestRecordNumber = LogFile->Header.OldestRecordNumber; + EofRec.BeginRecord = LogFile->Header.StartOffset; + EofRec.EndRecord = LogFile->Header.EndOffset; if (!WriteFile(LogFile->hFile, &EofRec, - sizeof(EOF_RECORD), + sizeof(EVENTLOGEOF), &dwWritten, NULL)) { @@ -721,7 +721,7 @@ BOOL LogfWriteData(PLOGFILE LogFile, DWORD BufSize, PBYTE Buffer) if (!WriteFile(LogFile->hFile, &LogFile->Header, - sizeof(FILE_HEADER), + sizeof(EVENTLOGHEADER), &dwWritten, NULL)) { @@ -757,7 +757,7 @@ ULONG LogfOffsetByNumber(PLOGFILE LogFile, DWORD RecordNumber) DWORD LogfGetOldestRecord(PLOGFILE LogFile) { - return LogFile->Header.OldestRecord; + return LogFile->Header.OldestRecordNumber; } BOOL LogfAddOffsetInformation(PLOGFILE LogFile, ULONG ulNumber, ULONG ulOffset) diff --git a/reactos/base/services/eventlog/logport.c b/reactos/base/services/eventlog/logport.c index 0db58ac3083..d82cf4c649b 100644 --- a/reactos/base/services/eventlog/logport.c +++ b/reactos/base/services/eventlog/logport.c @@ -143,7 +143,7 @@ NTSTATUS ProcessPortMessage(VOID) { DPRINT("Received datagram\n"); Message = (PIO_ERROR_LOG_MESSAGE) & Request.Message; - ulRecNum = SystemLog ? SystemLog->Header.NextRecord : 0; + ulRecNum = SystemLog ? SystemLog->Header.CurrentRecordNumber : 0; pRec = (PEVENTLOGRECORD) LogfAllocAndBuildNewRecord(&dwRecSize, ulRecNum, Message->Type, Message->EntryData.EventCategory, diff --git a/reactos/base/setup/reactos/lang/bg-BG.rc b/reactos/base/setup/reactos/lang/bg-BG.rc index df15c47b8d5..a46ad02cf66 100644 --- a/reactos/base/setup/reactos/lang/bg-BG.rc +++ b/reactos/base/setup/reactos/lang/bg-BG.rc @@ -76,8 +76,8 @@ BEGIN CONTROL " (MBR) ", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL " ", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -103,7 +103,7 @@ BEGIN LTEXT " , .", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT " , . , ., IDC_STATIC, 10, 180, 297, 20 + LTEXT " , . , ., IDC_STATIC, 10, 180, 297, 20 END diff --git a/reactos/base/setup/usetup/lang/sk-SK.h b/reactos/base/setup/usetup/lang/sk-SK.h index a7021533fd3..0cf6be92082 100644 --- a/reactos/base/setup/usetup/lang/sk-SK.h +++ b/reactos/base/setup/usetup/lang/sk-SK.h @@ -1,7 +1,7 @@ /* TRANSLATOR: Mrio Kamr /Mario Kacmar/ aka Kario (kario@szm.sk) * DATE OF TR: 22-01-2008 * Encoding : Latin II (852) - * LastChange: 01-12-2008 + * LastChange: 14-12-2008 */ #ifndef LANG_SK_SK_H__ @@ -1215,7 +1215,7 @@ static MUI_ENTRY skSKDeletePartitionEntries[] = { 6, 8, - "Vybrali Ste si odstrnenie oblasti", + "Vybrali ste si odstrnenie oblasti", TEXT_STYLE_NORMAL }, { @@ -1323,7 +1323,8 @@ MUI_ERROR skSKErrorEntries[] = }, { //ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", + "Intaltoru sa nepodarilo naintalova zavdzac kd sborovho\n" + "systmu FAT na systmov partciu.", "ENTER = Retart potaa" }, { @@ -1374,7 +1375,8 @@ MUI_ERROR skSKErrorEntries[] = }, { //ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", + "Intaltoru sa nepodarilo naintalova zavdzac kd sborovho\n" + "systmu FAT na systmov partciu.", "ENTER = Retart potaa" }, { @@ -1598,7 +1600,7 @@ MUI_STRING skSKStrings[] = {STRING_PARTITIONSIZE, "Vekos novej oblasti:"}, {STRING_CHOOSENEWPARTITION, - "Zvolili Ste vytvorenie novej oblasti na"}, + "Zvolili ste vytvorenie novej oblasti na"}, {STRING_HDDSIZE, "Zadajte, prosm, vekos novej oblasti v megabajtoch."}, {STRING_CREATEPARTITION, @@ -1606,7 +1608,7 @@ MUI_STRING skSKStrings[] = {STRING_PARTFORMAT, "Tto oblas sa bude formtova ako alia."}, {STRING_NONFORMATTEDPART, - "Zvolili Ste intalciu systmu ReactOS na nov alebo nenaformtovan oblas."}, + "Zvolili ste intalciu systmu ReactOS na nov alebo nenaformtovan oblas."}, {STRING_INSTALLONPART, "Intaltor naintaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, diff --git a/reactos/base/shell/cmd/cmdtable.c b/reactos/base/shell/cmd/cmdtable.c index 9fc7cd25357..516844fa312 100644 --- a/reactos/base/shell/cmd/cmdtable.c +++ b/reactos/base/shell/cmd/cmdtable.c @@ -120,7 +120,7 @@ COMMAND cmds[] = {_T("history"), 0, CommandHistory}, #endif -// {_T("if"), 0, cmd_if}, + {_T("if"), 0, cmd_if}, #ifdef INCLUDE_CMD_LABEL {_T("label"), 0, cmd_label}, diff --git a/reactos/base/shell/cmd/dir.c b/reactos/base/shell/cmd/dir.c index deead6c2777..2c43fe50475 100644 --- a/reactos/base/shell/cmd/dir.c +++ b/reactos/base/shell/cmd/dir.c @@ -989,7 +989,7 @@ DirPrintNewList(LPWIN32_FIND_DATA ptrFiles[], /* [IN]Files' Info */ INT iSizeFormat; ULARGE_INTEGER u64FileSize; - for (i = 0;i < dwCount;i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Calculate size */ if (ptrFiles[i]->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) @@ -1097,7 +1097,7 @@ DirPrintWideList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ /* Calculate the lines that will be printed */ iLines = (USHORT)((dwCount + iColumns - 1) / iColumns); - for (i = 0; i < iLines; i++) + for (i = 0; i < iLines && !bCtrlBreak; i++) { for (j = 0; j < iColumns; j++) { @@ -1154,7 +1154,7 @@ TCHAR szSize[30]; /* The size of file */ int iSizeFormat; /* The format of size field */ ULARGE_INTEGER u64FileSize; /* The file size */ - for(i = 0;i < dwCount;i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { /* Broke 8.3 format */ if (*ptrFiles[i]->cAlternateFileName ) @@ -1228,7 +1228,7 @@ DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ TCHAR szFullName[MAX_PATH]; DWORD i; - for (i = 0; i < dwCount; i++) + for (i = 0; i < dwCount && !bCtrlBreak; i++) { if ((_tcscmp(ptrFiles[i]->cFileName, _T(".")) == 0) || (_tcscmp(ptrFiles[i]->cFileName, _T("..")) == 0)) @@ -1681,6 +1681,15 @@ ULARGE_INTEGER u64Temp; /* A temporary counter */ /* Free array */ cmd_free(ptrFileArray); + /* Free linked list */ + while (ptrStartNode) + { + ptrNextNode = ptrStartNode->ptrNext; + cmd_free(ptrStartNode); + ptrStartNode = ptrNextNode; + dwCount --; + } + if (CheckCtrlBreak(BREAK_INPUT)) return 1; @@ -1741,15 +1750,6 @@ ULARGE_INTEGER u64Temp; /* A temporary counter */ FindClose(hRecSearch); } - /* Free linked list */ - while (ptrStartNode) - { - ptrNextNode = ptrStartNode->ptrNext; - cmd_free(ptrStartNode); - ptrStartNode = ptrNextNode; - dwCount --; - } - return 0; } diff --git a/reactos/base/shell/cmd/if.c b/reactos/base/shell/cmd/if.c index c462ce02710..ae848e8e0c8 100644 --- a/reactos/base/shell/cmd/if.c +++ b/reactos/base/shell/cmd/if.c @@ -49,13 +49,8 @@ static INT GenericCmp(INT (*StringCmp)(LPCTSTR, LPCTSTR), return StringCmp(Left, Right); } -BOOL ExecuteIf(PARSED_COMMAND *Cmd) +INT cmd_if (LPTSTR param) { - INT result = FALSE; /* when set cause 'then' clause to be executed */ - LPTSTR param; - -#if 0 - /* FIXME: need to handle IF /?; will require special parsing */ TRACE ("cmd_if: (\'%s\')\n", debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) @@ -63,7 +58,15 @@ BOOL ExecuteIf(PARSED_COMMAND *Cmd) ConOutResPaging(TRUE,STRING_IF_HELP1); return 0; } -#endif + + error_syntax(param); + return 1; +} + +BOOL ExecuteIf(PARSED_COMMAND *Cmd) +{ + INT result = FALSE; /* when set cause 'then' clause to be executed */ + LPTSTR param; if (Cmd->If.Operator == IF_CMDEXTVERSION) { diff --git a/reactos/base/shell/cmd/parser.c b/reactos/base/shell/cmd/parser.c index 7c35a57e5d6..6bbee17358b 100644 --- a/reactos/base/shell/cmd/parser.c +++ b/reactos/base/shell/cmd/parser.c @@ -332,7 +332,7 @@ static PARSED_COMMAND *ParseIf(void) memset(Cmd, 0, sizeof(PARSED_COMMAND)); Cmd->Type = C_IF; - int Type = ParseToken(0, STANDARD_SEPS); + int Type = CurrentTokenType; if (_tcsicmp(CurrentToken, _T("/I")) == 0) { Cmd->If.Flags |= IFFLAG_IGNORECASE; @@ -488,13 +488,19 @@ static PARSED_COMMAND *ParseCommandPart(void) /* Check for special forms */ if (_tcsicmp(ParsedLine, _T("if")) == 0) { - if (RedirList) + ParseToken(0, STANDARD_SEPS); + /* Do special parsing only if it's not followed by /? */ + if (_tcscmp(CurrentToken, _T("/?")) != 0) { - ParseError(); - FreeRedirection(RedirList); - return NULL; + if (RedirList) + { + ParseError(); + FreeRedirection(RedirList); + return NULL; + } + return ParseIf(); } - return ParseIf(); + Pos = _stpcpy(Pos, _T(" /?")); } /* Now get the tail */ diff --git a/reactos/base/shell/explorer/utility/xmlstorage.cpp b/reactos/base/shell/explorer/utility/xmlstorage.cpp index b1a18ad6c63..eae1d6f585f 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.cpp +++ b/reactos/base/shell/explorer/utility/xmlstorage.cpp @@ -471,9 +471,16 @@ std::string EncodeXMLString(const XS_String& str, bool cdata) } /// decode XML string literals -XS_String DecodeXMLString(const XS_String& str) +XS_String DecodeXMLString(const std::string& str) { - LPCXSSTR s = str.c_str(); +#ifdef XS_STRING_UTF8 + const XS_String& str_utf8 = str; +#else + XS_String str_utf8; + assign_utf8(str_utf8, str.c_str(), str.length()); +#endif + + LPCXSSTR s = str_utf8.c_str(); LPXSSTR buffer = (LPXSSTR)alloca(sizeof(XS_CHAR)*XS_len(s)); LPXSSTR o = buffer; @@ -514,7 +521,7 @@ XS_String DecodeXMLString(const XS_String& str) /// write node with children tree to output stream using original white space -void XMLNode::write_worker(std::ostream& out) const +void XMLNode::original_write_worker(std::ostream& out) const { out << _leading << '<' << EncodeXMLString(*this); @@ -522,10 +529,15 @@ void XMLNode::write_worker(std::ostream& out) const out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; if (!_children.empty() || !_content.empty()) { - out << '>' << _content; + out << '>'; + + if (_cdata_content) + out << EncodeXMLString(DecodeXMLString(_content), true); + else + out << _content; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) - (*it)->write_worker(out); + (*it)->original_write_worker(out); out << _end_leading << "'; } else @@ -619,7 +631,9 @@ void XMLNode::smart_write_worker(std::ostream& out, const XMLFormat& format, int else { out << '>'; - if (!*content) + if (_cdata_content) + out << EncodeXMLString(DecodeXMLString(_content), true); + else if (!*content) out << format._endl; else out << content; @@ -886,11 +900,15 @@ void XMLReaderBase::EndElementHandler() if (!strncmp(s,"",3)) { s += 9; p = (e-=3); + + _pos->_cdata_content = true; } else { // search for content end leaving only white space for _end_leading for(p=e; p>s; --p) if (!isspace((unsigned char)p[-1])) break; + + _pos->_cdata_content = false; } if (p != s) diff --git a/reactos/base/shell/explorer/utility/xmlstorage.h b/reactos/base/shell/explorer/utility/xmlstorage.h index b16ef9093f4..d5d83f27d0c 100644 --- a/reactos/base/shell/explorer/utility/xmlstorage.h +++ b/reactos/base/shell/explorer/utility/xmlstorage.h @@ -484,7 +484,7 @@ inline std::string get_utf8(const XS_String& s) #endif // XS_STRING_UTF8 extern std::string EncodeXMLString(const XS_String& str, bool cdata=false); -extern XS_String DecodeXMLString(const XS_String& str); +extern XS_String DecodeXMLString(const std::string& str); #ifdef __GNUC__ @@ -961,13 +961,15 @@ struct XMLNode : public XS_String friend struct XPathElement; XMLNode(const XS_String& name) - : XS_String(name) + : XS_String(name), + _cdata_content(false) { } XMLNode(const XS_String& name, const std::string& leading) : XS_String(name), - _leading(leading) + _leading(leading), + _cdata_content(false) { } @@ -977,10 +979,11 @@ struct XMLNode : public XS_String _leading(other._leading), _content(other._content), _end_leading(other._end_leading), - _trailing(other._trailing) + _trailing(other._trailing), #ifdef XMLNODE_LOCATION - , _location(other._location) + _location(other._location), #endif + _cdata_content(false) { for(Children::const_iterator it=other._children.begin(); it!=other._children.end(); ++it) _children.push_back(new XMLNode(**it)); @@ -994,10 +997,11 @@ struct XMLNode : public XS_String _leading(other._leading), _content(other._content), _end_leading(other._end_leading), - _trailing(other._trailing) + _trailing(other._trailing), #ifdef XMLNODE_LOCATION - , _location(other._location) + _location(other._location), #endif + _cdata_content(false) { // assert(copy_no_children==COPY_NOCHILDREN); } @@ -1153,23 +1157,41 @@ struct XMLNode : public XS_String return _attributes; } + /// read element node content XS_String get_content() const { -#ifdef XS_STRING_UTF8 - const XS_String& ret = _content; -#else - XS_String ret; - assign_utf8(ret, _content.c_str(), _content.length()); -#endif - - return DecodeXMLString(ret.c_str()); + return DecodeXMLString(_content); } + /// read content of a subnode specified by an XPath expression + XS_String get_sub_content(const XPath& xpath) const + { + const XMLNode* node = find_relative(xpath); + + if (node) + return node->get_content(); + else + return XS_EMPTY_STR; + } + + /// set element node content void set_content(const XS_String& s, bool cdata=false) { _content.assign(EncodeXMLString(s.c_str(), cdata)); } + /// set content of a subnode specified by an XPath expression + bool set_sub_content(const XPath& xpath, const XS_String& s, bool cdata=false) + { + XMLNode* node = find_relative(xpath); + + if (node) { + node->set_content(s, cdata); + return true; + } else + return false; + } + #ifdef XMLNODE_LOCATION const XMLLocation& get_location() const {return _location;} #endif @@ -1187,10 +1209,10 @@ struct XMLNode : public XS_String break; case FORMAT_ORIGINAL: - write_worker(out); + original_write_worker(out); break; - default: // FORMAT_SMART + default: // FORMAT_SMART smart_write_worker(out, format, indent); } @@ -1222,6 +1244,8 @@ protected: XMLLocation _location; #endif + bool _cdata_content; + XMLNode* get_first_child() const { if (!_children.empty()) @@ -1242,7 +1266,7 @@ protected: /// create a new node tree using the given XPath filter expression XMLNode* filter(XPath::const_iterator from, const XPath::const_iterator& to) const; - void write_worker(std::ostream& out) const; + void original_write_worker(std::ostream& out) const; void plain_write_worker(std::ostream& out) const; void pretty_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; void smart_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; diff --git a/reactos/base/shell/explorer/utility/xs-native.cpp b/reactos/base/shell/explorer/utility/xs-native.cpp index 7f56dd2813c..3b19171a565 100644 --- a/reactos/base/shell/explorer/utility/xs-native.cpp +++ b/reactos/base/shell/explorer/utility/xs-native.cpp @@ -206,14 +206,12 @@ struct Buffer #ifdef XS_STRING_UTF8 XS_String name_str(attr_name, attr_len); - XS_String value_str(value, value_len); #else - XS_String name_str, value_str; + XS_String name_str; assign_utf8(name_str, attr_name, attr_len); - assign_utf8(value_str, value, value_len); #endif - attributes[name_str] = DecodeXMLString(value_str); + attributes[name_str] = DecodeXMLString(std::string(value, value_len)); } } diff --git a/reactos/base/system/regsvr32/lang/bg-BG.rc b/reactos/base/system/regsvr32/lang/bg-BG.rc new file mode 100644 index 00000000000..6f2710e781c --- /dev/null +++ b/reactos/base/system/regsvr32/lang/bg-BG.rc @@ -0,0 +1,28 @@ +#include "resource.h" + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +BEGIN + +IDS_UsageMessage, "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Unregister server\n\ +/s - Silent; display no message boxes\n\ +/c - Console output\n\ +/i - Call DllInstall passing it an optional [cmdline]; when used with /u calls dll uninstall\n\ +/n - Do not call DllRegisterServer; this option must be used with /i" + +IDS_NoDllSpecified, " DLL." + +IDS_InvalidFlag, " : %s" + +IDS_SwitchN_NoI, " : /n /i" + +IDS_DllNotLoaded, " LoadLibrary('%s').\nGetLastError 0x%08x." + +IDS_MissingEntry, "%s , %s .\n\n\ + %s %s. PView, ." + +IDS_FailureMessage, "%s %s .\n : 0x%08x" + +IDS_SuccessMessage "%s %s ." +END diff --git a/reactos/base/system/regsvr32/rsrc.rc b/reactos/base/system/regsvr32/rsrc.rc index 40f5a83dd89..088183d2c13 100644 --- a/reactos/base/system/regsvr32/rsrc.rc +++ b/reactos/base/system/regsvr32/rsrc.rc @@ -3,6 +3,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" diff --git a/reactos/baseaddress.rbuild b/reactos/baseaddress.rbuild index e45862d824e..55967b54751 100644 --- a/reactos/baseaddress.rbuild +++ b/reactos/baseaddress.rbuild @@ -7,6 +7,7 @@ + diff --git a/reactos/boot/bootdata/hivesys_i386.inf b/reactos/boot/bootdata/hivesys_i386.inf index 497285a7e13..97954613954 100644 --- a/reactos/boot/bootdata/hivesys_i386.inf +++ b/reactos/boot/bootdata/hivesys_i386.inf @@ -890,22 +890,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 -; Green driver -;HKLM,"SYSTEM\CurrentControlSet\Services\green","ErrorControl",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Group",0x00000000,"Extended base" -;HKLM,"SYSTEM\CurrentControlSet\Services\green","ImagePath",0x00020000,"system32\drivers\green.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Start",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\green","Type",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\green\Parameters","AttachedDevice",0x00000000,"\Device\Serial0" - -; i8042 port driver -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ImagePath",0x00020000,"system32\drivers\i8042prt.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001 - ; Kernel-Mode Tests ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","ErrorControl",0x00010001,0x00000000 ;HKLM,"SYSTEM\CurrentControlSet\Services\Kmtest","Group",0x00000000,"Base" diff --git a/reactos/boot/freeldr/freeldr/include/mm.h b/reactos/boot/freeldr/freeldr/include/mm.h index 916f5ea92df..6ee257d186b 100644 --- a/reactos/boot/freeldr/freeldr/include/mm.h +++ b/reactos/boot/freeldr/freeldr/include/mm.h @@ -105,6 +105,7 @@ ULONG MmFindAvailablePagesBeforePage(PVOID PageLookupTable, ULONG TotalPageCoun VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount); // Removes entries in the memory map that describe memory above 4G VOID MmUpdateLastFreePageHint(PVOID PageLookupTable, ULONG TotalPageCount); // Sets the LastFreePageHint to the last usable page of memory BOOLEAN MmAreMemoryPagesAvailable(PVOID PageLookupTable, ULONG TotalPageCount, PVOID PageAddress, ULONG PageCount); // Returns TRUE if the specified pages of memory are available, otherwise FALSE +VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType); // Use with EXTREME caution! ULONG GetSystemMemorySize(VOID); // Returns the amount of total memory in the system PPAGE_LOOKUP_TABLE_ITEM MmGetMemoryMap(ULONG *NoEntries); // Returns a pointer to the memory mapping table and a number of entries in it diff --git a/reactos/boot/freeldr/freeldr/mm/mm.c b/reactos/boot/freeldr/freeldr/mm/mm.c index 23a9ae1dba3..445c75acba4 100644 --- a/reactos/boot/freeldr/freeldr/mm/mm.c +++ b/reactos/boot/freeldr/freeldr/mm/mm.c @@ -182,6 +182,22 @@ PVOID MmAllocateMemoryAtAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_ return MemPointer; } +VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType) +{ + ULONG PagesNeeded; + ULONG StartPageNumber; + + // Find out how many blocks it will take to + // satisfy this allocation + PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; + + // Get the starting page number + StartPageNumber = MmGetPageNumberFromAddress(MemoryAddress); + + // Set new type for these pages + MmAllocatePagesInLookupTable(PageLookupTableAddress, StartPageNumber, PagesNeeded, NewType); +} + PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType) { ULONG PagesNeeded; diff --git a/reactos/boot/freeldr/freeldr/windows/peloader.c b/reactos/boot/freeldr/freeldr/windows/peloader.c index aa5e3ad9b80..57378086ab7 100644 --- a/reactos/boot/freeldr/freeldr/windows/peloader.c +++ b/reactos/boot/freeldr/freeldr/windows/peloader.c @@ -405,7 +405,7 @@ WinLdrLoadImage(IN PCHAR FileName, /* Size of data is less than the virtual size - fill up the remainder with zeroes */ if (SizeOfRawData < VirtualSize) { - DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d", SizeOfRawData, VirtualSize)); + DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize)); RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); } diff --git a/reactos/boot/freeldr/freeldr/windows/wlmemory.c b/reactos/boot/freeldr/freeldr/windows/wlmemory.c index 8156f96a0b1..9720929fdd1 100644 --- a/reactos/boot/freeldr/freeldr/windows/wlmemory.c +++ b/reactos/boot/freeldr/freeldr/windows/wlmemory.c @@ -133,13 +133,15 @@ MempAllocatePageTables() TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; // PDE+HAL+KernelPTEs == MemoryData - Buffer = MmAllocateMemoryWithType( - TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); + Buffer = MmAllocateMemoryWithType(TotalSize, LoaderMemoryData); // Physical PTEs = FirmwareTemporary - PhysicalPageTablesBuffer = MmAllocateMemoryWithType( - NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); + PhysicalPageTablesBuffer = (PUCHAR)Buffer + TotalSize - NumPageTables*MM_PAGE_SIZE; + MmSetMemoryType(PhysicalPageTablesBuffer, + NumPageTables*MM_PAGE_SIZE, + LoaderFirmwareTemporary); + // This check is now redundant if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != PhysicalPageTablesBuffer) { diff --git a/reactos/config-arm.template.rbuild b/reactos/config-arm.template.rbuild index 68f76047b35..1103510d243 100644 --- a/reactos/config-arm.template.rbuild +++ b/reactos/config-arm.template.rbuild @@ -22,14 +22,20 @@ + + + + + + + + + + +