Mercurial > octave-libtiff
changeset 25186:ecc37eef11cc
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 09 Apr 2018 17:20:07 -0400 |
parents | e25b8fda2a51 (current diff) 559e4821c3f7 (diff) |
children | d2558ba799d8 |
files | |
diffstat | 5 files changed, 21 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/basics.txi Mon Apr 09 09:39:45 2018 -0700 +++ b/doc/interpreter/basics.txi Mon Apr 09 17:20:07 2018 -0400 @@ -254,7 +254,6 @@ disable_range = true fixed_point_format = true history_timestamp_format_string = "%%-- %D %I:%M %p --%%" -page_screen_output = false print_empty_dimensions = false save_default_options = "-mat-binary" struct_levels_to_print = 0
--- a/libgui/languages/nl_NL.ts Mon Apr 09 09:39:45 2018 -0700 +++ b/libgui/languages/nl_NL.ts Mon Apr 09 17:20:07 2018 -0400 @@ -2087,7 +2087,9 @@ <source>Could not copy help collection to temporary file. Search capabilities may be affected. %1</source> - <translation type="unfinished"></translation> + <translation>Kon de help collectie niet naar een tijdelijk +betand kopiƫren. De zoekfunctie kan beinvloed zijn. +%1</translation> </message> <message> <location line="+10"/> @@ -2122,7 +2124,7 @@ <message> <location line="+157"/> <source>Unable to register help file %1.</source> - <translation type="unfinished"></translation> + <translation>Kan help bestand %1 niet registreren.</translation> </message> </context> <context> @@ -2401,7 +2403,7 @@ <message> <location line="+7"/> <source>Convert Line Endings to &Windows (CRLF)</source> - <translation type="unfinished"></translation> + <translation>Zet regeleindes om naar &Windows (CRLF)</translation> </message> <message> <location line="+5"/> @@ -2747,7 +2749,10 @@ can not be applied. Please select another one or cancel saving!</source> - <translation type="unfinished"></translation> + <translation>The huidige codec %1 +kan niet worden toegepast. + +Selecteer s.v.p. een andere of annuleer opslaan!</translation> </message> <message> <location line="+11"/> @@ -2756,7 +2761,11 @@ Using it will result in data loss! Do you want to choose another encoding?</source> - <translation type="unfinished"></translation> + <translation>De huidige inhoud van de editor kan niet worden gecodeerd +met de geselecteerde codering %1. +Deze toch gebruiken leidt tot gegevensverlies! + +Wilt u een andere codering kiezen?</translation> </message> <message> <location line="+85"/> @@ -5185,7 +5194,7 @@ <message> <location line="+309"/> <source>Wrap long lines at current window border</source> - <translation type="unfinished"></translation> + <translation>Breek lange regels af op huidige vensterrand</translation> </message> <message> <location line="+475"/>
--- a/libinterp/corefcn/debug.cc Mon Apr 09 09:39:45 2018 -0700 +++ b/libinterp/corefcn/debug.cc Mon Apr 09 17:20:07 2018 -0400 @@ -1160,11 +1160,14 @@ if (args.length () != 0) print_usage (); + // FIXME: there are too many debug mode flags! + Vdebugging = false; octave::tree_evaluator::reset_debug_state (); + octave::tree_evaluator::debug_mode = false; - octave_throw_interrupt_exception (); + throw octave::interrupt_exception (); return ovl (); }
--- a/libinterp/corefcn/interpreter.cc Mon Apr 09 09:39:45 2018 -0700 +++ b/libinterp/corefcn/interpreter.cc Mon Apr 09 17:20:07 2018 -0400 @@ -1298,7 +1298,6 @@ Fdisable_range (octave_value (true)); Ffixed_point_format (octave_value (true)); Fhistory_timestamp_format_string (octave_value ("%%-- %D %I:%M %p --%%")); - Fpage_screen_output (octave_value (false)); Fprint_empty_dimensions (octave_value (false)); Fsave_default_options (octave_value ("-mat-binary")); Fstruct_levels_to_print (octave_value (0));
--- a/scripts/help/warning_ids.m Mon Apr 09 09:39:45 2018 -0700 +++ b/scripts/help/warning_ids.m Mon Apr 09 17:20:07 2018 -0400 @@ -182,8 +182,8 @@ ## issued when Octave does not find the target of a file operation such as ## @code{load} or @code{fopen} directly, but is able to locate the file in ## Octave's search @code{path} for files. The warning could indicate that a -## different file target then the programmer intended is being used. -## By default, the @code{Octave:fopen-file-in-path} warning is enabled. +## different file target than the programmer intended is being used. +## By default, the @code{Octave:data-file-in-path} warning is enabled. ## ## @item Octave:function-name-clash ## If the @code{Octave:function-name-clash} warning is enabled, a