INTEGRATION: CWS mergebuild (1.24.68); FILE MERGED

2004/04/30 13:32:10 hjs 1.24.68.4: #i8252# fix unmerge probs
2004/04/20 23:57:46 hjs 1.24.68.3: RESYNC: (1.24-1.25); FILE MERGED
2003/11/11 19:20:29 ihi 1.24.68.2: en -> en-US
2003/11/10 17:36:29 ihi 1.24.68.1: #111234# Merge during build

1 files changed, 33 insertions, 347 deletions

diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src
index 2603f2e2404a..a21b7a9b6512 100644
--- a/sc/source/ui/src/textdlgs.src
+++ b/sc/source/ui/src/textdlgs.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: textdlgs.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: vg $ $Date: 2003-12-17 20:08:49 $
+ *  last change: $Author: hjs $ $Date: 2004-06-26 20:11:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,19 +69,8 @@ TabDialog RID_SCDLG_CHAR
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 289 , 176 ) ;
-    Text = "Zeichen" ;
-    Text [ ENGLISH ] = "Character" ;
-    Text [ norwegian ] = "Character" ;
-    Text [ italian ] = "Carattere" ;
-    Text [ portuguese_brazilian ] = "Caracter" ;
-    Text [ portuguese ] = "Caracteres" ;
-    Text [ finnish ] = "Merkki" ;
-    Text [ danish ] = "Tegn" ;
-    Text [ french ] = "Caract�res" ;
-    Text [ swedish ] = "Tecken" ;
-    Text [ dutch ] = "Teken" ;
-    Text [ spanish ] = "Car�cter" ;
-    Text [ english_us ] = "Character" ;
+    Text [ de ] = "Zeichen" ;
+    Text [ en-US ] = "Character" ;
     Moveable = TRUE ;
     Closeable = TRUE ;
     TabControl 1
