From: Yuri C. <yu...@uk...> - 2015-01-08 08:13:06
|
Git commit bae82f98551d257e6648420d409f8980941d0609 by Yuri Chornoivan. Committed on 08/01/2015 at 08:12. Pushed by yurchor into branch 'master'. Fix typos M +1 -1 rkward/plugins/00saveload/import/import_csv.rkh M +1 -1 rkward/plugins/00saveload/import/import_csv.xml M +4 -4 rkward/plugins/00saveload/save/write_csv.rkh M +1 -1 rkward/plugins/data/one_var_tabulation.rkh M +2 -2 rkward/plugins/plots/histogram_options.rkh M +2 -2 rkward/plugins/plots/plot_options.rkh M +1 -1 rkward/plugins/plots/plot_stepfun_options.rkh M +4 -4 rkward/plugins/rkwarddev_scripts/write_csv.R M +1 -1 rkward/plugins/x11device/export.rkh M +1 -1 rkward/plugins/x11device/export.xml M +1 -1 rkward/plugins/x11device/grid.rkh http://commits.kde.org/rkward/bae82f98551d257e6648420d409f8980941d0609 diff --git a/rkward/plugins/00saveload/import/import_csv.rkh b/rkward/plugins/00saveload/import/import_csv.rkh index 44a8c30..89d100e 100644 --- a/rkward/plugins/00saveload/import/import_csv.rkh +++ b/rkward/plugins/00saveload/import/import_csv.rkh @@ -11,7 +11,7 @@ Choose the CSV file to import. An R object containing the data will be created. <settings> <caption id="tab_general"/> <setting id="file">The filename of the file to import</setting> - <setting id="quick">Select from one of the predefined (most common formats), or select "custom", to specify field separator and decimal separtor, below.</setting> + <setting id="quick">Select from one of the predefined (most common formats), or select "custom", to specify field separator and decimal separator, below.</setting> <setting id="header">Whether the first row of the file contains should be interpreted as column names</setting> <setting id="dec">Decimal character used in the imported file</setting> <setting id="custom_dec">If you selected "other" above, specify the character, here.</setting> diff --git a/rkward/plugins/00saveload/import/import_csv.xml b/rkward/plugins/00saveload/import/import_csv.xml index 7f5fe1e..64aa0d0 100644 --- a/rkward/plugins/00saveload/import/import_csv.xml +++ b/rkward/plugins/00saveload/import/import_csv.xml @@ -65,7 +65,7 @@ <browser id="file" type="file" label="File name"/> <dropdown id="quick" label="Data format" > <option value="csv" label="Comma separated values (CSV)" checked="true" /> - <option value="csv2" label="Semicolo separated values, comma as decimal separator (CSV2)" /> + <option value="csv2" label="Semicolon separated values, comma as decimal separator (CSV2)" /> <option value="delim" label="Tab separated values (TAB)" /> <option value="delim2" label="Tab separated values, comma as decimal separator (TAB2)" /> <option value="table" label="Custom"/> diff --git a/rkward/plugins/00saveload/save/write_csv.rkh b/rkward/plugins/00saveload/save/write_csv.rkh index 2924036..94f872a 100644 --- a/rkward/plugins/00saveload/save/write_csv.rkh +++ b/rkward/plugins/00saveload/save/write_csv.rkh @@ -28,17 +28,17 @@ Should existing files be overwritten or the data appended? If this is greyed out, the selected preset sets this for you. </setting> <setting id="quick"> - Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with resonable defaults. Use the custom format if you need more control. + Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with reasonable defaults. Use the custom format if you need more control. </setting> <caption id="frm_rDPPCCCOFT" /> <setting id="dec"> - Specify the desirend decimal point character. If this is greyed out, the selected preset sets this for you. + Specify the desired decimal point character. If this is greyed out, the selected preset sets this for you. </setting> <setting id="custom_dec"> Use this value as the custom decimal point character. </setting> <setting id="sep"> - Specify the desirend field separator character. If this is greyed out, the selected preset sets this for you. + Specify the desired field separator character. If this is greyed out, the selected preset sets this for you. </setting> <setting id="custom_sep"> Use this value as the custom field separator character. @@ -71,7 +71,7 @@ Check this to have all string values quoted. </setting> <setting id="qmethod"> - Controls how existing quotes in values are handled -- they can either be escaped or double qouted. If this is greyed out, the selected preset sets this for you. + Controls how existing quotes in values are handled -- they can either be escaped or double quoted. If this is greyed out, the selected preset sets this for you. </setting> <setting id="na"> Set the character to indicate missing data. diff --git a/rkward/plugins/data/one_var_tabulation.rkh b/rkward/plugins/data/one_var_tabulation.rkh index 18a9eca..9e2f4a8 100644 --- a/rkward/plugins/data/one_var_tabulation.rkh +++ b/rkward/plugins/data/one_var_tabulation.rkh @@ -1,7 +1,7 @@ <!DOCTYPE rkhelp> <document> <summary> - Generic tabulation plugin (single outcome vector). This plugin is designed to be embeded into other plugins. + Generic tabulation plugin (single outcome vector). This plugin is designed to be embedded into other plugins. </summary> <usage> diff --git a/rkward/plugins/plots/histogram_options.rkh b/rkward/plugins/plots/histogram_options.rkh index d1f0b24..de42216 100644 --- a/rkward/plugins/plots/histogram_options.rkh +++ b/rkward/plugins/plots/histogram_options.rkh @@ -4,7 +4,7 @@ This plugin provides various options for <b>hist</b> or <b>plot.histogram</b>. </summary> <usage> - This plugin is mostly used as an embeded plugin. All the GUI elements here set various parameters to either hist or plot.histogram functions. For parameter specific help see the respective R references. Few parameter combinations might not produce any sensible plot, so read the R references to make a judicious choice of parameters. + This plugin is mostly used as an embedded plugin. All the GUI elements here set various parameters to either hist or plot.histogram functions. For parameter specific help see the respective R references. Few parameter combinations might not produce any sensible plot, so read the R references to make a judicious choice of parameters. </usage> <settings> <setting id="addtoplot">Check this box if the histogram is to be added to the current plot. This is the <i>add</i> parameter.</setting> @@ -25,7 +25,7 @@ <setting id="angle">This is the <i>angle</i> parameter.</setting> <caption id="frame_histfilloptions"/> <setting id="usefillcol">Check this box to use a fill color for the histogram bars.</setting> - <setting id="histfillcol">This is the <i>col</i> parameter. The embeding plugin might set a default color. If it is empty, then <i>col</i> is not used in the code, otherwise the chosen color is used to fill the bars.</setting> + <setting id="histfillcol">This is the <i>col</i> parameter. The embedding plugin might set a default color. If it is empty, then <i>col</i> is not used in the code, otherwise the chosen color is used to fill the bars.</setting> </settings> <related> <ul> diff --git a/rkward/plugins/plots/plot_options.rkh b/rkward/plugins/plots/plot_options.rkh index 652f47c..fe16fa4 100644 --- a/rkward/plugins/plots/plot_options.rkh +++ b/rkward/plugins/plots/plot_options.rkh @@ -1,7 +1,7 @@ <!DOCTYPE rkhelp> <document> <summary> - Generic plot options plugin. More often than not, this plugin is embeded into other plugins. As a result, not all the features explained here are available in a specific embeded situation. When a particular feature is available, it is explained as below. + Generic plot options plugin. More often than not, this plugin is embedded into other plugins. As a result, not all the features explained here are available in a specific embedded situation. When a particular feature is available, it is explained as below. </summary> <usage> @@ -68,7 +68,7 @@ <li><i>allow_ylim</i>: Setting this to "true" ("false") enables (disables) the display of 'Min Y value' and 'Max Y value' input boxes.</li> <li><i>allow_type</i>: Setting this to "true" ("false") enables (disables) the display of the 'Points / Lines' tab.</li> <li><i>allow_aspect</i>: Setting this to "true" ("false") enables (disables) the display of the 'Aspect ratio' tab.</li> - <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the 'Grid' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embeded using an id="plot_options" then the following call:<br> + <li><i>allow_grid</i>: Setting this to "true" ("false") enables (disables) the display of the 'Grid' tab. If "true", the actual code for grid options can be extracted from code.calculate (see below) which in turn extracts it from grid_options.code.printout. Specifically, if the plot options plugin is embedded using an id="plot_options" then the following call:<br> printIndented ("\t", getRK_val ("plot_options.code.calculate"));</br><br> after the plotting function should do the job.</br></li> </ul> diff --git a/rkward/plugins/plots/plot_stepfun_options.rkh b/rkward/plugins/plots/plot_stepfun_options.rkh index 10e7c8c..3384f4a 100644 --- a/rkward/plugins/plots/plot_stepfun_options.rkh +++ b/rkward/plugins/plots/plot_stepfun_options.rkh @@ -4,7 +4,7 @@ Various graphical parameters for <b>plot.stepfun</b>. For detailed description of the individual parameters see the R reference on 'plot.stepfun'. </summary> <usage> - This is supposed to be used as an embeded plugin. All the elements are arguments to the plot.stepfun function. This plugin is useful in constructing <b>ecdf</b> plots. + This is supposed to be used as an embedded plugin. All the elements are arguments to the plot.stepfun function. This plugin is useful in constructing <b>ecdf</b> plots. </usage> <settings> <setting id="addtoplot">This is the <i>add</i> argument. This option might be disabled by the embedding plugin.</setting> diff --git a/rkward/plugins/rkwarddev_scripts/write_csv.R b/rkward/plugins/rkwarddev_scripts/write_csv.R index 69290be..ff5e8aa 100644 --- a/rkward/plugins/rkwarddev_scripts/write_csv.R +++ b/rkward/plugins/rkwarddev_scripts/write_csv.R @@ -75,7 +75,7 @@ etc.drop.format <- rk.XML.dropdown("File format", "Custom"=c(val="table") ), id.name="quick", - help="Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with resonable defaults. Use the custom format if you need more control." + help="Select one of the default file formats here. They will set some of the options (like field separator and decimal point) with reasonable defaults. Use the custom format if you need more control." ) etc.frame.characters <- rk.XML.frame( @@ -88,7 +88,7 @@ etc.frame.characters <- rk.XML.frame( etc.radio.decimal.opt.other <- rk.XML.option("Custom (specify below)", val="other", id.name="decOther") ), id.name="dec", - help="Specify the desirend decimal point character. If this is greyed out, the selected preset sets this for you." + help="Specify the desired decimal point character. If this is greyed out, the selected preset sets this for you." ), rk.XML.stretch(), etc.input.decimal <- rk.XML.input("", required=TRUE, id="custom_dec", @@ -105,7 +105,7 @@ etc.frame.characters <- rk.XML.frame( etc.radio.field.opt.other <- rk.XML.option("Custom (specify below)", val="other", id.name="sepOther") ), id.name="sep", - help="Specify the desirend field separator character. If this is greyed out, the selected preset sets this for you." + help="Specify the desired field separator character. If this is greyed out, the selected preset sets this for you." ), rk.XML.stretch(), etc.input.field <- rk.XML.input("", required=TRUE, id="custom_sep", @@ -126,7 +126,7 @@ etc.frame.specialChars <- rk.XML.frame( etc.radio.quote.opt.double <- rk.XML.option("Double", val="double", id.name="qmethodDbl") ), id.name="qmethod", - help="Controls how existing quotes in values are handled -- they can either be escaped or double qouted. If this is greyed out, the selected preset sets this for you." + help="Controls how existing quotes in values are handled -- they can either be escaped or double quoted. If this is greyed out, the selected preset sets this for you." ) ), rk.XML.col( diff --git a/rkward/plugins/x11device/export.rkh b/rkward/plugins/x11device/export.rkh index 009ce46..db67e33 100644 --- a/rkward/plugins/x11device/export.rkh +++ b/rkward/plugins/x11device/export.rkh @@ -35,7 +35,7 @@ <setting id="ps_horiz">Available only for Postscript/Ghostscript exporting, this is the <i>horizontal</i> parameter.</setting> <setting id="family">This is the <i>family</i> parameter to <b>postscript</b>. Be sure to choose a family that is available on the machine. The 'URW' class of font families require ghostscript. When in doubt leave this as 'Default', the default family (Helvectica) will be used. See the R reference on postscript for more details.</setting> <setting id="encoding">This is the <i>encoding</i> parameter to <b>postscript</b>. Be sure to choose an encoding compatible with the chosen font family. When in doubt leave this as 'Default', the default encoding (ISOLatin1) will be used. See the R reference on postscript for more details.</setting> - <setting id="autotitle">Uncheck this box, to specify a custom title to the graphics file. Note that this is not displayed on the plot, but rather it is embeded inside the graphics file. This is the <i>title</i> parameter to <b>postscript</b>.</setting> + <setting id="autotitle">Uncheck this box, to specify a custom title to the graphics file. Note that this is not displayed on the plot, but rather it is embedded inside the graphics file. This is the <i>title</i> parameter to <b>postscript</b>.</setting> <caption id="frame_gsoptions"/> <setting id="gsformat">File format to use. Only the most common ones are listed, but many more are supported by ghostscript. Select "Other" and see the option below to use these formats.</setting> diff --git a/rkward/plugins/x11device/export.xml b/rkward/plugins/x11device/export.xml index 0351585..eddc129 100644 --- a/rkward/plugins/x11device/export.xml +++ b/rkward/plugins/x11device/export.xml @@ -162,7 +162,7 @@ </dropdown> </row> </frame> - <frame id="title_properties" label="Title embeded in file"> + <frame id="title_properties" label="Title embedded in file"> <row> <column> <checkbox id="autotitle" value="1" value_unchecked="0" checked="true" label="Default Title"/> diff --git a/rkward/plugins/x11device/grid.rkh b/rkward/plugins/x11device/grid.rkh index 30c1417..94f1951 100644 --- a/rkward/plugins/x11device/grid.rkh +++ b/rkward/plugins/x11device/grid.rkh @@ -4,7 +4,7 @@ Various parameters for the <b>grid</b>. For detailed description of the individual parameters see the R reference on 'grid'. Note that this works only when standard (traditional S) graphics functions (see library(help="graphics")) are used to construct the plot. This does not work for trellis graphics devices (see <link href="rkward://rhelp/Lattice"/> for some information). </summary> <usage> - This may or may not be used as an embeded plugin. When used on a trellis device the produced error message is displayed. + This may or may not be used as an embedded plugin. When used on a trellis device the produced error message is displayed. </usage> <settings> <setting id="nx">This is the <i>nx</i> argument. The default is NULL, in which case, the vertical lines are drawn at the xaxis ticks. Select None to not draw the vertical lines. Select 'Specify below' to provide a specified (to be specified below) number of vertical lines in the grid.</setting> |