Merge SRC624: 09.03.01 - 21:40:01 (NoBranch)

1 files changed, 61 insertions, 8 deletions

diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index be80ba3a8f81..28677d4314d9 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.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-13 09:48:18 $
+ *  last change: $Author: kz $ $Date: 2001-03-09 20:39:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,7 +88,24 @@ Resource RSC_DATASOURCE_TYPES
     {
         Text = "Adabas;JDBC;ODBC;dBase;ADO;Text;Tabellendokument" ;
         Text [ english ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet" ;
-        Text [ english_us ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Spreadsheet" ;
+        Text [ english_us ] = "Adabas;JDBC;ODBC;dBase;Text" ;
+        Text[ portuguese ] = "Adabas;JDBC;ODBC;dBase;Texto";
+        Text[ russian ] = "Adabas;JDBC;ODBC;dBase;�����";
+        Text[ greek ] = "Adabas;JDBC;ODBC;dBase;�������";
+        Text[ dutch ] = "Adabas;JDBC;ODBC;dBase;Tekst";
+        Text[ french ] = "Adabas;JDBC;ODBC;dBase;Texte";
+        Text[ spanish ] = "Adabas;JDBC;ODBC;dBase;ADO;Texto;Hoja de c�lculo";
+        Text[ italian ] = "Adabas;JDBC;ODBC;dBase;Testo";
+        Text[ danish ] = "Adabas;JDBC;ODBC;dBase;Tekst";
+        Text[ swedish ] = "Adabas;JDBC;ODBC;dBase;ADO;Text;Tabelldokument";
+        Text[ polish ] = "Adabas;JDBC;ODBC;dBase;ADO;Tekst;Arkusz kalkulacyjny";
+        Text[ portuguese_brazilian ] = "Adabas;JDBC;ODBC;dBase;Text";
+        Text[ japanese ] = "Adabas;JDBC;ODBC;dBase;÷��";
+        Text[ korean ] = "Adabas;JDBC;ODBC;dBase;Text";
+        Text[ chinese_simplified ] = "Adabas;JDBC;ODBC;dBase;����";
+        Text[ chinese_traditional ] = "Adabas;JDBC;ODBC;dBase;��r";
+        Text[ turkish ] = "Adabas;JDBC;ODBC;dBase;Text";
+        Text[ arabic ] = "Adabas;JDBC;ODBC;dBase;ADO;��;����� �����";
     };
 };
 
@@ -98,9 +115,25 @@ Resource RSC_CHARSETS
     {
         Text = "Ansi;Mac;IBMPC (437);IBMPC (850)/ DOS;IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System" ;
         Text [ english ] = "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" ;
-        Text[ language_user1 ] = "Please take care of the numer of tokens in the translated string (Tokens are the units separated by ; characters). "
-            "It must be exactly the same number as in the original (untranslated) string. Thanks.";
+        Text [ english_us ] = "Ansi;Mac;DOS;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System" ;
+        Text[ language_user1 ] = "Please take care of the numer of tokens in the translated string (Tokens are the units separated by ; characters). It must be exactly the same number as in the original (untranslated) string. Thanks.";
+        Text[ portuguese ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
+        Text[ russian ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�������";
+        Text[ greek ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�������";
+        Text[ dutch ] = "Ansi;Mac;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Systeem";
+        Text[ french ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);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[ italian ] = "Ansi;Mac;IBMPC;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;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
+        Text[ portuguese_brazilian ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);Sistema";
+        Text[ japanese ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);����";
+        Text[ korean ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);System";
+        Text[ chinese_simplified ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);ϵͳ";
+        Text[ chinese_traditional ] = "Ansi;Mac;Dos;IBMPC;IBMPC (437);IBMPC (850);IBMPC (860);IBMPC (861);IBMPC (863);IBMPC (865);�t��";
+        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);����";
     };
 };
 
@@ -124,7 +157,7 @@ String STR_GENERAL_SDB_ERROR
     Text[ japanese ] = "�ް�����֐ڑ����̴װ";
     Text[ korean ] = "������ �ҽ��� ����ÿ� ����";
     Text[ chinese_simplified ] = "�ں�����Դ����ʱ����һ������";
-    Text[ chinese_traditional ] = "�s�u���Ʒ��ɵo�ͤ@�ӿ��~";
+    Text[ chinese_traditional ] = "�s�u���ƨӷ��ɵo�ͤ@�ӿ��~";
     Text[ turkish ] = "Error while connecting to the data source";
     Text[ arabic ] = "��� ����� ������� ����� ��������";
 };
@@ -133,12 +166,32 @@ String STR_OBJECT_ALREADY_EXSISTS
 {
     Text = "Fehler beim Erzeugen!";
     Text [ english ] = "Error while creating!";
-    Text [ english_us ] = "Error while creating!";
+    Text [ english_us ] = "Error during creation!";
+    Text[ portuguese ] = "Erro ao criar objecto!";
+    Text[ russian ] = "������ �� ����� ��������.";
+    Text[ greek ] = "������ ���� ��� ����������!";
+    Text[ dutch ] = "Error while creating!";
+    Text[ french ] = "Erreur durant le processus de cr�ation !";
+    Text[ spanish ] = "�Error al crear el objeto!";
+    Text[ italian ] = "Errore nella creazione dell'oggetto";
+    Text[ danish ] = "Error while creating!";
+    Text[ swedish ] = "Fel n�r objekt skulle skapas!";
+    Text[ polish ] = "B��d w trakcie tworzenia!";
+    Text[ portuguese_brazilian ] = "Error while creating!";
+    Text[ japanese ] = "�쐬����Ƃ��̴װ�B";
+    Text[ korean ] = "Error while creating!";
+    Text[ chinese_simplified ] = "Error while creating!";
+    Text[ chinese_traditional ] = "�b�إ߮ɵo�Ϳ��~";
+    Text[ turkish ] = "Error while creating!";
+    Text[ arabic ] = "��� ����� �������!";
 };
 
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.12  2001/02/13 09:48:18  fs
+ *  #83632# merge IBMPC, IBMPC(850), DOS
+ *
  *  Revision 1.11  2001/01/30 09:46:40  fs
  *  add the 'spreadsheet' to english_us, too
  *