Commits

Anonymous committed 9bbdf89

#i100000# roll back changes from mla01

Comments (0)

Files changed (14)

sw/inc/dialog.hrc

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dialog.hrc,v $
- * $Revision: 1.7.240.1 $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
 #define STR_LINKEDIT_TEXT       (RC_DIALOG_BEGIN +  1)
 
 #define STR_CLOSELINKMSG        (RC_DIALOG_BEGIN +  3)
-#define STR_PATH_NOT_FOUND      (RC_DIALOG_BEGIN +  4)
+#define STR_PATH_NOT_FOUND1     (RC_DIALOG_BEGIN +  4)
+#define STR_PATH_NOT_FOUND2     (RC_DIALOG_BEGIN +  5)
 
 #define STR_FLT_SGV             (RC_DIALOG_BEGIN +  8)
 

sw/inc/dochdl.hrc

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dochdl.hrc,v $
- * $Revision: 1.5.240.1 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
 
 #include "rcid.hrc"
 
-#define STR_NOGLOS                  (RC_DOCHDL_BEGIN + 1)
+#define STR_NOGLOS1                 (RC_DOCHDL_BEGIN + 1)
+#define STR_NOGLOS2                 (RC_DOCHDL_BEGIN + 2)
 #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)

sw/source/ui/dbui/mailmergechildwindow.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: mailmergechildwindow.src,v $
- * $Revision: 1.11.240.1 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
         Pos = MAP_APPFONT ( 40 , 6 ) ;
         Size = MAP_APPFONT ( 170 , 30 ) ;
         WordBreak = TRUE;
-        Text[ en-US ] = "The following error occurred:";
+        Text[ en-US ] = "The following error occured:";
     };
     FixedText   FT_DETAILS
     {

sw/source/ui/dialog/dialog.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dialog.src,v $
- * $Revision: 1.30.240.1 $
+ * $Revision: 1.30 $
  *
  * This file is part of OpenOffice.org.
  *
 	/* ### ACHTUNG: Neuer Text in Resource? Verkn�pfungen bearbeiten : Verkn�pfungen bearbeiten */
 	Text [ en-US ] = "Edit links" ;
 };
-String STR_PATH_NOT_FOUND
+String STR_PATH_NOT_FOUND1
 {
-	Text [ en-US ] = "The directory '%1' does not exist." ;
+	/* ### 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." ;
 };
 String STR_FLT_SGV
 {

sw/source/ui/dochdl/dochdl.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dochdl.src,v $
- * $Revision: 1.48.240.1 $
+ * $Revision: 1.48 $
  *
  * This file is part of OpenOffice.org.
  *
 #include "globals.hrc"
 
 
-String STR_NOGLOS
+String STR_NOGLOS1
 {
-	Text [ en-US ] = "AutoText for Shortcut '%1' not found." ;
+	Text [ en-US ] = "AutoText for Shortcut '" ;
 };
+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.";

sw/source/ui/dochdl/gloshdl.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: gloshdl.cxx,v $
- * $Revision: 1.32.240.1 $
+ * $Revision: 1.32 $
  *
  * This file is part of OpenOffice.org.
  *
             }
             else
             {
-                String aTmp( SW_RES(STR_NOGLOS));
-                aTmp.SearchAndReplaceAscii("%1", aShortName);
+                String aTmp( SW_RES(STR_NOGLOS1));
+                aTmp += aShortName;
+                aTmp += SW_RESSTR(STR_NOGLOS2);
                 InfoBox( pWrtShell->GetView().GetWindow(), aTmp ).Execute();
-
             }
 		}
 

sw/source/ui/frmdlg/frmpage.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: frmpage.src,v $
- * $Revision: 1.67.240.1 $
+ * $Revision: 1.67 $
  *
  * This file is part of OpenOffice.org.
  *
 	};
 	PushButton BT_REALSIZE
 	{
-        Pos = MAP_APPFONT ( 35 , 86 ) ;
-		Size = MAP_APPFONT ( 70 , 14 ) ;
+        Pos = MAP_APPFONT ( 55 , 86 ) ;
+		Size = MAP_APPFONT ( 50 , 14 ) ;
 		TabStop = TRUE ;
 		Hide = TRUE ;
         Text [ en-US ] = "~Original Size" ;

sw/source/ui/misc/insrule.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: insrule.src,v $
- * $Revision: 1.21.240.1 $
+ * $Revision: 1.21 $
  *
  * This file is part of OpenOffice.org.
  *
 	{
 		Text [ en-US ] = "Plain" ;
 	};
-	Text [ en-US ] = "Insert Horizontal Rule" ;
+	Text [ en-US ] = "Insert Horizontal Ruler" ;
 };
 
 

sw/source/ui/table/convert.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: convert.src,v $
- * $Revision: 1.29.240.1 $
+ * $Revision: 1.29 $
  *
  * This file is part of OpenOffice.org.
  *
 	{
         Pos = MAP_APPFONT ( 125 , 113 ) ;
         Size = MAP_APPFONT ( 66 , 10 ) ;
-        Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
+        Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ;
     };
 	NumericField NF_REPEAT_HEADER
 	{

sw/source/ui/table/instable.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: instable.src,v $
- * $Revision: 1.32.240.1 $
+ * $Revision: 1.32 $
  *
  * This file is part of OpenOffice.org.
  *
 	{
         Pos = MAP_APPFONT ( 30 , 105 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
-        Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
+		Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ;
 	};
 	NumericField NF_REPEAT_HEADER
 	{

sw/source/ui/table/tabledlg.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: tabledlg.src,v $
- * $Revision: 1.38.66.1 $
+ * $Revision: 1.38 $
  *
  * This file is part of OpenOffice.org.
  *
 	{
         Pos = MAP_APPFONT ( 31 , 114 ) ;
         Size = MAP_APPFONT ( 95 , 10 ) ;
-        Text [ en-US ] = "The first %POSITION_OF_CONTROL rows" ;
+		Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ;
 	};
 	NumericField NF_REPEAT_HEADER
 	{

sw/source/ui/uiview/view.hrc

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: view.hrc,v $
- * $Revision: 1.5.240.1 $
+ * $Revision: 1.5 $
  *
  * This file is part of OpenOffice.org.
  *
 
 // 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)
 

sw/source/ui/uiview/view.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: view.src,v $
- * $Revision: 1.52.110.1 $
+ * $Revision: 1.52 $
  *
  * This file is part of OpenOffice.org.
  *
 {
 	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 " ;

sw/source/ui/utlui/utlui.src

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: utlui.src,v $
- * $Revision: 1.53.240.1 $
+ * $Revision: 1.53 $
  *
  * This file is part of OpenOffice.org.
  *
 	};
 	String STR_AUTOFMTREDL_TYPO+1
 	{
-		Text [ en-US ] = "Replace \"standard\" quotes with %1 \bcustom%2 quotes" ;
+		Text [ en-US ] = "Replace \"standard\" quotes with %1custom%2 quotes" ;
 	};
 	String STR_AUTOFMTREDL_USER_STYLE+1
 	{