INTEGRATION: CWS mergebuild (1.43.58); FILE MERGED

2004/05/30 23:08:03 hjs 1.43.58.8: RESYNC: (1.44-1.45); FILE MERGED
2004/05/05 16:00:45 ihi 1.43.58.7: ISO Code update / Macro added
2004/04/29 11:10:47 hjs 1.43.58.6: #i8252# fix unmerge probs
2004/04/20 21:47:52 hjs 1.43.58.5: RESYNC: (1.43-1.44); FILE MERGED
2004/02/23 11:36:30 ihi 1.43.58.4: Merge-While-Build update
2004/02/05 18:04:22 hjs 1.43.58.3: #i8252# fix too much localizing
2003/11/11 19:22:03 ihi 1.43.58.2: en -> en-US
2003/11/10 17:40:01 ihi 1.43.58.1: #111234# Merge during build

1 files changed, 17 insertions, 83 deletions

diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 1173dfc746c9..67969d89e09c 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: res_bmp.src,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: kz $ $Date: 2004-05-19 00:45:31 $
+ *  last change: $Author: hjs $ $Date: 2004-06-26 17:56:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,37 +75,10 @@ PushButton RID_TIME_BUTTON
 PushButton RID_PREVIEW_BUTTON
 {
     Size = MAP_APPFONT ( 50 , 14 ) ;
-    Text = "Ab~spielen" ;
-    Text [ ENGLISH ] = "~Play" ;
+    Text [ de ] = "Ab~spielen" ;
     TabStop = TRUE ;
-    Text [ english_us ] = "Play" ;
-    Text [ italian ] = "Esegui" ;
-    Text [ spanish ] = "~Reproducir" ;
-    Text [ french ] = "Reproduire" ;
-    Text [ dutch ] = "Af~spelen" ;
-    Text [ swedish ] = "~Spela upp" ;
-    Text [ danish ] = "Afspil" ;
-    Text [ portuguese_brazilian ] = "Tocar" ;
-    Text [ portuguese ] = "~Tocar" ;
-    Text[ chinese_simplified ] = "放映";
-    Text[ russian ] = "�������������";
-    Text[ polish ] = "O~dtw�rz";
-    Text[ japanese ] = "再生";
-    Text[ chinese_traditional ] = "放映";
-    Text[ arabic ] = "�����";
-    Text[ greek ] = "������~��";
-    Text[ korean ] = "재생";
-    Text[ turkish ] = "�al��t�r";
-    Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Reprodueix";
-    Text[ finnish ] = "Toista";
-    Text[ thai ] = "เล่น";
-    Text[ czech ] = "Přehrát";
-    Text[ hebrew ] = "Ab~spielen";
-    Text[ hindi ] = "शुरु";
-    Text[ slovak ] = "Prehrať";
-    Text[ hungarian ] = "Lejátszás";
-    Text[ slovenian ] = "Predvajaj";
+    Text [ en-US ] = "Play" ;
+    Text [ x-comment ] = " ";
 };
 Bitmap BMP_TAB_PAGEMODE
 {
@@ -1369,6 +1342,15 @@ Image IMG_SLIDE_MANU_H
     MaskColor = IMAGE_MASK_STDCOLOR_HC;
 };
 
+
+#define SfxStyleFamiliesRes1\
+    Text [ de ] = "Grafikobjektvorlagen" ;\
+    Text [ en-US ] = "Graphics Styles" ;
+
+#define SfxStyleFamiliesRes2\
+    Text [ de ] = "Pr�sentationsobjektvorlagen" ;\
+    Text [ en-US ] = "Presentation Styles" ;
+
 SfxStyleFamilies DLG_STYLE_DESIGNER
 {
 
@@ -1377,33 +1359,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
     {
         SfxStyleFamilyItem RID_GRAPHICSTYLEFAMILY
         {
-            Text = "Grafikobjektvorlagen" ;
-            Text [ ENGLISH ] = "Graphic Objects Styles" ;
-            Text [ english_us ] = "Graphics Styles" ;
-            Text [ italian ] = "Modelli di oggetti grafici" ;
-            Text [ spanish ] = "Estilos de objeto gr�fico" ;
-            Text [ french ] = "Styles d'objet graphique" ;
-            Text [ dutch ] = "Opmaakprofielen voor grafische objecten" ;
-            Text [ swedish ] = "Grafikobjektmallar" ;
-            Text [ danish ] = "Grafikobjekttypografier" ;
-            Text [ portuguese_brazilian ] = "Estilos de objetos Gr�ficos" ;
-            Text [ portuguese ] = "Estilos de objectos gr�ficos" ;
-            Text[ chinese_simplified ] = "图形对象样式";
-            Text[ russian ] = "����������� �����";
-            Text[ polish ] = "Style obiekt�w graficznych";
-            Text[ japanese ] = "図オブジェクトスタイル";
-            Text[ chinese_traditional ] = "圖形物件樣式";
-            Text[ arabic ] = "����� ������ ����";
-            Text[ greek ] = "���� ������������ ��������";
-            Text[ korean ] = "그림 스타일";
-            Text[ turkish ] = "Grafik Bi�emleri";
-            Text[ czech ] = "Grafické styly";
-            Text[ slovak ] = "Grafické štýly";
-            Text[ hungarian ] = "Képstílusok";
-            Text[ finnish ] = "Grafiikkatyylit";
-            Text[ slovenian ] = "Slogi grafike";
+            SfxStyleFamiliesRes1
             StyleFamily = SFX_STYLE_FAMILY_PARA ;
-            FilterList =
+            FilterList  =
             {
                 < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
                 < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
@@ -1412,31 +1370,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
         };
         SfxStyleFamilyItem RID_PRESENTATIONSTYLEFAMILY
         {
-            Text = "Pr�sentationsobjektvorlagen" ;
-            Text [ ENGLISH ] = "Presentation objects styles" ;
-            Text [ english_us ] = "Presentation Styles" ;
-            Text [ italian ] = "Modelli di oggetti per presentazione" ;
-            Text [ spanish ] = "Estilos de objetos de presentaci�n" ;
-            Text [ french ] = "Styles d'objet de pr�sentation" ;
-            Text [ dutch ] = "Opmaakprofielen voor presentatieobjecten" ;
-            Text [ swedish ] = "Presentationsobjektmallar" ;
-            Text [ danish ] = "Pr�sentationsobjekttypografier" ;
-            Text [ portuguese_brazilian ] = "Estilos de objetos de apresenta��o" ;
-            Text [ portuguese ] = "Estilos de objectos de apresenta��o" ;
-            Text[ chinese_simplified ] = "演示文稿对象样式";
-            Text[ russian ] = "����� �����������";
-            Text[ polish ] = "Style obiekt�w prezentacji";
-            Text[ japanese ] = "プレゼンテーションオブジェクトスタイル";
-            Text[ chinese_traditional ] = "簡報樣式";
-            Text[ arabic ] = "����� ���� ��� ������";
-            Text[ greek ] = "������� ������������ �����������";
-            Text[ korean ] = "프레젠테이션 스타일";
-            Text[ turkish ] = "Sunum Bi�emleri";
-            Text[ czech ] = "Styly prezentace";
-            Text[ slovak ] = "Štýly prezentácie";
-            Text[ hungarian ] = "Bemutatóstílusok";
-            Text[ finnish ] = "Esitystyylit";
-            Text[ slovenian ] = "Slogi predstavitve";
+            SfxStyleFamiliesRes2
             StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
             FilterList =
             {