INTEGRATION: CWS mergebuild (1.19.94); FILE MERGED

2004/04/20 18:23:37 hjs 1.19.94.3: RESYNC: (1.19-1.20); FILE MERGED
2003/11/11 19:26:27 ihi 1.19.94.2: en -> en-US
2003/11/10 18:00:54 ihi 1.19.94.1: #111234# Merge during build

1 files changed, 14 insertions, 122 deletions

diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src
index a3d0dd82b16f..4e9708bada6c 100644
--- a/sw/source/ui/table/mergetbl.src
+++ b/sw/source/ui/table/mergetbl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mergetbl.src,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: vg $ $Date: 2003-12-17 19:15:42 $
+ *  last change: $Author: hjs $ $Date: 2004-06-26 03:41:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,7 @@ ModalDialog DLG_MERGE_TABLE
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 207 , 57 ) ;
-    Text = "Tabellen verbinden" ;
-    Text [ ENGLISH ] = "Join tables" ;
+    Text [ de ] = "Tabellen verbinden" ;
     Moveable = TRUE ;
     OKButton PB_OK
     {
@@ -95,137 +94,30 @@ ModalDialog DLG_MERGE_TABLE
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
         Size = MAP_APPFONT ( 139 , 8 ) ;
-        Text = "Modus" ;
-        Text [ ENGLISH ] = "Mode" ;
-        Text [ english_us ] = "Mode" ;
-        Text [ portuguese_brazilian ] = "Modo" ;
-        Text [ swedish ] = "L�ge" ;
-        Text [ danish ] = "Tilstand" ;
-        Text [ italian ] = "Modo" ;
-        Text [ spanish ] = "Modo" ;
-        Text [ french ] = "Mode" ;
-        Text [ dutch ] = "Modus" ;
-        Text [ portuguese ] = "Modo" ;
-        Text[ chinese_simplified ] = "模式";
-        Text[ russian ] = "�����";
-        Text[ polish ] = "Tryb";
-        Text[ japanese ] = "モード";
-        Text[ chinese_traditional ] = "模式";
-        Text[ arabic ] = "�������";
-        Text[ greek ] = "��������� �����������";
-        Text[ korean ] = "모드";
-        Text[ turkish ] = "T�r";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Mode";
-        Text[ finnish ] = "Tila";
-        Text[ thai ] = "โหมด";
-        Text[ czech ] = "Režim";
-        Text[ hebrew ] = "Modus";
-        Text[ hindi ] = "प्रकार ";
-        Text[ slovak ] = "Režim";
-        Text[ hungarian ] = "Mód";
-        Text[ slovenian ] = "Način";
+        Text [ de ] = "Modus" ;
+        Text [ en-US ] = "Mode" ;
+        Text [ x-comment ] = " ";
     };
     RadioButton RB_MERGE_PREV
     {
         Pos = MAP_APPFONT ( 12 , 15 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
-        Text = "mit der ~vorherigen Tabelle verbinden" ;
-        Text [ ENGLISH ] = "Join with ~previous table" ;
+        Text [ de ] = "mit der ~vorherigen Tabelle verbinden" ;
         Check = TRUE ;
         TabStop = TRUE ;
-        Text[ english_us ] = "Join with ~previous table";
-        Text[ portuguese ] = "Unir � tabela ~anterior";
-        Text[ russian ] = "���������� � ���������� ��������";
-        Text[ dutch ] = "met de ~vorige tabel verbinden";
-        Text[ french ] = "Fusionner avec le tableau ~pr�c�dent";
-        Text[ spanish ] = "Unir con la tabla ~anterior";
-        Text[ italian ] = "Unisci alla tabella precedente";
-        Text[ danish ] = "flet med forrige tabel";
-        Text[ swedish ] = "sammanfoga med den ~f�reg�ende tabellen";
-        Text[ polish ] = "Z��cz z ~poprzedni� tabel�";
-        Text[ portuguese_brazilian ] = "Juntar com a tabela ~anterior";
-        Text[ japanese ] = "前の表と結合(~P)";
-        Text[ chinese_simplified ] = "和上一个表格合并(~P)";
-        Text[ chinese_traditional ] = "和上一個表格合併(~P)";
-        Text[ arabic ] = "����� �� ������ ������";
-        Text[ greek ] = "����� �� ����������� ������";
-        Text[ korean ] = "이전 표에 연결(~P)";
-        Text[ turkish ] = "�nceki ~tablo ile birle�tir";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Uneix a la taula ~anterior";
-        Text[ finnish ] = "Liit� ~edelliseen taulukkoon";
-        Text[ thai ] = "ร่วมด้วยตาราง~ก่อน";
-        Text[ czech ] = "Spojit s předchozí tabulkou";
-        Text[ hebrew ] = "mit der ~vorherigen Tabelle verbinden";
-        Text[ hindi ] = "~पिछले सारणी के साथ जोड़ो";
-        Text[ slovak ] = "Spojiť s ~predchádzajúcou tabuľkou";
-        Text[ hungarian ] = "Egyesítés az ~előző táblázattal";
-        Text[ slovenian ] = "Združi s ~prejšnjo tabelo";
+        Text [ en-US ] = "Join with ~previous table";
+        Text [ x-comment ] = " ";
     };
     RadioButton RB_MERGE_NEXT
     {
         Pos = MAP_APPFONT ( 12 , 30 ) ;
         Size = MAP_APPFONT ( 130 , 10 ) ;
-        Text = "mit der ~nachfolgenden Tabelle verbinden" ;
-        Text [ ENGLISH ] = "Join with ~next table" ;
-        Text[ english_us ] = "Join with ~next table";
-        Text[ portuguese ] = "Unir � tabela ~seguinte";
-        Text[ russian ] = "���������� �� ��������� ��������";
-        Text[ dutch ] = "Met de v~olgende tabel verbinden";
-        Text[ french ] = "Fusionner avec le tableau ~suivant";
-        Text[ spanish ] = "Unir con la tabla ~siguiente";
-        Text[ italian ] = "Unisci alla tabella successiva";
-        Text[ danish ] = "flet med efterf�lgende tabel";
-        Text[ swedish ] = "sammanfoga med den ~efterf�ljande tabellen";
-        Text[ polish ] = "Z��cz z ~nast�pn� tabel�";
-        Text[ portuguese_brazilian ] = "Juntar com a tabela ~seguinte";
-        Text[ japanese ] = "次の表と結合(~N)";
-        Text[ chinese_simplified ] = "和下一个表格合并(~N)";
-        Text[ chinese_traditional ] = "和下一個表格合併(~N)";
-        Text[ arabic ] = "����� �� ������ ������";
-        Text[ greek ] = "����� �� ������� ������";
-        Text[ korean ] = "다음 표에 연결(~N)";
-        Text[ turkish ] = "S~onraki tablo ile birle�tir";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "uneix amb la taula ~seg�ent";
-        Text[ finnish ] = "Liit� ~seuraavaan taulukkoon";
-        Text[ thai ] = "ร่วมด้วยตาราง~ถัดไป";
-        Text[ czech ] = "Spojit s následující tabulkou";
-        Text[ hebrew ] = "mit der ~nachfolgenden Tabelle verbinden";
-        Text[ hindi ] = "~अगले सारणी के साथ जोड़ो";
-        Text[ slovak ] = "Spojiť s ~nasledujúcou tabuľkou";
-        Text[ hungarian ] = "Egyesítés a ~következő táblázattal";
-        Text[ slovenian ] = "Združi z ~naslednjo tabelo";
+        Text [ de ] = "mit der ~nachfolgenden Tabelle verbinden" ;
+        Text [ en-US ] = "Join with ~next table";
+        Text [ x-comment ] = " ";
     };
-    Text[ english_us ] = "Merge Tables";
-    Text[ portuguese ] = "Unir tabelas";
-    Text[ russian ] = "���������� �������";
-    Text[ dutch ] = "Tabellen verbinden";
-    Text[ french ] = "Fusion de tableaux";
-    Text[ spanish ] = "unir tablas";
-    Text[ italian ] = "Unisci tabelle";
-    Text[ danish ] = "Flet tabeller";
-    Text[ swedish ] = "Sammanfoga tabeller";
-    Text[ polish ] = "Scal tabele";
-    Text[ portuguese_brazilian ] = "Mesclar Tabelas";
-    Text[ japanese ] = "表の結合";
-    Text[ chinese_simplified ] = "连接表格";
-    Text[ chinese_traditional ] = "連接表格";
-    Text[ arabic ] = "��� �������";
-    Text[ greek ] = "���������� �������";
-    Text[ korean ] = "표 병합";
-    Text[ turkish ] = "Tablolar� birle�tir";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Fusiona les taules";
-    Text[ finnish ] = "Yhdist� taulukot";
-    Text[ thai ] = "ผสานตาราง";
-    Text[ czech ] = "Sloučit tabulky";
-    Text[ hebrew ] = "Tabellen verbinden";
-    Text[ hindi ] = "सारणियों को मिलाओ";
-    Text[ slovak ] = "Zlúčiť tabuľky";
-    Text[ hungarian ] = "Táblázatok egyesítése";
-    Text[ slovenian ] = "Spoji tabele";
+    Text [ en-US ] = "Merge Tables";
+    Text [ x-comment ] = " ";
 };