@@ -94,101 +83,20 @@ TabDialog RID_SCDLG_CHAR
             PageItem
             {
                 Identifier = RID_SVXPAGE_CHAR_NAME ;
-                Text = "Schrift" ;
-                Text [ ENGLISH ] = "Character" ;
-                Text[ english_us ] = "Font";
-                Text[ portuguese ] = "Tipo de letra";
-                Text[ russian ] = "�����";
-                Text[ greek ] = "�������������";
-                Text[ dutch ] = "Lettertype";
-                Text[ french ] = "Police";
-                Text[ spanish ] = "Fuente";
-                Text[ italian ] = "Carattere";
-                Text[ danish ] = "Skrifttype";
-                Text[ swedish ] = "Teckensnitt";
-                Text[ polish ] = "Czcionka";
-                Text[ portuguese_brazilian ] = "Fonte";
-                Text[ japanese ] = "フォント";
-                Text[ korean ] = "글꼴";
-                Text[ chinese_simplified ] = "字体";
-                Text[ chinese_traditional ] = "字型";
-                Text[ turkish ] = "Yaz� tipi";
-                Text[ arabic ] = "����";
-                Text[ catalan ] = "Tipus de lletra";
-                Text[ finnish ] = "Fontti";
-                Text[ thai ] = "ตัวอักษร";
-                Text[ czech ] = "Písmo";
-                Text[ hebrew ] = "‮גופן‬";
-                Text[ hindi ] = "फ़ॉन्ट्";
-                Text[ slovak ] = "Písmo";
-                Text[ hungarian ] = "Betűkészlet";
-                Text[ slovenian ] = "Pisava";
+                Text [ de ] = "Schrift" ;
+                Text [ en-US ] = "Font";
             };
             PageItem
             {
                 Identifier = RID_SVXPAGE_CHAR_EFFECTS ;
-                Text = "Schrifteffekt" ;
-                Text [ ENGLISH ] = "Character Extension" ;
-                Text[ english_us ] = "Font Effects";
-                Text[ portuguese ] = "Efeitos do tipo de letra";
-                Text[ russian ] = "������� ������";
-                Text[ greek ] = "��� ��������������";
-                Text[ dutch ] = "Schrifteffect";
-                Text[ french ] = "Effets de caract�res";
-                Text[ spanish ] = "Efecto de fuente";
-                Text[ italian ] = "Effetto carattere";
-                Text[ danish ] = "Skrifteffekter";
-                Text[ swedish ] = "Teckeneffekt";
-                Text[ polish ] = "Efekty czcionki";
-                Text[ portuguese_brazilian ] = "Efeitos da Fonte";
-                Text[ japanese ] = "フォント効果";
-                Text[ korean ] = "글꼴 효과";
-                Text[ chinese_simplified ] = "字体效果";
-                Text[ chinese_traditional ] = "字型效果";
-                Text[ turkish ] = "Yaz� tipi efektleri";
-                Text[ arabic ] = "������� ������";
-                Text[ catalan ] = "Efectes de lletra";
-                Text[ finnish ] = "Fonttitehosteet";
-                Text[ thai ] = "ลักษณะตัวอักษร";
-                Text[ czech ] = "Efekty pro písmo";
-                Text[ hebrew ] = "‮אפקטים לגופנים‬";
-                Text[ hindi ] = "फ़ॉन्ट् प्रभाव";
-                Text[ slovak ] = "Efekty pre písmo";
-                Text[ hungarian ] = "Betűhatások";
-                Text[ slovenian ] = "Učinki pisave";
+                Text [ de ] = "Schrifteffekt" ;
+                Text [ en-US ] = "Font Effects";
             };
             PageItem
             {
                 Identifier = RID_SVXPAGE_CHAR_POSITION ;
-                Text = "Schriftposition" ;
-                Text [ ENGLISH ] = "Character Position" ;
-                Text[ english_us ] = "Font Position";
-                Text[ portuguese ] = "Posi��o";
-                Text[ russian ] = "��������� ������";
-                Text[ greek ] = "���� ��������������";
-                Text[ dutch ] = "Letterpositie";
-                Text[ french ] = "Position";
-                Text[ spanish ] = "Posici�n de fuente";
-                Text[ italian ] = "Posizione carattere";
-                Text[ danish ] = "Skriftplacering";
-                Text[ swedish ] = "Teckenposition";
-                Text[ polish ] = "Pozycja czcionki";
-                Text[ portuguese_brazilian ] = "Posi��o da Fonte";
-                Text[ japanese ] = "フォントの位置";
-                Text[ korean ] = "글꼴 위치";
-                Text[ chinese_simplified ] = "字体位置";
-                Text[ chinese_traditional ] = "字型位置";
-                Text[ turkish ] = "Yaz� tipi konumu";
-                Text[ arabic ] = "���� ����";
-                Text[ catalan ] = "Posici� del tipus de lletra";
-                Text[ finnish ] = "Fontin sijainti";
-                Text[ thai ] = "ตำแหน่งตัวอักษร";
-                Text[ czech ] = "Pozice písma";
-                Text[ hebrew ] = "Schriftposition";
-                Text[ hindi ] = "फ़ॉन्ट् का स्थान";
-                Text[ slovak ] = "Pozícia písma";
-                Text[ hungarian ] = "Betűhelyzet";
-                Text[ slovenian ] = "Položaj pisave";
+                Text [ de ] = "Schriftposition" ;
+                Text [ en-US ] = "Font Position";
             };
         };
     };
