--- Merging r48432 into '.':

U    compiler/msg/errorct.msg
C    compiler/msg/errord.msg
U    compiler/msg/errorda.msg
C    compiler/msg/errordu.msg
U    compiler/msg/errore.msg
U    compiler/msg/errores.msg
U    compiler/msg/errorf.msg
U    compiler/msg/errorfi.msg
U    compiler/msg/errorhe.msg
U    compiler/msg/errorheu.msg
U    compiler/msg/errorid.msg
U    compiler/msg/erroriu.msg
U    compiler/msg/errorn.msg
U    compiler/msg/errorpl.msg
U    compiler/msg/errorpli.msg
U    compiler/msg/errorpt.msg
U    compiler/msg/errorptu.msg
U    compiler/msg/errorr.msg
U    compiler/msg/errorru.msg
U    compiler/msg/errorues.msg
U    compiler/msgtxt.inc
--- Recording mergeinfo for merge of r48432 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 2

# revisions: 48432
r48432 | florian | 2021-01-26 23:03:17 +0100 (Tue, 26 Jan 2021) | 1 line
Changed paths:
   M /trunk/compiler/msg/errorct.msg
   M /trunk/compiler/msg/errord.msg
   M /trunk/compiler/msg/errorda.msg
   M /trunk/compiler/msg/errordu.msg
   M /trunk/compiler/msg/errore.msg
   M /trunk/compiler/msg/errores.msg
   M /trunk/compiler/msg/errorf.msg
   M /trunk/compiler/msg/errorfi.msg
   M /trunk/compiler/msg/errorhe.msg
   M /trunk/compiler/msg/errorheu.msg
   M /trunk/compiler/msg/errorid.msg
   M /trunk/compiler/msg/erroriu.msg
   M /trunk/compiler/msg/errorn.msg
   M /trunk/compiler/msg/errorpl.msg
   M /trunk/compiler/msg/errorpli.msg
   M /trunk/compiler/msg/errorpt.msg
   M /trunk/compiler/msg/errorptu.msg
   M /trunk/compiler/msg/errorr.msg
   M /trunk/compiler/msg/errorru.msg
   M /trunk/compiler/msg/errorues.msg
   M /trunk/compiler/msgtxt.inc

  * updated copyright year to 2021

git-svn-id: branches/fixes_3_2@49309 -

compiler/msg/errorct.msg

@@ -1,6 +1,6 @@
 #
 #   This file is part of the Free Pascal Compiler
-#   Copyright (c) 1993-2020 by the Free Pascal Development team
+#   Copyright (c) 1993-2021 by the Free Pascal Development team
 #
 #   Catalan Language File for Free Pascal
 #
@@ -2103,7 +2103,7 @@ option_code_page_not_available=11039_E_La p
 #
 option_logo=11023_[
 Free Pascal Compiler versió $FPCFULLVERSION [$FPCDATE] per $FPCCPU
-Copyright (c) 1993-2020 per Florian Klaempfl and others
+Copyright (c) 1993-2021 per Florian Klaempfl and others
 ]
 
 #

compiler/msg/errord.msg

@@ -6,7 +6,7 @@
 #   Based on errore.msg of SVN revision 39700
 #
 #   This file is part of the Free Pascal Compiler
-#   Copyright (c) 1998-2018 by the Free Pascal Development team
+#   Copyright (c) 1998-2021 by the Free Pascal Development team
 #
 #   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
@@ -3715,7 +3715,7 @@ package_u_ppl_filename=13029_U_PPL Dateiname $1
 #
 option_logo=11023_[
 Free Pascal Compiler Version $FPCFULLVERSION [$FPCDATE] f�r $FPCTARGET
-Copyright (c) 1993-2020 Florian Kl„mpfl und andere
+Copyright (c) 1993-2021 Florian Kl„mpfl und andere
 ]
 
 #

compiler/msg/errorda.msg

@@ -3535,7 +3535,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 #
 option_logo=11023_[
 Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] til $FPCTARGET
-Copyright (c) 1993-2020 Florian Klaempfl and others
+Copyright (c) 1993-2021 Florian Klaempfl and others
 ]
 
 #

compiler/msg/errordu.msg

@@ -6,7 +6,7 @@
 #   Based on errore.msg of SVN revision 39700
 #
 #   This file is part of the Free Pascal Compiler
-#   Copyright (c) 1998-2018 by the Free Pascal Development team
+#   Copyright (c) 1998-2021 by the Free Pascal Development team
 #
 #   See the file COPYING.v2, included in this distribution,
 #   for details about the copyright.
@@ -3714,7 +3714,7 @@ package_u_ppl_filename=13029_U_PPL Dateiname $1
 #
 option_logo=11023_[
 Free Pascal Compiler Version $FPCFULLVERSION [$FPCDATE] für $FPCTARGET
-Copyright (c) 1993-2020 Florian Klämpfl und andere
+Copyright (c) 1993-2021 Florian Klämpfl und andere
 ]
 
 #

