Git commit 96f88a1aee3212076a859ef4e6e66d32edac9032 by Yuri Chornoivan. Committed on 19/11/2014 at 05:40. Pushed by yurchor into branch 'master'.
Fix typos M +1 -1 doc/rkwardplugins/index.docbook M +3 -3 packages/rkwarddev/demo/skeleton_dialog.R M +1 -1 rkward/main.cpp M +2 -2 rkward/pages/rkward_console.rkh M +1 -1 rkward/pages/rkward_plot_history.rkh M +2 -2 rkward/pages/rkward_trouble_shooting.rkh M +1 -1 rkward/pages/rkward_workspace_browser.rkh http://commits.kde.org/rkward/96f88a1aee3212076a859ef4e6e66d32edac9032 diff --git a/doc/rkwardplugins/index.docbook b/doc/rkwardplugins/index.docbook index 96eae9a..bae26aa 100644 --- a/doc/rkwardplugins/index.docbook +++ b/doc/rkwardplugins/index.docbook @@ -2022,7 +2022,7 @@ user (selection from a list of values shown next to this element) --> a good translation, even if that means skipping some strings (or even skipping some message catalogs as a whole). Other users may be able to fill in any gaps in technical terms.</para></listitem> <listitem><para>At the time of this writing, &rkward;'s project hosting is about to change, and this also affect the translation workflow. Do read comments accompanying - the .pot-files, on how translations should be handled. If in doubt, it is never wrong to send your work the the rkward-devel mailing list, or to ask for up-to-date instructions, + the .pot-files, on how translations should be handled. If in doubt, it is never wrong to send your work the rkward-devel mailing list, or to ask for up-to-date instructions, there.</para></listitem> </itemizedlist> </sect1> diff --git a/packages/rkwarddev/demo/skeleton_dialog.R b/packages/rkwarddev/demo/skeleton_dialog.R index dc20de6..490e259 100644 --- a/packages/rkwarddev/demo/skeleton_dialog.R +++ b/packages/rkwarddev/demo/skeleton_dialog.R @@ -205,11 +205,11 @@ tab2.create <- rk.XML.col(crt.opts, dep.opts) # help="If you already created XML content for the plugin, select the main dialog object here."), # rk.XML.frame( # js.prep <- rk.XML.varslot("preprocess()", source=children.varselector, -# help="A JavaScript object to be used as the the preprocess() function."), +# help="A JavaScript object to be used as the preprocess() function."), # js.calc <- rk.XML.varslot("calculate()", source=children.varselector, -# help="A JavaScript object to be used as the the calculate() function."), +# help="A JavaScript object to be used as the calculate() function."), # js.prnt <- rk.XML.varslot("printout()", source=children.varselector, -# help="A JavaScript object to be used as the the printout() function."), +# help="A JavaScript object to be used as the printout() function."), # rk.XML.stretch()) # )) # tab3.children <- rk.XML.col(rk.XML.row(children.text), rk.XML.row(children.var)) diff --git a/rkward/main.cpp b/rkward/main.cpp index 6fc9883..55216e3 100644 --- a/rkward/main.cpp +++ b/rkward/main.cpp @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) { options.add ("evaluate <Rcode>", ki18n ("After starting (and after loading the specified workspace, if applicable), evaluate the given R code."), 0); options.add ("debug-level <level>", ki18n ("Verbosity of debug messages (0-5)"), "2"); options.add ("debug-flags <flags>", ki18n ("Mask for components to debug (see debug.h)"), QString::number (DEBUG_ALL).toLocal8Bit ()); - options.add ("debugger <command and arguments>", ki18n ("Debugger for the fronted. Specify last, or add '--' after all debugger arguments"), ""); + options.add ("debugger <command and arguments>", ki18n ("Debugger for the frontend. Specify last, or add '--' after all debugger arguments"), ""); options.add ("backend-debugger <command>", ki18n ("Debugger for the backend. (Enclose any debugger arguments in single quotes ('') together with the command. Make sure to re-direct stdout!)"), ""); options.add ("r-executable <command>", ki18n ("Use specified R installation, instead of the one configured at compile time (note: rkward R library must be installed to that installation of R)"), ""); options.add ("+[File]", ki18n ("R workspace file to open"), 0); diff --git a/rkward/pages/rkward_console.rkh b/rkward/pages/rkward_console.rkh index fc50332..8ef7420 100644 --- a/rkward/pages/rkward_console.rkh +++ b/rkward/pages/rkward_console.rkh @@ -36,7 +36,7 @@ Pressing F2 (or selecting "Function reference" from the context menu) will try t <section id="command_history" title="Navigating the command history"> The console provides a mechanism to recall recent commands, similar to the readline functionality offered in R or most shells. -To recall the previous command, simply press the up arrow. Press the up arrow repeatedly to recall the command before that, and so on. Similarily, pressing the down arrow goes downwards in the command history. Of course, you can also edit a recalled command line. +To recall the previous command, simply press the up arrow. Press the up arrow repeatedly to recall the command before that, and so on. Similarly, pressing the down arrow goes downwards in the command history. Of course, you can also edit a recalled command line. It is also possible to search the command history for lines starting with a specified string. To use this, enter - for example - "print" in the console. Now use Shift+Up / Shift+Down. You will note, that only those recent command lines that started with "print" will be shown. @@ -60,7 +60,7 @@ To configure the behavior of the console, select "Configure" from the context me <li><b>Load/save command history</b>: Whether the <link href="#command_history">command history</link> is saved when closing RKWard, and reloaded when next starting RKWard again. If this is not checked, each session of RKWard will start out with an empty command history.</li> <li><b>Maximum length command history</b>: Only this many lines are kept in the <link href="#command_history">command history</link>.</li> <li><b>Maximum number of paragraphs/lines to display in the console</b>: No more than this many total lines (commands and output) will be shown in the console. When this number of lines is exceeded, lines will be removed at the top of the console window. To clear the console entirely, chose "Clear" from the context menu or the Edit menu.</li> - <li><b>Run commands from script editor throught the console</b>: Commands coming from script editors may be sent through the console, i.e. the commands and their results will be shown in the console. If this option is not checked, the commands will only be visible in the Command log, but not in the console.</li> + <li><b>Run commands from script editor through the console</b>: Commands coming from script editors may be sent through the console, i.e. the commands and their results will be shown in the console. If this option is not checked, the commands will only be visible in the Command log, but not in the console.</li> <li><b>Also add those commands to console history</b>: If the above option is checked, this affects, whether such commands are also added to the console history. Turning off this option may help to keep the console history "clean".</li> <li><b>Command history is context sensitive by default</b>: If this is checked, the context sensitive mode of navigating the <link href="#command_history">command history</link> is the default, i.e. available with Up/Down without Shift. Else the key binding for this is Shift+Up/Down.</li> </ul> diff --git a/rkward/pages/rkward_plot_history.rkh b/rkward/pages/rkward_plot_history.rkh index 1332b23..c83022b 100644 --- a/rkward/pages/rkward_plot_history.rkh +++ b/rkward/pages/rkward_plot_history.rkh @@ -37,7 +37,7 @@ <li><code>rk.plot.history.summary(which,type)</code>: this helper function provides some summaries about the screen device history. Here, <code>which</code> is a "device id" (default is <i>NULL</i>: summaries about all managed devices) and <code>type</code> is either <i>devices</i> (returns device specific information) or <i>history</i> (returns information on all the saved plots in the history).</li> <li>Technically speaking, function calls that pass through either <code>graphics::plot.new()</code> or <code>graphics::persp()</code> or <code>lattice::print.trellis()</code> are captured.</li> <li>The base graphics plots are recorded and replayed using <code>recordPlot()</code> and <code>replayPlot()</code>.</li> - <li>The lattice plots are added to the history using a custom <code>print.trellis()</code> function set by <code>lattice.options("print.function")</code>. So, you are warned against resetting or modifying this from a running RKWard session. Similarly, you are very strongly advised agiainst using the <code>plot</code> method on a trellis object since it will not pass through <code>print.trellis()</code> and hence not be stored in the history. This may seem innocuous, but it will have irreparable consequences when trying to use <code>trellis.last.object()</code>, thereafter. You have been warned!</li> + <li>The lattice plots are added to the history using a custom <code>print.trellis()</code> function set by <code>lattice.options("print.function")</code>. So, you are warned against resetting or modifying this from a running RKWard session. Similarly, you are very strongly advised against using the <code>plot</code> method on a trellis object since it will not pass through <code>print.trellis()</code> and hence not be stored in the history. This may seem innocuous, but it will have irreparable consequences when trying to use <code>trellis.last.object()</code>, thereafter. You have been warned!</li> </ul> </section> diff --git a/rkward/pages/rkward_trouble_shooting.rkh b/rkward/pages/rkward_trouble_shooting.rkh index 1191642..bfbf61a 100644 --- a/rkward/pages/rkward_trouble_shooting.rkh +++ b/rkward/pages/rkward_trouble_shooting.rkh @@ -19,7 +19,7 @@ Typically you would call them from R via <link href="rkward://rhelp/update.packages">update.packages</link> and <link href="rkward://rhelp/library">library</link> to achieve this. But RKWard simplifies this for you. You'll be guided through the install procedure for the required package. Please note you need root privileges in certain situations. </section> - <section title="RKWard claimes to take care of seamless integration with an office-suite. Why is there no option to save it as an office file?" shorttitle="RKWard integration with an office-suite" id="integration_in_office_suite"> + <section title="RKWard claims to take care of seamless integration with an office-suite. Why is there no option to save it as an office file?" shorttitle="RKWard integration with an office-suite" id="integration_in_office_suite"> We agree that RKWard is still very lacking when it comes to office integration, and "seamless" integration is still far away. Refer to <link href="rkward://page/rkward_output"/> for information on how to accomplish the most important things right now. </section> <section title="RKWard is running since ages. Has it hung up?" shorttitle="RKWard seems to hang" id="hung_up_problems"> @@ -32,6 +32,6 @@ <section title="I think I did something wrong? Where is 'Undo' and 'Redo'?" shorttitle="Undo/Redo" id="undo_redo_problems"> Right now RKWard doesn't have "undo" or "redo" functionality in all places. For example there is such functionality for the script editor, but there is no undo or redo for finished plots or tests. Therefore it's important that you know what you do before you start. It's recommended to use copies of original data and to give everything a meaningful name. - However, RKWard tries to give you as much information as possible about things you have done. For tests and plots that you run from the menu, the <link href="rkward://page/rkward_output"/> will contain a "run again" link below the output. You can use this to re-do this action with identical or slighly modified settings. Also, tests and plots try to show the most relevant settings in combination with the creation date. Moreover you can check and copy any code generated for your documentation purposes. + However, RKWard tries to give you as much information as possible about things you have done. For tests and plots that you run from the menu, the <link href="rkward://page/rkward_output"/> will contain a "run again" link below the output. You can use this to re-do this action with identical or slightly modified settings. Also, tests and plots try to show the most relevant settings in combination with the creation date. Moreover you can check and copy any code generated for your documentation purposes. </section> </document> diff --git a/rkward/pages/rkward_workspace_browser.rkh b/rkward/pages/rkward_workspace_browser.rkh index e40b1e5..cc8b163 100644 --- a/rkward/pages/rkward_workspace_browser.rkh +++ b/rkward/pages/rkward_workspace_browser.rkh @@ -9,7 +9,7 @@ </summary> <section title="What is shown" id="introduction"> - Literally hundreds or even thousands of objects are present in a typical R session. This can be overwhelming at first, therefore the workspace browser offers to show only a certain subset of objects. The options here are "Show Hidden Objects", "All vs. Non-Functions vs. Functions", and "Show All Environments" (available at the top of the browser window, or chosing "Show Objects" from the context menu). + Literally hundreds or even thousands of objects are present in a typical R session. This can be overwhelming at first, therefore the workspace browser offers to show only a certain subset of objects. The options here are "Show Hidden Objects", "All vs. Non-Functions vs. Functions", and "Show All Environments" (available at the top of the browser window, or choosing "Show Objects" from the context menu). The first should be obvious. It controls whether objects whose name start with a dot ('.') are shown or not. Those are often used for internal objects, which are not meant for direct use, so it's generally safe to hide them from view.