@@ -215,57 +123,12 @@ TabDialog RID_SCDLG_CHAR
         Pos = MAP_APPFONT ( 169 , 151 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Zur�ck : Zur�ck */
-        Text = "Zur�ck" ;
-        Text [ ENGLISH ] = "Return" ;
-        Text [ norwegian ] = "Return" ;
-        Text [ italian ] = "Indietro" ;
-        Text [ portuguese_brazilian ] = "Voltar" ;
-        Text [ portuguese ] = "Anterior" ;
-        Text [ finnish ] = "Edellinen" ;
-        Text [ danish ] = "Tilbage" ;
-        Text [ french ] = "Pr�c�dent" ;
-        Text [ swedish ] = "Tillbaka" ;
-        Text [ dutch ] = "Ongedaan maken" ;
-        Text [ spanish ] = "Regresar" ;
-        Text [ english_us ] = "Back" ;
+        Text [ de ] = "Zur�ck" ;
+        Text [ en-US ] = "Back" ;
         TabStop = TRUE ;
-        Text[ chinese_simplified ] = "返回";
-        Text[ russian ] = "�����";
-        Text[ polish ] = "Wstecz";
-        Text[ japanese ] = "戻る";
-        Text[ chinese_traditional ] = "返回";
-        Text[ arabic ] = "������";
-        Text[ greek ] = "����";
-        Text[ korean ] = "뒤로";
-        Text[ turkish ] = "Geri";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Enrere";
-        Text[ thai ] = "กลับไป";
-        Text[ czech ] = "Zpět";
-        Text[ hebrew ] = "‮קודם‬";
-        Text[ hindi ] = "पीछे";
-        Text[ slovak ] = "Späť";
-        Text[ hungarian ] = "Vissza";
-        Text[ slovenian ] = "Nazaj";
+        Text [ x-comment ] = " ";
     };
-    Text[ chinese_simplified ] = "字符";
-    Text[ russian ] = "������";
-    Text[ polish ] = "Znak";
-    Text[ japanese ] = "文字";
-    Text[ chinese_traditional ] = "字元";
-    Text[ arabic ] = "�����";
-    Text[ greek ] = "����������";
-    Text[ korean ] = "문자";
-    Text[ turkish ] = "Karakter";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Car�cter";
-    Text[ thai ] = "ตัวอักขระ";
-    Text[ czech ] = "Znak";
-    Text[ hebrew ] = "Zeichen";
-    Text[ hindi ] = "अक्षर";
-    Text[ slovak ] = "Znak";
-    Text[ hungarian ] = "Karakter";
-    Text[ slovenian ] = "Znak";
+    Text [ x-comment ] = " ";
 };
 
 TabDialog RID_SCDLG_PARAGRAPH
@@ -273,19 +136,8 @@ TabDialog RID_SCDLG_PARAGRAPH
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 289 , 176 ) ;
-    Text = "Absatz" ;
-    Text [ ENGLISH ] = "Paragraph" ;
-    Text [ norwegian ] = "Avsnitt" ;
-    Text [ italian ] = "Paragrafo" ;
-    Text [ portuguese_brazilian ] = "Par�grafo" ;
-    Text [ portuguese ] = "Par�grafo" ;
-    Text [ finnish ] = "Kappale" ;
-    Text [ danish ] = "Afsnit" ;
-    Text [ french ] = "Paragraphe" ;
-    Text [ swedish ] = "Stycke" ;
-    Text [ dutch ] = "Alinea" ;
-    Text [ spanish ] = "P�rrafo" ;
-    Text [ english_us ] = "Paragraph" ;
+    Text [ de ] = "Absatz" ;
+    Text [ en-US ] = "Paragraph" ;
     Moveable = TRUE ;
     Closeable = TRUE ;
     TabControl 1
