diff --git a/compiler/errore.msg b/compiler/errore.msg
index a94062399a..ffea903d48 100644
--- a/compiler/errore.msg
+++ b/compiler/errore.msg
@@ -156,9 +156,9 @@ scan_n_far_directive_ignored=02006_N_$F directive (FAR) ignored
 scan_n_stack_check_global_under_linux=02007_N_Stack check is global under Linux
 % Stack checking with the \var{-Cs} switch is ignored under \linux, since
 % \linux does this for you. Only displayed when \var{-vn} is used.
-scan_n_ignored_switch=02008_N_Ignored compiler switch $1
+scan_n_ignored_switch=02008_N_Ignored compiler switch "$1"
 % With \var{-vn} on, the compiler warns if it ignores a switch
-scan_w_illegal_switch=02009_W_Illegal compiler switch $1
+scan_w_illegal_switch=02009_W_Illegal compiler switch "$1"
 % You included a compiler switch (i.e. \var{\{\$... \}}) which the compiler
 % doesn't know.
 scan_w_switch_is_global=02010_W_This compiler switch has a global effect
@@ -246,17 +246,17 @@ scan_i_press_enter=02040_I_Press <return> to continue
 % When the \var{-vi} switch is used, the compiler stops compilation
 % and waits for the \var{Enter} key to be pressed when it encounters
 % a \var{\{\$STOP\}} directive.
-scan_w_unsupported_switch=02041_W_Unsupported switch $1
+scan_w_unsupported_switch=02041_W_Unsupported switch "$1"
 % When warings are turned on (\var{-vw}) the compiler warns you about
 % unsupported switches. This means that the switch is used in Delphi or
 % Turbo Pascal, but not in \fpc
-scan_w_illegal_directive=02042_W_Illegal compiler directive $1
+scan_w_illegal_directive=02042_W_Illegal compiler directive "$1"
 % When warings are turned on (\var{-vw}) the compiler warns you about
 % unrecognised switches. For a list of recognised switches, \progref
 scan_t_back_in=02043_T_Back in $1
 % When you use (\var{-vt}) the compiler tells you when it has finished
 % reading an include file.
-scan_w_unsupported_app_type=02044_W_Unsupported application type: $1
+scan_w_unsupported_app_type=02044_W_Unsupported application type: "$1"
 % You get this warning, ff you specify an unknown application type
 % with the directive \var{\{\$APPTYPE\}}
 scan_w_app_type_not_support=02045_W_APPTYPE isn't support by the target OS
@@ -267,13 +267,13 @@ scan_n_version_not_support=02047_N_VERSION is not supported by target OS.
 % The \var{\{\$VERSION\}} directive is only supported by win32 target.
 scan_n_only_exe_version=02048_N_VERSION only for exes or DLLs
 % The \var{\{\$VERSION\}} directive is only used for executable or DLL sources.
-scan_w_wrong_version_ignored=02049_W_Wrong format for VERSION directive $1
+scan_w_wrong_version_ignored=02049_W_Wrong format for VERSION directive "$1"
 % The \var{\{\$VERSION\}} directive format is majorversion.minorversion
 % where majorversion and minorversion are words.
-scan_w_unsupported_asmmode_specifier=02050_W_Unsupported assembler style specified $1
+scan_w_unsupported_asmmode_specifier=02050_W_Unsupported assembler style specified "$1"
 % When you specify an assembler mode with the \var{\{\$ASMMODE xxx\}}
 % the compiler didn't recognize the mode you specified.
-scan_w_no_asm_reader_switch_inside_asm=02051_W_ASM reader switch is not possible inside asm statement, $1 will be effective only for next
+scan_w_no_asm_reader_switch_inside_asm=02051_W_ASM reader switch is not possible inside asm statement, "$1" will be effective only for next
 % It is not possible to switch from one assembler reader to another
 % inside an assmebler block. The new reader will be used for next
 % assembler statement only.
@@ -318,15 +318,15 @@ parser_w_proc_interrupt_ignored=03003_W_Procedure type INTERRUPT ignored for not
 % and is ignored for other processors.
 parser_e_dont_nest_interrupt=03004_E_INTERRUPT procedure can't be nested
 % An \var{INTERRUPT} procedure must be global.
-parser_w_proc_directive_ignored=03005_W_Procedure type $1 ignored
+parser_w_proc_directive_ignored=03005_W_Procedure type "$1" ignored
 % This is a warning. \var{REGISTER},\var{REINTRODUCE} is ignored by FPC programs for now.
 % This is introduced first for Delphi compatibility.
-parser_e_no_overload_for_all_procs=03006_E_Not all declarations of $1 are declared with OVERLOAD
+parser_e_no_overload_for_all_procs=03006_E_Not all declarations of "$1" are declared with OVERLOAD
 % When you want to use overloading using the \var{OVERLOAD} directive, then
 % all declarations need to have \var{OVERLOAD} specified.
 parser_e_no_dll_file_specified=03007_E_No DLL File specified
 % No longer in use.
-parser_e_export_name_double=03008_E_Duplicate exported function name $1
+parser_e_export_name_double=03008_E_Duplicate exported function name "$1"
 % Exported function names inside a specific DLL must all be different
 parser_e_export_ordinal_double=03009_E_Duplicate exported function index $1
 % Exported function names inside a specific DLL must all be different
@@ -371,27 +371,27 @@ parser_f_no_anonym_objects=03022_F_Anonym class definitions are not allowed
 %          end;
 % \end{verbatim}
 % will trigger this error.
-parser_object_has_no_vmt=03023_E_The object $1 has no VMT
+parser_object_has_no_vmt=03023_E_The object "$1" has no VMT
 parser_e_illegal_parameter_list=03024_E_Illegal parameter list
 % You are calling a function with parameters that are of a different type than
 % the declared parameters of the function.
-parser_e_wrong_parameter_type=03025_E_Wrong parameter type specified for arg no. $1
+parser_e_wrong_parameter_type=03025_E_Wrong parameter type specified for arg no. "$1"
 % There is an error in the parameter list of the function or procedure.
 % The compiler cannot determine the error more accurate than this.
 parser_e_wrong_parameter_size=03026_E_Wrong amount of parameters specified
 % There is an error in the parameter list of the function or procedure,
 % the number of parameters is not correct.
-parser_e_overloaded_no_procedure=03027_E_overloaded identifier $1 isn't a function
+parser_e_overloaded_no_procedure=03027_E_overloaded identifier "$1" isn't a function
 % The compiler encountered a symbol with the same name as an overloaded
 % function, but it isn't a function it can overload.
 parser_e_overloaded_have_same_parameters=03028_E_overloaded functions have the same parameter list
 % You're declaring overloaded functions, but with the same parameter list.
 % Overloaded function must have at least 1 different parameter in their
 % declaration.
-parser_e_header_dont_match_forward=03029_E_function header doesn't match the forward declaration $1
+parser_e_header_dont_match_forward=03029_E_function header doesn't match the forward declaration "$1"
 % You declared a function with same parameters but
 % different result type or function modifiers.
-parser_e_header_different_var_names=03030_E_function header $1 doesn't match forward : var name changes $2 => $3
+parser_e_header_different_var_names=03030_E_function header "$1" doesn't match forward : var name changes $2 => $3
 % You declared the function in the \var{interface} part, or with the
 % \var{forward} directive, but define it with a different parameter list.
 parser_n_duplicate_enum=03031_N_Values in enumeration types have to be ascending
@@ -403,7 +403,7 @@ parser_n_duplicate_enum=03031_N_Values in enumeration types have to be ascending
 % \end{verbatim}
 % The second declaration would produce an error. \var{A\_UAS} needs to have a
 % value higher than \var{A\_E}, i.e. at least 7.
-parser_n_interface_name_diff_implementation_name=03032_N_Interface and implementation names are different $1 => $2
+parser_n_interface_name_diff_implementation_name=03032_N_Interface and implementation names are different "$1" => "$2"
 % This note warns you if the implementation and interface names of a
 % functions are different, but they have the same mangled name. This
 % is important when using overloaded functions (but should produce no error).
@@ -453,7 +453,7 @@ parser_e_methode_id_expected=03047_E_method identifier expected
 % This happens when the compiler scans a procedure declaration that contains
 % a dot, i.e., a object or class method, but the procedure name is not a
 % procedure of this type.
-parser_e_header_dont_match_any_member=03048_E_function header doesn't match any method of this class $1
+parser_e_header_dont_match_any_member=03048_E_function header doesn't match any method of this class "$1"
 % This identifier is not a method.
 % This happens when the compiler scans a procedure declaration that contains
 % a dot, i.e., a object or class method, but the procedure name is not a
@@ -498,12 +498,12 @@ parser_e_case_mismatch=03055_E_Constant and CASE types do not match
 parser_e_illegal_symbol_exported=03056_E_The symbol can't be exported from a library
 % You can only export procedures and functions when you write a library. You
 % cannot export variables or constants.
