Merge SRC631: 10.05.01 - 07:45:14 (NoBranch)

1 files changed, 64 insertions, 15 deletions

diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 4d18fdf20ea4..7472b66a8ec7 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbumiscres.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: rt $ $Date: 2001-05-03 19:16:38 $
+ *  last change: $Author: rt $ $Date: 2001-05-10 05:46:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,6 +107,8 @@ Resource RSC_DATASOURCE_TYPES
         Text[ turkish ] = "Adabas;JDBC;ODBC;dBase;Text";
         Text[ arabic ] = "Adabas;JDBC;ODBC;dBase;ADO;��;����� �����";
         Text[ language_user1 ] = "Please be carefull with the number/ordering of (semicolon-separated) tokens in the string.";
+        Text[ finnish ] = "Adabas;JDBC;ODBC;dBase;Text";
+        Text[ catalan ] = "Adabas;JDBC;ODBC;dBase;ADO;Texto;Hoja de c�lculo";
     };
 };
 
@@ -116,26 +118,28 @@ Resource RSC_CHARSETS
     {
         Text = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System;UTF-8" ;
         Text [ english ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System;UTF-8" ;
-        Text [ english_us ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System" ;
+        Text [ english_us ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System;UTF-8" ;
 
         Text[ language_user1 ] = "Please be carefull with the number/ordering of (semicolon-separated) tokens in the string.";
-        Text[ portuguese ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
-        Text[ russian ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�������";
+        Text[ portuguese ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema;UTF-8";
+        Text[ russian ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�������;UTF-8";
         Text[ greek ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�������";
-        Text[ dutch ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Systeem";
-        Text[ french ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Syst�me";
-        Text[ spanish ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
+        Text[ dutch ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Systeem;UTF-8";
+        Text[ french ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Syst�me;UTF-8";
+        Text[ spanish ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema;UTF-8";
         Text[ italian ] = "Ansi;Mac;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
         Text[ danish ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
-        Text[ swedish ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
-        Text[ polish ] = "Ansi;Mac;IBMPC(473);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
+        Text[ swedish ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System;UTF-8";
+        Text[ polish ] = "Ansi;Mac;IBMPC(437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System;UTF-8";
         Text[ portuguese_brazilian ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
-        Text[ japanese ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);����";
+        Text[ japanese ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);����;UTF-8";
         Text[ korean ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
-        Text[ chinese_simplified ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);ϵͳ";
-        Text[ chinese_traditional ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�t��";
+        Text[ chinese_simplified ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);ϵͳ;UTF-8";
+        Text[ chinese_traditional ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�t��;UTF-8";
         Text[ turkish ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistem";
         Text[ arabic ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);����";
+        Text[ finnish ] = "Ansi;Mac;DOS;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
+        Text[ catalan ] = "Ansi;Mac;IBMPC (437);IBMPC (850)/DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
     };
 };
 
@@ -162,6 +166,8 @@ String STR_GENERAL_SDB_ERROR
     Text[ chinese_traditional ] = "�s�u���ƨӷ��ɵo�ͤ@�ӿ��~";
     Text[ turkish ] = "Error while connecting to the data source";
     Text[ arabic ] = "��� ����� ������� ����� ��������";
+    Text[ finnish ] = "On ilmennyt virhe muodostettaessa yhteytt� tietol�hteeseen";
+    Text[ catalan ] = "Error durante la conexi�n con la fuente de datos";
 };
 
 String STR_OBJECT_ALREADY_EXSISTS
@@ -186,25 +192,68 @@ String STR_OBJECT_ALREADY_EXSISTS
     Text[ chinese_traditional ] = "�b�إ߮ɵo�Ϳ��~";
     Text[ turkish ] = "Error while creating!";
     Text[ arabic ] = "��� ����� �������!";
+    Text[ finnish ] = "Fehler beim Erzeugen!";
+    Text[ catalan ] = "�Error al crear el objeto!";
 };
 
 String STR_UNEXPECTED_ERROR
 {
     Text = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgef�hrt werden.";
     Text [ english ] = "An unexpected error occured. The operation could not be completed.";
-    Text [ english_us ] = "An unexpected error occured. The operation could not be completed.";
+    Text [ english_us ] = "An unexpected error occurred. The operation could not be performed.";
+    Text[ portuguese ] = "Ocorreu um erro imprevisto. � imposs�vel executar a opera��o.";
+    Text[ russian ] = "��������� ����������� ������. ��������� ������ �������� ����������.";
+    Text[ greek ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ dutch ] = "Er is een onverwachte fout opgetreden. De opdracht kan niet worden uitgevoerd.";
+    Text[ french ] = "Une erreur impr�vue s'est produite : impossible d'ex�cuter l'op�ration !";
+    Text[ spanish ] = "Ha ocurrido un error. No se puede ejecutar la operaci�n.";
+    Text[ finnish ] = "Ein unerwarteter Fehler ist aufgetreten. Die operation kann nicht ausgef�hrt werden.";
+    Text[ italian ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ danish ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ swedish ] = "Ett ov�ntat fel har uppst�tt. Det g�r inte att utf�ra operationen.";
+    Text[ polish ] = "Wyst�pi� nieoczekiwany b��d. Operacji nie mo�na wykona�.";
+    Text[ portuguese_brazilian ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ japanese ] = "�\\�����Ȃ��װ���������܂����B����̎��s�͂ł��܂���B";
+    Text[ korean ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ chinese_simplified ] = "����һ������Ĵ����޷�ִ�����������";
+    Text[ chinese_traditional ] = "�o�ͤ@�ӷN�~�����~�C�L�k����o�Ӱʧ@�C";
+    Text[ turkish ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ arabic ] = "An unexpected error occured. The operation could not be completed.";
+    Text[ catalan ] = "An unexpected error occured. The operation could not be completed.";
 };
 
 String STR_COULDNOTOPEN_LINKEDDOC
 {
     Text = "Das Dokument\n\n$file$\n\nkonnte nicht ge�ffnet werden.";
     Text [ english ] = "Th document\n\n$file$\n\ncould not be opened.";
-    Text [ english_us ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text [ english_us ] = "The document\n\n$file$\n\ncould not be opened.";
+    Text[ portuguese ] = "Foi imposs�vel abrir o documento\n\n$file$\n\n.";
+    Text[ russian ] = "������� ��������\n\n$file$\n\n����������.";
+    Text[ greek ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ dutch ] = "Het document\n\n$file$\n\nkon niet worden geopend.";
+    Text[ french ] = "Impossible d'ouvrir\n\nle document\n\n$file$ !";
+    Text[ spanish ] = "No se pudo abrir el documento\n\n$file$\n\n.";
+    Text[ finnish ] = "Das Dokument\n\n$file$\n\nkonnte nicht ge�ffnet werden.";
+    Text[ italian ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ danish ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ swedish ] = "Det gick inte att �ppna dokumentet\n\n$file$\n\n.";
+    Text[ polish ] = "Otwarcie dokumentu\n\n$file$\n\nnie powiod�o si�.";
+    Text[ portuguese_brazilian ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ japanese ] = "�޷����\n\n$file$ ��\n\n�J���܂���ł����B";
+    Text[ korean ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ chinese_simplified ] = "����ĵ�\n\n$file$\n\n�޷����򿪡�";
+    Text[ chinese_traditional ] = "�o�Ӥ��\n\n$file$\n\n�L�k�}�ҡC";
+    Text[ turkish ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ arabic ] = "Th document\n\n$file$\n\ncould not be opened.";
+    Text[ catalan ] = "Th document\n\n$file$\n\ncould not be opened.";
 };
 
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.18  2001/05/03 19:16:38  rt
+ *  Merge SRC630: 03.05.01 - 21:15:59 (NoBranch)
+ *
  *  Revision 1.17  2001/04/27 08:06:19  fs
  *  #86370# add UTF-8 to the list of supported charsets
  *