diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-16 12:04:59 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-16 12:04:59 +0000 |
commit | 2bafee19286bac50f8bb45e740a6b8275bbbef36 (patch) | |
tree | 4e77761b0280dec32b3f000e1518ef325b8ecf95 /sw/source | |
parent | 22a3ff92076e5a9c855a301831666c4ca33388da (diff) |
#i100000# roll back changes from mla01
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/ui/dbui/mailmergechildwindow.src | 4 | ||||
-rw-r--r-- | sw/source/ui/dialog/dialog.src | 13 | ||||
-rw-r--r-- | sw/source/ui/dochdl/dochdl.src | 11 | ||||
-rw-r--r-- | sw/source/ui/dochdl/gloshdl.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.src | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/insrule.src | 4 | ||||
-rw-r--r-- | sw/source/ui/table/convert.src | 4 | ||||
-rw-r--r-- | sw/source/ui/table/instable.src | 4 | ||||
-rw-r--r-- | sw/source/ui/table/tabledlg.src | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/view.hrc | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/view.src | 14 | ||||
-rw-r--r-- | sw/source/ui/utlui/utlui.src | 4 |
12 files changed, 53 insertions, 27 deletions
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src index 6d9f0bc49272..fd0e59fb0623 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.240.1 $ + * $Revision: 1.11 $ * * 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 occurred:"; + Text[ en-US ] = "The following error occured:"; }; FixedText FT_DETAILS { diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src index 5f323732dfd5..985dccf842e7 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.240.1 $ + * $Revision: 1.30 $ * * This file is part of OpenOffice.org. * @@ -43,9 +43,16 @@ String STR_LINKEDIT_TEXT /* ### ACHTUNG: Neuer Text in Resource? Verknpfungen bearbeiten : Verknpfungen 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 { diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src index 4c201bec02b9..a1c11627ff46 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.240.1 $ + * $Revision: 1.48 $ * * This file is part of OpenOffice.org. * @@ -33,10 +33,15 @@ #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."; diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx index 8d716d6420a9..c98b76476c10 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.240.1 $ + * $Revision: 1.32 $ * * This file is part of OpenOffice.org. * @@ -647,10 +647,10 @@ BOOL SwGlossaryHdl::Expand( const String& rShortName, } 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(); - } } diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index eb1e06090a08..f44c84f3a2f0 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.240.1 $ + * $Revision: 1.67 $ * * This file is part of OpenOffice.org. * @@ -330,8 +330,8 @@ TabPage TP_FRM_STD }; 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" ; diff --git a/sw/source/ui/misc/insrule.src b/sw/source/ui/misc/insrule.src index 9c0767f15eca..006f745df269 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.240.1 $ + * $Revision: 1.21 $ * * This file is part of OpenOffice.org. * @@ -76,7 +76,7 @@ ModalDialog DLG_INSERT_RULER { Text [ en-US ] = "Plain" ; }; - Text [ en-US ] = "Insert Horizontal Rule" ; + Text [ en-US ] = "Insert Horizontal Ruler" ; }; diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index 3eec84232ba1..2023263856c7 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.240.1 $ + * $Revision: 1.29 $ * * 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_CONTROL rows" ; + Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ; }; NumericField NF_REPEAT_HEADER { diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index ca5680ebf494..5a64b0b6df45 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.240.1 $ + * $Revision: 1.32 $ * * 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_CONTROL rows" ; + Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ; }; NumericField NF_REPEAT_HEADER { diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 4e6aec8bdb9f..1511ebeaa619 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.66.1 $ + * $Revision: 1.38 $ * * 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_CONTROL rows" ; + Text [ en-US ] = "The first%POSITION_OF_CONTROLrows" ; }; NumericField NF_REPEAT_HEADER { diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/ui/uiview/view.hrc index 2c6d31277f0e..f3061d2e1b3f 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.240.1 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -39,6 +39,8 @@ // 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 beb4f423ba28..277cf8748d7a 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.110.1 $ + * $Revision: 1.52 $ * * This file is part of OpenOffice.org. * @@ -136,6 +136,18 @@ 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 2882146a8986..a476d35cb643 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.240.1 $ + * $Revision: 1.53 $ * * 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 %1 \bcustom%2 quotes" ; + Text [ en-US ] = "Replace \"standard\" quotes with %1custom%2 quotes" ; }; String STR_AUTOFMTREDL_USER_STYLE+1 { |