-parser_w_should_use_override=03057_W_An inherited method is hidden by $1
+parser_w_should_use_override=03057_W_An inherited method is hidden by "$1"
 % A method that is declared \var{virtual} in a parent class, should be
 % overridden in the descendent class with the \var{override} directive. If you
 % don't specify the \var{override} directive, you will hide the parent method;
 % you will not override it.
-parser_e_nothing_to_be_overridden=03058_E_There is no method in an ancestor class to be overridden: $1
+parser_e_nothing_to_be_overridden=03058_E_There is no method in an ancestor class to be overridden: "$1"
 % You try to \var{override} a virtual method of a parent class that doesn't
 % exist.
 parser_e_no_procedure_to_access_property=03059_E_No member is provided to access property
@@ -528,13 +528,13 @@ parser_e_cant_access_private_member=03063_E_Cannot access a private field of an
 % Fields that are declared in a \var{private} section of an object or class
 % declaration cannot be accessed outside the module where the class is
 % defined.
-parser_w_overloaded_are_not_both_virtual=03064_W_overloaded method of virtual method should be virtual: $1
+parser_w_overloaded_are_not_both_virtual=03064_W_overloaded method of virtual method should be virtual: "$1"
 % If you declare overloaded methods in a class, then they should either all be
 % virtual, or none. You shouldn't mix them.
-parser_w_overloaded_are_not_both_non_virtual=03065_W_overloaded method of non-virtual method should be non-virtual: $1
+parser_w_overloaded_are_not_both_non_virtual=03065_W_overloaded method of non-virtual method should be non-virtual: "$1"
 % If you declare overloaded methods in a class, then they should either all be
 % virtual, or none. You shouldn't mix them.
-parser_e_overloaded_methodes_not_same_ret=03066_E_overloaded methods which are virtual must have the same return type: $1
+parser_e_overloaded_methodes_not_same_ret=03066_E_overloaded methods which are virtual must have the same return type: "$1"
 % If you declare virtual overloaded methods in a class definition, they must
 % have the same return type.
 parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested
@@ -543,7 +543,7 @@ parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested
 parser_e_methods_dont_be_export=03068_E_methods can't be EXPORTed
 % You cannot declare a procedure that is a method for an object as
 % \var{export}ed. That is, your methods cannot be called from a C program.
-parser_e_call_by_ref_without_typeconv=03069_E_call by var parameters have to match exactly: Got $1 expected $2
+parser_e_call_by_ref_without_typeconv=03069_E_call by var parameters have to match exactly: Got "$1" expected "$2"
 % When calling a function declared with \var{var} parameters, the variables in
 % the function call must be of exactly the same type. There is no automatic
 % type conversion.
@@ -627,7 +627,7 @@ parser_f_unsupported_feature=03092_F_Use of unsupported feature!
 parser_e_mix_of_classes_and_objects=03093_E_The mix of CLASSES and OBJECTS isn't allowed
 % You cannot derive \var{objects} and \var{classes} intertwined . That is,
 % a class cannot have an object as parent and vice versa.
-parser_w_unknown_proc_directive_ignored=03094_W_Unknown procedure directive had to be ignored: $1
+parser_w_unknown_proc_directive_ignored=03094_W_Unknown procedure directive had to be ignored: "$1"
 % The procedure direcive you secified is unknown. Recognised procedure
 % directives are \var{cdecl}, \var{stdcall}, \var{popstack}, \var{pascal}
 % \var{register}, \var{export}.
@@ -665,7 +665,7 @@ parser_e_abstract_no_definition=03098_E_Abstract methods shouldn't have any defi
 parser_e_overloaded_must_be_all_global=03099_E_This overloaded function can't be local (must be exported)
 % You are defining a overloaded function in the implementation part of a unit,
 % but there is no corresponding declaration in the interface part of the unit.
-parser_w_virtual_without_constructor=03100_W_Virtual methods are used without a constructor in $1
+parser_w_virtual_without_constructor=03100_W_Virtual methods are used without a constructor in "$1"
 % If you declare objects or classes that contain virtual methods, you need
 % to have a constructor and destructor to initialize them. The compiler
 % encountered an object or class with virtual methods that doesn't have
@@ -693,7 +693,7 @@ parser_e_no_paras_allowed=03108_E_Array properties aren't allowed here
 parser_e_no_property_found_to_override=03109_E_No property found to override
 % You want to overrride a property of a parent class, when there is, in fact,
 % no such property in the parent class.
-parser_e_only_one_default_property=03110_E_Only one default property is allowed, found inherited default property in class $1
+parser_e_only_one_default_property=03110_E_Only one default property is allowed, found inherited default property in class "$1"
 % You specified a property as \var{Default}, but a parent class already has a
 % default property, and a class can have only one default property.
 parser_e_property_need_paras=03111_E_The default property must be an array property
@@ -708,7 +708,7 @@ parser_e_cant_have_published=03114_E_The class can't have a published section, u
 % If you want a \var{published} section in a class definition, you must
 % use the \var{\{\$M+\}} switch, whch turns on generation of type
 % information.
-parser_e_forward_declaration_must_be_resolved=03115_E_Forward declaration of class $1 must be resolved here to use the class as ancestor
+parser_e_forward_declaration_must_be_resolved=03115_E_Forward declaration of class "$1" must be resolved here to use the class as ancestor
 % To be able to use an object as an ancestor object, it must be defined
 % first. This error occurs in the following situation:
 % \begin{verbatim}
@@ -721,16 +721,16 @@ parser_e_forward_declaration_must_be_resolved=03115_E_Forward declaration of cla
 parser_e_no_local_operator=03116_E_Local operators not supported
 % You cannot overload locally, i.e. inside procedures or function
 % definitions.
-parser_e_proc_dir_not_allowed_in_interface=03117_E_Procedure directive $1 not allowed in interface section
+parser_e_proc_dir_not_allowed_in_interface=03117_E_Procedure directive "$1" not allowed in interface section
 % This procedure directive is not allowed in the \var{interface} section of
 % a unit. You can only use it in the \var{implementation} section.
-parser_e_proc_dir_not_allowed_in_implementation=03118_E_Procedure directive $1 not allowed in implementation section
+parser_e_proc_dir_not_allowed_in_implementation=03118_E_Procedure directive "$1" not allowed in implementation section
 % This procedure directive is not defined in the \var{implementation} section of
 % a unit. You can only use it in the \var{interface} section.
-parser_e_proc_dir_not_allowed_in_procvar=03119_E_Procedure directive $1 not allowed in procvar declaration
+parser_e_proc_dir_not_allowed_in_procvar=03119_E_Procedure directive "$1" not allowed in procvar declaration
 % This procedure directive cannot be part of a procedural or function
 % type declaration.
-parser_e_function_already_declared_public_forward=03120_E_Function is already declared Public/Forward $1
+parser_e_function_already_declared_public_forward=03120_E_Function is already declared Public/Forward "$1"
 % You will get this error if a function is defined as \var{forward} twice.
 % Or it is once in the \var{interface} section, and once as a \var{forward}
 % declaration in the \var{implmentation} section.
@@ -738,7 +738,7 @@ parser_e_not_external_and_export=03121_E_Can't use both EXPORT and EXTERNAL
 % These two procedure directives are mutually exclusive
 parser_e_name_keyword_expected=03122_E_NAME keyword expected
 % The definition of an external variable needs a \var{name} clause.
-parser_w_not_supported_for_inline=03123_W_$1 not yet supported inside inline procedure/function
+parser_w_not_supported_for_inline=03123_W_"$1" not yet supported inside inline procedure/function
 % Inline procedures don't support this declaration.
 parser_w_inlining_disabled=03124_W_Inlining disabled
 % Inlining of procedures is disabled.
@@ -751,7 +751,7 @@ parser_f_assembler_reader_not_supported=03127_F_Selected assembler reader not su
 % The selected assembler reader (with \var{\{\$ASMMODE xxx\}} is not
 % supported. The compiler can be compiled with or without support for a
 % particular assembler reader.
-parser_e_proc_dir_conflict=03128_E_Procedure directive $1 has conflicts with other directives
+parser_e_proc_dir_conflict=03128_E_Procedure directive "$1" has conflicts with other directives
 % You specified a procedure directive that conflicts with other directives.
 % for instance \var{cdecl} and \var{pascal} are mutually exclusive.
 parser_e_call_convention_dont_match_forward=03129_E_Calling convention doesn't match forward
@@ -791,7 +791,7 @@ parser_e_invalid_float_operation=03139_E_Invalid floating point operation
 parser_e_array_lower_less_than_upper_bound=03140_E_Upper bound of range is less than lower bound
 % The upper bound of a \var{case} label is less than the lower bound and this
 % is not possible
-parser_w_string_too_long=03141_W_string "$1" is longer than $2
+parser_w_string_too_long=03141_W_string "$1" is longer than "$2"
 % The size of the constant string is larger than the size you specified in
 % string type definition
 parser_e_string_larger_array=03142_E_string length is larger than array of char length
@@ -803,7 +803,7 @@ parser_e_ill_msg_param=03144_E_Message handlers can take only one call by ref. p
 % A method declared with the \var{message}-directive as message handler
 % can take only one parameter which must be declared as call by reference
 % Parameters are declared as call by reference using the \var{var}-directive
-parser_e_duplicate_message_label=03145_E_Duplicate message label: $1
+parser_e_duplicate_message_label=03145_E_Duplicate message label: "$1"
 % A label for a message is used twice in one object/class
 parser_e_self_in_non_message_handler=03146_E_Self can be only an explicit parameter in message handlers
 % The self parameter can be passed only explicitly in a method which
@@ -905,7 +905,7 @@ type_e_incompatible_types=04001_E_Incompatible types: got "$1" expected "$2"
 %              is due the strict type checking of pascal }
 % End.
 % \end{verbatim}