@@ -299,55 +151,16 @@ TabDialog RID_SCDLG_PARAGRAPH
             {
                 Identifier = RID_SVXPAGE_STD_PARAGRAPH ;
                 /* ### ACHTUNG: Neuer Text in Resource? Einz�ge und Abst�nde : Einz�ge und Abst�nde */
-                Text = "Einz�ge und Abst�nde" ;
-                Text [ ENGLISH ] = "Indent and Spacing" ;
-                Text [ norwegian ] = "Indent and Spacing" ;
-                Text [ italian ] = "Rientri e distanze" ;
-                Text [ portuguese_brazilian ] = "Recuo & Afastamentos" ;
-                Text [ portuguese ] = "Avan�os e espa�amento" ;
-                Text [ finnish ] = "Sisennykset ja v�lit" ;
-                Text [ danish ] = "Indrykning og afstand" ;
-                Text [ french ] = "Retraits et �carts" ;
-                Text [ swedish ] = "Indrag och avst�nd" ;
-                Text [ dutch ] = "Inspringingen en afstanden" ;
-                Text [ spanish ] = "Sangr�as y espacios" ;
-                Text [ english_us ] = "Indents & Spacing" ;
+                Text [ de ] = "Einz�ge und Abst�nde" ;
+                Text [ en-US ] = "Indents & Spacing" ;
                 PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
-                Text[ chinese_simplified ] = "缩进和间隔";
-                Text[ russian ] = "������� � ���������";
-                Text[ polish ] = "Wci�cia i odst�py";
-                Text[ japanese ] = "インデントと行間隔";
-                Text[ chinese_traditional ] = "縮排和間隔";
-                Text[ arabic ] = "������� ��������";
-                Text[ greek ] = "������ ��� ����������";
-                Text[ korean ] = "들여쓰기 및 간격";
-                Text[ turkish ] = "Girinti ve aral�klar";
-                Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Sagnats i espaiat";
-                Text[ thai ] = "ระยะเยื้องและระยะห่าง";
-                Text[ czech ] = "Odsazení a proklad znaků";
-                Text[ hebrew ] = "‮שוליים ורווחים‬";
-                Text[ hindi ] = "इन्डेन्ट्स और अंतर देना";
-                Text[ slovak ] = "Odsadenie a medzery";
-                Text[ hungarian ] = "Behúzás és térköz";
-                Text[ slovenian ] = "Zamiki in razmiki";
+                Text [ x-comment ] = " ";
             };
             /*
             PageItem  {
                     Identifier = RID_SVXPAGE_EXT_PARAGRAPH;
-                    Text = "Absatz (Zus�tze)";
-                    Text[ ENGLISH ] = "Paragraph (Extensions)";
-                    Text[norwegian] = "Avsnitt (Utvidelser)";
-                    Text[italian] = "Paragrafo (Estensioni)";
-                    Text[portuguese_brazilian] = "Par�grafo (Extens es)";
-                    Text[portuguese] = "Par�grafo (Extens�es)";
-                    Text[finnish] = "Kappale (laajennukset)";
-                    Text[danish] = "Afsnit (Filtypenavne)";
-                    Text[french] = "Paragraphe (Extensions)";
-                    Text[swedish] = "Stycke (till�gg)";
-                    Text[dutch] = "Alinea (Extensions)";
-                    Text[spanish] = "P�rrafo (extensiones)";
-                    Text[english_us] = "Paragraph (Extensions)";
+                    Text [ de ] = "Absatz (Zus�tze)";
+                    Text [ en-US ] = "Paragraph (Extensions)";
                     PageResID = RID_SVXPAGE_EXT_PARAGRAPH;
                 };
 */
