Backport

svn path=/branches/mono-1-1-9/mcs/; revision=51067

diff --git a/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.resources b/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.resources
index ad326f3a7e28b08e6c1d17f9032937a3114277f6..cd59180b70e12776766908ef9e54aa1da801a91b 100644 (file)
Binary files a/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.resources and b/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.resources differ

diff --git a/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.txt b/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.txt
index 1a6e4abb50297aca0b21499a1a46e9a99062783c..8914048032fc74d3c8bde8d82e86090d6c60fac1 100644 (file)
--- a/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.txt
+++ b/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Common/Resources/isc_error_msg.txt
@@ -2017,8 +2017,7 @@
 336396464=invalid lock level {0}\r
 336396465=invalid bookmark handle\r
 336396468=wrong or obsolete version\r
-336396471=The insert, update, delete, ddl or authorization statement cannot\r
- be executed because the transaction is inquiry only\r
+336396471=The insert, update, delete, ddl or authorization statement cannot be executed because the transaction is inquiry only\r
 336396472=external file could not be opened for output\r
 336396477=multiple rows in singleton select\r
 336396478=No subqueries permitted for VIEW WITH CHECK OPTION\r
@@ -3596,4 +3595,4 @@
 710=Unexpected end of database file.\r
 711=Can't open database file {0}\r
 712=Can't read a database page\r
-713=System memory exhausted
\ No newline at end of file
+713=System memory exhausted\r

diff --git a/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Firebird.dll.resources b/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Firebird.dll.resources
index 67e8e905f4acee717241e22b0da5400eeafea63f..1fdee43a668bb035f257af1b852c9d45d8de83f0 100644 (file)
--- a/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Firebird.dll.resources
+++ b/mcs/class/FirebirdSql.Data.Firebird/FirebirdSql.Data.Firebird.dll.resources
@@ -1 +1 @@
--resource:FirebirdSql.Data.Common/Resources/isc_error_msg.resources\r
+-resource:FirebirdSql.Data.Common/Resources/isc_error_msg.resources,FirebirdSql.Data.Common.Resources.isc_error_msg.resources