-type_e_not_equal_types=04002_E_Type mismatch between $1 and $2
+type_e_not_equal_types=04002_E_Type mismatch between "$1" and "$2"
 % The types are not equal
 type_e_type_id_expected=04003_E_Type identifier expected
 % The identifier is not a type, or you forgot to supply a type identifier.
@@ -982,10 +982,10 @@ type_w_maybe_wrong_hi_lo=04022_W_lo/hi(dword/qword) returns the upper/lower word
 % to type cast the argument to \var{word/integer}
 type_e_integer_or_real_expr_expected=04023_E_Integer or real expression expected
 % The first argument to \var{str} must a real or integer type.
-type_e_wrong_type_in_array_constructor=04024_E_Wrong type $1 in array constructor
+type_e_wrong_type_in_array_constructor=04024_E_Wrong type "$1" in array constructor
 % You are trying to use a type in an array constructor which is not
 % allowed.
-type_e_wrong_parameter_type=04025_E_Incompatible type for arg no. $1: Got $2, expected $3
+type_e_wrong_parameter_type=04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"
 % You are trying to pass an invalid type for the specified parameter.
 type_e_no_method_and_procedure_not_compatible=04026_E_Method (variable) and Procedure (variable) are not compatible
 % You can't assign a method to a procedure variable or a procedure to a
@@ -1024,7 +1024,7 @@ type_e_array_required=04033_E_Array type required
 % This section lists all the messages that concern the handling of symbols.
 % This means all things that have to do with procedure and variable names.
 % \begin{description}
-sym_e_id_not_found=05000_E_Identifier not found $1
+sym_e_id_not_found=05000_E_Identifier not found "$1"
 % The compiler doesn't know this symbol. Usually happens when you misspel
 % the name of a variable or procedure, or when you forgot to declare a
 % variable.
@@ -1032,14 +1032,14 @@ sym_f_internal_error_in_symtablestack=05001_F_Internal Error in SymTableStack()
 % An internal error occurred in the compiler; If you encounter such an error,
 % please contact the developers and try to provide  an exact description of
 % the circumstances in which the error occurs.
-sym_e_duplicate_id=05002_E_Duplicate identifier $1
+sym_e_duplicate_id=05002_E_Duplicate identifier "$1"
 % The identifier was already declared in the current scope.
 sym_h_duplicate_id_where=05003_H_Identifier already defined in $1 at line $2
 % The identifier was already declared in a previous scope.
-sym_e_unknown_id=05004_E_Unknown identifier $1
+sym_e_unknown_id=05004_E_Unknown identifier "$1"
 % The identifier encountered hasn't been declared, or is used outside the
 % scope where it's defined.
-sym_e_forward_not_resolved=05005_E_Forward declaration not solved $1
+sym_e_forward_not_resolved=05005_E_Forward declaration not solved "$1"
 % This can happen in two cases:
 % \begin{itemize}
 % \item This happens when you declare a function (in the \var{interface} part, or
@@ -1055,7 +1055,7 @@ sym_e_error_in_type_def=05007_E_Error in type definition
 % For example, \var{Array [1..1.25]} will trigger this error.
 sym_e_type_id_not_defined=05008_E_Type identifier not defined
 % The type identifier has not been defined yet.
-sym_e_forward_type_not_resolved=05009_E_Forward type not resolved $1
+sym_e_forward_type_not_resolved=05009_E_Forward type not resolved "$1"
 % A symbol was forward defined, but no declaration was encountered.
 sym_e_only_static_in_static=05010_E_Only static variables can be used in static methods or outside methods
 % A static method of an object can only access static variables.
@@ -1068,9 +1068,9 @@ sym_f_type_must_be_rec_or_class=05012_F_record or class type expected
 sym_e_no_instance_of_abstract_object=05013_E_Instances of classes or objects with an abstract method are not allowed
 % You are trying to generate an instance of a class which has an abstract
 % method that wasn't overridden.
-sym_w_label_not_defined=05014_W_Label not defined $1
+sym_w_label_not_defined=05014_W_Label not defined "$1"
 % A label was declared, but not defined.
-sym_e_label_used_and_not_defined=05015_E_Label used but not defined $1
+sym_e_label_used_and_not_defined=05015_E_Label used but not defined "$1"
 % A label was declared and used, but not defined.
 sym_e_ill_label_decl=05016_E_Illegal label declaration
 % This error should never happen; it occurs if a label is defined outside a
@@ -1087,27 +1087,27 @@ sym_e_label_already_defined=05020_E_label already defined
 % You are defining a label twice. You can define a label only once.
 sym_e_ill_type_decl_set=05021_E_illegal type declaration of set elements
 % The declaration of a set contains an invalid type definition.
-sym_e_class_forward_not_resolved=05022_E_Forward class definition not resolved $1
+sym_e_class_forward_not_resolved=05022_E_Forward class definition not resolved "$1"
 % You declared a class, but you didn't implement it.
-sym_n_unit_not_used=05023_H_Unit $1 not used in $2
+sym_n_unit_not_used=05023_H_Unit "$1" not used in $2
 % The unit referenced in the \var{uses} clause is not used.
-sym_h_para_identifier_not_used=05024_H_Parameter $1 not used
+sym_h_para_identifier_not_used=05024_H_Parameter "$1" not used
 % This is a warning. The identifier was declared (locally or globally) but
 % wasn't used (locally or globally).
-sym_n_local_identifier_not_used=05025_N_Local variable $1 not used
+sym_n_local_identifier_not_used=05025_N_Local variable "$1" not used
 % You have declared, but not used a variable in a procedure or function
 % implementation.
-sym_h_para_identifier_only_set=05026_H_Value parameter $1 is assigned but never used
+sym_h_para_identifier_only_set=05026_H_Value parameter "$1" is assigned but never used
 % This is a warning. The identifier was declared (locally or globally)
 % set but not used (locally or globally).
-sym_n_local_identifier_only_set=05027_N_Local variable $1 is assigned but never used
+sym_n_local_identifier_only_set=05027_N_Local variable "$1" is assigned but never used
 % The variable in a procedure or function
 % implementation is declared, set but never used.
-sym_h_local_symbol_not_used=05028_H_Local $1 $2 is not used
+sym_h_local_symbol_not_used=05028_H_Local $1 "$2" is not used
 % A local symbol is never used.
-sym_n_private_identifier_not_used=05029_N_Private field $1.$2 is never used
-sym_n_private_identifier_only_set=05030_N_Private field $1.$2 is assigned but never used
-sym_n_private_method_not_used=05031_N_Private method $1.$2 never used
+sym_n_private_identifier_not_used=05029_N_Private field "$1.$2" is never used
+sym_n_private_identifier_only_set=05030_N_Private field "$1.$2" is assigned but never used
+sym_n_private_method_not_used=05031_N_Private method "$1.$2" never used
 sym_e_set_expected=05032_E_Set type expected
 % The variable or expression isn't of type \var{set}. This happens in an
 % \var{in} statement.
@@ -1115,18 +1115,18 @@ sym_w_function_result_not_set=05033_W_Function result does not seem to be set
 % You can get this warning if the compiler thinks that a function return
 % value is not set. This will not be displayed for assembler procedures,
 % or procedures that contain assembler blocks.
-sym_w_wrong_C_pack=05034_W_Type $1 is not aligned correctly in current record for C
+sym_w_wrong_C_pack=05034_W_Type "$1" is not aligned correctly in current record for C
 % Arrays with sizes not multiples of 4 will be wrongly aligned
 % for C structures.
-sym_e_illegal_field=05035_E_Unknown record field identifier $1
+sym_e_illegal_field=05035_E_Unknown record field identifier "$1"
 % The field doesn't exist in the record definition.
-sym_n_uninitialized_local_variable=05036_W_Local variable $1 does not seem to be initialized
-sym_n_uninitialized_variable=05037_W_Variable $1 does not seem to be initialized
+sym_n_uninitialized_local_variable=05036_W_Local variable "$1" does not seem to be initialized
+sym_n_uninitialized_variable=05037_W_Variable "$1" does not seem to be initialized
 % These messages are displayed if the compiler thinks that a variable will
 % be used (i.e. appears in the right-hand-side of an expression) when it
 % wasn't initialized first (i.e. appeared in the left-hand side of an
 % assigment)
