From 5f2ca16f13b6d710547c0fca834e922e7a084cb9 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 27 Jun 2006 14:21:03 +0000 Subject: [PATCH] Merged revisions 3929,3978 via svnmerge from http://svn.freepascal.org/svn/fpc/trunk git-svn-id: branches/fixes_2_0@3979 - --- compiler/msg/errord.msg | 28 +++++++++++++++------ compiler/msg/errorhe.msg | 4 +-- compiler/msg/errorptd.msg | 53 ++++++++++++++++++++++++++++++++++----- compiler/msg/errorptw.msg | 53 ++++++++++++++++++++++++++++++++++----- 4 files changed, 117 insertions(+), 21 deletions(-) diff --git a/compiler/msg/errord.msg b/compiler/msg/errord.msg index 92b9f1b19e..bda2096da5 100644 --- a/compiler/msg/errord.msg +++ b/compiler/msg/errord.msg @@ -1,5 +1,7 @@ # # German (alternative) Language File for Free Pascal +# Latest updates contributed by Karl-Michael Schindler aka mischi +# # # This file is part of the Free Pascal Compiler # Copyright (c) 1998-2000 by the Free Pascal Development team @@ -55,7 +57,7 @@ general_t_compilername=01000_T_Compiler: $1 % When the \var{-vt} switch is used, this line tells you what compiler % is used. -general_d_sourceos=01001_D_Hostbetriebssystem: $1 +general_d_sourceos=01001_D_Quellbetriebssystem: $1 % When the \var{-vd} switch is used, this line tells you what the source % operating system is. general_i_targetos=01002_I_Zielbetriebssystem: $1 @@ -322,6 +324,17 @@ scan_e_compile_time_typeerror=02072_E_Compile time Ausdruck: Erwartete $1 aber e % Type check of a compile time expression failed. scan_n_app_type_not_support=02073_N_APPTYPE wird vom Zielbetriebssystem nicht untersttzt % The \var{\{\$APPTYPE\}} directive is supported by certain operating systems only. +scan_e_illegal_optimization_specifier=02074_E_"$1" ist eine ungltige Optimierung +% When you specify an optimization with the \var{\{\$OPTIMIZATION xxx\}} +% the compiler didn't recognize the optimization you specified. +scan_w_setpeflags_not_support=02075_W_SETPEFLAGS wird vom Zielbetriebssystem nicht untersttzt +% The \var{\{\$SETPEFLAGS\}} directive is not supported by the target OS +scan_w_imagebase_not_support=02076_W_IMAGEBASE wird vom Zielbetriebssystem nicht untersttzt +% The \var{\{\$IMAGEBASE\}} directive is not supported by the target OS +scan_w_minstacksize_not_support=02077_W_MINSTACKSIZE wird vom Zielbetriebssystem nicht untersttzt +% The \var{\{\$MINSTACKSIZE\}} directive is not supported by the target OS +scan_w_maxstacksize_not_support=02078_W_MAXSTACKSIZE wird vom Zielbetriebssystem nicht untersttzt +% The \var{\{\$MAXSTACKSIZE\}} directive is not supported by the target OS % \end{description} # # Parser @@ -1023,7 +1036,8 @@ parser_e_dispinterface_cant_have_parent=03216_E_Ein DISPINTERFACE kann keine Elt % A DISPINMTERFACE is a special type of interface which can't have a parent class parser_e_dispinterface_needs_a_guid=03217_E_Ein DISPINTERFACE ben”tigt einen GUID % A DISPINMTERFACE needs always an interface identification -parser_w_overridden_methods_not_same_ret=03218_W_šberschriebene Methoden mssen einen entsprechenden Rckgabetyp haben. Dieser Code kann abstrzen, weil er von einem Delphi Parser Bug abh„ngt (Methode "$2" wird durch "$1" berschrieben, die einen anderen Rckgabetyp hat). +parser_w_overridden_methods_not_same_ret=03218_W_šberschriebene Methoden mssen einen entsprechenden Rckgabetyp haben. Dieser Code kann abstrzen, weil er von einem Delphi Parser Bug abh„ngt (Methode "$2" wird durch "$1" berschrieben, die einen anderen +Rckgabetyp hat). % If you declare overridden methods in a class definition, they must % have the same return type. Some versions of Delphi allow you to change the % return type of interface methods, and even to change procedures into @@ -1798,7 +1812,7 @@ asmw_e_invalid_register=08019_E_Asm: Ung % This section lists errors that occur when the compiler is processing the % command line or handling the configuration files. % \begin{description} -exec_w_source_os_redefined=09000_W_Quell-Betriebssystem wurde neu definiert +exec_w_source_os_redefined=09000_W_Quellbetriebssystem wurde neu definiert exec_i_assembling_pipe=09001_I_Assembliere (pipe) $1 exec_d_cant_create_asmfile=09002_E_Kann Assemblerdatei nicht erzeugen: $1 % The mentioned file can't be create. Check if you've @@ -2165,7 +2179,7 @@ Free Pascal Compiler Version $FPCVER Compiler Datum: $FPCDATE Compiler Zielsystem: $FPCCPU -Untersttzte Zielsysteme: +Untersttzte Zielbetriebssysteme: $OSTARGETS Untersttzte CPU Instruktionen: @@ -2281,9 +2295,9 @@ S*2Aas_assembliere mit Hilfe von GNU AS **1i_zeige alle Information ber den Compiler **2iD_zeige Compilerdatum **2iV_zeige Compilerversion -**2iSO_zeige Compiler-Betriebssystem +**2iSO_zeige Compilerbetriebssystem **2iSP_zeige Compilerprozessor -**2iTO_zeige Ziel-Betriebssystem +**2iTO_zeige Zielbetriebssystem **2iTP_zeige Zielprozessor **1I_erg„nze zum Include-Pfad **1k_bergebe an den Linker @@ -2349,7 +2363,7 @@ S*2Aas_assembliere mit Hilfe von GNU AS **2sh_erzeuge Script um auf dem Host zu linken **2st_erzeuge Script um auf dem Zielsystem zu linken **2sr_berspringe die Phase der "register allocation" (mit -alr benutzen) -**1T_Ziel-Betriebssystem:: +**1T_Zielbetriebssystem:: 3*2Temx_OS/2 via EMX (einschliesslich EMX/RSX extender) 3*2Tfreebsd_FreeBSD 3*2Tgo32v2_Version 2 of DJ Delorie DOS extender diff --git a/compiler/msg/errorhe.msg b/compiler/msg/errorhe.msg index 606126b6b5..c1028a80f3 100644 --- a/compiler/msg/errorhe.msg +++ b/compiler/msg/errorhe.msg @@ -1,9 +1,9 @@ # -# $Id: errorhe.msg,v 1.5 2005/04/10 08:11:14 florian Exp $ # This file is part of the Free Pascal Compiler # Copyright (c) 1999-2000 by the Free Pascal Development team # -# Hebrew Language File for Free Pascal +# Hebrew language file for Free Pascal Compiler +# Contributed by # # See the file COPYING.FPC, included in this distribution, # for details about the copyright. diff --git a/compiler/msg/errorptd.msg b/compiler/msg/errorptd.msg index d35c633f4f..efd0689a2e 100644 --- a/compiler/msg/errorptd.msg +++ b/compiler/msg/errorptd.msg @@ -1,9 +1,50 @@ -%%% Reordering of errorptd.msg respective to errore.msg -%%% Contains all comments from errorptd.msg -%%% Reordering of msg/errorptd.msg respective to msg/errore.msg -%%% Contains all comments from msg/errorptd.msg -%%% Reordering of msg/errorptd.msg respective to msg/errore.msg -%%% Contains all comments from msg/errorptd.msg +# +# This file is part of the Free Pascal Compiler +# Copyright (c) 1999-2000 by the Free Pascal Development team +# +# Portuguese (DOS encoding) language file for Free Pascal Compiler +# Contributed by Ari Ricardo Ody +# +# See the file COPYING.FPC, included in this distribution, +# for details about the copyright. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# +# The constants are build in the following order: +# __ +# +# is the part of the compiler the message is used +# asmr_ assembler parsing +# asmw_ assembler writing/binary writers + +# unit_ unit handling +# scan_ scanner +# parser_ parser +# type_ type checking +# general_ general info +# exec_ calls to assembler, linker, binder +# +# the type of the message it should normally used for +# f_ fatal error +# e_ error +# w_ warning +# n_ note +# h_ hint +# i_ info +# l_ add linenumber +# u_ used +# t_ tried +# c_ conditional +# d_ debug message +# x_ executable informations +# + +# +# General +# general_t_compilername=01000_T_Compilador usado: $1 % When the \var{-vt} switch is used, this line tells you what compiler % is used. diff --git a/compiler/msg/errorptw.msg b/compiler/msg/errorptw.msg index 1467442f01..8a3197d757 100644 --- a/compiler/msg/errorptw.msg +++ b/compiler/msg/errorptw.msg @@ -1,9 +1,50 @@ -%%% Reordering of errorptw.new respective to errore.msg -%%% Contains all comments from errorptw.new -%%% Reordering of errorptw.msg respective to errore.msg -%%% Contains all comments from errorptw.msg -%%% Reordering of msg/errorptw.msg respective to msg/errore.msg -%%% Contains all comments from msg/errorptw.msg +# +# This file is part of the Free Pascal Compiler +# Copyright (c) 1999-2000 by the Free Pascal Development team +# +# Portuguese (Windows encoding) language file for Free Pascal Compiler +# Contributed by Ari Ricardo Ody +# +# See the file COPYING.FPC, included in this distribution, +# for details about the copyright. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# +# The constants are build in the following order: +# __ +# +# is the part of the compiler the message is used +# asmr_ assembler parsing +# asmw_ assembler writing/binary writers + +# unit_ unit handling +# scan_ scanner +# parser_ parser +# type_ type checking +# general_ general info +# exec_ calls to assembler, linker, binder +# +# the type of the message it should normally used for +# f_ fatal error +# e_ error +# w_ warning +# n_ note +# h_ hint +# i_ info +# l_ add linenumber +# u_ used +# t_ tried +# c_ conditional +# d_ debug message +# x_ executable informations +# + +# +# General +# general_t_compilername=01000_T_Compilador usado: $1 % When the \var{-vt} switch is used, this line tells you what compiler % is used.