compiler/msg/errore.msg

@@ -3687,7 +3687,7 @@ package_u_ppl_filename=13029_U_PPL filename $1
 #
 option_logo=11023_[
 Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errores.msg

@@ -3477,7 +3477,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 #
 option_logo=11023_[
 Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorf.msg

@@ -1715,7 +1715,7 @@ option_asm_forced=11022_W_"$1" assembler use forced
 #
 option_logo=11023_[
 Compilateur Free Pascal version $FPCFULLVERSION [$FPCDATE] pour $FPCTARGET
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorfi.msg

@@ -3499,7 +3499,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 # Logo (option -l)
 #
 option_logo=11023_[ Compilateur Free Pascal version $FPCFULLVERSION [$FPCDATE] for $FPCCPU
-Copyright (c) 1993-2020, Florian Klaempfl and others]
+Copyright (c) 1993-2021, Florian Klaempfl and others]
 #
 # Info (option -i)
 #

compiler/msg/errorhe.msg

@@ -2407,7 +2407,7 @@ option_confict_asm_debug=11041_W_
 #
 option_logo=11023_[
 Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorheu.msg

@@ -3496,7 +3496,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 #
 option_logo=11023_[
 Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorid.msg

@@ -3504,7 +3504,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 #
 option_logo=11023_[
 Free Pascal Compiler versi $FPCFULLVERSION [$FPCDATE] untuk $FPCCPU
-Hak Cipta (c) 1993-2020 oleh Florian Klaempfl and others
+Hak Cipta (c) 1993-2021 oleh Florian Klaempfl and others
 ]
 
 #

compiler/msg/erroriu.msg

@@ -2693,7 +2693,7 @@ wpo_cant_create_feedback_file=12019_E_Impossibile creare il file di feedback "$1
 #
 option_logo=11023_[
 Compilatore Free Pascal, versione $FPCFULLVERSION [$FPCDATE] per $FPCCPU
-Copyright (c) 1993-2020 di Florian Klaempfl and others
+Copyright (c) 1993-2021 di Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorn.msg

@@ -3485,7 +3485,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 #
 option_logo=11023_[
 Free Pascal Compiler versie $FPCFULLVERSION [$FPCDATE] voor $FPCTARGET
-Copyright (c) 1993-2020 door Florian Klaempfl en anderen
+Copyright (c) 1993-2021 door Florian Klaempfl en anderen
 ]
 #
 # Info (option -i)

compiler/msg/errorpl.msg

@@ -2119,7 +2119,7 @@ option_code_page_not_available=11039_E_Nieznana strona kodowa
 #
 option_logo=11023_[
 Free Pascal Compiler wersja $FPCFULLVERSION [$FPCDATE] dla $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorpli.msg

@@ -2119,7 +2119,7 @@ option_code_page_not_available=11039_E_Nieznana strona kodowa
 #
 option_logo=11023_[
 Free Pascal Compiler wersja $FPCFULLVERSION [$FPCDATE] dla $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorpt.msg

@@ -3086,7 +3086,7 @@ wpo_cant_create_feedback_file=12019_E_Imposs
 #
 option_logo=11023_[
 Compilador Free Pascal versÆo $FPCFULLVERSION [$FPCDATE] para $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorptu.msg

@@ -3514,7 +3514,7 @@ wpo_cant_create_feedback_file=12019_E_Impossível criar arquivo retorno otimiza
 #
 option_logo=11023_[
 Compilador Free Pascal versão $FPCFULLVERSION [$FPCDATE] para $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorr.msg

@@ -2506,7 +2506,7 @@ wpo_cant_create_feedback_file=12019_E_
 #
 option_logo=11023_[
 Š®¬¯¨«ïâ®à Free Pascal ¢¥àᨨ $FPCFULLVERSION [$FPCDATE] ¤«ï $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorru.msg

@@ -3387,7 +3387,7 @@ wpo_cant_create_feedback_file=12019_E_Невозможно создать фай
 #
 option_logo=11023_[
 Компилятор Free Pascal версии $FPCFULLVERSION [$FPCDATE] для $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msg/errorues.msg

@@ -3471,7 +3471,7 @@ wpo_cant_create_feedback_file=12019_E_Cannot create specified whole program opti
 #
 option_logo=11023_[
 Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPCCPU
-Copyright (c) 1993-2020 by Florian Klaempfl and others
+Copyright (c) 1993-2021 by Florian Klaempfl and others
 ]
 
 #

compiler/msgtxt.inc

@@ -1359,7 +1359,7 @@ const msgtxt : array[0..000344,1..240] of char=(
   '13029_U_PPL filename $1'#000+
   '11023_Free Pascal Compiler version $FPCFULL','VERSION [$FPCDATE] for $F'+
   'PCCPU'#010+
-  'Copyright (c) 1993-2020 by Florian Klaempfl and others'#000+
+  'Copyright (c) 1993-2021 by Florian Klaempfl and others'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler date      : $FPCDATE'#010+