Fixes fuer merge

2 files changed, 91 insertions, 91 deletions

diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 781771fb593e..3f229c2bd749 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cnttab.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2000-12-04 11:53:05 $
+ *  last change: $Author: nf $ $Date: 2000-12-04 12:37:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1793,18 +1793,18 @@ TabPage TP_TOX_SELECT
 
             ItemList =
             {
-                < "StarOffice Math" ;               1;> ;
-                < "StarOffice Chart" ;          2;> ;
-                < "StarOffice Calc" ;               8;> ;
-                < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+                < "%PRODUCTNAME Math" ;                 1;> ;
+                < "%PRODUCTNAME Chart" ;            2;> ;
+                < "%PRODUCTNAME Calc" ;                 8;> ;
+                < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
                 < "Andere OLE-Objekte";     128;> ;
             };
             ItemList[ ENGLISH ] =
             {
-                < "StarOffice Math" ;               1; > ;
-                < "StarOffice Chart" ;          2;> ;
-                < "StarOffice Calc" ;               8;> ;
-                < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+                < "%PRODUCTNAME Math" ;                 1; > ;
+                < "%PRODUCTNAME Chart" ;            2;> ;
+                < "%PRODUCTNAME Calc" ;                 8;> ;
+                < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
                 < "Other OLE objects" ;     128;> ;
             };
             ItemList [ language_user1 ] =
@@ -1817,147 +1817,147 @@ TabPage TP_TOX_SELECT
         };
         ItemList [ english_us ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Other OLE Objects";  128;> ;
         };
         ItemList [ portuguese ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Outros objectos OLE";    128;> ;
         };
         ItemList [ russian ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Äðóãèå îáúåêòû OLE";     128;> ;
         };
         ItemList [ greek ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "¢ëëá áíôéêåßìåíá OLE";   128;> ;
         };
         ItemList [ dutch ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Andere OLE-objecten";    128;> ;
         };
         ItemList [ french ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Autres objets OLE";  128;> ;
         };
         ItemList [ spanish ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Otros objetos OLE";  128;> ;
         };
         ItemList [ italian ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Altri oggetti OLE";  128;> ;
         };
         ItemList [ danish ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
             < "StarCalc" ;              8;> ;
             < "StarDraw/StarImpress" ;  16;> ;
             < "Andre OLE-objekter";     128;> ;
         };
         ItemList [ swedish ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Andra OLE-objekt";   128;> ;
         };
         ItemList [ polish ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "Inne obiekty OLE";   128;> ;
         };
         ItemList [ portuguese_brazilian ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Image" ;              8;> ;
-            < "StarOffice Calc" ;   16;> ;
-            < "StarOffice Draw/StarOffice Impress";     128;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Image" ;                8;> ;
+            < "%PRODUCTNAME Calc" ;     16;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress";     128;> ;
         };
         ItemList [ japanese ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "‚»‚Ì‚Ù‚©‚Ì OLE µÌÞ¼Þª¸Ä";    128;> ;
         };
         ItemList [ korean ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Image" ;              8;> ;
-            < "StarOffice Calc" ;   16;> ;
-            < "StarOffice Draw/StarOffice Impress";     128;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Image" ;                8;> ;
+            < "%PRODUCTNAME Calc" ;     16;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress";     128;> ;
         };
         ItemList [ chinese_simplified ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "ÆäËû OLE ¶ÔÏó";  128;> ;
         };
         ItemList [ chinese_traditional ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "¨ä¥¦ªº OLE ª«¥ó";    128;> ;
         };
         ItemList [ arabic ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Calc" ;               8;> ;
-            < "StarOffice Draw/StarOffice Impress" ;    16;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Calc" ;                 8;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
             < "ßÇÆäÇÊ OLE ÃÎÑì";    128;> ;
         };
         ItemList [ turkish ] =
         {
-            < "StarOffice Math" ;               1;> ;
-            < "StarOffice Chart" ;          2;> ;
-            < "StarOffice Image" ;              8;> ;
-            < "StarOffice Calc" ;   16;> ;
-            < "StarOffice Draw/StarOffice Impress";     128;> ;
+            < "%PRODUCTNAME Math" ;                 1;> ;
+            < "%PRODUCTNAME Chart" ;            2;> ;
+            < "%PRODUCTNAME Image" ;                8;> ;
+            < "%PRODUCTNAME Calc" ;     16;> ;
+            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress";     128;> ;
         };
     };
     };
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index 200c94c9a9ed..e78f02cce01b 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: view.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: obo $ $Date: 2000-12-04 11:54:26 $
+ *  last change: $Author: nf $ $Date: 2000-12-04 12:39:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -256,12 +256,12 @@ QueryBox MSG_SEARCH_END
     Buttons = WB_YES_NO ;
     DefButton = WB_DEF_YES ;
     Message = "%PRODUCTNAME Writer hat bis zum Ende des Dokumentes gesucht. Möchten Sie die Suche am Dokumentanfang fortsetzen?" ;
