INTEGRATION: CWS mergebuild (1.2.158); FILE MERGED

2004/04/27 16:32:25 hjs 1.2.158.1: #i8252# fix unmerge, isonames and no translatable strings

1 files changed, 26 insertions, 323 deletions

diff --git a/svx/source/dialog/connpooloptions.src b/svx/source/dialog/connpooloptions.src
index 94e3439ea360..c9ddb29c38e7 100644
--- a/svx/source/dialog/connpooloptions.src
+++ b/svx/source/dialog/connpooloptions.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: connpooloptions.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2004-02-03 18:19:21 $
+ *  last change: $Author: hjs $ $Date: 2004-06-25 11:51:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,105 +79,24 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     {
         Pos = MAP_APPFONT( 4, 3 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 8, 8 );
-        Text = "Aufbewahrung von Verbindungen";
-        Text [ english ] = "Connection Pool";
-        Text [ english_us ] = "Connection pool";
-        Text [ language_user1 ] = "; Please don't translate the german phrase! It is an unfortunate translation of the english technical term.";
-        Text[ portuguese ] = "Agrega��o de liga��es";
-        Text[ russian ] = "���������� ����������";
-        Text[ greek ] = "����� ������������ ���������";
-        Text[ dutch ] = "Behouden van verbindingen";
-        Text[ french ] = "Pool de connexions";
-        Text[ spanish ] = "Pool de conexiones";
-        Text[ finnish ] = "Yhteysvaranto";
-        Text[ italian ] = "Insieme di collegamenti";
-        Text[ danish ] = "Fastholdelse af forbindelser";
-        Text[ swedish ] = "Kopplingspool";
-        Text[ polish ] = "Pula po��cze�";
-        Text[ portuguese_brazilian ] = "Pool de conex�es";
-        Text[ japanese ] = "ドライバを使った接続保持の設定";
-        Text[ korean ] = "연결 풀";
-        Text[ chinese_simplified ] = "保留驱动程序的设置";
-        Text[ chinese_traditional ] = "保留驅動程式的設置";
-        Text[ turkish ] = "Ba�lant� havuzu";
-        Text[ arabic ] = "Connection pool";
-        Text[ catalan ] = "Connexi� de recursos";
-        Text[ thai ] = "รวมการเชื่อมต่อ";
-        Text[ czech ] = "Sdílená připojení";
-        Text[ hebrew ] = "Aufbewahrung von Verbindungen";
-        Text[ hindi ] = "कनेक्शन् पूल";
-        Text[ slovak ] = "Zdieľanie pripojenia";
-        Text[ hungarian ] = "Kapcsolatgyűjtő";
-        Text[ slovenian ] = "Zaloga povezav";
+        Text [ de ] = "Aufbewahrung von Verbindungen";
+        Text [ en-US ] = "Connection pool";
+        Text [ x-comment ] = "; Please don't translate the german phrase! It is an unfortunate translation of the english technical term.";
     };
     CheckBox CB_POOL_CONNS
     {
         Pos = MAP_APPFONT( 7, 15 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 14, 8 );
-        Text = "Verbindungen aufbewahren";
-        Text [ english ] = "Connection pooling enabled";
-        Text [ english_us ] = "Connection pooling enabled";
-        Text[ portuguese ] = "Agregar liga��es";
-        Text[ russian ] = "���������� ���������� ����������";
-        Text[ greek ] = "� ����������� ��������� ��������������";
-        Text[ dutch ] = "Ve~rbindingen behouden";
-        Text[ french ] = "Pool de connexions actif";
-        Text[ spanish ] = "Pool de conexiones activo";
-        Text[ finnish ] = "Yhteysvaranto k�yt�ss�";
-        Text[ italian ] = "Attiva insieme dei collegamenti";
-        Text[ danish ] = "Fasthold forbindelser";
-        Text[ swedish ] = "Poolning av kopplingar";
-        Text[ polish ] = "~Pula po��cze� aktywna";
-        Text[ portuguese_brazilian ] = "Pool de conex�es habilitado";
-        Text[ japanese ] = "ドライバを使って接続を保持する";
-        Text[ korean ] = "연결 풀링 활성화";
-        Text[ chinese_simplified ] = "保留使用驱动程序";
-        Text[ chinese_traditional ] = "保留使用驅動程式";
-        Text[ turkish ] = "Ortayatoplama ba�lant�s� etkin";
-        Text[ arabic ] = "Connection pooling enabled";
-        Text[ catalan ] = "Habilita la connexi� de recursos";
-        Text[ language_user1 ] = "; jc 01.08.01: der Eintrag befindet sich in Extras/Optionen/Datenquellen/Verbindungen";
-        Text[ thai ] = "เปิดใช้งานรวมการเชื่อมต่อ";
-        Text[ czech ] = "Sdílení připojení povoleno";
-        Text[ hebrew ] = "Verbindungen aufbewahren";
-        Text[ hindi ] = "कनेक्शन् पूलिंग को सक्षम किया है";
-        Text[ slovak ] = "Zdieľanie pripojenia umožnené";
-        Text[ hungarian ] = "Kapcsolatgyűjtő engedélyezve";
-        Text[ slovenian ] = "Zbiranje povezav je omogočeno";
+        Text [ de ] = "Verbindungen aufbewahren";
+        Text [ en-US ] = "Connection pooling enabled";
+        Text [ x-comment ] = "; jc 01.08.01: der Eintrag befindet sich in Extras/Optionen/Datenquellen/Verbindungen";
     };
     FixedText FT_DRIVERS
     {
         Pos = MAP_APPFONT( 17, 27 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 14 - 8, 8 );
-        Text = "In %PRODUCTNAME bekannte Treiber";
-        Text [ english ] = "Drivers known in %PRODUCTNAME";
-        Text [ english_us ] = "Drivers known in %PRODUCTNAME";
-        Text[ portuguese ] = "Controladores conhecidos de %PRODUCTNAME";
-        Text[ russian ] = "��������, ��������� %PRODUCTNAME";
-        Text[ greek ] = "������ ����������� �������� ��� %PRODUCTNAME";
-        Text[ dutch ] = "Onder %PRODUCTNAME bekende drivers";
-        Text[ french ] = "Pilotes d�clar�s sous %PRODUCTNAME";
-        Text[ spanish ] = "Controladores conocidos en %PRODUCTNAME";
-        Text[ finnish ] = "%PRODUCTNAMEn tunnetut ohjaimet";
-        Text[ italian ] = "Driver conosciuti in %PRODUCTNAME";
-        Text[ danish ] = "Kendte drivere i %PRODUCTNAME";
-        Text[ swedish ] = "K�nda drivrutiner i %PRODUCTNAME";
-        Text[ polish ] = "~Sterowniki znane w %PRODUCTNAME";
-        Text[ portuguese_brazilian ] = "Drivers conhecidos pelo %PRODUCTNAME";
-        Text[ japanese ] = "%PRODUCTNAME で使えるドライバ";
-        Text[ korean ] = "%PRODUCTNAME에서 알려져 있는 드라이버";
-        Text[ chinese_simplified ] = "已经为 %PRODUCTNAME 提供的驱动程序";
-        Text[ chinese_traditional ] = "已經為 %PRODUCTNAME 提供的驅動程式";
-        Text[ turkish ] = "%PRODUCTNAME deki bilinen s�r�c�ler";
-        Text[ arabic ] = "Drivers known in %PRODUCTNAME";
-        Text[ catalan ] = "Controladors coneguts d'%PRODUCTNAME";
-        Text[ thai ] = "ไดร้ฟ์เวอร์ที่รู้จักใน %PRODUCTNAME";
-        Text[ czech ] = "Ovladače známé pro %PRODUCTNAME";
-        Text[ hebrew ] = "In %PRODUCTNAME bekannte Treiber";
-        Text[ hindi ] = "%PRODUCTNAME में ड्रइवर्स अज्ञात नहीं है";
-        Text[ slovak ] = "Ovládače známe pre %PRODUCTNAME";
-        Text[ hungarian ] = "Az %PRODUCTNAME által ismert illesztőprogramok";
-        Text[ slovenian ] = "Znani gonilniki v %PRODUCTNAME";
+        Text [ de ] = "In %PRODUCTNAME bekannte Treiber";
+        Text [ en-US ] = "Drivers known in %PRODUCTNAME";
     };
     Control CTRL_DRIVER_LIST
     {
@@ -191,35 +110,8 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     {
         Pos = MAP_APPFONT( 17, 38 + LIST_SIZE_Y + 4 );
         Size = MAP_APPFONT( 70, 8 );
-        Text = "aktueller Treiber:";
-        Text [ english ] = "current driver:";
-        Text [ english_us ] = "Current driver:";
-        Text[ portuguese ] = "Controlador actual:";
-        Text[ russian ] = "������� �������:";
-        Text[ greek ] = "������ �����. ��������:";
-        Text[ dutch ] = "Huidige driver:";
-        Text[ french ] = "Pilote actif :";
-        Text[ spanish ] = "Controlador actual:";
-        Text[ finnish ] = "Nykyinen ohjain:";
-        Text[ italian ] = "Driver attivo:";
-        Text[ danish ] = "Nuv�rende driver:";
-        Text[ swedish ] = "Aktuell drivrutin:";
-        Text[ polish ] = "Bie��cy sterownik:";
-        Text[ portuguese_brazilian ] = "Driver atual:";
-        Text[ japanese ] = "現在のドライバ:";
-        Text[ korean ] = "현재 드라이버:";
-        Text[ chinese_simplified ] = "现在使用中的驱动程序：";
-        Text[ chinese_traditional ] = "現在使用的驅動程式：";
-        Text[ turkish ] = "Ge�erli s�r�c�:";
-        Text[ arabic ] = "Current driver:";
-        Text[ catalan ] = "Controlador actual:";
-        Text[ thai ] = "ไดร้ฟ์เวอร์ปัจจุบัน:";
-        Text[ czech ] = "Současný ovladač:";
-        Text[ hebrew ] = "aktueller Treiber:";
-        Text[ hindi ] = "वर्तमान ड्रइवर:";
-        Text[ slovak ] = "Súčasný ovládač:";
-        Text[ hungarian ] = "Aktuális illesztőprogram:";
-        Text[ slovenian ] = "Trenutni gonilnik:";
+        Text [ de ] = "aktueller Treiber:";
+        Text [ en-US ] = "Current driver:";
     };
     FixedText FT_DRIVER
     {
@@ -230,69 +122,15 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
     {
         Pos = MAP_APPFONT( 17, 38 + LIST_SIZE_Y + 4 + 8 + 3 );
         Size = MAP_APPFONT( PAGE_SIZE_X - 23, 8 );
-        Text = "Verbindungen dieses Treibers aufbewahren";
-        Text [ english ] = "enable pooling for this driver";
-        Text [ english_us ] = "Enable pooling for this driver";
-        Text[ portuguese ] = "Agregar as liga��es deste controlador";
-        Text[ russian ] = "���������� ���������� ����� ��������";
-        Text[ greek ] = "������������ ������������ ��� ���� �� ��������� ��������";
-        Text[ dutch ] = "V~erbindingen voor deze driver behouden";
-        Text[ french ] = "Pool de connexions actif pour ce pilote";
-        Text[ spanish ] = "Pool de conexiones para este controlador";
-        Text[ finnish ] = "Ota ohjaimen ~varantotoiminto k�ytt��n";
-        Text[ italian ] = "Mantenere il collegamento del driver";
-        Text[ danish ] = "Fasthold denne drivers forbindelser";
-        Text[ swedish ] = "Poolning av kopplingar f�r den h�r drivrutinen";
-        Text[ polish ] = "W��~cz pul� dla tego sterownika";
-        Text[ portuguese_brazilian ] = "Habilitar pooling de conex�es para este driver";
-        Text[ japanese ] = "このドライバで接続を保持する";
-        Text[ korean ] = "이 드라이버를 위해 연결 풀링을 활성화";
-        Text[ chinese_simplified ] = "保留使用这个驱动程序";
-        Text[ chinese_traditional ] = "保留使用這個驅動程式";
-        Text[ turkish ] = "Bu s�r�c� i�in havuzu etkin hale getir";
-        Text[ arabic ] = "Enable pooling for this driver";
-        Text[ catalan ] = "habilita els recursos per aquest controlador";
-        Text[ thai ] = "เปิดใช้งานรวมสำหรับไดร้ฟ์เวอร์นี้";
-        Text[ czech ] = "Povolit sdílení pro tento ovladač";
-        Text[ hebrew ] = "Verbindungen dieses Treibers aufbewahren";
-        Text[ hindi ] = "इस ड्रइवर केलिए पूलिंग को सक्षम करो";
-        Text[ slovak ] = "Aktivovať zdieľanie pre tento ovládač";
-        Text[ hungarian ] = "A gyűjtés engedélyezése erre az illesztőprogramra";
-        Text[ slovenian ] = "Omogoči zbiranje povezav za ta gonilnik";
+        Text [ de ] = "Verbindungen dieses Treibers aufbewahren";
+        Text [ en-US ] = "Enable pooling for this driver";
     };
     FixedText FT_TIMEOUT
     {
         Pos = MAP_APPFONT( 27, 38 + LIST_SIZE_Y + 4 + 8 + 3 + 8 + 3 + 2 );
         Size = MAP_APPFONT( 70, 8 );
-        Text = "Verfallszeit (Sekunden)";
-        Text [ english ] = "Timeout (seconds)";
-        Text [ english_us ] = "Timeout (seconds)";
-        Text[ portuguese ] = "Tempo de espera excedido (segundos)";
-        Text[ russian ] = "����� �������� (�������)";
-        Text[ greek ] = "~������� ���� (��������.)";
-        Text[ dutch ] = "Time-out (seconden)";
-        Text[ french ] = "Time out (secondes)";
-        Text[ spanish ] = "Tiempo muerto (segundos)";
-        Text[ finnish ] = "Aikakatkaisu (sekunteina)";
-        Text[ italian ] = "Timeout (secondi)";
-        Text[ danish ] = "Forfaldstid (sekunder)";
-        Text[ swedish ] = "Timeout (sekunder)";
-        Text[ polish ] = "~Limit czasu (w sekundach)";
-        Text[ portuguese_brazilian ] = "Tempo de espera excedido (segundos)";
-        Text[ japanese ] = "タイムアウト(秒)";
-        Text[ korean ] = "제한 시간(초)";
-        Text[ chinese_simplified ] = "超过时限(秒)";
-        Text[ chinese_traditional ] = "超過時限(秒)";
-        Text[ turkish ] = "Zamana��m�(saniye)";
-        Text[ arabic ] = "Timeout (seconds)";
-        Text[ catalan ] = "Temps d'espera (segons)";
-        Text[ thai ] = "หมดเวลา (วินาที)";
-        Text[ czech ] = "Vypršení času (vteřin)";
-        Text[ hebrew ] = "Verfallszeit (Sekunden)";
-        Text[ hindi ] = "समय की समाप्ती (सेकन्ड्स)";
-        Text[ slovak ] = "Timeout (sekundy)";
-        Text[ hungarian ] = "Időtúllépés (másodpercben)";
-        Text[ slovenian ] = "Časovna omejitev (sek.)";
+        Text [ de ] = "Verfallszeit (Sekunden)";
+        Text [ en-US ] = "Timeout (seconds)";
     };
     NumericField NF_TIMEOUT
     {
@@ -312,163 +150,28 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
 
     String STR_DRIVER_NAME
     {
-        Text = "Treibername";
-        Text [ english ] = "Driver name";
-        Text [ english_us ] = "Driver name";
-        Text[ portuguese ] = "Nome do controlador";
-        Text[ russian ] = "��� ��������";
-        Text[ greek ] = "����� ������������ ��������";
-        Text[ dutch ] = "Drivernaam";
-        Text[ french ] = "Pilotes";
-        Text[ spanish ] = "Nombre del controlador";
-        Text[ finnish ] = "Ohjaimen nimi";
-        Text[ italian ] = "Nome driver";
-        Text[ danish ] = "Drivernavn";
-        Text[ swedish ] = "Drivrutinsnamn";
-        Text[ polish ] = "Nazwa sterownika";
-        Text[ portuguese_brazilian ] = "Nome do Driver";
-        Text[ japanese ] = "ドライバ名";
-        Text[ korean ] = "드라이버 이름";
-        Text[ chinese_simplified ] = "驱动程序的名称";
-        Text[ chinese_traditional ] = "驅動程式名稱";
-        Text[ turkish ] = "S�r�c� ad�";
-        Text[ arabic ] = "Driver name";
-        Text[ catalan ] = "Nom del controlador";
-        Text[ thai ] = "ชื่อไดร้ฟ์เวอร์";
-        Text[ czech ] = "Název ovladače";
-        Text[ hebrew ] = "Treibername";
-        Text[ hindi ] = "ड्रइवर का नाम";
-        Text[ slovak ] = "Názov ovládača";
-        Text[ hungarian ] = "Illesztőprogram neve";
-        Text[ slovenian ] = "Ime gonilnika";
+        Text [ de ] = "Treibername";
+        Text [ en-US ] = "Driver name";
     };
     String STR_POOLED_FLAG
     {
-        Text = "aufbewahren";
-        Text [ english ] = "pool";
-        Text [ english_us ] = "Pool";
-        Text[ portuguese ] = "Agregar";
-        Text[ russian ] = "����������";
-        Text[ greek ] = "����� ������������";
-        Text[ dutch ] = "behouden";
-        Text[ french ] = "Pool";
-        Text[ spanish ] = "Conservar";
-        Text[ finnish ] = "Varanto";
-        Text[ italian ] = "pool";
-        Text[ danish ] = "Fasthold";
-        Text[ swedish ] = "Pool";
-        Text[ polish ] = "Pula";
-        Text[ portuguese_brazilian ] = "Pool";
-        Text[ japanese ] = "保持";
-        Text[ korean ] = "연결 풀";
-        Text[ chinese_simplified ] = "保留";
-        Text[ chinese_traditional ] = "保留";
-        Text[ turkish ] = "Havuz";
-        Text[ arabic ] = "Pool";
-        Text[ catalan ] = "recurs";
-        Text[ thai ] = "รวม";
-        Text[ czech ] = "Sdílení";
-        Text[ hebrew ] = "aufbewahren";
-        Text[ hindi ] = "पूल";
-        Text[ slovak ] = "Zdieľanie";
-        Text[ hungarian ] = "Gyűjtő";
-        Text[ slovenian ] = "Zaloga";
+        Text [ de ] = "aufbewahren";
+        Text [ en-US ] = "Pool";
     };
     String STR_POOL_TIMEOUT
     {
-        Text = "Verfallszeit";
-        Text [ english ] = "Timeout";
-        Text [ english_us ] = "Timeout";
-        Text[ portuguese ] = "Tempo de espera excedido";
-        Text[ russian ] = "����� ��������";
-        Text[ greek ] = "������� ����";
-        Text[ dutch ] = "Time-out";
-        Text[ french ] = "Time out";
-        Text[ spanish ] = "Tiempo muerto";
-        Text[ finnish ] = "Aikakatkaisu";
-        Text[ italian ] = "Timeout";
-        Text[ danish ] = "Forfaldstid";
-        Text[ swedish ] = "Timeout";
-        Text[ polish ] = "Limit czasu";
-        Text[ portuguese_brazilian ] = "Tempo de espera excedido";
-        Text[ japanese ] = "タイムアウト";
-        Text[ korean ] = "제한 시간";
-        Text[ chinese_simplified ] = "超过时限";
-        Text[ chinese_traditional ] = "超過時限";
-        Text[ turkish ] = "Zaman��m�";
-        Text[ arabic ] = "Timeout";
-        Text[ catalan ] = "Temps d'espera";
-        Text[ thai ] = "หมดเวลา";
-        Text[ czech ] = "Vypršení času";
-        Text[ hebrew ] = "Verfallszeit";
-        Text[ hindi ] = "समय की समाप्ती";
-        Text[ slovak ] = "Prerušenie (timeout)";
-        Text[ hungarian ] = "Időtúllépés";
-        Text[ slovenian ] = "Časovna omejitev";
+        Text [ de ] = "Verfallszeit";
+        Text [ en-US ] = "Timeout";
     };
     String STR_YES
     {
-        Text = "ja";
-        Text [ english ] = "yes";
-        Text [ english_us ] = "Yes";
-        Text[ portuguese ] = "Sim";
-        Text[ russian ] = "��";
-        Text[ greek ] = "���";
-        Text[ dutch ] = "ja";
-        Text[ french ] = "Oui";
-        Text[ spanish ] = "S�";
-        Text[ finnish ] = "Kyll�";
-        Text[ italian ] = "S�";
-        Text[ danish ] = "ja";
-        Text[ swedish ] = "Ja";
-        Text[ polish ] = "Tak";
-        Text[ portuguese_brazilian ] = "Sim";
-        Text[ japanese ] = "はい";
-        Text[ korean ] = "예";
-        Text[ chinese_simplified ] = "是";
-        Text[ chinese_traditional ] = "是";
-        Text[ turkish ] = "Evet";
-        Text[ arabic ] = "���";
-        Text[ catalan ] = "s�";
-        Text[ thai ] = "ใช่";
-        Text[ czech ] = "Ano";
-        Text[ hebrew ] = "‮כן‬";
-        Text[ hindi ] = "हाँ";
-        Text[ slovak ] = "Áno";
-        Text[ hungarian ] = "Igen";
-        Text[ slovenian ] = "Da";
+        Text [ de ] = "ja";
+        Text [ en-US ] = "Yes";
     };
     String STR_NO
     {
-        Text = "nein";
-        Text [ english ] = "no";
-        Text [ english_us ] = "No";
-        Text[ portuguese ] = "N�o";
-        Text[ russian ] = "���";
-        Text[ greek ] = "���";
-        Text[ dutch ] = "nee";
-        Text[ french ] = "Non";
-        Text[ spanish ] = "No";
-        Text[ finnish ] = "Ei";
-        Text[ italian ] = "No";
-        Text[ danish ] = "nej";
-        Text[ swedish ] = "Nej";
-        Text[ polish ] = "Nie";
-        Text[ portuguese_brazilian ] = "N�o";
-        Text[ japanese ] = "いいえ";
-        Text[ korean ] = "아니오";
-        Text[ chinese_simplified ] = "否";
-        Text[ chinese_traditional ] = "否";
-        Text[ turkish ] = "Hay�r";
-        Text[ arabic ] = "��";
-        Text[ catalan ] = "no";
-        Text[ thai ] = "ไม่ใช่";
-        Text[ czech ] = "Ne";
-        Text[ hebrew ] = "‮לא‬";
-        Text[ hindi ] = "नहीं";
-        Text[ slovak ] = "Nie";
-        Text[ hungarian ] = "Nem";
-        Text[ slovenian ] = "Ne";
+        Text [ de ] = "nein";
+        Text [ en-US ] = "No";
     };
 };