Mercurial > octave

changeset 27124:da349bc21f8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 28 May 2019 19:18:50 +0000
parents dc89c9b30f3c (current diff) 5af449d4e1f4 (diff)
children d2d2f66e1cdc
files libgui/src/documentation.cc
diffstat 3 files changed, 28 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/languages/nl_NL.ts	Tue May 28 18:53:25 2019 +0000
+++ b/libgui/languages/nl_NL.ts	Tue May 28 19:18:50 2019 +0000
@@ -487,52 +487,52 @@
     <message>
         <location filename="../../../octave-qt/qhelpsearchquerywidget.cpp" line="+124"/>
         <source>Search for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoek naar:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Previous search</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoek vorige</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Next search</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoek volgende</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Search</source>
-        <translation type="unfinished">Zoek</translation>
+        <translation>Zoek</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Advanced search</source>
-        <translation type="unfinished"></translation>
+        <translation>Geavanceerd zoeken</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>words &lt;B&gt;similar&lt;/B&gt; to:</source>
-        <translation type="unfinished"></translation>
+        <translation>woorden &lt;B&gt;gelijkend&lt;/B&gt; aan:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&lt;B&gt;without&lt;/B&gt; the words:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;B&gt;zonder&lt;/B&gt; de woorden:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>with &lt;B&gt;exact phrase&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
+        <translation>met de &lt;B&gt;exacte zin&lt;/B&gt;:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>with &lt;B&gt;all&lt;/B&gt; of the words:</source>
-        <translation type="unfinished"></translation>
+        <translation>met &lt;B&gt;alle&lt;/B&gt; woorden:</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>with &lt;B&gt;at least one&lt;/B&gt; of the words:</source>
-        <translation type="unfinished"></translation>
+        <translation>met &lt;B&gt;minstens een&lt;/B&gt; van de woorden:</translation>
     </message>
 </context>
 <context>
@@ -2504,7 +2504,7 @@
     <message>
         <location line="+5"/>
         <source>Convert Line Endings to Legacy &amp;Mac (CR)</source>
-        <translation type="unfinished">Zet regeleindes om naar Legacy &amp;Mac (CR)</translation>
+        <translation>Zet regeleindes om naar Legacy &amp;Mac (CR)</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5178,22 +5178,22 @@
     <message>
         <location line="+50"/>
         <source> columns</source>
-        <translation type="unfinished"></translation>
+        <translation>kolommen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source> column</source>
-        <translation type="unfinished"></translation>
+        <translation>kolom</translation>
     </message>
     <message>
         <location line="+47"/>
         <source> rows</source>
-        <translation type="unfinished"></translation>
+        <translation>rijen</translation>
     </message>
     <message>
         <location line="+0"/>
         <source> row</source>
-        <translation type="unfinished"></translation>
+        <translation>rij</translation>
     </message>
 </context>
 <context>
@@ -5613,7 +5613,7 @@
     <message>
         <location line="+5"/>
         <source>Legacy Mac (CR)</source>
-        <translation type="unfinished">Legacy Mac (CR)</translation>
+        <translation>Legacy Mac (CR)</translation>
     </message>
     <message>
         <location line="+5"/>
--- a/libgui/src/documentation.cc	Tue May 28 18:53:25 2019 +0000
+++ b/libgui/src/documentation.cc	Tue May 28 19:18:50 2019 +0000
@@ -415,6 +415,9 @@
       query_string = "";
 #endif
 
+    if (query_string.isEmpty ())
+      return;
+
     // Get quoted search strings first, then take first string as fall back
     QRegExp rx ("\"([^\"]*)\"");
     if (rx.indexIn (query_string, 0) != -1)
--- a/scripts/startup/inputrc	Tue May 28 18:53:25 2019 +0000
+++ b/scripts/startup/inputrc	Tue May 28 19:18:50 2019 +0000
@@ -1,6 +1,13 @@
+########################################################################
 ## This file configures the behavior of line-input editing for all
 ## Octave users when Octave is configured to use GNU Readline library
 ## for input-line editing.
+##
+## This file is NOT an Octave script.
+##
+## Do not make changes to this file unless you understand how
+## GNU Readline configuration works.
+########################################################################
 
 ## history-search-backward:
 ##
@@ -20,12 +27,12 @@
 
 "\e[B": history-search-forward
 
-## Disable so the usual paste shortcut will work on Windows systems.
+## Disable Ctrl+v so the usual paste shortcut will work on Windows.
 ## \C-q should still be available for quoted insert.
 
 "\C-v": ""
 
-## In windows, disable audiable bell which is enabled by default
+## On Windows, disable audible bell which is enabled by default.
 $if term=cygwin
    set bell-style none
 $endif