@@ -355,105 +168,23 @@ TabDialog RID_SCDLG_PARAGRAPH
             {
                 Identifier = RID_SVXPAGE_ALIGN_PARAGRAPH ;
                 PageResID = RID_SVXPAGE_ALIGN_PARAGRAPH ;
-                Text = "Ausrichtung" ;
-                Text [ ENGLISH ] = "Alignment" ;
-                Text [ english_us ] = "Alignment" ;
-                Text [ portuguese_brazilian ] = "Alinhamento" ;
-                Text [ swedish ] = "Justering" ;
-                Text [ danish ] = "Justering" ;
-                Text [ italian ] = "Allineamento" ;
-                Text [ spanish ] = "Alineaci�n" ;
-                Text [ french ] = "Alignement" ;
-                Text [ dutch ] = "Uitlijning" ;
-                Text [ portuguese ] = "Alinhamento" ;
-                Text[ chinese_simplified ] = "对齐";
-                Text[ russian ] = "������������";
-                Text[ polish ] = "Wyr�wnanie";
-                Text[ japanese ] = "配置";
-                Text[ chinese_traditional ] = "對齊";
-                Text[ arabic ] = "��������";
-                Text[ greek ] = "��������";
-                Text[ korean ] = "맞춤";
-                Text[ turkish ] = "Hizalama";
-                Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Alineament";
-                Text[ finnish ] = "Tasaus";
-                Text[ thai ] = "จัดตำแหน่ง";
-                Text[ czech ] = "Zarovnání";
-                Text[ hebrew ] = "‮ישור‬";
-                Text[ hindi ] = "पंक्तिकरण";
-                Text[ slovak ] = "Zarovnanie";
-                Text[ hungarian ] = "Igazítás";
-                Text[ slovenian ] = "Poravnava";
+                Text [ de ] = "Ausrichtung" ;
+                Text [ en-US ] = "Alignment" ;
+                Text [ x-comment ] = " ";
             };
             PageItem
             {
                 Identifier = RID_SVXPAGE_PARA_ASIAN ;
-                Text = "Asiatische Typographie" ;
-                Text [ ENGLISH ] = "Asian typography" ;
-                Text[ english_us ] = "Asian Typography";
-                Text[ portuguese ] = "Tipografia asi�tica";
-                Text[ russian ] = "��������� ����������";
-                Text[ greek ] = "�������� ����������";
-                Text[ dutch ] = "Aziatische typografie";
-                Text[ french ] = "Typographie asiatique";
-                Text[ spanish ] = "Tipograf�a asi�tica";
-                Text[ italian ] = "Tipografia asiatica";
-                Text[ danish ] = "Asiatisk typografi";
-                Text[ swedish ] = "Asiatisk typografi";
-                Text[ polish ] = "Typografia azjatycka";
-                Text[ portuguese_brazilian ] = "Tipografia asi�tica";
-                Text[ japanese ] = "日本語文の体裁";
-                Text[ korean ] = "한글 입력 체계";
-                Text[ chinese_simplified ] = "中日韩文字";
-                Text[ chinese_traditional ] = "中日韓文字";
-                Text[ turkish ] = "Asya Matbaas�";
-                Text[ arabic ] = "����� ������� ��������";
-                Text[ catalan ] = "Tipografia asi�tica";
-                Text[ finnish ] = "Aasialaiset merkit";
-                Text[ thai ] = "แบบการพิมพ์แบบเอเชีย";
-                Text[ czech ] = "Asijská typografie";
-                Text[ hebrew ] = "Asiatische Typographie";
-                Text[ hindi ] = "ऐशियन टइपोग्रफी";
-                Text[ slovak ] = "Ázijská typografia";
-                Text[ hungarian ] = "Ázsiai tipográfia";
-                Text[ slovenian ] = "Azijska tipografija";
+                Text [ de ] = "Asiatische Typographie" ;
+                Text [ en-US ] = "Asian Typography";
             };
             PageItem
             {
                 Identifier = RID_SVXPAGE_TABULATOR ;
-                Text = "Tabulator" ;
-                Text [ ENGLISH ] = "Paragraph (Tabs)" ;
-                Text [ norwegian ] = "Avsnitt (Tabulatorer)" ;
-                Text [ italian ] = "Tabulazione" ;
-                Text [ portuguese_brazilian ] = "Tabula��o" ;
-                Text [ portuguese ] = "Tabula��o" ;
-                Text [ finnish ] = "Sarkain" ;
-                Text [ danish ] = "Tabulator" ;
-                Text [ french ] = "Tabulation" ;
-                Text [ swedish ] = "Tabulator" ;
-                Text [ dutch ] = "Tabs" ;
-                Text [ spanish ] = "Tabuladores" ;
-                Text [ english_us ] = "Tab" ;
+                Text [ de ] = "Tabulator" ;
+                Text [ en-US ] = "Tab" ;
                 PageResID = RID_SVXPAGE_TABULATOR ;
-                Text[ chinese_simplified ] = "制表符";
-                Text[ russian ] = "���������";
-                Text[ polish ] = "Tabulator";
-                Text[ japanese ] = "タブ";
-                Text[ chinese_traditional ] = "定位鍵";
-                Text[ arabic ] = "����� �����";
-                Text[ greek ] = "����������";
-                Text[ korean ] = "탭";
-                Text[ turkish ] = "Sekmeler";
-                Text[ language_user1 ] = " ";
-                Text[ catalan ] = "Pestanya";
-                Text[ thai ] = "ระยะกั้น";
-                Text[ czech ] = "Tabulátor";
-                Text[ hebrew ] = "Tabulator";
-                Text[ hindi ] = "टॉब";
-                Text[ slovak ] = "Tabulátor";
-                Text[ hungarian ] = "Tabulátor";
-                Text[ slovenian ] = "Tabulator";
+                Text [ x-comment ] = " ";
             };
         };
     };