-    Message [ ENGLISH ] = "StarOffice Writer has searched to the end of the document. Do you want to continue at the beginning?" ;
-    Message [ norwegian ] = "StarOffice Writer har søkt til slutten av  dokumentet. Vil du fortsette fra begynnelsen?" ;
+    Message [ ENGLISH ] = "%PRODUCTNAME Writer has searched to the end of the document. Do you want to continue at the beginning?" ;
+    Message [ norwegian ] = "%PRODUCTNAME Writer har søkt til slutten av  dokumentet. Vil du fortsette fra begynnelsen?" ;
     Message [ italian ] = "%PRODUCTNAME Writer ha cercato fino alla fine del documento. Volete continuare dall'inizio del documento?" ;
     Message [ portuguese_brazilian ] = "O %PRODUCTNAME Writer buscou até o final do documento. Deseja continuar do início?" ;
     Message [ portuguese ] = "O %PRODUCTNAME Writer procurou até ao fim do documento. Deseja continuar a procura no início do documento?" ;
-    Message [ finnish ] = "StarOffice Writer on etsinyt asiakirjan loppuun asti.Jatketaanko alusta?" ;
+    Message [ finnish ] = "%PRODUCTNAME Writer on etsinyt asiakirjan loppuun asti.Jatketaanko alusta?" ;
     Message [ danish ] = "%PRODUCTNAME Writer har søgt til slutningen af dokumentet. Vil du fortsætte søgningen fra dokumentets begyndelse?" ;
     Message [ french ] = "%PRODUCTNAME Writer a atteint la fin du document. Souhaitez-vous reprendre la recherche au début du document ?" ;
     Message [ swedish ] = "%PRODUCTNAME Writer har sökt till slutet av dokument. Vill Du fortsätta sökningen i början av dokumentet?" ;
@@ -284,12 +284,12 @@ QueryBox MSG_SEARCH_START
     Buttons = WB_YES_NO ;
     DefButton = WB_DEF_YES ;
     Message = "%PRODUCTNAME Writer hat bis zum Anfang des Dokumentes gesucht. Möchten Sie die Suche am Dokumentende fortsetzen?" ;
-    Message [ ENGLISH ] = "StarOffice Writer has searched to the beginning of the document. Do you want to continue at the end?" ;
-    Message [ norwegian ] = "StarOffice Writer har søkt til begynnelsen av dokumentet. Vil du fortsette fra slutten?" ;
+    Message [ ENGLISH ] = "%PRODUCTNAME Writer has searched to the beginning of the document. Do you want to continue at the end?" ;
+    Message [ norwegian ] = "%PRODUCTNAME Writer har søkt til begynnelsen av dokumentet. Vil du fortsette fra slutten?" ;
     Message [ italian ] = "%PRODUCTNAME Writer ha cercato fino all'inizio del documento. Volete continuare dalla fine del documento?" ;
     Message [ portuguese_brazilian ] = "O %PRODUCTNAME Writer buscou até o início do documento. Deseja continuar no final?" ;
     Message [ portuguese ] = "O %PRODUCTNAME Writer procurou até ao início do documento. Deseja continuar a procura no fim do documento?" ;
-    Message [ finnish ] = "StarOffice Writer on etsinyt asiakirjan alkuun asti.Jatketaanko lopusta?" ;
+    Message [ finnish ] = "%PRODUCTNAME Writer on etsinyt asiakirjan alkuun asti.Jatketaanko lopusta?" ;
     Message [ danish ] = "%PRODUCTNAME Writer har søgt til begyndelsen af dokumentet. Vil du fortsætte søgningen fra dokumentets slutning?" ;
     Message [ french ] = "%PRODUCTNAME Writer a atteint le début du document. Souhaitez-vous reprendre la recherche à la fin du document ?" ;
     Message [ swedish ] = "%PRODUCTNAME Writer har sökt till början av dokumentet. Vill Du fortsätta sökningen i slutet av dokumentet?" ;