diff options
-rw-r--r-- | sc/source/ui/navipi/navipi.src | 14 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tphf.src | 2 | ||||
-rw-r--r-- | sc/source/ui/src/sc.src | 4 | ||||
-rw-r--r-- | sc/source/ui/src/scerrors.src | 1 | ||||
-rw-r--r-- | sc/source/ui/src/scstring.src | 78 | ||||
-rw-r--r-- | sc/source/ui/src/scwarngs.src | 2 | ||||
-rw-r--r-- | sc/source/ui/src/simpref.src | 3 | ||||
-rw-r--r-- | sc/source/ui/src/solveroptions.src | 2 | ||||
-rw-r--r-- | sc/source/ui/src/solvrdlg.src | 1 | ||||
-rw-r--r-- | sc/source/ui/src/sortdlg.src | 4 | ||||
-rw-r--r-- | sc/source/ui/src/subtdlg.src | 2 | ||||
-rw-r--r-- | sc/source/ui/src/tabopdlg.src | 1 | ||||
-rw-r--r-- | sc/source/ui/src/textdlgs.src | 2 | ||||
-rw-r--r-- | sc/source/ui/src/toolbox.src | 10 | ||||
-rw-r--r-- | sc/source/ui/styleui/scstyles.src | 6 | ||||
-rw-r--r-- | sc/source/ui/styleui/styledlg.src | 2 | ||||
-rw-r--r-- | sc/util/hidother.src | 1 | ||||
-rw-r--r-- | scaddins/source/analysis/analysis.src | 2 | ||||
-rw-r--r-- | scaddins/source/analysis/analysis_deffuncnames.src | 3 | ||||
-rw-r--r-- | scaddins/source/analysis/analysis_funcnames.src | 2 | ||||
-rw-r--r-- | sccomp/source/solver/solver.src | 9 |
21 files changed, 104 insertions, 47 deletions
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index 7b05c8494deb..08e57cf4bf3c 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -59,23 +59,13 @@ Window RID_SCDLG_NAVIGATOR { SVLook = TRUE ; HelpId = HID_SC_NAVIGATOR ; - //? Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT ( 115 , 116 ) ; OutputSize = TRUE ; DialogControl = TRUE ; Hide = TRUE ; Text [ en-US ] = "Navigator" ; - // Closeable = TRUE ; - // Moveable = TRUE ; - // Zoomable = TRUE ; - // Sizeable = TRUE ; - // EnableResizing = TRUE ; - // HideWhenDeactivate = TRUE ; - // Border = TRUE ; - // Dockable = TRUE ; FixedText FT_ROW { - // Pos = MAP_APPFONT( 2, 20 ); Pos = MAP_APPFONT ( 2 , 19 ) ; // an kleinere Toolbox-Bitmaps angepasst Size = MAP_APPFONT ( 19 , 10 ) ; @@ -85,7 +75,6 @@ Window RID_SCDLG_NAVIGATOR { HelpId = HID_SC_NAVIPI_ROW ; Border = TRUE ; - // Pos = MAP_APPFONT( 31, 19 ); Pos = MAP_APPFONT ( 31 , 18 ) ; // an kleinere Toolbox-Bitmaps angepasst Size = MAP_APPFONT ( 30 , 12 ) ; @@ -119,7 +108,6 @@ Window RID_SCDLG_NAVIGATOR // "Control" braucht immer eigene HelpId HelpId = HID_SC_NAVIPI_ENTRIES ; Border = TRUE ; - // Pos = MAP_APPFONT( 2, 52 ); Pos = MAP_APPFONT ( 2 , 35 ) ; Size = MAP_APPFONT ( 110 , 100 ) ; TabStop = TRUE ; @@ -128,7 +116,6 @@ Window RID_SCDLG_NAVIGATOR { HelpId = HID_SC_NAVIPI_DOC ; Border = TRUE ; - // Pos = MAP_APPFONT( 2, 35 ); Pos = MAP_APPFONT ( 2 , 89 ) ; Size = MAP_APPFONT ( 82 , 50 ) ; TabStop = TRUE ; @@ -244,6 +231,7 @@ ImageList RID_IMAGELIST_NAVCONT MaskColor = STD_MASKCOLOR ; SC_NAVI_CONT_IDLIST }; + Image RID_IMG_DROP_URL { ImageBitmap = Bitmap { File = "dropurl.png" ; }; diff --git a/sc/source/ui/pagedlg/tphf.src b/sc/source/ui/pagedlg/tphf.src index d1d7396d8829..d6cda1047cc1 100644 --- a/sc/source/ui/pagedlg/tphf.src +++ b/sc/source/ui/pagedlg/tphf.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "sc.hrc" + PushButton RID_SCBTN_HFEDIT { TabStop = TRUE ; @@ -34,4 +35,3 @@ PushButton RID_SCBTN_HFEDIT Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Edit..." ; }; - diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src index dae422e15cd0..62da4f53488b 100644 --- a/sc/source/ui/src/sc.src +++ b/sc/source/ui/src/sc.src @@ -27,8 +27,6 @@ #include "sc.hrc" // -> #include <sfx.hrc> - - // App-Titel------------------------------------------------------ String RID_APPTITLE @@ -41,8 +39,6 @@ String RID_APPTITLE // Icons & Bitmaps: ---------------------------------------------------------- - - // ??? String 30001 { Text = "Dummy1" ; }; String 30002 { Text = "Dummy2" ; }; diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src index 51ab222e0a1a..2a2e2ad47169 100644 --- a/sc/source/ui/src/scerrors.src +++ b/sc/source/ui/src/scerrors.src @@ -167,4 +167,3 @@ Resource RID_ERRHDLSC Text [ en-US ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; }; }; - diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 417993c993b6..310364fdeb5f 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -24,6 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #include "sc.hrc" // -> #include <sfx.hrc> // Strings fuer Interface-Namen ------------------------------------------ @@ -32,38 +33,47 @@ String SCSTR_APPLICATION { Text [ en-US ] = "%PRODUCTNAME Calc 6.0"; }; + String SCSTR_50_APPLICATION { Text [ en-US ] = "StarCalc 5.0" ; }; + String SCSTR_40_APPLICATION { Text [ en-US ] = "StarCalc 4.0" ; }; + String SCSTR_30_APPLICATION { Text [ en-US ] = "StarCalc 3.0" ; }; + String SCSTR_LONG_SCDOC_NAME { Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION Spreadsheet"; }; + String SCSTR_50_LONG_DOCNAME { Text [ en-US ] = "%PRODUCTNAME 5.0 Spreadsheet" ; }; + String SCSTR_40_LONG_DOCNAME { Text [ en-US ] = "%PRODUCTNAME 4.0 Spreadsheet" ; }; + String SCSTR_30_LONG_DOCNAME { Text [ en-US ] = "StarCalc 3.0 Spreadsheet" ; }; + String SCSTR_SHORT_SCDOC_NAME { Text [ en-US ] = "Spreadsheet" ; }; + String SCSTR_HUMAN_SCDOC_NAME { Text [ en-US ] = "Spreadsheet" ; @@ -89,7 +99,6 @@ String SCSTR_FORMATSHELL Text [ en-US ] = "Formats for Cells"; }; - String SCSTR_DRAWSHELL { Text [ en-US ] = "Graphics objects" ; @@ -119,6 +128,7 @@ String SCSTR_GRAPHICSHELL { Text [ en-US ] = "Graphics"; }; + String SCSTR_PAGEBREAKSHELL { Text [ en-US ] = "Pagebreak"; @@ -150,148 +160,182 @@ String STR_ROWHEIGHT { Text [ en-US ] = "Height" ; }; + String STR_OPT_ROWHEIGHT { Text [ en-US ] = "Add" ; }; + String STR_ROWHEIGHT_TITLE { Text [ en-US ] = "Row Height" ; }; + String STR_OPT_ROWHEIGHT_TITLE { Text [ en-US ] = "Optimal Row Height" ; }; + String STR_COLWIDTH { Text [ en-US ] = "Width" ; }; + String STR_OPT_COLWIDTH { Text [ en-US ] = "Add" ; }; + String STR_COLWIDTH_TITLE { Text [ en-US ] = "Column Width" ; }; + String STR_OPT_COLWIDTH_TITLE { Text [ en-US ] = "Optimal Column Width" ; }; + String SCSTR_UNDEFINED { Text [ en-US ] = "- undefined -" ; }; + String SCSTR_NONE { Text [ en-US ] = "- none -" ; }; + String SCSTR_EMPTY { Text [ en-US ] = "- empty -" ; }; + String SCSTR_NOTEMPTY { Text [ en-US ] = "- not empty -" ; }; + String SCSTR_NEWTABLE { Text [ en-US ] = "- new sheet -" ; }; + String SCSTR_ALL { Text [ en-US ] = "- all -" ; }; + String SCSTR_STDFILTER { Text [ en-US ] = "Standard Filter..." ; }; + String SCSTR_TOP10FILTER { Text [ en-US ] = "Top 10" ; }; + String SCSTR_NONAME { Text [ en-US ] = "unnamed" ; }; + String SCSTR_COLUMN { Text [ en-US ] = "Column" ; }; + String SCSTR_ROW { Text [ en-US ] = "Row" ; }; + String SCSTR_NEW { Text [ en-US ] = "~New" ; }; + String SCSTR_ADD { Text [ en-US ] = "~Add" ; }; + String SCSTR_REMOVE { Text [ en-US ] = "~Delete" ; }; + String SCSTR_CANCEL { Text [ en-US ] = "Cance~l" ; }; + String SCSTR_MODIFY { Text [ en-US ] = "Modif~y" ; }; - String SCSTR_SHOWTABLE { Text [ en-US ] = "Show Sheet" ; }; + String SCSTR_HIDDENTABLES { Text [ en-US ] = "Hidden Sheets" ; }; + String SCSTR_SELECTDB { Text [ en-US ] = "Select Database Range" ; }; + String SCSTR_AREAS { Text [ en-US ] = "Ranges" ; }; + String SCSTR_TABLE { Text [ en-US ] = "Sheet" ; }; + String SCSTR_NAME { Text [ en-US ] = "Name" ; }; + String SCSTR_INSTABLE { Text [ en-US ] = "Insert Sheet" ; }; + String SCSTR_APDTABLE { Text [ en-US ] = "Append Sheet" ; }; + String SCSTR_RENAMETAB { Text [ en-US ] = "Rename Sheet" ; }; + String SCSTR_SET_TAB_BG_COLOR { Text [ en-US ] = "Tab Color" ; }; + String SCSTR_NO_TAB_BG_COLOR { Text [ en-US ] = "Default" ; }; + String SCSTR_RENAMEOBJECT { Text [ en-US ] = "Name Object"; }; + String STR_INSERTGRAPHIC { Text [ en-US ] = "Insert Picture" ; @@ -303,50 +347,62 @@ String SCSTR_HOR_JUSTIFY_LEFT { Text [ en-US ] = "Align left" ; }; + String SCSTR_HOR_JUSTIFY_CENTER { Text [ en-US ] = "Centered horizontally" ; }; + String SCSTR_HOR_JUSTIFY_RIGHT { Text [ en-US ] = "Align right" ; }; + String SCSTR_HOR_JUSTIFY_BLOCK { Text [ en-US ] = "Justify" ; }; + String SCSTR_HOR_JUSTIFY_REPEAT { Text [ en-US ] = "Repeat alignment" ; }; + String SCSTR_HOR_JUSTIFY_STANDARD { Text [ en-US ] = "Horizontal alignment default" ; }; + String SCSTR_VER_JUSTIFY_TOP { Text [ en-US ] = "Align to top" ; }; + String SCSTR_VER_JUSTIFY_CENTER { Text [ en-US ] = "Centered vertically" ; }; + String SCSTR_VER_JUSTIFY_BOTTOM { Text [ en-US ] = "Align to bottom" ; }; + String SCSTR_VER_JUSTIFY_STANDARD { Text [ en-US ] = "Vertical alignment default" ; }; + String SCSTR_ORIENTATION_TOPBOTTOM { Text [ en-US ] = "Top to bottom" ; }; + String SCSTR_ORIENTATION_BOTTOMTOP { Text [ en-US ] = "Bottom to Top" ; }; + String SCSTR_ORIENTATION_STANDARD { Text [ en-US ] = "Default orientation" ; @@ -356,30 +412,37 @@ String SCSTR_PROTECTDOC { Text [ en-US ] = "Protect Document" ; }; + String SCSTR_UNPROTECTDOC { Text [ en-US ] = "Unprotect document" ; }; + String SCSTR_PROTECTTAB { Text [ en-US ] = "Protect Sheet" ; }; + String SCSTR_UNPROTECTTAB { Text [ en-US ] = "Unprotect sheet" ; }; + String SCSTR_CHG_PROTECT { Text [ en-US ] = "Protect Records" ; }; + String SCSTR_CHG_UNPROTECT { Text [ en-US ] = "Unprotect Records" ; }; + String SCSTR_PASSWORD { Text [ en-US ] = "Password:" ; }; + String SCSTR_PASSWORDOPT { Text [ en-US ] = "Password (optional):" ; @@ -455,18 +518,22 @@ String SCSTR_VALID_MINIMUM { Text [ en-US ] = "~Minimum" ; }; + String SCSTR_VALID_MAXIMUM { Text [ en-US ] = "~Maximum" ; }; + String SCSTR_VALID_VALUE { Text [ en-US ] = "~Value" ; }; + String SCSTR_VALID_RANGE { Text [ en-US ] = "~Source" ; }; + String SCSTR_VALID_LIST { Text [ en-US ] = "~Entries" ; @@ -505,26 +572,32 @@ String SCSTR_GRFILTER_OPENERROR { Text [ en-US ] = "Graphics file can not be opened" ; }; + String SCSTR_GRFILTER_IOERROR { Text [ en-US ] = "Graphics file can not be read" ; }; + String SCSTR_GRFILTER_FORMATERROR { Text [ en-US ] = "Unknown graphic format" ; }; + String SCSTR_GRFILTER_VERSIONERROR { Text [ en-US ] = "This graphic file version is not supported" ; }; + String SCSTR_GRFILTER_FILTERERROR { Text [ en-US ] = "Graphics filter not found" ; }; + String SCSTR_GRFILTER_TOOBIG { Text [ en-US ] = "Not enough memory available to insert graphics." ; }; + String SCSTR_UNDO_GRAFFILTER { Text [ en-US ] = "Graphics Filter" ; @@ -773,4 +846,3 @@ String SCSTR_WARN_ME_IN_FUTURE_CHECK { Text [ en-US ] = "Warn me about this in the future."; }; - diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src index aedfd5fd8ad0..15792a596e46 100644 --- a/sc/source/ui/src/scwarngs.src +++ b/sc/source/ui/src/scwarngs.src @@ -28,8 +28,6 @@ #include "scwarngs.hxx" #include "sc.hrc" - - #define SH_MAX 0x7fff Resource RID_WRNHDLSC diff --git a/sc/source/ui/src/simpref.src b/sc/source/ui/src/simpref.src index 1a0ade87d012..2c8dfd665fcb 100644 --- a/sc/source/ui/src/simpref.src +++ b/sc/source/ui/src/simpref.src @@ -26,16 +26,15 @@ ************************************************************************/ #include "simpref.hrc" + ModelessDialog RID_SCDLG_SIMPLEREF { OutputSize = TRUE ; - //HelpId = SID_DEFINE_DBNAME ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 60 ) ; Text = "Bereich festlegen" ; Moveable = TRUE ; - // Closeable = TRUE; // Dieser Dialog hat einen Cancel-Button ! FixedText FT_ASSIGN { Pos = MAP_APPFONT ( 6 , 6 ) ; diff --git a/sc/source/ui/src/solveroptions.src b/sc/source/ui/src/solveroptions.src index 0a3432344f35..87c75277f413 100644 --- a/sc/source/ui/src/solveroptions.src +++ b/sc/source/ui/src/solveroptions.src @@ -95,7 +95,6 @@ ModalDialog RID_SCDLG_SOLVEROPTIONS Text [ en-US ] = "Options" ; }; - ModalDialog RID_SCDLG_SOLVER_INTEGER { OutputSize = TRUE ; @@ -186,4 +185,3 @@ ModalDialog RID_SCDLG_SOLVER_DOUBLE }; Text [ en-US ] = "Edit Setting" ; }; - diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src index 6a8a3d955644..2dc1a8ef01c1 100644 --- a/sc/source/ui/src/solvrdlg.src +++ b/sc/source/ui/src/solvrdlg.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "solvrdlg.hrc" + ModelessDialog RID_SCDLG_SOLVER { OutputSize = TRUE ; diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src index 17f2d9ca0b45..3eb7e43585d0 100644 --- a/sc/source/ui/src/sortdlg.src +++ b/sc/source/ui/src/sortdlg.src @@ -25,6 +25,7 @@ * ************************************************************************/ #include "sortdlg.hrc" + TabPage RID_SCPAGE_SORT_FIELDS { Hide = TRUE ; @@ -116,6 +117,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Text [ en-US ] = "T~hen by" ; }; }; + TabPage RID_SCPAGE_SORT_OPTIONS { Hide = TRUE ; @@ -158,7 +160,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS Text [ de ] = "Enable ~natural sort" ; Text [ en-US ] = "Enable ~natural sort" ; Text [ cs ] = "Aktivovat přirozené třídění" ; - Text [ sk ] = "Aktivovať prirodzené triedenie" ; + Text [ sk ] = "Aktivovať prirodzené triedenie" ; TabStop = TRUE ; Text [ x-comment ] = " " ; }; diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src index ef614eff276c..1fe9bb0d777a 100644 --- a/sc/source/ui/src/subtdlg.src +++ b/sc/source/ui/src/subtdlg.src @@ -181,10 +181,12 @@ TabPage RID_SCPAGE_SUBT_GROUP1 < RID_SUBTBASE { HelpId = HID_SCPAGE_SUBT_GROUP1 ; }; + TabPage RID_SCPAGE_SUBT_GROUP2 < RID_SUBTBASE { HelpId = HID_SCPAGE_SUBT_GROUP2 ; }; + TabPage RID_SCPAGE_SUBT_GROUP3 < RID_SUBTBASE { HelpId = HID_SCPAGE_SUBT_GROUP3 ; diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src index 25af654f4147..e4f99ab59596 100644 --- a/sc/source/ui/src/tabopdlg.src +++ b/sc/source/ui/src/tabopdlg.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "tabopdlg.hrc" + ModelessDialog RID_SCDLG_TABOP { OutputSize = TRUE ; diff --git a/sc/source/ui/src/textdlgs.src b/sc/source/ui/src/textdlgs.src index eab99e713828..6b2321ad2017 100644 --- a/sc/source/ui/src/textdlgs.src +++ b/sc/source/ui/src/textdlgs.src @@ -25,8 +25,6 @@ * ************************************************************************/ - - #include <svx/dialogs.hrc> #include "sc.hrc" diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index 798bf1272fea..2834917c4317 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -260,11 +260,11 @@ FloatingWindow RID_TBXCTL_INSOBJ #define DEFAULT_IDLIST \ IdList = { \ /* Eingabezeile */ \ - SID_INPUT_FUNCTION; /* 20047 */ \ - SID_INPUT_SUM; /* 20048 */ \ - SID_INPUT_EQUAL; /* 20049 */ \ - SID_INPUT_CANCEL; \ - SID_INPUT_OK; \ + SID_INPUT_FUNCTION; /* 26047 */ \ + SID_INPUT_SUM; /* 26048 */ \ + SID_INPUT_EQUAL; /* 26049 */ \ + SID_INPUT_CANCEL; /* 26050 */ \ + SID_INPUT_OK; /* 26051 */ \ }; \ IdCount = { \ 5; \ diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index e1f6459c9ee1..b70db0e615e2 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -27,6 +27,7 @@ #include "sc.hrc" #include <svl/style.hrc> + #define IMPL_FAMILY(family,filter) \ StyleFamily = family; \ FilterList = { filter } @@ -43,14 +44,15 @@ SfxStyleFamilies DLG_STYLE_DESIGNER < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ; < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ; ) ; Text [ en-US ] = "Cell Styles" ; -}; + }; + SfxStyleFamilyItem { IMPL_FAMILY ( SFX_STYLE_FAMILY_PAGE , < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ; < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ; ) ; Text [ en-US ] = "Page Styles" ; -}; + }; }; // style family images are now taken from an ImageList diff --git a/sc/source/ui/styleui/styledlg.src b/sc/source/ui/styleui/styledlg.src index 57a5f3b51700..5fac741b05cb 100644 --- a/sc/source/ui/styleui/styledlg.src +++ b/sc/source/ui/styleui/styledlg.src @@ -27,6 +27,7 @@ #include "sc.hrc" #include "styledlg.hrc" // -> TP_xxx + TabDialog RID_SCDLG_STYLES_PAR { OutputSize = TRUE ; @@ -86,6 +87,7 @@ TabDialog RID_SCDLG_STYLES_PAR }; }; }; + TabDialog RID_SCDLG_STYLES_PAGE { OutputSize = TRUE ; diff --git a/sc/util/hidother.src b/sc/util/hidother.src index ffdb5c329399..7170e7b4c3dc 100644 --- a/sc/util/hidother.src +++ b/sc/util/hidother.src @@ -501,4 +501,3 @@ hidspecial HID_DAI_FUNC_ROT13 { HelpID = HID_DAI_FUNC_ROT13; }; // generated from there, because of the use of macros (#95943#): hidspecial SID_RENAME_OBJECT { HelpID = SID_RENAME_OBJECT; }; - diff --git a/scaddins/source/analysis/analysis.src b/scaddins/source/analysis/analysis.src index 5f94659137c1..bdff7932b68b 100644 --- a/scaddins/source/analysis/analysis.src +++ b/scaddins/source/analysis/analysis.src @@ -25,10 +25,8 @@ * ************************************************************************/ - #include "analysis.hrc" - Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS { Resource ANALYSIS_Workday diff --git a/scaddins/source/analysis/analysis_deffuncnames.src b/scaddins/source/analysis/analysis_deffuncnames.src index 134a825e2063..2c67e2ca3c11 100644 --- a/scaddins/source/analysis/analysis_deffuncnames.src +++ b/scaddins/source/analysis/analysis_deffuncnames.src @@ -25,10 +25,8 @@ * ************************************************************************/ - #include "analysis.hrc" - Resource RID_ANALYSIS_DEFFUNCTION_NAMES { @@ -868,5 +866,4 @@ Resource RID_ANALYSIS_DEFFUNCTION_NAMES < "FACTDOUBLE"; >; }; }; - }; diff --git a/scaddins/source/analysis/analysis_funcnames.src b/scaddins/source/analysis/analysis_funcnames.src index e9762cda2092..47796f3b0e3c 100644 --- a/scaddins/source/analysis/analysis_funcnames.src +++ b/scaddins/source/analysis/analysis_funcnames.src @@ -25,10 +25,8 @@ * ************************************************************************/ - #include "analysis.hrc" - Resource RID_ANALYSIS_FUNCTION_NAMES { diff --git a/sccomp/source/solver/solver.src b/sccomp/source/solver/solver.src index ff353bc4db9e..39664c4e22d5 100644 --- a/sccomp/source/solver/solver.src +++ b/sccomp/source/solver/solver.src @@ -36,18 +36,22 @@ String RID_PROPERTY_NONNEGATIVE { Text [ en-US ] = "Assume variables as non-negative"; }; + String RID_PROPERTY_INTEGER { Text [ en-US ] = "Assume variables as integer"; }; + String RID_PROPERTY_TIMEOUT { Text [ en-US ] = "Solving time limit (seconds)"; }; + String RID_PROPERTY_EPSILONLEVEL { Text [ en-US ] = "Epsilon level (0-3)"; }; + String RID_PROPERTY_LIMITBBDEPTH { Text [ en-US ] = "Limit branch-and-bound depth"; @@ -57,20 +61,23 @@ String RID_ERROR_NONLINEAR { Text [ en-US ] = "The model is not linear."; }; + String RID_ERROR_EPSILONLEVEL { Text [ en-US ] = "The epsilon level is invalid."; }; + String RID_ERROR_INFEASIBLE { Text [ en-US ] = "The model is infeasible. Check limiting conditions."; }; + String RID_ERROR_UNBOUNDED { Text [ en-US ] = "The model is unbounded."; }; + String RID_ERROR_TIMEOUT { Text [ en-US ] = "The time limit was reached."; }; - |