@@ -480,57 +211,12 @@ TabDialog RID_SCDLG_PARAGRAPH
         Pos = MAP_APPFONT ( 169 , 151 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         /* ### ACHTUNG: Neuer Text in Resource? Zur�ck : Zur�ck */
-        Text = "Zur�ck" ;
-        Text [ ENGLISH ] = "Return" ;
-        Text [ norwegian ] = "Return" ;
-        Text [ italian ] = "Indietro" ;
-        Text [ portuguese_brazilian ] = "Voltar" ;
-        Text [ portuguese ] = "Anterior" ;
-        Text [ finnish ] = "Edellinen" ;
-        Text [ danish ] = "Tilbage" ;
-        Text [ french ] = "Pr�c�dent" ;
-        Text [ swedish ] = "Tillbaka" ;
-        Text [ dutch ] = "Ongedaan maken" ;
-        Text [ spanish ] = "Regresar" ;
-        Text [ english_us ] = "Back" ;
+        Text [ de ] = "Zur�ck" ;
+        Text [ en-US ] = "Back" ;
         TabStop = TRUE ;
-        Text[ chinese_simplified ] = "返回";
-        Text[ russian ] = "�����";
-        Text[ polish ] = "Wstecz";
-        Text[ japanese ] = "戻る";
-        Text[ chinese_traditional ] = "返回";
-        Text[ arabic ] = "������";
-        Text[ greek ] = "����";
-        Text[ korean ] = "뒤로";
-        Text[ turkish ] = "Geri";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Enrere";
-        Text[ thai ] = "กลับไป";
-        Text[ czech ] = "Zpět";
-        Text[ hebrew ] = "‮קודם‬";
-        Text[ hindi ] = "पीछे";
-        Text[ slovak ] = "Späť";
-        Text[ hungarian ] = "Vissza";
-        Text[ slovenian ] = "Nazaj";
+        Text [ x-comment ] = " ";
     };
-    Text[ chinese_simplified ] = "段落";
-    Text[ russian ] = "�����";
-    Text[ polish ] = "Akapit";
-    Text[ japanese ] = "段落";
-    Text[ chinese_traditional ] = "段落";
-    Text[ arabic ] = "������";
-    Text[ greek ] = "����������";
-    Text[ korean ] = "단락";
-    Text[ turkish ] = "Paragraf";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Par�graf";
-    Text[ thai ] = "ย่อหน้า";
-    Text[ czech ] = "Odstavec";
-    Text[ hebrew ] = "‮פסקאות‬";
-    Text[ hindi ] = "परिच्छेद";
-    Text[ slovak ] = "Odstavec";
-    Text[ hungarian ] = "Bekezdés";
-    Text[ slovenian ] = "Odstavek";
+    Text [ x-comment ] = " ";
 };