CWS-TOOLING: integrate CWS mla01

2008-11-26 11:44:02 +0100 os  r264361 : cws migration

14 files changed, 31 insertions, 59 deletions

diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index 03b78ceec3..c252d18a8e 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dialog.hrc,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,8 +54,7 @@
 #define STR_LINKEDIT_TEXT       (RC_DIALOG_BEGIN +  1)
 
 #define STR_CLOSELINKMSG        (RC_DIALOG_BEGIN +  3)
-#define STR_PATH_NOT_FOUND1     (RC_DIALOG_BEGIN +  4)
-#define STR_PATH_NOT_FOUND2     (RC_DIALOG_BEGIN +  5)
+#define STR_PATH_NOT_FOUND      (RC_DIALOG_BEGIN +  4)
 
 #define STR_FLT_SGV             (RC_DIALOG_BEGIN +  8)
 
diff --git a/sw/inc/dochdl.hrc b/sw/inc/dochdl.hrc
index 57a414fef5..adfbd810e6 100644
--- a/sw/inc/dochdl.hrc
+++ b/sw/inc/dochdl.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dochdl.hrc,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,8 +33,7 @@
 
 #include "rcid.hrc"
 
-#define STR_NOGLOS1                 (RC_DOCHDL_BEGIN + 1)
-#define STR_NOGLOS2                 (RC_DOCHDL_BEGIN + 2)
+#define STR_NOGLOS                  (RC_DOCHDL_BEGIN + 1)
 #define MSG_ERR_INSERT_GLOS         (RC_DOCHDL_BEGIN + 3)
 #define MSG_CLPBRD_FORMAT_ERROR     (RC_DOCHDL_BEGIN + 4)
 #define MSG_UPDATE_NEW_GLOS_FMT     (RC_DOCHDL_BEGIN + 5)
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src
index 6cd781f83d..a33f24d268 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/ui/dbui/mailmergechildwindow.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mailmergechildwindow.src,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -251,7 +251,7 @@ ModalDialog DLG_MM_SENDWARNING
         Pos = MAP_APPFONT ( 40 , 6 ) ;
         Size = MAP_APPFONT ( 170 , 30 ) ;
         WordBreak = TRUE;
-        Text[ en-US ] = "The following error occured:";
+        Text[ en-US ] = "The following error occurred:";
     };
     FixedText   FT_DETAILS
     {
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index 6ed44c13dd..2e27bafe58 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dialog.src,v $
- * $Revision: 1.30 $
+ * $Revision: 1.30.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -43,16 +43,9 @@ String STR_LINKEDIT_TEXT
     /* ### ACHTUNG: Neuer Text in Resource? Verknüpfungen bearbeiten : Verkn³pfungen bearbeiten */
     Text [ en-US ] = "Edit links" ;
 };
-String STR_PATH_NOT_FOUND1
+String STR_PATH_NOT_FOUND
 {
-    /* ### ACHTUNG: Neuer Text in Resource? Das Verzeichnis ' : Das Verzeichnis '' */
-    Text [ en-US ] = "The directory '" ;
-};
-String STR_PATH_NOT_FOUND2
-{
-    /* ### ACHTUNG: Neuer Text in Resource? ' existiert nicht. : '' existiert nicht. */
-    /* ### ACHTUNG: Neuer Text in Resource? ' existiert nicht. : '' existiert nicht. */
-    Text [ en-US ] = "' does not exist." ;
+    Text [ en-US ] = "The directory '%1' does not exist." ;
 };
 String STR_FLT_SGV
 {
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index 3cb5cc17c9..9d83668b55 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dochdl.src,v $
- * $Revision: 1.48 $
+ * $Revision: 1.48.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,15 +33,10 @@
 #include "globals.hrc"
 
 
-String STR_NOGLOS1
+String STR_NOGLOS
 {
-    Text [ en-US ] = "AutoText for Shortcut '" ;
+    Text [ en-US ] = "AutoText for Shortcut '%1' not found." ;
 };
-String STR_NOGLOS2
-{
-    Text [ en-US ] = "' not found." ;
-};
-
 String STR_NO_TABLE
 {
     Text [ en-US ] = "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table.";
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 86a68223ab..d8bb52b31e 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: gloshdl.cxx,v $
- * $Revision: 1.32 $
+ * $Revision: 1.32.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -647,10 +647,10 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName,
             }
             else
             {
-                String aTmp( SW_RES(STR_NOGLOS1));
-                aTmp += aShortName;
-                aTmp += SW_RESSTR(STR_NOGLOS2);
+                String aTmp( SW_RES(STR_NOGLOS));
+                aTmp.SearchAndReplaceAscii("%1", aShortName);
                 InfoBox( pWrtShell->GetView().GetWindow(), aTmp ).Execute();
+
             }
         }
 
diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src
index b572795308..f0829319d1 100644
--- a/sw/source/ui/frmdlg/frmpage.src
+++ b/sw/source/ui/frmdlg/frmpage.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: frmpage.src,v $
- * $Revision: 1.67 $
+ * $Revision: 1.67.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -330,8 +330,8 @@ TabPage TP_FRM_STD
     };
     PushButton BT_REALSIZE
     {
-        Pos = MAP_APPFONT ( 55 , 86 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 35 , 86 ) ;
+        Size = MAP_APPFONT ( 70 , 14 ) ;
         TabStop = TRUE ;
         Hide = TRUE ;
         Text [ en-US ] = "~Original Size" ;
diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src
index b7c9c1b49f..ec1b587edd 100644
--- a/sw/source/ui/misc/insrule.src
+++ b/sw/source/ui/misc/insrule.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: insrule.src,v $
- * $Revision: 1.21 $
+ * $Revision: 1.21.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -76,7 +76,7 @@ ModalDialog DLG_INSERT_RULER
     {
         Text [ en-US ] = "Plain" ;
     };
-    Text [ en-US ] = "Insert Horizontal Ruler" ;
+    Text [ en-US ] = "Insert Horizontal Rule" ;
 };
 
 
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index 17485efdd6..0ce074374b 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: convert.src,v $
- * $Revision: 1.29 $
+ * $Revision: 1.29.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -111,7 +111,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
     {
         Pos = MAP_APPFONT ( 125 , 113 ) ;
         Size = MAP_APPFONT ( 66 , 10 ) ;
-        Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ;
+        Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
     };
     NumericField NF_REPEAT_HEADER
     {
diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src
index 2056a700c3..58b4bbb44d 100644
--- a/sw/source/ui/table/instable.src
+++ b/sw/source/ui/table/instable.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: instable.src,v $
- * $Revision: 1.32 $
+ * $Revision: 1.32.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -122,7 +122,7 @@ ModalDialog DLG_INSERT_TABLE
     {
         Pos = MAP_APPFONT ( 30 , 105 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
-        Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ;
+        Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
     };
     NumericField NF_REPEAT_HEADER
     {
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 5fdbed2c57..998f9c30d6 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tabledlg.src,v $
- * $Revision: 1.38 $
+ * $Revision: 1.38.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -679,7 +679,7 @@ TabPage TP_TABLE_TEXTFLOW
     {
         Pos = MAP_APPFONT ( 31 , 114 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
-        Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ;
+        Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
     };
     NumericField NF_REPEAT_HEADER
     {
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc
index 48534acc4b..e22d1a264d 100644
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/ui/uiview/view.hrc
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: view.hrc,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,8 +39,6 @@
 
 // STR -------------------------------------------------------------------
 
-#define STR_NOGLOS1         		(RC_VIEW_BEGIN + 1)
-#define STR_NOGLOS2         		(RC_VIEW_BEGIN + 2)
 #define STR_NUM_LEVEL         		(RC_VIEW_BEGIN + 3)
 #define STR_NUM_OUTLINE        		(RC_VIEW_BEGIN + 4)
 
diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src
index ce1571689c..a643c9a136 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/ui/uiview/view.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: view.src,v $
- * $Revision: 1.52 $
+ * $Revision: 1.52.110.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -136,18 +136,6 @@ InfoBox MSG_SCAN_NOSOURCE
 {
     Message [ en-US ] = "Source not specified." ;
 };
-String STR_NOGLOS1
-{
-    Text [ en-US ] = "AutoText for Shortcut '" ;
-};
-String STR_NOGLOS2
-{
-    /* ### ACHTUNG: Neuer Text in Resource? ' nicht gefunden. : '' nicht gefunden. */
-    /* ### ACHTUNG: Neuer Text in Resource? ' nicht gefunden. : '' nicht gefunden. */
-    /* ### ACHTUNG: Neuer Text in Resource? ' nicht gefunden. : '' nicht gefunden. */
-    /* ### ACHTUNG: Neuer Text in Resource? ' nicht gefunden. : '' nicht gefunden. */
-    Text [ en-US ] = "' not found." ;
-};
 String STR_NUM_LEVEL
 {
     Text [ en-US ] = "Level " ;
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index ff4c74a2ba..7a45772630 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: utlui.src,v $
- * $Revision: 1.53 $
+ * $Revision: 1.53.240.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,7 +54,7 @@ Resource RID_SHELLRES_AUTOFMTSTRS
     };
     String STR_AUTOFMTREDL_TYPO+1
     {
-        Text [ en-US ] = "Replace \"standard\" quotes with %1custom%2 quotes" ;
+        Text [ en-US ] = "Replace \"standard\" quotes with %1 \bcustom%2 quotes" ;
     };
     String STR_AUTOFMTREDL_USER_STYLE+1
     {