From 2bf79e6e5141c61b79c35feaca8e7ed56b844900 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 10 Jul 2010 10:00:19 +0000
Subject: [PATCH] * fixed error message when using for-in with
Objective-Pascal 1.0
git-svn-id: trunk@15541 -
---
compiler/msg/errord.msg | 2 +-
compiler/msg/errordu.msg | 2 +-
compiler/msg/errore.msg | 2 +-
compiler/msg/errorpt.msg | 2 +-
compiler/msg/errorptu.msg | 2 +-
compiler/msgtxt.inc | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/compiler/msg/errord.msg b/compiler/msg/errord.msg
index aa61232468..27c9c83bc7 100644
--- a/compiler/msg/errord.msg
+++ b/compiler/msg/errord.msg
@@ -1325,7 +1325,7 @@ parser_e_widestring_to_ansi_compile_time=03293_E_Eine Unicodechar/string Konstan
% constant expressions that have to be converted into an ansistring or shortstring
% at compile time, for example inside typed constants. The reason is that the
% compiler cannot know what the actual ansi encoding will be at run time.
-parser_e_objc_enumerator_2_0=03294_E_Objective-Pascal For-in Schleifen erfordern, dass der Modenschalter \{\$modeswitch ObjectiveC1\} aktiv ist
+parser_e_objc_enumerator_2_0=03294_E_Objective-Pascal For-in Schleifen erfordern, dass der Modenschalter \{\$modeswitch ObjectiveC2\} aktiv ist
% Objective-C ``fast enumeration'' support was added in Objective-C 2.0, and
% hence the appropriate modeswitch has to be activated to expose this feature.
% Note that Objective-C 2.0 programs require Mac OS X 10.5 or later.
diff --git a/compiler/msg/errordu.msg b/compiler/msg/errordu.msg
index 7846f82736..06e0124fc1 100644
--- a/compiler/msg/errordu.msg
+++ b/compiler/msg/errordu.msg
@@ -1325,7 +1325,7 @@ parser_e_widestring_to_ansi_compile_time=03293_E_Eine Unicodechar/string Konstan
% constant expressions that have to be converted into an ansistring or shortstring
% at compile time, for example inside typed constants. The reason is that the
% compiler cannot know what the actual ansi encoding will be at run time.
-parser_e_objc_enumerator_2_0=03294_E_Objective-Pascal For-in Schleifen erfordern, dass der Modenschalter \{\$modeswitch ObjectiveC1\} aktiv ist
+parser_e_objc_enumerator_2_0=03294_E_Objective-Pascal For-in Schleifen erfordern, dass der Modenschalter \{\$modeswitch ObjectiveC2\} aktiv ist
% Objective-C ``fast enumeration'' support was added in Objective-C 2.0, and
% hence the appropriate modeswitch has to be activated to expose this feature.
% Note that Objective-C 2.0 programs require Mac OS X 10.5 or later.
diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg
index 1759d1a12c..f56f3e07bd 100644
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@@ -1315,7 +1315,7 @@ parser_e_widestring_to_ansi_compile_time=03293_E_Unicodechar/string constants ca
% constant expressions that have to be converted into an ansistring or shortstring
% at compile time, for example inside typed constants. The reason is that the
% compiler cannot know what the actual ansi encoding will be at run time.
-parser_e_objc_enumerator_2_0=03294_E_For-in Objective-Pascal loops require \{\$modeswitch ObjectiveC1\} to be active
+parser_e_objc_enumerator_2_0=03294_E_For-in Objective-Pascal loops require \{\$modeswitch ObjectiveC2\} to be active
% Objective-C ``fast enumeration'' support was added in Objective-C 2.0, and
% hence the appropriate modeswitch has to be activated to expose this feature.
% Note that Objective-C 2.0 programs require Mac OS X 10.5 or later.
diff --git a/compiler/msg/errorpt.msg b/compiler/msg/errorpt.msg
index 9bf2c4a822..3ed9b8a93e 100644
--- a/compiler/msg/errorpt.msg
+++ b/compiler/msg/errorpt.msg
@@ -1317,7 +1317,7 @@ parser_e_widestring_to_ansi_compile_time=03293_E_Constantes caracteres/unicode n
% constant expressions that have to be converted into an ansistring or shortstring
% at compile time, for example inside typed constants. The reason is that the
% compiler cannot know what the actual ansi encoding will be at run time.
-parser_e_objc_enumerator_2_0=03294_E_La�os "For-in Objective-Pascal" requerem que a chave \{\$modeswitch ObjectiveC1\} esteja ativa
+parser_e_objc_enumerator_2_0=03294_E_La�os "For-in Objective-Pascal" requerem que a chave \{\$modeswitch ObjectiveC2\} esteja ativa
% Objective-C ``fast enumeration'' support was added in Objective-C 2.0, and
% hence the appropriate modeswitch has to be activated to expose this feature.
% Note that Objective-C 2.0 programs require Mac OS X 10.5 or later.
diff --git a/compiler/msg/errorptu.msg b/compiler/msg/errorptu.msg
index cc1502cbc1..29b7d698b6 100644
--- a/compiler/msg/errorptu.msg
+++ b/compiler/msg/errorptu.msg
@@ -1317,7 +1317,7 @@ parser_e_widestring_to_ansi_compile_time=03293_E_Constantes caracteres/unicode n
% constant expressions that have to be converted into an ansistring or shortstring
% at compile time, for example inside typed constants. The reason is that the
% compiler cannot know what the actual ansi encoding will be at run time.
-parser_e_objc_enumerator_2_0=03294_E_Laços "For-in Objective-Pascal" requerem que a chave \{\$modeswitch ObjectiveC1\} esteja ativa
+parser_e_objc_enumerator_2_0=03294_E_Laços "For-in Objective-Pascal" requerem que a chave \{\$modeswitch ObjectiveC2\} esteja ativa
% Objective-C ``fast enumeration'' support was added in Objective-C 2.0, and
% hence the appropriate modeswitch has to be activated to expose this feature.
% Note that Objective-C 2.0 programs require Mac OS X 10.5 or later.
diff --git a/compiler/msgtxt.inc b/compiler/msgtxt.inc
index 7b68752a1f..d6a7589aed 100644
--- a/compiler/msgtxt.inc
+++ b/compiler/msgtxt.inc
@@ -458,7 +458,7 @@ const msgtxt : array[0..000236,1..240] of char=(
'03293_E_Unicodechar/string constants cannot be converted to ansi/short'+
'string at compile-time'#000+
'03294_E_For-in Objective-Pascal loops require \{\$modeswitch Objective'+
- 'C1\} to be',' active'#000+
+ 'C2\} to be',' active'#000+
'03295_E_The compiler cannot find the NSFastEnumerationProtocol or NSFa'+
'stEnumerationState type in the CocoaAll unit'#000+
'04000_E_Type mismatch'#000+