-sym_e_id_no_member=05038_E_identifier idents no member $1
+sym_e_id_no_member=05038_E_identifier idents no member "$1"
 % When using the extended syntax of \var{new}, you must specify the constructor
 % method of the class you are trying to create. The procedure you specified
 % does not exist.
@@ -1258,7 +1258,7 @@ cg_e_unable_inline_procvar=06032_E_Procvar calls can't be inline.
 % A procedure with a procedural variable call cannot be inlined.
 cg_e_no_code_for_inline_stored=06033_E_No code for inline procedure stored
 % The compiler couldn't store code for the inline procedure.
-cg_e_no_call_to_interrupt=06034_E_Direct call of interrupt procedure $1 is not possible
+cg_e_no_call_to_interrupt=06034_E_Direct call of interrupt procedure "$1" is not possible
 % You can not call an interrupt procedure directly from FPC code
 cg_e_can_access_element_zero=06035_E_Element zero of an ansi/wide- or longstring can't be accessed, use (set)length instead
 % You should use \var{setlength} to set the length of an ansi/wide/longstring
diff --git a/compiler/msgidx.inc b/compiler/msgidx.inc
index 2e8b0a33f7..af713b542f 100644
--- a/compiler/msgidx.inc
+++ b/compiler/msgidx.inc
@@ -557,7 +557,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 31078;
+  MsgTxtSize = 31210;
 
   MsgIdxMax : array[1..20] of longint=(
     17,58,165,34,41,41,86,14,35,40,
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index bcdef20110..e8757806b6 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000129] of string[240]=(
+const msgtxt : array[0..000130] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000129,1..240] of char=(
+const msgtxt : array[0..000130,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -28,30 +28,30 @@ const msgtxt : array[0..000129,1..240] of char=(
   '02005_W_Comment level $1 found'#000+
   '02006_N_$F directive (FAR) ignored'#000+
   '02007_N_Stack check is global ','under Linux'#000+
-  '02008_N_Ignored compiler switch $1'#000+
-  '02009_W_Illegal compiler switch $1'#000+
+  '02008_N_Ignored compiler switch "$1"'#000+
+  '02009_W_Illegal compiler switch "$1"'#000+
   '02010_W_This compiler switch has a global effect'#000+
   '02011_E_Illegal char constant'#000+
   '02012_F_Can'#039't open file $1'#000+
   '02013_F_Can'#039't open include file $1'#000+
-  '02014_E_Too many ','$ENDIFs or $ELSEs'#000+
+  '02014_E_Too m','any $ENDIFs or $ELSEs'#000+
   '02015_W_Records fields can be aligned to 1,2,4,8,16 or 32 bytes only'#000+
   '02016_W_Enumerated can be saved in 1,2 or 4 bytes only'#000+
   '02017_E_$ENDIF expected for $1 $2 defined in line $3'#000+
-  '02018_E_Syntax error while parsing a conditio','nal compiling expressio'+
+  '02018_E_Syntax error while parsing a cond','itional compiling expressio'+
   'n'#000+
   '02019_E_Evaluating a conditional compiling expression'#000+
   '02020_W_Macro contents is cut after char 255 to evalute expression'#000+
   '02021_E_ENDIF without IF(N)DEF'#000+
   '02022_F_User defined: $1'#000+
   '02023_E_User defined: $1'#000+
-  '02024_W_User ','defined: $1'#000+
+  '02024_W_U','ser defined: $1'#000+
   '02025_N_User defined: $1'#000+
   '02026_H_User defined: $1'#000+
   '02027_I_User defined: $1'#000+
   '02028_E_Keyword redefined as macro has no effect'#000+
   '02029_F_Macro buffer overflow while reading or expanding a macro'#000+
-  '02030_W_Extension of macros exceeds a d','eep of 16.'#000+
+  '02030_W_Extension of macros exceeds',' a deep of 16.'#000+
   '02031_E_compiler switches aren'#039't allowed in (* ... *) styled comme'+
   'nts'#000+
   '02032_D_Handling switch "$1"'#000+
@@ -59,707 +59,713 @@ const msgtxt : array[0..000129,1..240] of char=(
   '02034_C_IFDEF $1 found, $2'#000+
   '02035_C_IFOPT $1 found, $2'#000+
   '02036_C_IF $1 found, $2'#000+
-  '02037_C_IFNDEF $1 found, $2'#000+
-  '0','2038_C_ELSE $1 found, $2'#000+
+  '02037_C_IFNDEF $1 found, ','$2'#000+
+  '02038_C_ELSE $1 found, $2'#000+
   '02039_C_Skipping until...'#000+
   '02040_I_Press <return> to continue'#000+
-  '02041_W_Unsupported switch $1'#000+
-  '02042_W_Illegal compiler directive $1'#000+
+  '02041_W_Unsupported switch "$1"'#000+
+  '02042_W_Illegal compiler directive "$1"'#000+
   '02043_T_Back in $1'#000+
-  '02044_W_Unsupported application type: $1'#000+
-  '02045_W_APPTYPE isn'#039't supp','ort by the target OS'#000+
+  '02044_W_Unsupported application type: "$1"'#000+
+  '02045_W_APPTYPE ','isn'#039't support by the target OS'#000+
   '02046_W_DESCRIPTION is only supported for OS2 and Win32'#000+
   '02047_N_VERSION is not supported by target OS.'#000+
   '02048_N_VERSION only for exes or DLLs'#000+
-  '02049_W_Wrong format for VERSION directive $1'#000+
-  '02050_W_Unsupported assembler st','yle specified $1'#000+
-  '02051_W_ASM reader switch is not possible inside asm statement, $1 wil'+
-  'l be effective only for next'#000+
+  '02049_W_Wrong format for VERSION directive "$1"'#000+
+  '02050_W_Unsupported ','assembler style specified "$1"'#000+
+  '02051_W_ASM reader switch is not possible inside asm statement, "$1" w'+
+  'ill be effective only for next'#000+
   '02052_E_Wrong switch toggle, use ON/OFF or +/-'#000+
   '02053_E_Resource files are not supported for this target'#000+
-  '02054_W_Include envi','ronment $1 not found in environment'#000+
+  '0205','4_W_Include environment $1 not found in environment'#000+
   '02055_E_Illegal value for FPU register limit'#000+
   '02056_W_Only one resource file is supported for this target'#000+
   '02057_W_Macro support has been turned off'#000+
   '03000_E_Parser - Syntax Error'#000+
-  '03001_W_Procedure type FAR ','ignored'#000+
+  '03001_W_Pro','cedure type FAR ignored'#000+
   '03002_W_Procedure type NEAR ignored'#000+
   '03003_W_Procedure type INTERRUPT ignored for not i386'#000+
   '03004_E_INTERRUPT procedure can'#039't be nested'#000+
-  '03005_W_Procedure type $1 ignored'#000+
-  '03006_E_Not all declarations of $1 are declared with OVERLOAD'#000+
-  '03','007_E_No DLL File specified'#000+
-  '03008_E_Duplicate exported function name $1'#000+
+  '03005_W_Procedure type "$1" ignored'#000+
+  '03006_E_Not all declarations of "$1" are decla','red with OVERLOAD'#000+
+  '03007_E_No DLL File specified'#000+
+  '03008_E_Duplicate exported function name "$1"'#000+
   '03009_E_Duplicate exported function index $1'#000+
   '03010_E_Invalid index for exported function'#000+
-  '03011_W_Relocatable DLL or executable $1 debug info does not work, dis'+
-  'abled.'#000+
-  '03','012_W_To allow debugging for win32 code you need to disable reloca'+
-  'tion with -WN option'#000+
+  '03011_W_Relocatable DLL or executable $1 debug info does ','not work, d'+
+  'isabled.'#000+
+  '03012_W_To allow debugging for win32 code you need to disable relocati'+
+  'on with -WN option'#000+
   '03013_E_Constructor name must be INIT'#000+
   '03014_E_Destructor name must be DONE'#000+
   '03015_E_Illegal open parameter'#000+
-  '03016_E_Procedure type INLINE not supported'#000+
-  '030','17_W_Private methods shouldn'#039't be VIRTUAL'#000+
+  '03016_E_Procedure type IN','LINE not supported'#000+
+  '03017_W_Private methods shouldn'#039't be VIRTUAL'#000+
   '03018_W_Constructor should be public'#000+
   '03019_W_Destructor should be public'#000+
   '03020_N_Class should have one destructor only'#000+
   '03021_E_Local class definitions are not allowed'#000+
-  '03022_F_Anonym class definition','s are not allowed'#000+
-  '03023_E_The object $1 has no VMT'#000+
+  '03022_F_A','nonym class definitions are not allowed'#000+
+  '03023_E_The object "$1" has no VMT'#000+
   '03024_E_Illegal parameter list'#000+
-  '03025_E_Wrong parameter type specified for arg no. $1'#000+
+  '03025_E_Wrong parameter type specified for arg no. "$1"'#000+
   '03026_E_Wrong amount of parameters specified'#000+
-  '03027_E_overloaded identifier $1 isn'#039't a function'#000+
-  '03028_E_o','verloaded functions have the same parameter list'#000+
-  '03029_E_function header doesn'#039't match the forward declaration $1'#000+
-  '03030_E_function header $1 doesn'#039't match forward : var name change'+
-  's $2 => $3'#000+
-  '03031_N_Values in enumeration types have to be as','cending'#000+
-  '03032_N_Interface and implementation names are different $1 => $2'#000+
+  '03027_E_overloaded identifier "$1','" isn'#039't a function'#000+
+  '03028_E_overloaded functions have the same parameter list'#000+
+  '03029_E_function header doesn'#039't match the forward declaration "$1"'+
+  #000+
+  '03030_E_function header "$1" doesn'#039't match forward : var name chan'+
+  'ges $2 => $3'#000+
+  '03031_N_Values in',' enumeration types have to be ascending'#000+
+  '03032_N_Interface and implementation names are different "$1" => "$2"'#000+
   '03033_E_With can not be used for variables in a different segment'#000+
   '03034_E_function nesting > 31'#000+
-  '03035_E_range check error while evaluating constants'#000+
-  '03036_W_range che','ck error while evaluating constants'#000+
+  '03035_E_range check error while ev','aluating constants'#000+
+  '03036_W_range check error while evaluating constants'#000+
   '03037_E_duplicate case label'#000+
   '03038_E_Upper bound of case range is less than lower bound'#000+
   '03039_E_typed constants of classes are not allowed'#000+
-  '03040_E_functions variables of overloaded functions are not allow','ed'#000+
+  '03040_E_functions variables o','f overloaded functions are not allowed'#000+
   '03041_E_string length must be a value from 1 to 255'#000+
   '03042_W_use extended syntax of NEW and DISPOSE for instances of object'+
   's'#000+
   '03043_W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+
-  '03044_E_use of NEW or DISPOSE is not possible f','or untyped pointers'#000+
+  '03044_E_use',' of NEW or DISPOSE is not possible for untyped pointers'#000+
   '03045_E_class identifier expected'#000+
   '03046_E_type identifier not allowed here'#000+
   '03047_E_method identifier expected'#000+
-  '03048_E_function header doesn'#039't match any method of this class $1'#000+
-  '03049_P_procedure/function $1'#000+
-  '03050_E_Illega','l floating point constant'#000+
+  '03048_E_function header doesn'#039't match any method of this class "$1'+
+  '"'#000+
+  '03049_','P_procedure/function $1'#000+
+  '03050_E_Illegal floating point constant'#000+
   '03051_E_FAIL can be used in constructors only'#000+
   '03052_E_Destructors can'#039't have parameters'#000+
   '03053_E_Only class methods can be referred with class references'#000+
-  '03054_E_Only class methods can be accessed in class methods'#000+
-  '0','3055_E_Constant and CASE types do not match'#000+
+  '03054_E_Only class meth','ods can be accessed in class methods'#000+
+  '03055_E_Constant and CASE types do not match'#000+
   '03056_E_The symbol can'#039't be exported from a library'#000+
-  '03057_W_An inherited method is hidden by $1'#000+
-  '03058_E_There is no method in an ancestor class to be overridden: $1'#000+
-  '03059_E_No member is provided t','o access property'#000+
+  '03057_W_An inherited method is hidden by "$1"'#000+
+  '03058_E_There is no method in an ancestor class to be overri','dden: "$'+
+  '1"'#000+
+  '03059_E_No member is provided to access property'#000+
   '03060_W_Stored prorperty directive is not yet implemented'#000+
   '03061_E_Illegal symbol for property access'#000+
   '03062_E_Cannot access a protected field of an object here'#000+
-  '03063_E_Cannot access a private field of an object here'#000+
-  '03064_W','_overloaded method of virtual method should be virtual: $1'#000+
+  '03063_E_Cannot access',' a private field of an object here'#000+
+  '03064_W_overloaded method of virtual method should be virtual: "$1"'#000+
   '03065_W_overloaded method of non-virtual method should be non-virtual:'+
-  ' $1'#000+
-  '03066_E_overloaded methods which are virtual must have the same return'+
-  ' type: $1'#000+
-  '03067_E_EXPORT declared fun','ctions can'#039't be nested'#000+
+  ' "$1"'#000+
+  '03066_E_overloaded methods which are virtual must have the sa','me retu'+
+  'rn type: "$1"'#000+
+  '03067_E_EXPORT declared functions can'#039't be nested'#000+
   '03068_E_methods can'#039't be EXPORTed'#000+
-  '03069_E_call by var parameters have to match exactly: Got $1 expected '+
-  '$2'#000+
+  '03069_E_call by var parameters have to match exactly: Got "$1" expecte'+
+  'd "$2"'#000+
   '03070_E_Class isn'#039't a parent class of the current class'#000+
-  '03071_E_SELF is only allowed in methods'#000+
-  '03072_E_method','s can be only in other methods called direct with type'+
-  ' identifier of the class'#000+
+  '03','071_E_SELF is only allowed in methods'#000+
+  '03072_E_methods can be only in other methods called direct with type i'+
+  'dentifier of the class'#000+
   '03073_E_Illegal use of '#039':'#039#000+
   '03074_E_range check error in set constructor or duplicate set element'#000+
-  '03075_E_Pointer to object expected'#000+
-  '03076_E_Expression must be co','nstructor call'#000+
+  '03075_E_Poin','ter to object expected'#000+
+  '03076_E_Expression must be constructor call'#000+
   '03077_E_Expression must be destructor call'#000+
   '03078_E_Illegal order of record elements'#000+
   '03079_E_Expression type must be class or record type'#000+
-  '03080_E_Procedures can'#039't return a value'#000+
-  '03081_E_constructors and destructors must be met','hods'#000+
+  '03080_E_Procedures can'#039't return a va','lue'#000+
+  '03081_E_constructors and destructors must be methods'#000+
   '03082_E_Operator is not overloaded'#000+
   '03083_E_Impossible to overload assignment for equal types'#000+
   '03084_E_Impossible operator overload'#000+
   '03085_E_Re-raise isn'#039't possible there'#000+
-  '03086_E_The extended syntax of new or dispose isn'#039't allowed for a '+
-  'c','lass'#000+
+  '03086_E_The ext','ended syntax of new or dispose isn'#039't allowed for '+
+  'a class'#000+
   '03087_E_Assembler incompatible with function return type'#000+
   '03088_E_Procedure overloading is switched off'#000+
   '03089_E_It is not possible to overload this operator (overload = inste'+
   'ad)'#000+
-  '03090_E_Comparative operator must return a boolean value'#000+
-  '0','3091_E_Only virtual methods can be abstract'#000+
+  '03090_','E_Comparative operator must return a boolean value'#000+
+  '03091_E_Only virtual methods can be abstract'#000+
   '03092_F_Use of unsupported feature!'#000+
   '03093_E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
-  '03094_W_Unknown procedure directive had to be ignored: $1'#000+
-  '03095_E_absolute can only be associated to ONE va','riable'#000+
+  '03094_W_Unknown procedure directive had to be ignored: ','"$1"'#000+
+  '03095_E_absolute can only be associated to ONE variable'#000+
   '03096_E_absolute can only be associated a var or const'#000+
   '03097_E_Only ONE variable can be initialized'#000+
   '03098_E_Abstract methods shouldn'#039't have any definition (with funct'+
   'ion body)'#000+
-  '03099_E_This overloaded function can'#039't be local (must be ','exporte'+
+  '030','99_E_This overloaded function can'#039't be local (must be exporte'+
   'd)'#000+
-  '03100_W_Virtual methods are used without a constructor in $1'#000+
+  '03100_W_Virtual methods are used without a constructor in "$1"'#000+
   '03101_M_Macro defined: $1'#000+
   '03102_M_Macro undefined: $1'#000+
   '03103_M_Macro $1 set to $2'#000+
   '03104_I_Compiling $1'#000+
-  '03105_U_Parsing interface of unit $1'#000+
-  '03106_U_Parsing implementation',' of $1'#000+
+  '03105_U_Par','sing interface of unit $1'#000+
+  '03106_U_Parsing implementation of $1'#000+
   '03107_D_Compiling $1 for the second time'#000+
   '03108_E_Array properties aren'#039't allowed here'#000+
   '03109_E_No property found to override'#000+
-  '03110_E_Only one default property is allowed, found inherited default '+
-  'property in class $1'#000+
-  '03111_E_The defaul','t property must be an array property'#000+
+  '03110_E_Only one default property is allowed, found i','nherited defaul'+
+  't property in class "$1"'#000+
+  '03111_E_The default property must be an array property'#000+
   '03112_E_Virtual constructors are only supported in class object model'#000+
   '03113_E_No default property available'#000+
-  '03114_E_The class can'#039't have a published section, use the {$M+} sw'+
-  'itch'#000+
-  '03115_E_Forward declarat','ion of class $1 must be resolved here to use'+
+  '03114_E_The class can'#039't have a publis','hed section, use the {$M+} '+
+  'switch'#000+
+  '03115_E_Forward declaration of class "$1" must be resolved here to use'+
   ' the class as ancestor'#000+
   '03116_E_Local operators not supported'#000+
-  '03117_E_Procedure directive $1 not allowed in interface section'#000+
-  '03118_E_Procedure directive $1 not allowed in implementation section'#000+
-  '03','119_E_Procedure directive $1 not allowed in procvar declaration'#000+
-  '03120_E_Function is already declared Public/Forward $1'#000+
+  '03117_E_Procedure directive "$1" not allowed in interface section'#000+
+  '03118_E_P','rocedure directive "$1" not allowed in implementation secti'+
+  'on'#000+
+  '03119_E_Procedure directive "$1" not allowed in procvar declaration'#000+
+  '03120_E_Function is already declared Public/Forward "$1"'#000+
   '03121_E_Can'#039't use both EXPORT and EXTERNAL'#000+
-  '03122_E_NAME keyword expected'#000+
-  '03123_W_$1 not yet supported inside inline proce','dure/function'#000+
+  '03122_E_NA','ME keyword expected'#000+
+  '03123_W_"$1" not yet supported inside inline procedure/function'#000+
   '03124_W_Inlining disabled'#000+
   '03125_I_Writing Browser log $1'#000+
   '03126_H_may be pointer dereference is missing'#000+
   '03127_F_Selected assembler reader not supported'#000+
-  '03128_E_Procedure directive $1 has conflicts with other directives'#000+
-  '03129_E_','Calling convention doesn'#039't match forward'#000+
+  '03128','_E_Procedure directive "$1" has conflicts with other directives'+
+  #000+
+  '03129_E_Calling convention doesn'#039't match forward'#000+
   '03130_E_Register calling (fastcall) not supported'#000+
   '03131_E_Property can'#039't have a default value'#000+
-  '03132_E_The default value of a property must be constant'#000+
-  '03133_E_Symbol can'#039't be published, can be only a',' class'#000+
+  '03132_E_The default value of a pr','operty must be constant'#000+
+  '03133_E_Symbol can'#039't be published, can be only a class'#000+
   '03134_E_That kind of property can'#039't be published'#000+
   '03135_W_Empty import name specified'#000+
   '03136_W_An import name is required'#000+
-  '03137_E_Function internal name changed after use of function'#000+
+  '03137_E_Function internal name changed af','ter use of function'#000+
   '03138_E_Division by zero'#000+
-  '03139_E_Invalid floating po','int operation'#000+
+  '03139_E_Invalid floating point operation'#000+
   '03140_E_Upper bound of range is less than lower bound'#000+
-  '03141_W_string "$1" is longer than $2'#000+
+  '03141_W_string "$1" is longer than "$2"'#000+
   '03142_E_string length is larger than array of char length'#000+
-  '03143_E_Illegal expression after message directive'#000+
-  '03144_E_Message handlers ','can take only one call by ref. parameter'#000+
-  '03145_E_Duplicate message label: $1'#000+
+  '03','143_E_Illegal expression after message directive'#000+
+  '03144_E_Message handlers can take only one call by ref. parameter'#000+
+  '03145_E_Duplicate message label: "$1"'#000+
   '03146_E_Self can be only an explicit parameter in message handlers'#000+
-  '03147_E_Threadvars can be only static or global'#000+
-  '03148_F_Direct assembler not supported for binar','y output format'#000+
+  '03147_E_Threadvars c','an be only static or global'#000+
+  '03148_F_Direct assembler not supported for binary output format'#000+
   '03149_W_Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mod'+
   'e delphi} instead'#000+
   '03150_E_OVERRIDE can'#039't be used in objects'#000+
-  '03151_E_Data types which requires initialization/finalization can'#039't'+
-  ' be used in variant records'#000+
-  '031','52_E_Resourcestrings can be only static or global'#000+
+  '03151_E_Data types whi','ch requires initialization/finalization can'#039+
+  't be used in variant records'#000+
+  '03152_E_Resourcestrings can be only static or global'#000+
   '03153_E_Exit with argument can'#039't be used here'#000+
   '03154_E_The type of the storage symbol must be boolean'#000+
-  '03155_E_This symbol isn'#039't allowed as storage symbol'#000+
-  '03156_E_Only class which are compiled',' in $M+ mode can be published'#000+
+  '03155_E_This ','symbol isn'#039't allowed as storage symbol'#000+
+  '03156_E_Only class which are compiled in $M+ mode can be published'#000+
   '03157_E_Procedure directive expected'#000+
   '03158_E_The value for a property index must be of an ordinal type'#000+
-  '03159_E_Procedure name to short to be exported'#000+
-  '03160_E_No DEFFILE entry can be generated for unit global va','rs'#000+
+  '03159_E_Procedure name to short',' to be exported'#000+
+  '03160_E_No DEFFILE entry can be generated for unit global vars'#000+
   '03161_E_Compile without -WD option'#000+
   '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
   'ule'#000+
   '03163_E_Can'#039't export with index under $1'#000+
-  '03164_E_Exporting of variables is not supported under $1'#000+
+  '03164_E_Exp','orting of variables is not supported under $1'#000+
   '04000_E_Type mismatch'#000+
-  '04001_E_','Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type mismatch between $1 and $2'#000+
+  '04001_E_Incompatible types: got "$1" expected "$2"'#000+
+  '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
-  '04005_E_Integer expression expected, but got "$1"'#000+
-  '04006_E_Boolean expression expected, ','but got "$1"'#000+
+  '04005_E','_Integer expression expected, but got "$1"'#000+
+  '04006_E_Boolean expression expected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
-  '04010_E_Variable or type indentifier expected'#000+
+  '04010_E_Variable or type ','indentifier expected'#000+
   '04011_E_Can'#039't evaluate constant expression'#000+
-  '04012_E_Set elem','ents are not compatible'#000+
+  '04012_E_Set elements are not compatible'#000+
   '04013_E_Operation not implemented for sets'#000+
   '04014_W_Automatic type conversion from floating type to COMP which is '+
   'an integer type'#000+
-  '04015_H_use DIV instead to get an integer result'#000+
-  '04016_E_string types doesn'#039't match, be','cause of $V+ mode'#000+
+  '04015_H','_use DIV instead to get an integer result'#000+
+  '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
   '04017_E_succ or pred on enums with assignments not possible'#000+
   '04018_E_Can'#039't read or write variables of this type'#000+
-  '04019_E_Can'#039't use readln or writeln on typed file'#000+
+  '04019_E_Can'#039't use readln or wri','teln on typed file'#000+
   '04020_E_Can'#039't use read or write on untyped file.'#000+
-  '04021_E_Type',' conflict between set elements'#000+
+  '04021_E_Type conflict between set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   '04023_E_Integer or real expression expected'#000+
-  '04024_E_Wrong type $1 in array constructor'#000+
-  '04025_E_Incompatible type for arg no. $1: Got $2, expected $','3'#000+
+  '04024_E_Wrong type "$1"',' in array constructor'#000+
+  '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
   '04027_E_Illegal constant passed to internal math function'#000+
-  '04028_E_Can'#039't get the address of constants'#000+
+  '04028_E_Can'#039't get the ad','dress of constants'#000+
   '04029_E_Argument can'#039't be assigned to'#000+
-  '04030_E_Can'#039't assign local pr','ocedure/function to procedure varia'+
-  'ble'#000+
+  '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
+  'e'#000+
   '04031_E_Can'#039't assign values to an address'#000+
   '04032_E_Can'#039't assign values to const variable'#000+
-  '04033_E_Array type required'#000+
-  '05000_E_Identifier not found $1'#000+
+  '04033_E_Array type required',#000+
+  '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
-  '05002_E_Dup','licate identifier $1'#000+
+  '05002_E_Duplicate identifier "$1"'#000+
   '05003_H_Identifier already defined in $1 at line $2'#000+
-  '05004_E_Unknown identifier $1'#000+
-  '05005_E_Forward declaration not solved $1'#000+
-  '05006_F_Identifier type already defined as type'#000+
+  '05004_E_Unknown identifier "$1"'#000+
+  '05005_E_Forward declaration not solved "$1"'#000+
+  '0','5006_F_Identifier type already defined as type'#000+
   '05007_E_Error in type definition'#000+
-  '05008_E_Type i','dentifier not defined'#000+
-  '05009_E_Forward type not resolved $1'#000+
+  '05008_E_Type identifier not defined'#000+
+  '05009_E_Forward type not resolved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
   ' methods'#000+
-  '05011_E_Invalid call to tvarsym.mangledname()'#000+
+  '05011_','E_Invalid call to tvarsym.mangledname()'#000+
   '05012_F_record or class type expected'#000+
-  '05013_E_Instances ','of classes or objects with an abstract method are '+
-  'not allowed'#000+
-  '05014_W_Label not defined $1'#000+
-  '05015_E_Label used but not defined $1'#000+
-  '05016_E_Illegal label declaration'#000+
+  '05013_E_Instances of classes or objects with an abstract method are no'+
+  't allowed'#000+
+  '05014_W_Label not defined "$1"'#000+
+  '05015_E_Label used but not defined "$1"'#000+
+  '05016_E_Ill','egal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  '05018_E_Label not f','ound'#000+
+  '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
-  '05022_E_Forward class definition not resolved $1'#000+
-  '05023_H_Unit $1 not used in $2'#000+
-  '05024_H_Parameter $1 not used'#000+
-  '05025_N_Local',' variable $1 not used'#000+
-  '05026_H_Value parameter $1 is assigned but never used'#000+
-  '05027_N_Local variable $1 is assigned but never used'#000+
-  '05028_H_Local $1 $2 is not used'#000+
-  '05029_N_Private field $1.$2 is never used'#000+
-  '05030_N_Private field $1.$2 is assign','ed but never used'#000+
-  '05031_N_Private method $1.$2 never used'#000+
+  '05022_E_Forward class d','efinition not resolved "$1"'#000+
+  '05023_H_Unit "$1" not used in $2'#000+
+  '05024_H_Parameter "$1" not used'#000+
+  '05025_N_Local variable "$1" not used'#000+
+  '05026_H_Value parameter "$1" is assigned but never used'#000+
+  '05027_N_Local variable "$1" is assigned but never used',#000+
+  '05028_H_Local $1 "$2" is not used'#000+
+  '05029_N_Private field "$1.$2" is never used'#000+
+  '05030_N_Private field "$1.$2" is assigned but never used'#000+
+  '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
-  '05033_W_Function result does not seem to be set'#000+
-  '05034_W_Type $1 is not aligned correctly in current record for C'#000+
-  '05035_E_Unknown record field identifier $1'#000,
-  '05036_W_Local variable $1 does not seem to be initialized'#000+
-  '05037_W_Variable $1 does not seem to be initialized'#000+
-  '05038_E_identifier idents no member $1'#000+
+  '05033_W_Function result does not see','m to be set'#000+
+  '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
+  '05035_E_Unknown record field identifier "$1"'#000+
+  '05036_W_Local variable "$1" does not seem to be initialized'#000+
+  '05037_W_Variable "$1" does not seem to be initialized'#000+
+  '05','038_E_identifier idents no member "$1"'#000+
   '05039_B_Found declaration: $1'#000+
   '05040_E_Data segment too large (max. 2GB)'#000+
-  '06000_E_BREAK not a','llowed'#000+
+  '06000_E_BREAK not allowed'#000+
   '06001_E_CONTINUE not allowed'#000+
   '06002_E_Expression too complicated - FPU stack overflow'#000+
-  '06003_E_Illegal expression'#000+
+  '06003_E_Illegal ex','pression'#000+
   '06004_E_Invalid integer expression'#000+
   '06005_E_Illegal qualifier'#000+
   '06006_E_High range limit < low range limit'#000+
-  '06007_E_Illegal c','ounter variable'#000+
+  '06007_E_Illegal counter variable'#000+
   '06008_E_Can'#039't determine which overloaded function to call'#000+
-  '06009_E_Parameter list size exceeds 65535 bytes'#000+
+  '06009_E_Parameter list size exceeds ','65535 bytes'#000+
   '06010_E_Illegal type conversion'#000+
   '06011_D_Conversion between ordinals and pointers is not portable acros'+
   's platforms'#000+
-  '0601','2_E_File types must be var parameters'#000+
+  '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
-  '06014_E_illegal call by reference parameters'#000+
+  '06014_E_illegal cal','l by reference parameters'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible illegal call of constructor or destru','ctor (doesn'#039+
-  't match to this context)'#000+
+  '06016_W_Possible illegal call of constructor or destructor (doesn'#039't'+
+  ' match to this context)'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
-  '06019_E_procedure call with stackframe ESP/SP'#000+
+  '06019_E_procedure call ','with stackframe ESP/SP'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06021_F_Internal Error in getfloatreg(), allocation failu','re'#000+
+  '06021_F_Internal Error in getfloatreg(), allocation failure'#000+
   '06022_F_Unknown float type'#000+
   '06023_F_SecondVecn() base defined twice'#000+
   '06024_F_Extended cg68k not supported'#000+
-  '06025_F_32-bit unsigned not supported in MC68000 mode'#000+
+  '060','25_F_32-bit unsigned not supported in MC68000 mode'#000+
   '06026_F_Internal Error in secondinline()'#000+
   '06027_D_Register $1 weight $2 $3'#000+
-  '06028','_E_Stack limit excedeed in local routine'#000+
+  '06028_E_Stack limit excedeed in local routine'#000+
   '06029_D_Stack frame is omitted'#000+
-  '06030_W_Range check for 64 bit integers is not supported on this targe'+
-  't'#000+
+  '06030_W_Range check for 64 bit integer','s is not supported on this tar'+
+  'get'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls can'#039't be inline.'#000+
-  '06033_E_','No code for inline procedure stored'#000+
-  '06034_E_Direct call of interrupt procedure $1 is not possible'#000+
-  '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
-  '06036_E_Include and exclude not implemented in ','this case'#000+
+  '06033_E_No code for inline procedure stored'#000+
+  '06034_E_Direct call of interrupt procedure "$1" is not possible'#000+
+  '06035_E_El','ement zero of an ansi/wide- or longstring can'#039't be acc'+
+  'essed, use (set)length instead'#000+
+  '06036_E_Include and exclude not implemented in this case'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#039' clause'#000+
-  '06038_E_Cannot call message handler method directly'#000+
+  '06038_E_Cannot call m','essage handler method directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements aren'#039't allowed in a ','finally bloc'+
-  'k'#000+
+  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
   '07000_D_Starting $1 styled assembler parsing'#000+
   '07001_D_Finished $1 styled assembler parsing'#000+
-  '07002_E_Non-label pattern contains @'#000+
+  '0700','2_E_Non-label pattern contains @'#000+
   '07003_W_Override operator not supported'#000+
   '07004_E_Error building record offset'#000+
-  '07005_E_OFFSET used wi','thout identifier'#000+
+  '07005_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
-  '07008_E_need to use OFFSET here'#000+
+  '0','7008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
-  '07011_E_Relocatable symbol',' can only be added'#000+
+  '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Invalid reference syntax'#000+
+  '07014_E_Inv','alid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
-  '07017_E_','Invalid base and index register usage'#000+
+  '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
-  '07019_E_Wrong scale factor specified'#000+
+  '07019_E_Wrong scale fa','ctor specified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
-  '07023','_W_@CODE and @DATA not supported'#000+
+  '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
-  '07025_E_Divide by zero in asm evaluator'#000+
+  '07025_E_Divide by zero in asm',' evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
-  '07029_W_Fwait can cause e','mulation problems with emu387'#000+
+  '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_FADD without operand translated into FADDP'#000+
-  '07031_W_ENTER instruction is not supported by Linux kernel'#000+
+  '07031_W_ENTER instruction i','s not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
-  '07034_','E_Constant value out of bounds'#000+
+  '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
-  '07037_E_Error converting binary $1'#000+
+  '07037_E','_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
-  '07040_W_$1 is associated to an overl','oaded function'#000+
+  '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
-  '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
+  '07042_E_Cannot use OLDEBP outside a nested procedure',#000+
   '07084_E_Cannot use RESULT in this function'#000+
   '07085_H_RESULT is register $1'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
-  '0704','4_E_SEG not supported'#000+
+  '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix an','d destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
-  '07049_E_','Assemler syntax error in operand'#000+
+  '07049_E_Assemler syntax error in operand'#000+
   '07050_E_Assemler syntax error in constant'#000+
-  '07051_E_Invalid String expression'#000+
+  '07051_E_Invalid String expression',#000+
   '07052_bit constant created for address'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
-  '07055_E_Invalid combination',' of prefix and opcode: $1'#000+
+  '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
-  '07057_E_Too many operands on line'#000+
+  '07057_E_Too many operands o','n line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
-  '07062_E_Unknown ','label identifier $1'#000+
+  '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
-  '07065_E_NOR not supported'#000+
+  '07065_E_NOR n','ot supported'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
-  '07069','_E_Wrong symbol type'#000+
+  '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
-  '07071_E_Invalid segment override expression'#000+
+  '07071_E_Invalid segment o','verride expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
-  '07074_No type of variable specif','ied'#000+
+  '07074_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
-  '07077_E_Using a defined name as a local label'#000+
+  '07077_E_U','sing a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '0','7080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't access fields directly for parameters'#000+
+  '07080_N_.align is target specific, use .balign or .p2align'#000+
+  '07081_E_Can'#039't access fields directly for parameter','s'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
-  'ands',#000+
+  'ands'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
-  '08002_F_Comp not supported'#000+
+  '08002_F_Comp not supported',#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer se','lected'#000+
+  '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit references not supported'#000+
+  '08008_','E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
-  '08011_E_A','sm: $1 value exceeds bounds $2'#000+
+  '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '09000_W_Source operating system redefined'#000+
+  '09','000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assember file: $1'#000+
-  '09003_E_Can'#039't create obj','ect file: $1'#000+
+  '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_W_Assembler $1 not found, switching to external assembling'#000+
+  '09005_W_Assembler $1 not found, switching to external ass','embling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_W_Error while assembling exitcode $1'#000+
-  '09008_W_Can'#039't call the assembler, error $1 switching ','to external'+
-  ' assembling'#000+
+  '09008_W_Can'#039't call the assembler, error $1 switching to external a'+
+  'ssembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling smartlink $1'#000+
-  '09011_W_Object $1 not found, Linking may fail !'#000+
+  '09011_W_Object $1 not found, Li','nking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_W_Error while linking'#000+
-  '09014_W_Can'#039't call the linker, switchi','ng to external linking'#000+
+  '09014_W_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_W_Util $1 not found, switching to external linking'#000+
-  '09017_T_Using util $1'#000+
+  '09017_T_U','sing util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
-  '09020_I_Closin','g script $1'#000+
+  '09020_I_Closing script $1'#000+
   '09021_W_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
-  '09023_T_unit $1 can'#039't be static linked, switching to smart linking'+
-  #000+
+  '09','023_T_unit $1 can'#039't be static linked, switching to smart linki'+
+  'ng'#000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
-  #000,
+  #000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
-  '09026_E_unit $1 can'#039't be smart or static linked'#000+
+  '09026_E_unit $1 can'#039't be smart or static',' linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
-  '0','9030_X_Size of Code: $1 bytes'#000+
+  '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
-  '09032_X_Size of uninitialized data: $1 bytes'#000+
+  '09032_X_Size of uninitialized data:',' $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
-  '10001_T_PPU Loading $','1'#000+
+  '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU File too short'#000+
+  '10006_U_PPU File too s','hort'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for an other processor'#000,
+  '10009_U_PPU is compiled for an other processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Write PPU-File'#000+
+  '10013_F_Can'#039't Write PP','U-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
-  '10017_F_PPU Dbx count pr','oblem'#000+
+  '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 and $2'#000+
+  '10020_F_Circular unit reference between $1 and $2',#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
-  '10024_F_','Unit $1 searched but $2 found'#000+
+  '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10026_F_There were $1 errors compiling module, stopping'#000+
+  '10026_F_There were $','1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
-  '10029_U_Recomp','iling $1, source found only'#000+
+  '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
+  '10031_U_Recompiling u','nit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
-  '10033_U_Recompiling unit, obj is ','older than asm'#000+
+  '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
-  '10036_U_Second load for unit $1'#000+
+  '10036_U_Second load for ','unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10038_H_Conditional $1 was not set at startup in last compilation of $'+
   '2'#000+
-  '10039_H_Conditiona','l $1 was set at startup in last compilation of $2'#000+
+  '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file supported'#000+
+  '11001_W_Only one ','source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
-  '11004_F_No sourc','e file name in command line'#000+
+  '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
-  '11007_H_-? writes help pages'#000+
+  '11007_H_-?',' writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_N_Reading further options from $1'#000+
-  '11011','_W_Target is already set to: $1'#000+
+  '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
-  '11013_F_too many IF(N)DEFs'#000+
+  '11013','_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation i','s not supported by this execut'+
-  'able'#000+
+  '11016_W_Debug information generation is not supported by this executab'+
+  'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '11018_E_You are using the obsolete switch $1'#000+
+  '11018_E_You are using the obsolete swi','tch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '1','1021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
-  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
+  '11023_Fr','ee Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'+
+  #010+
   'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler ','version $FPCVER'#010+
+  '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
-  'This program comes under the GNU General Public Licence'#010+
+  'This program comes under the GNU Gen','eral Public Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
   '                 bugrep@freepascal.org'#000+
-  '11','025_**0*_put + after a boolean switch option to enable it, - to di'+
-  'sable it'#010+
-  '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
+  '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
+  'ble it'#010+
+  '**1a_the compiler doesn'#039't delete ','the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
-  '**2ar_list register allocation/release info in assembler ','file'#010+
+  '**2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
-  '**2bl_generate local symbol info'#010+
+  '**2bl_generate loc','al symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ch<n>_<n','> bytes heap (between 1023 and 67107840)'#010+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
-  '**2Co_check overflow of integer operations'#010+
+  '**2Co_check overflow of ','integer operations'#010+
   '**2Cr_range checking'#010+
   '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
-  '**','1d<x>_defines the symbol <x>'#010+
+  '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
   '*O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
-  '**1e<x>_set path to executable'#010+
+  '*','*1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
-  '**2FD<x>_sets the directory where to search for com','piler utilities'#010+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
-  '**2Fi<x>_adds <x> to include path'#010+
+  '**2Fi<x>_adds',' <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
-  '**2Fr<x>','_load error message file <x>'#010+
+  '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
-  '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
+  '**2FU<x>_set unit output path to <x>, overrides ','-FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gg_use gsym'#010+
   '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_use',' line info unit to show more info for backtraces'#010+
+  '*g2gl_use line info unit to show more info for backtraces'#010+
   '*g2gc_generate checks for pointers'#010+
   '**1i_information'#010+
-  '**2iD_return compiler date'#010+
+  '**2iD_r','eturn compiler date'#010+
   '**2iV_return compiler version'#010+
   '**2iSO_return compiler OS'#010+
   '**2iSP_return compiler processor'#010+
-  '**2iTO_return target OS',#010+
+  '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
-  '**1l_write logo'#010+
+  '**1l_write l','ogo'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
-  '**1pg_generate profile code fo','r gprof (defines FPC_PROFILE)'#010+
+  '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '*L1P_use pipes instead of creating temporary assembler files'#010+
-  '**1S<x>_syntax options:'#010+
+  '**1S<x>_syntax op','tions:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
-  '**2S','d_tries to be Delphi compatible'#010+
+  '**2Sd_tries to be Delphi compatible'#010+
   '**2Se<x>_compiler stops after the <x> errors (default is 1)'#010+
-  '**2Sg_allow LABEL and GOTO'#010+
+  '**2Sg_allow LABE','L and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2So_tries to be TP/BP 7.0 co','mpatible'#010+
+  '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
   '**2Ss_constructor name must be init (destructor must be done)'#010+
-  '**2St_allow static keyword in objects'#010+
+  '**2S','t_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**1u<x>_undefines the symbol <x>'#010+
-  '**1U_unit opt','ions:'#010+
+  '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
+  '**1v<x>_Be verbose. <x> is a combination o','f the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
-  '**2*_w : Show warnings               u : Show unit',' info'#010+
+  '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  m : Show defined macros'#010+
+  '**2*_h : Show hints                  m ',': Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
-  '**2*_l : Show linenumbers            c : Sho','w conditionals'#010+
+  '**2*_l : Show linenumbers            c : Show conditionals'#010+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
-  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
+  '**2*_b : Show all proce','dure          r : Rhide/GCC compatibility mod'+
+  'e'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
-  '**2*_    occurs',#010+
+  '**2*_    occurs'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
-  '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
+  '**2XD_try to',' link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2XX_try to link sma','rt            (defines FPC_LINK_SMART)'#010+
+  '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
-  '3*2Aas_assemble using GNU AS'#010+
+  '3*2Aas_assemb','le using GNU AS'#010+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Lin','ux) file using Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_obj file using Tasm (Borland)'#010+
+  '3*2Atasm_obj fi','le using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '3*1R<x>_assembl','er reading style:'#010+
+  '3*1R<x>_assembler reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
-  '3*2Rdirect_copy assembler text directly to assembler file'#010+
+  '3*2Rdirect_copy ass','embler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
-  '3*2Or','_keep certain variables in registers'#010+
+  '3*2Or_keep certain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
-  '3*2O1_level 1 optimizations (quick optimizations)'#010+
+  '3*2O1_level 1 optimizat','ions (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (same as -O2u)'#010+
-  '3*2Op','<x>_target processor:'#010+
+  '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
-  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
+  '3*3Op2_set target processor to Pentium/PentiumM','MX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
-  '3*2TGO32V1_version 1 of DJ Delorie DO','S extender'#010+
+  '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TLINUX_Linux'#010+
-  '3*2Tnetware_Novell Netware Module (experimental)'#010+
+  '3*2Tnetware_Novell Netware Module',' (experimental)'#010+
   '3*2TOS2_OS/2 2.x'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
-  '3*2WB<x>_Set Image base to Hexadecimal <x> va','lue'#010+
+  '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WG_Specify graphic type application'#010+
+  '3*2WG_Specify',' graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
-  '6*1A<x>_out','put format'#010+
+  '6*1A<x>_output format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola assembler'#010+
+  '6*2Am','ot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
-  '6*2OG_generate faster cod','e (default)'#010+
+  '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O2_set target processor to a MC68020+'#010+
-  '6*1R<x>_assembler reading style:'#010+
+  '6*1R<x>_assembl','er reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
-  '6*2TATARI_Atari S','T/STe/TT'#010+
+  '6*2TATARI_Atari ST/STe/TT'#010+
   '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
-  '**1h_shows this help without waiting'#000
+  '**1h_shows this help withou','t waiting'#000
 );