Mercurial > octave-nkf
changeset 20041:c3a40003aa42
maint: Merge away accidental head.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 01 Apr 2015 12:45:04 -0400 |
| parents | a3dbb17d4dad (current diff) 17d79913f065 (diff) |
| children | 8d0860d5fd5a |
| files | libgui/graphics/Canvas.cc libgui/graphics/Figure.cc |
| diffstat | 31 files changed, 735 insertions(+), 684 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Mar 20 16:19:47 2015 -0400 +++ b/NEWS Wed Apr 01 12:45:04 2015 -0400 @@ -141,6 +141,10 @@ There is still one difference: Matlab switches to '%e' and Octave switches to '%g'. + ** The functions intersect, setdiff, setxor, and union now return a + column vector as output unless the input was a row vector. This change + was made for Matlab compatibility. + ** The archive family of functions (bzip2, gzip, zip, tar) and their unpacking routines (bunzip2, gunzip, unzip, untar, unpack) have been recoded. Excepting unpack, the default is now to place files
--- a/build-aux/common.mk Fri Mar 20 16:19:47 2015 -0400 +++ b/build-aux/common.mk Wed Apr 01 12:45:04 2015 -0400 @@ -843,6 +843,7 @@ -e "s|%OCTAVE_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \ -e "s|%OCTAVE_DOC_CACHE_FILE%|\"${doc_cache_file}\"|" \ -e "s|%OCTAVE_EXEC_PREFIX%|\"${exec_prefix}\"|" \ + -e "s|%OCTAVE_EXEEXT%|\"${EXEEXT}\"|" \ -e "s|%OCTAVE_FCNFILEDIR%|\"${fcnfiledir}\"|" \ -e "s|%OCTAVE_IMAGEDIR%|\"${imagedir}\"|" \ -e "s|%OCTAVE_INCLUDEDIR%|\"${includedir}\"|" \ @@ -874,6 +875,7 @@ -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \ -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \ -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \ + -e "s|%OCTAVE_SHLEXT%|\"${SHLEXT}\"|" \ -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \ -e "s|%OCTAVE_VERSION%|\"${version}\"|" && \ $(simple_move_if_change_rule)
--- a/doc/interpreter/contributors.in Fri Mar 20 16:19:47 2015 -0400 +++ b/doc/interpreter/contributors.in Wed Apr 01 12:45:04 2015 -0400 @@ -213,6 +213,7 @@ Stefan Monnier Antoine Moreau Kai P. Mueller +Armin Müller Hannes Müller Victor Munoz PrasannaKumar Muralidharan @@ -238,6 +239,7 @@ Carl Osterwisch Janne Olavi Paanajärvi Scott Pakin +José Luis García Pallero Jason Alan Palmer Gabriele Pannocchia Sylvain Pelissier
--- a/libgui/graphics/Canvas.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/graphics/Canvas.cc Wed Apr 01 12:45:04 2015 -0400 @@ -593,10 +593,12 @@ updateCurrentPoint (figObj, obj, event); gh_manager::post_callback (figObj.get_handle (), - "windowbuttondownfcn"); + "windowbuttondownfcn", + button_number (event)); gh_manager::post_callback (currentObj.get_handle (), - "buttondownfcn", button_number (event)); + "buttondownfcn", + button_number (event)); if (event->button () == Qt::RightButton) ContextMenu::executeAt (currentObj.get_properties (),
--- a/libgui/graphics/Figure.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/graphics/Figure.cc Wed Apr 01 12:45:04 2015 -0400 @@ -440,11 +440,14 @@ else if (fp.toolbar_is ("figure")) showFigureToolBar (true); else // "auto" - showFigureToolBar (! hasUiControlChildren (fp)); + showFigureToolBar (! hasUiControlChildren (fp) && + fp.menubar_is ("figure")); break; case figure::properties::ID_MENUBAR: showMenuBar (fp.menubar_is ("figure")); + if (fp.toolbar_is ("auto")) + showFigureToolBar (fp.menubar_is ("figure")); break; case figure::properties::ID_KEYPRESSFCN:
--- a/libgui/languages/de_DE.ts Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/languages/de_DE.ts Wed Apr 01 12:45:04 2015 -0400 @@ -65,7 +65,7 @@ <context> <name>QTerminal</name> <message> - <location filename="../qterminal/libqterminal/QTerminal.h" line="+133"/> + <location filename="../qterminal/libqterminal/QTerminal.h" line="+135"/> <source>Copy</source> <translation>Kopieren</translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1776"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1778"/> <source>copied selection to clipboard</source> <translation>Auswahl in die Zwischenablage kopiert</translation> </message> @@ -96,107 +96,89 @@ <context> <name>QtHandles::Figure</name> <message> - <location filename="../graphics/Figure.cc" line="+268"/> <source>Figure ToolBar</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+24"/> + <translation type="obsolete">Werkzeugleiste</translation> + </message> + <message> <source>&File</source> - <translation>&Datei</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">&Datei</translation> + </message> + <message> <source>&Save</source> - <translation>&Speichern</translation> - </message> - <message> - <location line="+1"/> + <translation type="obsolete">&Speichern</translation> + </message> + <message> <source>Save &As</source> - <translation>Speichern &unter</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">Speichern &unter</translation> + </message> + <message> <source>&Close Figure</source> - <translation>Abbildung s&chließen</translation> - </message> - <message> - <location line="+3"/> + <translation type="obsolete">Abbildung s&chließen</translation> + </message> + <message> <source>&Edit</source> - <translation>&Bearbeiten</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">&Bearbeiten</translation> + </message> + <message> <source>Cop&y</source> - <translation>&Kopieren</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">&Kopieren</translation> + </message> + <message> <source>Cu&t</source> - <translation>&Ausschneiden</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">&Ausschneiden</translation> + </message> + <message> <source>&Paste</source> - <translation>E&infügen</translation> - </message> - <message> - <location line="+5"/> + <translation type="obsolete">E&infügen</translation> + </message> + <message> <source>&Help</source> - <translation>&Hilfe</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">&Hilfe</translation> + </message> + <message> <source>&About QtHandles</source> - <translation>&Über QtHandles</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">&Über QtHandles</translation> + </message> + <message> <source>About &Qt</source> - <translation>Über &Qt</translation> - </message> - <message> - <location line="+403"/> + <translation type="obsolete">Über &Qt</translation> + </message> + <message> <source>About QtHandles</source> - <translation>Über QtHandles</translation> - </message> - <message> - <location line="+37"/> + <translation type="obsolete">Über QtHandles</translation> + </message> + <message> <source>Save Figure As</source> - <translation>Abbildung speichern unter</translation> + <translation type="obsolete">Abbildung speichern unter</translation> </message> </context> <context> <name>QtHandles::MouseModeActionGroup</name> <message> - <location filename="../graphics/MouseModeActionGroup.cc" line="+40"/> <source>Rotate</source> - <translation>Rotieren</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">Rotieren</translation> + </message> + <message> <source>Zoom In</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <translatorcomment>David: Removed 'Ansicht' as that is the name of the parent menu</translatorcomment> + <translation type="obsolete">Vergrößern</translation> + </message> + <message> <source>Zoom Out</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <translatorcomment>David: Removed 'Ansicht' as that is the name of the parent menu</translatorcomment> + <translation type="obsolete">Verkleinern</translation> + </message> + <message> <source>Pan</source> - <translation>Schwenken</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">Schwenken</translation> + </message> + <message> <source>Insert Text</source> - <translation>Text einfügen</translation> - </message> - <message> - <location line="+2"/> + <translation type="obsolete">Text einfügen</translation> + </message> + <message> <source>Select</source> - <translation>Auswählen</translation> + <translation type="obsolete">Auswählen</translation> </message> </context> <context> @@ -348,12 +330,14 @@ <message> <location line="+5"/> <source>&Indent</source> + <translatorcomment>David: Ich denke Einzug erhöhen/verringern passt besser, da Ausrücken wohl das Verschieben von Text vor den Zeilenbeginn meint</translatorcomment> <translation>E&inzug erhöhen</translation> </message> <message> <location line="+2"/> <source>&Unindent</source> - <translation>Einzug verringern</translation> + <translatorcomment>Armin: Auch "A&usrücken"</translatorcomment> + <translation>Einz&ug verringern</translation> </message> <message> <location line="-55"/> @@ -374,7 +358,8 @@ <location line="-1126"/> <source>Could not start custom file editor %1</source> - <translation type="unfinished"></translation> + <translation>Externer Editor kann nicht gestartet werden: +%1</translation> </message> <message> <location line="+148"/> @@ -479,12 +464,12 @@ <message> <location line="+3"/> <source>&Uppercase Selection</source> - <translation type="unfinished"></translation> + <translation>Auswahl zu Großb&uchstaben</translation> </message> <message> <location line="+2"/> <source>&Lowercase Selection</source> - <translation type="unfinished"></translation> + <translation>Auswahl zu K&leinbuchstaben</translation> </message> <message> <location line="+19"/> @@ -509,12 +494,12 @@ <message> <location line="+8"/> <source>Move to Matching Brace</source> - <translation type="unfinished"></translation> + <translation>Zur schließenden Klammer springen</translation> </message> <message> <location line="+2"/> <source>Select to Matching Brace</source> - <translation type="unfinished"></translation> + <translation>Auswahl bis zur schließenden Klammer</translation> </message> <message> <location line="+16"/> @@ -529,7 +514,7 @@ <message> <location line="+4"/> <source>&View</source> - <translation>Ansicht</translation> + <translation>An&sicht</translation> </message> <message> <location line="+2"/> @@ -559,22 +544,22 @@ <message> <location line="+4"/> <source>Show Long Line &Marker</source> - <translation type="unfinished"></translation> + <translation>Markierung langer Zeilen anzeigen</translation> </message> <message> <location line="+6"/> <source>Zoom &In</source> - <translation type="unfinished"></translation> + <translation>Ver&größern</translation> </message> <message> <location line="+2"/> <source>Zoom &Out</source> - <translation type="unfinished"></translation> + <translation>Ver&kleinern</translation> </message> <message> <location line="+2"/> <source>&Normal Size</source> - <translation type="unfinished"></translation> + <translation>&Normale Größe</translation> </message> <message> <location line="+32"/> @@ -656,22 +641,22 @@ <message> <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/> <source>eol:</source> - <translation type="unfinished"></translation> + <translation>Zeilenende:</translation> </message> <message> <location line="+10"/> <source>line:</source> - <translation type="unfinished"></translation> + <translation>Zeile:</translation> </message> <message> <location line="+3"/> <source>col:</source> - <translation type="unfinished"></translation> + <translation>Spalte:</translation> </message> <message> <location line="+156"/> <source>%1 is a built-in function</source> - <translation type="unfinished"></translation> + <translation>Kann %1 nicht öffnen: interne Funktion</translation> </message> <message> <location line="+31"/> @@ -701,11 +686,11 @@ %1 is about to be closed but has been modified. %2</source> - <translation type="unfinished">Die Datei - - %1 - -soll geschlossen werden aber wurde modifiziert. %2</translation> + <translation>Die Datei + + %1 + +soll geschlossen werden, wurde aber modifiziert. %2</translation> </message> <message> <location line="+288"/> @@ -769,7 +754,13 @@ call your script using its name as an Octave command. Do you want to choose another name?</source> - <translation type="unfinished"></translation> + <translation>"%1" +ist kein gültiger Bezeichner. + +Wird das Skript unter diesem Namen gespeichert, kann +es nicht als Octave-Befehl aufgerufen werden. + +Möchten Sie einen anderen anderen Namen wählen?</translation> </message> <message> <location line="+85"/> @@ -802,7 +793,7 @@ <message> <location line="+15"/> <source>Set Browser Directory...</source> - <translation type="unfinished"></translation> + <translation>Wechsle in Verzeichnis...</translation> </message> <message> <location line="+4"/> @@ -823,7 +814,7 @@ <message> <location line="-4"/> <source>One directory up</source> - <translation type="unfinished">Ein Verzeichnis höher</translation> + <translation>Ein Verzeichnis höher</translation> </message> <message> <location line="+6"/> @@ -860,7 +851,7 @@ <message> <location line="-335"/> <source>Activate to open in editor, right click for alternatives</source> - <translation type="unfinished"></translation> + <translation>Doppelklick zum Öffnen im Editor, Rechtsklick für mehr Optionen</translation> </message> <message> <location line="+236"/> @@ -979,7 +970,7 @@ <message> <location line="+1"/> <source>New File.txt</source> - <translation type="unfinished"></translation> + <translation>Neue Datei.txt</translation> </message> <message> <location line="+16"/> @@ -1206,7 +1197,7 @@ <message> <location line="+6"/> <source>Include matching directories in search results</source> - <translation>Auch Verzeichnisse berücksichtigen, die die Suchanfrage erfüllen</translation> + <translation>Auch Verzeichnisse berücksichtigen, deren Name die Suchanfrage erfüllt</translation> </message> <message> <location line="+2"/> @@ -1226,22 +1217,22 @@ <message> <location line="-35"/> <source>Enter the filename search expression</source> - <translation type="unfinished"></translation> + <translation>Suchausdruck für den Dateinamen</translation> </message> <message> <location line="+18"/> <source>Search subdirectories</source> - <translation type="unfinished"></translation> + <translation>Unterverzeichnisse einschließen</translation> </message> <message> <location line="+6"/> <source>Include directory names</source> - <translation type="unfinished"></translation> + <translation>Verzeichnisnamen einschließen</translation> </message> <message> <location line="+12"/> <source>Enter the file content search expression</source> - <translation type="unfinished"></translation> + <translation>Suche nach Dateien, die einen bestimmten Text enthalten</translation> </message> <message> <location line="+5"/> @@ -1251,12 +1242,12 @@ <message> <location line="+4"/> <source>Text case insensitive</source> - <translation>Groß-/Kleinschreibung beachten</translation> + <translation>Groß-/Kleinschreibung ignorieren</translation> </message> <message> <location line="+3"/> <source>Set text content is case insensitive</source> - <translation>Groß-/Kleinschreibung beim Text beachten</translation> + <translation>Groß-/Kleinschreibung beim Text ignorieren</translation> </message> <message> <location line="+11"/> @@ -1306,7 +1297,8 @@ <message> <location line="+23"/> <source>%1 match(es)</source> - <translation type="unfinished"></translation> + <translatorcomment>Armin: alternativ "Übereinstimmungen"</translatorcomment> + <translation>%1 Treffer</translation> </message> <message> <location line="+9"/> @@ -1342,7 +1334,7 @@ <message> <location line="+8"/> <source>Enter text to filter the command history</source> - <translation type="unfinished"></translation> + <translation>Suchbegriff eingeben, um die Befehlshistorie zu filtern</translation> </message> <message> <location line="+10"/> @@ -1404,13 +1396,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="+262"/> + <location filename="../src/main-window.cc" line="+268"/> <source>Load Workspace</source> <translation>Lade Arbeitsumgebung</translation> </message> <message> - <location line="+726"/> - <location line="+917"/> + <location line="+732"/> + <location line="+931"/> <source>About Octave</source> <translation>Über Octave</translation> </message> @@ -1460,12 +1452,12 @@ <translation>Einfügen</translation> </message> <message> - <location line="-1458"/> + <location line="-1478"/> <source>Save Workspace As</source> <translation>Arbeitsumgebung speichern als</translation> </message> <message> - <location line="+131"/> + <location line="+134"/> <source>The release notes file '%1' is empty.</source> <translation>Die Datei '%1' mit Versionshinweisen ist leer.</translation> </message> @@ -1485,14 +1477,14 @@ <translation>Neuigkeiten aus der Octave Community</translation> </message> <message> - <location line="+185"/> + <location line="+187"/> <source>Are you sure you want to exit Octave?</source> <translation>Octave wirklich beenden?</translation> </message> <message> - <location line="+839"/> + <location line="+854"/> <source>Open an existing file in editor</source> - <translation type="unfinished"></translation> + <translation>Öffne eine vorhandene Datei im Editor</translation> </message> <message> <location line="+57"/> @@ -1565,12 +1557,12 @@ <translation>Hineinspringen</translation> </message> <message> - <location line="-1005"/> + <location line="-1020"/> <source>Octave</source> <translation>Octave</translation> </message> <message> - <location line="+853"/> + <location line="+868"/> <source>Load Workspace...</source> <translation>Lade Arbeitsumgebung...</translation> </message> @@ -1640,7 +1632,12 @@ <translation>Neuigkeiten der Community</translation> </message> <message> - <location line="+25"/> + <location line="+6"/> + <source>Toolbar</source> + <translation>Werkzeugleiste</translation> + </message> + <message> + <location line="+18"/> <source>Enter directory name</source> <translation>Neues Verzeichnis eingeben</translation> </message> @@ -1655,15 +1652,15 @@ <translation>Ein Verzeichnis höher</translation> </message> <message> - <location line="-1135"/> - <location line="+1138"/> + <location line="-1148"/> + <location line="+1151"/> <source>Browse directories</source> <translation>Verzeichnis suchen</translation> </message> <message> - <location line="-176"/> + <location line="-175"/> <source>Quit Debug Mode</source> - <translation type="unfinished">Debug-Modus beenden</translation> + <translation>Debug-Modus beenden</translation> </message> <message> <location line="+38"/> @@ -1735,7 +1732,7 @@ <context> <name>news_reader</name> <message> - <location line="-1394"/> + <location line="-1411"/> <source><html> <body> <p> @@ -1794,18 +1791,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+67"/> - <location line="+176"/> + <location filename="../src/octave-dock-widget.cc" line="+68"/> + <location line="+198"/> <source>Undock widget</source> <translation>Fenster lösen</translation> </message> <message> - <location line="-166"/> + <location line="-188"/> <source>Hide widget</source> <translation>Fenster verbergen</translation> </message> <message> - <location line="+113"/> + <location line="+132"/> <source>Dock widget</source> <translation>Fenster andocken</translation> </message> @@ -1854,12 +1851,12 @@ <message> <location line="+211"/> <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation type="unfinished">Die Datei %1 existiert nicht im Suchpfad. Um </translation> + <translation>Die Datei %1 befindet sich nicht im Suchpfad. Um die momentan geöffnete Datei auszuführen oder zu debuggen, wechseln Sie entweder in das Verzeichnis %2 oder fügen Sie dieses Verzeichnis dem Suchpfad hinzu.</translation> </message> <message> <location line="+1"/> <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> - <translation type="unfinished"></translation> + <translation>Die Datei %1 wird von einer Datei gleichen Namens im Suchpfad verdeckt. Um die Funktion, die Sie gerade bearbeiten, auszuführen oder zu debuggen, wechseln Sie in das Verzeichnis %2.</translation> </message> <message> <location line="+2"/> @@ -1908,7 +1905,7 @@ Stelle sicher, dass Du Lese- und Schreibrechte für %2 besitzt. -Die Octave Benutzeroberfläche muss jetzt geschlossen werden.</translation> +Die Octave-Benutzeroberfläche muss jetzt geschlossen werden.</translation> </message> <message> <location line="+5"/> @@ -1942,32 +1939,33 @@ <message> <location line="-111"/> <source>Dock widget title bar</source> - <translation type="unfinished"></translation> + <translation>Titelleisten der Unterfenster</translation> </message> <message> <location line="+53"/> <source>Small</source> - <translation type="unfinished"></translation> + <translation>Klein</translation> </message> <message> <location line="+7"/> <source> Normal</source> - <translation type="unfinished"></translation> + <translatorcomment>Armin: Was macht das Leerzeichen?</translatorcomment> + <translation type="unfinished">Normal</translation> </message> <message> <location line="+10"/> <source>Large</source> - <translation type="unfinished"></translation> + <translation>Groß</translation> </message> <message> <location line="+168"/> <source>Custom style</source> - <translation type="unfinished"></translation> + <translation>Benutzerdefiniert</translation> </message> <message> <location line="+32"/> <source>3D</source> - <translation type="unfinished"></translation> + <translation>3D</translation> </message> <message> <location line="+148"/> @@ -1982,12 +1980,13 @@ <message> <location line="+135"/> <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source> - <translation type="unfinished"></translation> + <translatorcomment>Where is this string used?</translatorcomment> + <translation type="unfinished">Funktioniert gut mit Schriftarten fester Breite. Die Position der angezeigten Linie basiert auf der Breite eines Leerzeichens der Standardschriftart. Dies funktioniert möglicherweise nicht gut mit Stilen, die eine Schriftart variabler Breite verwenden oder wenn verschiedene Schriftgrößen oder -stile (fett/kursiv/normal) verwendet werden.</translation> </message> <message> <location line="+19"/> <source>Enable Code Folding</source> - <translation type="unfinished"></translation> + <translation>Code-Faltung aktivieren</translation> </message> <message> <location line="+61"/> @@ -2012,7 +2011,7 @@ <message> <location line="+68"/> <source>Indentation</source> - <translation type="unfinished"></translation> + <translation>Einrückung</translation> </message> <message> <location line="+24"/> @@ -2047,7 +2046,7 @@ <message> <location line="+23"/> <source>Indentation uses tabs</source> - <translation type="unfinished"></translation> + <translation>Tabulator statt Leerzeichen</translation> </message> <message> <location line="+38"/> @@ -2077,27 +2076,27 @@ <message> <location line="+48"/> <source>With Octave builtins</source> - <translation type="unfinished"></translation> + <translation>Mit internen Funktionen</translation> </message> <message> <location line="+10"/> <source>With Octave functions</source> - <translation type="unfinished"></translation> + <translation>Mit Octave-Funktionen</translation> </message> <message> <location line="+64"/> <source>Show completion list automatically</source> - <translation type="unfinished"></translation> + <translation>Liste von Vorschlägen automatisch anzeigen</translation> </message> <message> <location line="+51"/> <source>Restore editor tabs from previous session on startup</source> - <translation>Editor Dateien der letzten Sitzung wiederherstellen</translation> + <translation>Editor-Dateien der letzten Sitzung wiederherstellen</translation> </message> <message> <location line="+20"/> <source>Reload externally changed files without prompt</source> - <translation type="unfinished"></translation> + <translation>Extern geänderte Dateien ohne Nachfrage neu laden</translation> </message> <message> <location line="-446"/> @@ -2112,17 +2111,17 @@ <message> <location line="+209"/> <source>(Changing buffer size clears history)</source> - <translation type="unfinished"></translation> + <translation>(Ändern der Puffergröße löscht Historie)</translation> </message> <message> <location line="+28"/> <source>History buffer Size</source> - <translation type="unfinished"></translation> + <translation>Puffergröße der Befehlshistorie</translation> </message> <message> <location line="+34"/> <source>Print debug location in terminal window in addition to the marker in the editor</source> - <translation type="unfinished"></translation> + <translation>Debug-Position im Terminal ausgeben, zusätzlich zur Markierung im Editor</translation> </message> <message> <location line="+16"/> @@ -2152,12 +2151,12 @@ <message> <location line="-549"/> <source>Interface</source> - <translation type="unfinished"></translation> + <translation>Benutzeroberfläche</translation> </message> <message> <location line="+52"/> <source>Confirm before exiting</source> - <translation type="unfinished"></translation> + <translation>Vor dem Beenden nachfragen</translation> </message> <message> <location line="+74"/> @@ -2168,45 +2167,45 @@ <location line="+29"/> <location line="+592"/> <source>Show status bar</source> - <translation type="unfinished"></translation> + <translation>Statusleiste anzeigen</translation> </message> <message> <location line="-540"/> <source>Text inactive</source> - <translation type="unfinished"></translation> + <translation>Text inaktiv</translation> </message> <message> <location line="-32"/> <location line="+45"/> <source>Active</source> - <translation type="unfinished"></translation> + <translation>Aktiv</translation> </message> <message> <location line="+39"/> <source>Background inactive</source> - <translation type="unfinished"></translation> + <translation>Hintergrund inaktiv</translation> </message> <message> <location line="+73"/> <source>Octave Startup</source> - <translation type="unfinished"></translation> + <translation>Start von Octave</translation> </message> <message> <location line="+41"/> <location line="+1392"/> <source>Startup path</source> - <translation type="unfinished"></translation> + <translation>Startpfad</translation> </message> <message> <location line="-1379"/> <location line="+1409"/> <source>Browse</source> - <translation type="unfinished"></translation> + <translation>Auswählen</translation> </message> <message> <location line="-1322"/> <source>After Column</source> - <translation type="unfinished"></translation> + <translation>Nach Spalte</translation> </message> <message> <location line="+47"/> @@ -2221,12 +2220,12 @@ <message> <location line="+58"/> <source>Tab width min.</source> - <translation type="unfinished"></translation> + <translation>Reiterbreite min.</translation> </message> <message> <location line="+64"/> <source>max.</source> - <translation type="unfinished"></translation> + <translation>max.</translation> </message> <message> <location line="+615"/> @@ -2266,7 +2265,7 @@ <message> <location line="+123"/> <source>Set focus to terminal when running a command from within another widget</source> - <translation type="unfinished"></translation> + <translation>Wechsle ins Terminalfenster, wenn ein Befehl von einem anderen Fenster aus gestartet wird</translation> </message> <message> <location line="+73"/> @@ -2296,47 +2295,48 @@ <message> <location line="-1377"/> <source>These preferences are applied after any .octaverc startup files.</source> - <translation type="unfinished"></translation> + <translation>Diese Einstellungen werden nach dem Laden vorhandener .octaverc-Dateien angewendet</translation> </message> <message> <location line="+55"/> <source>Restore working directory of previous session</source> - <translation type="unfinished"></translation> + <translation>Arbeitsverzeichnis der vorherigen Sitzung wiederherstellen</translation> </message> <message> <location line="+322"/> <source>Draw a long line marker</source> - <translation type="unfinished"></translation> + <translatorcomment>This is a fairly loose translation which is clearer IMO.</translatorcomment> + <translation>Vertikale Linie zeichnen</translation> </message> <message> <location line="+48"/> <source>Show EOL characters</source> - <translation type="unfinished"></translation> + <translation>EOL-Steuerzeichen anzeigen</translation> </message> <message> <location line="+9"/> <source>Default EOL mode</source> - <translation type="unfinished"></translation> + <translation>Standard-EOL-Modus</translation> </message> <message> <location line="+412"/> <source>Number of characters before list is shown: </source> - <translation type="unfinished"></translation> + <translation>Mindestanzahl Zeichen für Öffnen der Liste: </translation> </message> <message> <location line="+79"/> <source>File handling</source> - <translation type="unfinished"></translation> + <translation>Dateiverwaltung</translation> </message> <message> <location line="+93"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).</p></body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body><p>Wählen Sie Schriftart, Schriftgröße (als Differenz zur Standard-Schriftgröße), Schriftstil (<b>f</b>ett, <b>k</b>ursiv, <b>u</b>nterstrichen), Textfarbe und Hintergrundfarbe (bei letzterer ist Magenta (255,0,255) ein Platzhalter für die Standard-Hintergrundfarbe).</p></body></html></translation> </message> <message> <location line="+341"/> <source>Display</source> - <translation type="unfinished"></translation> + <translation>Anzeige</translation> </message> <message> <location line="+39"/> @@ -2346,12 +2346,12 @@ <message> <location line="+12"/> <source>Behavior</source> - <translation type="unfinished"></translation> + <translation>Verhalten</translation> </message> <message> <location line="+34"/> <source>Restore last directory of previous session</source> - <translation type="unfinished"></translation> + <translation>Letztes Verzeichnis der vorherigen Sitzung wiederherstellen</translation> </message> <message> <location line="+71"/> @@ -2361,12 +2361,12 @@ <message> <location line="+42"/> <source>Hide tool tips</source> - <translation type="unfinished"></translation> + <translation>Tooltips verbergen</translation> </message> <message> <location line="+182"/> <source>Edit a shortcut by double-clicking in a cell</source> - <translation type="unfinished"></translation> + <translation>Zum Bearbeiten eines Tastenkürzels auf eine Zelle doppelklicken</translation> </message> <message> <location line="+108"/> @@ -2406,7 +2406,7 @@ <message> <location line="+1714"/> <source>Synchronize Octave working directory with file browser</source> - <translation>Octave Arbeitsverzeichnis und Dateibrowser synchronisieren</translation> + <translation>Octave-Arbeitsverzeichnis und Dateibrowser synchronisieren</translation> </message> <message> <location line="+132"/> @@ -2632,92 +2632,92 @@ <message> <location filename="../src/shortcut-manager.cc" line="+109"/> <source>New File</source> - <translation type="unfinished">Neue Datei</translation> + <translation>Neue Datei</translation> </message> <message> <location line="+1"/> <source>New Function</source> - <translation type="unfinished">Neue Funktion</translation> + <translation>Neue Funktion</translation> </message> <message> <location line="+2"/> <source>New Figure</source> - <translation type="unfinished">Neue Abbildung</translation> + <translation>Neue Abbildung</translation> </message> <message> <location line="+1"/> <source>Open File</source> - <translation type="unfinished"></translation> + <translation>Datei öffnen</translation> </message> <message> <location line="+1"/> <source>Load Workspace</source> - <translation type="unfinished">Lade Arbeitsumgebung</translation> + <translation>Lade Arbeitsumgebung</translation> </message> <message> <location line="+1"/> <source>Save Workspace As</source> - <translation type="unfinished">Arbeitsumgebung speichern als</translation> + <translation>Arbeitsumgebung speichern als</translation> </message> <message> <location line="+1"/> <location line="+158"/> <source>Preferences</source> - <translation type="unfinished"></translation> + <translation>Einstellungen</translation> </message> <message> <location line="-157"/> <source>Exit Octave</source> - <translation type="unfinished"></translation> + <translation>Octave beenden</translation> </message> <message> <location line="+3"/> <location line="+84"/> <source>Copy</source> - <translation type="unfinished">Kopieren</translation> + <translation>Kopieren</translation> </message> <message> <location line="-83"/> <location line="+85"/> <source>Paste</source> - <translation type="unfinished">Einfügen</translation> + <translation>Einfügen</translation> </message> <message> <location line="-84"/> <location line="+80"/> <source>Undo</source> - <translation type="unfinished">Rückgängig</translation> + <translation>Rückgängig</translation> </message> <message> <location line="-79"/> <location line="+84"/> <source>Select All</source> - <translation type="unfinished">Alles auswählen</translation> + <translation>Alles auswählen</translation> </message> <message> <location line="-83"/> <source>Clear Clipboard</source> - <translation type="unfinished">Zwischenablage leeren</translation> + <translation>Zwischenablage leeren</translation> </message> <message> <location line="+1"/> <source>Find in Files</source> - <translation type="unfinished"></translation> + <translation>In Dateien suchen</translation> </message> <message> <location line="+2"/> <source>Clear Command Window</source> - <translation type="unfinished">Befehlsfenster löschen</translation> + <translation>Befehlsfenster löschen</translation> </message> <message> <location line="+2"/> <source>Clear Command History</source> - <translation type="unfinished">Befehlshistorie löschen</translation> + <translation>Befehlshistorie löschen</translation> </message> <message> <location line="+2"/> <source>Clear Workspace</source> - <translation type="unfinished">Arbeitsumgebung löschen</translation> + <translation>Arbeitsumgebung löschen</translation> </message> <message> <location line="+3"/> @@ -2732,83 +2732,83 @@ <message> <location line="+2"/> <source>Step Out</source> - <translation type="unfinished">Herausspringen</translation> + <translation>Herausspringen</translation> </message> <message> <location line="+2"/> <source>Continue</source> - <translation type="unfinished">Fortfahren</translation> + <translation>Fortfahren</translation> </message> <message> <location line="+2"/> <source>Quit Debug Mode</source> - <translation type="unfinished">Debug Modus beenden</translation> + <translation>Debug Modus beenden</translation> </message> <message> <location line="+4"/> <source>Show Command Window</source> - <translation type="unfinished">Befehlsfenster anzeigen</translation> + <translation>Befehlsfenster anzeigen</translation> </message> <message> <location line="+2"/> <source>Show Command History</source> - <translation type="unfinished">Befehlshistorie anzeigen</translation> + <translation>Befehlshistorie anzeigen</translation> </message> <message> <location line="+2"/> <source>Show File Browser</source> - <translation type="unfinished">Dateibrowser anzeigen</translation> + <translation>Dateibrowser anzeigen</translation> </message> <message> <location line="+2"/> <source>Show Workspace</source> - <translation type="unfinished">Arbeitsumgebung anzeigen</translation> + <translation>Arbeitsumgebung anzeigen</translation> </message> <message> <location line="+2"/> <source>Show Editor</source> - <translation type="unfinished">Editor anzeigen</translation> + <translation>Editor anzeigen</translation> </message> <message> <location line="+2"/> <source>Show Documentation</source> - <translation type="unfinished">Dokumentation anzeigen</translation> + <translation>Dokumentation anzeigen</translation> </message> <message> <location line="+2"/> <source>Command Window</source> - <translation type="unfinished">Befehlsfenster</translation> + <translation>Befehlsfenster</translation> </message> <message> <location line="+2"/> <source>Command History</source> - <translation type="unfinished">Befehlshistorie</translation> + <translation>Befehlshistorie</translation> </message> <message> <location line="+2"/> <source>File Browser</source> - <translation type="unfinished">Dateibrowser</translation> + <translation>Dateibrowser</translation> </message> <message> <location line="+2"/> <source>Workspace</source> - <translation type="unfinished">Arbeitsumgebung</translation> + <translation>Arbeitsumgebung</translation> </message> <message> <location line="+2"/> <location line="+216"/> <source>Editor</source> - <translation type="unfinished">Editor</translation> + <translation>Editor</translation> </message> <message> <location line="-214"/> <source>Documentation</source> - <translation type="unfinished">Dokumentation</translation> + <translation>Dokumentation</translation> </message> <message> <location line="+2"/> <source>Reset Window Layout</source> - <translation type="unfinished"></translation> + <translation>Fensterlayout zurücksetzen</translation> </message> <message> <location line="+3"/> @@ -2823,42 +2823,42 @@ <message> <location line="+2"/> <source>Report a Bug</source> - <translation type="unfinished"></translation> + <translation>Einen Programmfehler melden</translation> </message> <message> <location line="+1"/> <source>Octave Packages</source> - <translation type="unfinished">Octave Pakete</translation> + <translation>Octave Pakete</translation> </message> <message> <location line="+1"/> <source>Share Code</source> - <translation type="unfinished">Code teilen</translation> + <translation>Code teilen</translation> </message> <message> <location line="+1"/> <source>Contribute to Octave</source> - <translation type="unfinished">Zu Octave beitragen</translation> + <translation>Zu Octave beitragen</translation> </message> <message> <location line="+1"/> <source>Octave Developer Resources</source> - <translation type="unfinished">Ressourcen für Octave Entwickler</translation> + <translation>Ressourcen für Octave Entwickler</translation> </message> <message> <location line="+2"/> <source>About Octave</source> - <translation type="unfinished">Über Octave</translation> + <translation>Über Octave</translation> </message> <message> <location line="+3"/> <source>Release Notes</source> - <translation type="unfinished">Versionshinweise</translation> + <translation>Versionshinweise</translation> </message> <message> <location line="+1"/> <source>Community News</source> - <translation type="unfinished">Neuigkeiten der Community</translation> + <translation>Neuigkeiten der Community</translation> </message> <message> <location line="+5"/> @@ -2883,7 +2883,7 @@ <message> <location line="+1"/> <source>Close All</source> - <translation type="unfinished">Alle schließen</translation> + <translation>Alle schließen</translation> </message> <message> <location line="+1"/> @@ -2908,52 +2908,52 @@ <message> <location line="+3"/> <source>Find and Replace</source> - <translation type="unfinished">Suchen und Ersetzen</translation> + <translation>Suchen und Ersetzen</translation> </message> <message> <location line="+2"/> <source>Delete to Start of Word</source> - <translation type="unfinished">Bis zum Anfang des Wortes löschen</translation> + <translation>Bis zum Anfang des Wortes löschen</translation> </message> <message> <location line="+2"/> <source>Delete to End of Word</source> - <translation type="unfinished">Bis zum Ende des Wortes löschen</translation> + <translation>Bis zum Ende des Wortes löschen</translation> </message> <message> <location line="+2"/> <source>Delete to Start of Line</source> - <translation type="unfinished">Bis zum Anfang der Zeile löschen</translation> + <translation>Bis zum Anfang der Zeile löschen</translation> </message> <message> <location line="+2"/> <source>Delete to End of Line</source> - <translation type="unfinished">Bis zum Ende der Zeile löschen</translation> + <translation>Bis zum Ende der Zeile löschen</translation> </message> <message> <location line="+2"/> <source>Delete Line</source> - <translation type="unfinished">Zeile löschen</translation> + <translation>Zeile löschen</translation> </message> <message> <location line="+2"/> <source>Copy Line</source> - <translation type="unfinished">Zeile kopieren</translation> + <translation>Zeile kopieren</translation> </message> <message> <location line="+2"/> <source>Cut Line</source> - <translation type="unfinished">Zeile ausschneiden</translation> + <translation>Zeile ausschneiden</translation> </message> <message> <location line="+2"/> <source>Duplicate Selection/Line</source> - <translation type="unfinished">Zeile oder Auswahl duplizieren</translation> + <translation>Zeile oder Auswahl duplizieren</translation> </message> <message> <location line="+2"/> <source>Transpose Line</source> - <translation type="unfinished">Zeilen tauschen</translation> + <translation>Zeilen tauschen</translation> </message> <message> <location line="+2"/> @@ -2963,12 +2963,12 @@ <message> <location line="+3"/> <source>Comment Selection</source> - <translation type="unfinished"></translation> + <translation>Auswahl auskommentieren</translation> </message> <message> <location line="+2"/> <source>Uncomment Selection</source> - <translation type="unfinished"></translation> + <translation>Auswahl entkommentieren</translation> </message> <message> <location line="+2"/> @@ -3015,12 +3015,12 @@ <message> <location line="+2"/> <source>Move to Matching Brace</source> - <translation type="unfinished"></translation> + <translation>Zur schließenden Klammer springen</translation> </message> <message> <location line="+2"/> <source>Select to Matching Brace</source> - <translation type="unfinished"></translation> + <translation>Auswahl bis zur schließenden Klammer</translation> </message> <message> <location line="+2"/> @@ -3075,12 +3075,12 @@ <message> <location line="+2"/> <source>Zoom In</source> - <translation type="unfinished"></translation> + <translation>Vergrößern</translation> </message> <message> <location line="+1"/> <source>Zoom Out</source> - <translation type="unfinished"></translation> + <translation>Verkleinern</translation> </message> <message> <location line="+2"/> @@ -3137,13 +3137,13 @@ <location line="+3"/> <location line="+23"/> <source>File</source> - <translation type="unfinished"></translation> + <translation>Datei</translation> </message> <message> <location line="-21"/> <location line="+23"/> <source>Edit</source> - <translation type="unfinished">Bearbeite</translation> + <translation>Bearbeiten</translation> </message> <message> <location line="-21"/> @@ -3154,18 +3154,18 @@ <message> <location line="-23"/> <source>Window</source> - <translation type="unfinished"></translation> + <translation>Fenster</translation> </message> <message> <location line="+2"/> <location line="+25"/> <source>Help</source> - <translation type="unfinished"></translation> + <translation>Hilfe</translation> </message> <message> <location line="-23"/> <source>News</source> - <translation type="unfinished"></translation> + <translation>Neuigkeiten</translation> </message> <message> <location line="+17"/> @@ -3175,7 +3175,7 @@ <message> <location line="+4"/> <source>Run</source> - <translation type="unfinished">Ausführen</translation> + <translation>Ausführen</translation> </message> <message> <location line="+124"/> @@ -3346,7 +3346,7 @@ </translation> </message> <message> - <location line="+147"/> + <location line="+161"/> <source>Copy name</source> <translation>Namen kopieren</translation> </message>
--- a/libgui/languages/es_ES.ts Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/languages/es_ES.ts Wed Apr 01 12:45:04 2015 -0400 @@ -49,7 +49,8 @@ <message> <location line="+1"/> <source>background</source> - <translation>plano de fondo</translation> + <translation>segundo plano</translation> + <translatorcomment>La interpretación correcta en castellano de background es 'segundo plano', en lugar del literal 'plano de fondo'</translatorcomment> </message> <message> <location line="+1"/> @@ -82,7 +83,7 @@ <message> <location line="+5"/> <source>Clear Window</source> - <translation type="unfinished"></translation> + <translation>Limpiar ventana</translation> </message> </context> <context> @@ -98,7 +99,7 @@ <message> <location filename="../graphics/Figure.cc" line="+268"/> <source>Figure ToolBar</source> - <translation type="unfinished">Barra de herramientas para figura</translation> + <translation>Barra de herramientas de figura</translation> </message> <message> <location line="+24"/> @@ -176,17 +177,17 @@ <message> <location line="+2"/> <source>Zoom In</source> - <translation type="unfinished">Aumentar zoom</translation> + <translation>Ampliar</translation> </message> <message> <location line="+4"/> <source>Zoom Out</source> - <translation type="unfinished">Disminuir zoom</translation> + <translation>Reducir</translation> </message> <message> <location line="+4"/> <source>Pan</source> - <translation type="unfinished"></translation> + <translation>Mover</translation> </message> <message> <location line="+2"/> @@ -236,8 +237,7 @@ </message> <message> <location line="+1"/> - <source>New function name: -</source> + <source>New function name:</source> <translation>Nombre de la nueva función:</translation> </message> <message> @@ -313,7 +313,7 @@ <message> <location line="+3"/> <source>Pre&vious Breakpoint</source> - <translation>Punto de interrupción &previo</translation> + <translation>Punto de interrupción &anterior</translation> </message> <message> <location line="-6"/> @@ -362,9 +362,8 @@ </message> <message> <location line="-1126"/> - <source>Could not start custom file editor -%1</source> - <translation type="unfinished">No se ha podido iniciar el editor de archivos personalizado %1</translation> + <source>Could not start custom file editor %1</source> + <translation>No se ha podido iniciar el editor de archivos personalizado %1</translation> </message> <message> <location line="+148"/> @@ -454,12 +453,12 @@ <message> <location line="+2"/> <source>Transpose Line</source> - <translation>Transponer línea</translation> + <translation>Intercambiar con línea anterior</translation> </message> <message> <location line="+5"/> <source>&Show Completion List</source> - <translation type="unfinished">&Mostrar lista de terminación</translation> + <translation>&Mostrar lista de comandos coincidentes</translation> </message> <message> <location line="+2"/> @@ -469,12 +468,12 @@ <message> <location line="+3"/> <source>&Uppercase Selection</source> - <translation type="unfinished">Seleccionar &mayusculas</translation> + <translation>Convertir selección a &mayúsculas</translation> </message> <message> <location line="+2"/> <source>&Lowercase Selection</source> - <translation type="unfinished">Seleccionar m&inúsculas</translation> + <translation>Convertir selección a m&inúsculas</translation> </message> <message> <location line="+19"/> @@ -499,13 +498,13 @@ <message> <location line="+8"/> <source>Move to Matching Brace</source> - <translatorcomment>Llave o paréntesis en español.</translatorcomment> - <translation>Mover a la llave correspondiente</translation> + <translation>Mover al paréntesis/corchete/llave correspondiente</translation> + <translatorcomment>Las posibilidades son aréntesis, corchete o llave.</translatorcomment> </message> <message> <location line="+2"/> <source>Select to Matching Brace</source> - <translation type="unfinished">Seleccionar hasta la llave correspondiente</translation> + <translation>Seleccionar hasta el paréntesis/corchete/llave correspondiente</translation> </message> <message> <location line="+16"/> @@ -530,7 +529,7 @@ <message> <location line="+3"/> <source>Show &Line Numbers</source> - <translation>Mostrar número de &línea</translation> + <translation>Mostrar números de &línea</translation> </message> <message> <location line="+4"/> @@ -550,19 +549,17 @@ <message> <location line="+4"/> <source>Show Long Line &Marker</source> - <translation>Mostrar &marcador largo de línea</translation> + <translation>Mostrar &marcador de longitud de línea</translation> </message> <message> <location line="+6"/> <source>Zoom &In</source> - <translatorcomment>the term zoom is not well defined in spanish</translatorcomment> - <translation type="unfinished">&Aumentar zoom</translation> + <translation>&Ampliar</translation> </message> <message> <location line="+2"/> <source>Zoom &Out</source> - <translatorcomment>the term zoom is not well defined in spanish</translatorcomment> - <translation type="unfinished">&Disminuir zoom</translation> + <translation>&Disminuir</translation> </message> <message> <location line="+2"/> @@ -591,30 +588,22 @@ </message> <message> <location line="-1103"/> - <source>Could not open file -%1 -for read: %2.</source> + <source>Could not open file\n%1\nfor read: %2.</source> <translation>No se ha podido abrir el archivo\n%1\npara lectura: %2.</translation> </message> <message> <location line="+19"/> - <source>File -%1 -does not exist. Do you want to create it?</source> + <source>File\n%1\ndoes not exist. Do you want to create it?</source> <translation>El archivo\n%1\nno existe. ¿Desea crearlo?</translation> </message> <message> <location line="+25"/> - <source>Could not open file -%1 -for write: %2.</source> + <source>Could not open file\n%1\nfor write: %2.</source> <translation>No se ha podido abrir el archivo\n%1\npara escritura: %2.</translation> </message> <message> <location line="+62"/> - <source>File not saved! A file with the selected name -%1 -is already open in the editor</source> + <source>File not saved! A file with the selected name\n%1\nis already open in the editor</source> <translation>¡Archivo no guardado! Un archivo con el nombre seleccionado\n%1\nya se encuentra abierto en el editor</translation> </message> <message> @@ -648,8 +637,7 @@ <message> <location filename="../src/m-editor/file-editor-tab.cc" line="+92"/> <source>eol:</source> - <translatorcomment>It may be a reference to end-of-line ("fin de línea" in spanish)</translatorcomment> - <translation type="unfinished">eol:</translation> + <translation>Fin de línea:</translation> </message> <message> <location line="+10"/> @@ -664,7 +652,7 @@ <message> <location line="+156"/> <source>%1 is a built-in function</source> - <translation type="unfinished">%1 es una función incorporada</translation> + <translation>%1 es una función integrada en Octave</translation> </message> <message> <location line="+31"/> @@ -674,7 +662,7 @@ <message> <location line="+775"/> <source>Goto line</source> - <translation>Ir a línea</translation> + <translation>Ir a la línea</translation> </message> <message> <location line="+1"/> @@ -689,21 +677,13 @@ </message> <message> <location line="+4"/> - <source>The file - - %1 - -is about to be closed but has been modified. %2</source> - <translation>El archivo - - %1 - -va a ser cerrado pero ha sido previamente modificado. %2</translation> + <source>The file\n\n%1\n\nis about to be closed but has been modified. %2</source> + <translation>El archivo\n\n%1\n\nva a ser cerrado, pero ha sido modificado. %2</translation> </message> <message> <location line="+288"/> <source>Line Endings:</source> - <translation>Finales de línea:</translation> + <translation>Fin de línea:</translation> </message> <message> <location line="+23"/> @@ -732,44 +712,28 @@ </message> <message> <location line="-6"/> - <source> - -Warning: The contents in the editor is modified!</source> - <translation>\n\n Advertencia: ¡El contenido del editor ha sido modificado!</translation> + <source>\n\nWarning: The contents in the editor is modified!</source> + <translation>\n\nAdvertencia: ¡el contenido del editor ha sido modificado!</translation> </message> <message> <location line="+7"/> - <source>It seems that the file -%1 -has been deleted or renamed. Do you want to save it now?%2</source> - <translation>Parece que el archivo\n%1\nha sido eliminado o renombrado.¿Desea guardarlo ahora?%2</translation> + <source>It seems that the file\n%1\nhas been deleted or renamed. Do you want to save it now?%2</source> + <translation>Parece que el archivo\n%1\nha sido eliminado o renombrado. ¿Desea guardarlo ahora?%2</translation> </message> <message> <location line="-285"/> - <source>Could not open file %1 for write: -%2.</source> + <source>Could not open file %1 for write:\n%2.</source> <translation>No se ha podido abrir el archivo %1 para escritura:\n%2.</translation> </message> <message> <location line="+177"/> - <source>"%1" -is not a valid identifier. - -If you keep this file name, you will not be able to -call your script using its name as an Octave command. - -Do you want to choose another name?</source> - <translation>"%1" -no es un identificador válido. - -Si se mantiene este nombre de archivo, no será posible llamar al script utilizando su nombre como un comando Octave. - -¿Desea elegir otro nombre?</translation> + <source>"%1"\nis not a valid identifier.\n\nIf you keep this file name, you will not be able to call your script using its name as an Octave command.\n\nDo you want to choose another name?</source> + <translation>"%1"\nno es un identificador válido.\n\nSi se mantiene este nombre de archivo, no será posible llamar al script utilizando su nombre como un comando de Octave.\n\n¿Desea elegir otro nombre?</translation> </message> <message> <location line="+85"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> - <translation>Parece que el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo?</translation> + <translation>Parece que el archivo '%1' ha sido modificado por otra aplicación. ¿Desea recargarlo?</translation> </message> </context> <context> @@ -818,7 +782,7 @@ <message> <location line="-4"/> <source>One directory up</source> - <translation type="unfinished">Directorio superior</translation> + <translation>Directorio superior</translation> </message> <message> <location line="+6"/> @@ -833,7 +797,7 @@ <message> <location line="+2"/> <source>Set Octave directroy to current browser directory</source> - <translation>Asignar el directorio de Octave como directorio actual del explorador</translation> + <translation>Asignar el directorio actual del explorador como directorio de Octave</translation> </message> <message> <location line="+7"/> @@ -855,7 +819,7 @@ <message> <location line="-335"/> <source>Activate to open in editor, right click for alternatives</source> - <translation>Activar para abrir en editor, presione clic derecho para alternativas</translation> + <translation>Activar para abrir en el editor, haga clic derecho para ver las alternativas</translation> </message> <message> <location line="+236"/> @@ -924,14 +888,12 @@ </message> <message> <location line="+1"/> - <source>Rename file/directory: -</source> + <source>Rename file/directory:</source> <translation>Renombrar archivo/directorio:</translation> </message> <message> <location line="+1"/> - <source> - to: </source> + <source>\nto: </source> <translation>\na: </translation> </message> <message> @@ -942,8 +904,7 @@ </message> <message> <location line="-13"/> - <source>Are you sure you want to delete -</source> + <source>Are you sure you want to delete</source> <translation>¿Está seguro de que desea eliminar</translation> </message> <message> @@ -993,12 +954,12 @@ <message> <location filename="../src/welcome-wizard.cc" line="+199"/> <source>Enjoy!</source> - <translation>¡Que lo disfrute!</translation> + <translation>¡Disfrútelo!</translation> </message> <message> <location line="+4"/> <source>Previous</source> - <translation>Previo</translation> + <translation>Anterior</translation> </message> <message> <location line="+1"/> @@ -1172,17 +1133,17 @@ <message> <location line="+10"/> <source>Named:</source> - <translation>Nombrado:</translation> + <translation>Denominado:</translation> </message> <message> <location line="+8"/> <source>Start in:</source> - <translation>Iniciar en:</translation> + <translation>Buscar en:</translation> </message> <message> <location line="+5"/> <source>Enter the start directory</source> - <translation>Introducir directorio de inicio</translation> + <translation>Introduzca el directorio superior de búsqueda</translation> </message> <message> <location line="+3"/> @@ -1192,7 +1153,7 @@ <message> <location line="+1"/> <source>Browse for start directory</source> - <translation>Explorar para seleccionar el directorio de inicio</translation> + <translation>Explorar para seleccionar el directorio superior de búsqueda</translation> </message> <message> <location line="+7"/> @@ -1207,27 +1168,27 @@ <message> <location line="+2"/> <source>Name case insensitive</source> - <translation>Distinguir mayúsculas/minúsculas en nombre</translation> + <translation>No distinguir mayúsculas de minúsculas</translation> </message> <message> <location line="+3"/> <source>Set matching name is case insensitive</source> - <translation>Establecer distinción entre mayúsculas y minúsculas en el nombre</translation> + <translation>Establecer la no distinción entre mayúsculas y minúsculas</translation> </message> <message> <location line="+2"/> <source>Contains text:</source> - <translation>Contiene el texto:</translation> + <translation>Conteniendo el texto:</translation> </message> <message> <location line="-35"/> <source>Enter the filename search expression</source> - <translation type="unfinished">Introduzca expresión para busqueda del archivo</translation> + <translation>Introduzca expresión de búsqueda para los nombres de archivo</translation> </message> <message> <location line="+18"/> <source>Search subdirectories</source> - <translation>Buscar subdirectorios</translation> + <translation>Buscar en subdirectorios</translation> </message> <message> <location line="+6"/> @@ -1237,22 +1198,22 @@ <message> <location line="+12"/> <source>Enter the file content search expression</source> - <translation type="unfinished">Introducir expresion de busqueda con contenido del archivo</translation> + <translation>Busca en el contenido del fichero</translation> </message> <message> <location line="+5"/> <source>Text to match</source> - <translation>Texto a coincidir</translation> + <translation>Texto a buscar</translation> </message> <message> <location line="+4"/> <source>Text case insensitive</source> - <translation>Distinguir mayúsculas/minúsculas en texto</translation> + <translation>No distinguir entre mayúsculas y minúsculas</translation> </message> <message> <location line="+3"/> <source>Set text content is case insensitive</source> - <translation>Establecer distinción entre mayúsculas y minúsculas en el texto</translation> + <translation>Establecer la no distinción entre mayúsculas y minúsculas</translation> </message> <message> <location line="+11"/> @@ -1272,7 +1233,7 @@ <message> <location line="+1"/> <source>Start search for matching files</source> - <translation>Empezar búsqueda de archivos coincidentes</translation> + <translation>Empezar la búsqueda</translation> </message> <message> <location line="+3"/> @@ -1282,7 +1243,7 @@ <message> <location line="+1"/> <source>Stop searching</source> - <translation>Detener búsqueda</translation> + <translation>Detener la búsqueda</translation> </message> <message> <location line="+15"/> @@ -1302,12 +1263,12 @@ <message> <location line="+23"/> <source>%1 match(es)</source> - <translation type="unfinished">%1 resultado(s) coincidente(s)</translation> + <translation>%1 resultado(s) coincidente(s)</translation> </message> <message> <location line="+9"/> <source>Set search directory</source> - <translation>Seleccionar directorio de búsqueda</translation> + <translation>Seleccionar el directorio de búsqueda</translation> </message> </context> <context> @@ -1333,7 +1294,7 @@ <message> <location line="+24"/> <source>Double-click a command to transfer it to the terminal.</source> - <translation>Pulse dos veces un comando para transferirlo al terminal.</translation> + <translation>Haga doble clic en un comando para transferirlo al terminal.</translation> </message> <message> <location line="+8"/> @@ -1392,7 +1353,7 @@ <p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> -<p>Parece que está utilizando la interface gráfica de Octave por primera vez en esta computadora. +<p>Parece que está utilizando la interfaz gráfica de Octave por primera vez en esta computadora. Pulse 'Siguiente' para crear un archivo de configuración e iniciar Octave.</p> <p>El archivo de configuración se guardará en<br>%1.</p> </body></html></translation> @@ -1403,7 +1364,7 @@ <message> <location filename="../src/main-window.cc" line="+262"/> <source>Load Workspace</source> - <translation>Cargar espacio de trabajo</translation> + <translation>Cargar el espacio de trabajo</translation> </message> <message> <location line="+726"/> @@ -1459,17 +1420,17 @@ <message> <location line="-1458"/> <source>Save Workspace As</source> - <translation>Guardar espacio de trabajo como</translation> + <translation>Guardar el espacio de trabajo como</translation> </message> <message> <location line="+131"/> <source>The release notes file '%1' is empty.</source> - <translation>El archivo de las notas de versión %1 está vacío.</translation> + <translation>El archivo de notas de versión %1 está vacío.</translation> </message> <message> <location line="+4"/> <source>The release notes file '%1' cannot be read.</source> - <translation>El archivo de las notas de versión %1 no puede ser leído.</translation> + <translation>El archivo de notas de versión %1 no puede ser leído.</translation> </message> <message> <location line="+13"/> @@ -1484,7 +1445,7 @@ <message> <location line="+185"/> <source>Are you sure you want to exit Octave?</source> - <translation>¿Está seguro que desea salir de Octave?</translation> + <translation>¿Está seguro de que desea salir de Octave?</translation> </message> <message> <location line="+839"/> @@ -1574,12 +1535,12 @@ <message> <location line="+3"/> <source>Save Workspace As...</source> - <translation>Guardar espacio de trabajo como...</translation> + <translation>Guardar el espacio de trabajo como...</translation> </message> <message> <location line="+38"/> <source>New Script</source> - <translation type="unfinished">Nuevo script (guión)</translation> + <translation>Nuevo guión (script)</translation> </message> <message> <location line="+115"/> @@ -1589,7 +1550,7 @@ <message> <location line="+94"/> <source>Reset Default Window Layout</source> - <translation>Reestablecer el esquema de ventana predeterminado</translation> + <translation>Restablecer el esquema de ventana predeterminado</translation> </message> <message> <location line="+16"/> @@ -1604,7 +1565,7 @@ <message> <location line="+3"/> <source>Contribute to Octave</source> - <translation>Colaborar en Octave</translation> + <translation>Colaborar con Octave</translation> </message> <message> <location line="+3"/> @@ -1660,7 +1621,7 @@ <message> <location line="-176"/> <source>Quit Debug Mode</source> - <translation>Salir de modo de depuración</translation> + <translation>Salir del modo de depuración</translation> </message> <message> <location line="+38"/> @@ -1751,7 +1712,7 @@ Las fuentes de noticias de la comunidad Octave parece que no están disponibles. </p> <p> -Para las últimas novedades, visite +Para ver las últimas novedades, visite <a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a> cuando tenga conexión a la web (el enlace se abre en un navegador externo). </p> @@ -1776,13 +1737,13 @@ <translation><html> <body> <p> -La conexión a la web para desplegar las últimas novedades sobre Octave ha sido desactivada. +La conexión a la web para mostrar las últimas novedades sobre Octave ha sido desactivada. </p> <p> -Para ver las últimas novedades, vea +Para ver las últimas novedades, vaya a <a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a> cuando tenga conexión a la web (el enlace se abre en un navegador externo) -o active las conexiones de web para ver las novedades en el diálogo de configuración de red de Octave +o active la conexión a la web para ver las novedades en el diálogo de configuración de red de Octave </p> <p> <small><em>&mdash; Los desarrolladores de Octave, @@ -1840,9 +1801,7 @@ </message> <message> <location line="-10"/> - <source>File -%1 -does not exist. Do you want to create it?</source> + <source>File\n%1\ndoes not exist. Do you want to create it?</source> <translation>El archivo\n%1\nno existe. ¿Desea crearlo?</translation> </message> <message> @@ -1853,17 +1812,17 @@ <message> <location line="+211"/> <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation type="unfinished">El archivo %1 no existe en la ruta de carga. Para correr o depurar la función que está editando, tiene que cambiar al directorio %2 o agregar ese directorio a la ruta de carga.</translation> + <translation>El archivo %1 no existe en las rutas de búsqueda de funciones (path). Para ejecutar o depurar la función que está editando, tiene que cambiar al directorio %2 o agregar ese directorio a las rutas de búsqueda de funciones (path).</translation> </message> <message> <location line="+1"/> <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> - <translation type="unfinished">El archivo %1 está ensombrecido por un archivo con el mismo nombre en la ruta de carga. Para ejecutar o depurar la función que se está editando, cambie al directorio %2.</translation> + <translation>Existe un archivo con el mismo nombre que %1 en la ruta de búsqueda de funciones (path). Para ejecutar o depurar la función que se está editando, cambie al directorio %2.</translation> </message> <message> <location line="+2"/> <source>Change Directory or Add Directory to Load Path</source> - <translation>Cambiar directorio o agregar directorio a la ruta de carga</translation> + <translation>Cambiar directorio o agregar directorio a la ruta de búsqueda de funciones (path)</translation> </message> <message> <location line="+2"/> @@ -1874,7 +1833,7 @@ <location line="+1"/> <source>Add Directory to Load Path</source> <translatorcomment>Uso la traducción "ruta" para "path": http://es.wikipedia.org/wiki/Ruta_(informática)</translatorcomment> - <translation>Agregar directorio a la ruta de carga</translation> + <translation>Agregar directorio a la ruta de búsqueda de funciones (path)</translation> </message> <message> <location line="-223"/> @@ -1888,22 +1847,15 @@ <message> <location filename="../src/m-editor/octave-txt-lexer.cc" line="+39"/> <source>Default</source> - <translation type="unfinished">Por defecto</translation> + <translation>Por defecto</translation> </message> </context> <context> <name>resource_manager</name> <message> <location filename="../src/resource-manager.cc" line="+245"/> - <source>The settings file -%1 -does not exist and can not be created. -Make sure you have read and write permissions to -%2 - -Octave GUI must be closed now.</source> - <translation>El archivo de configuración\n%1\nno existe y no puede ser creado. -Asegúrese de que tiene permisos de escritura sobre\n%2\n\nOctave GUI se cerrará.</translation> + <source>The settings file\n%1\ndoes not exist and can not be created.\nMake sure you have read and write permissions to\n%2\n\nOctave GUI must be closed now.</source> + <translation>El archivo de configuración\n%1\nno existe y no se puede crear.\nAsegúrese de que tiene permisos de escritura sobre\n%2\n\nOctave se cerrará.</translation> </message> <message> <location line="+5"/> @@ -1932,7 +1884,7 @@ <message> <location line="+10"/> <source>Letter icons</source> - <translation>Iconos de letras</translation> + <translation>Iconos de texto</translation> </message> <message> <location line="+7"/> @@ -1942,22 +1894,22 @@ <message> <location line="-118"/> <source>Dock widget title bar</source> - <translation type="unfinished">Acoplar barra de título de widget</translation> + <translation>Acoplar widget de barra de título</translation> </message> <message> <location line="+53"/> <source>Small</source> - <translation type="unfinished"></translation> + <translation>Pequeño</translation> </message> <message> <location line="+7"/> <source> Normal</source> - <translation type="unfinished"></translation> + <translation>Normal</translation> </message> <message> <location line="+10"/> <source>Large</source> - <translation type="unfinished"></translation> + <translation>Grande</translation> </message> <message> <location line="+168"/> @@ -1967,12 +1919,12 @@ <message> <location line="+92"/> <source>These preferences are applied after any .octaverc startup files.</source> - <translation type="unfinished"></translation> + <translation>Estas configuraciones se aplicarán después de la ejecución de los ficheros de inicio .octaverc</translation> </message> <message> <location line="+55"/> <source>Restore working directory of previous session</source> - <translation type="unfinished"></translation> + <translation>Restaurar el directorio de trabajo de la sesión anterior</translation> </message> <message> <location line="+33"/> @@ -1987,17 +1939,17 @@ <message> <location line="+138"/> <source>Draw a long line marker</source> - <translation type="unfinished"></translation> + <translation>Mostrar marcador de longitud de línea</translation> </message> <message> <location line="+48"/> <source>Show EOL characters</source> - <translation type="unfinished"></translation> + <translation>Mostrar caracteres de fin de línea</translation> </message> <message> <location line="+9"/> <source>Default EOL mode</source> - <translation type="unfinished"></translation> + <translation>Identificador de fin de línea por defecto</translation> </message> <message> <location line="+154"/> @@ -2052,7 +2004,7 @@ <message> <location line="+173"/> <source>Restore editor tabs from previous session on startup</source> - <translation>Restaurar las pestañas del editor de la sesión anterior en el arranque </translation> + <translation>En el arranque, restaurar las pestañas del editor de la sesión anterior</translation> </message> <message> <location line="-426"/> @@ -2103,7 +2055,7 @@ <message> <location line="+625"/> <source>Number of characters before list is shown: </source> - <translation type="unfinished"></translation> + <translation>Número de caracteres a escribir antes de mostrar la lista</translation> </message> <message> <location line="+112"/> @@ -2143,7 +2095,7 @@ <message> <location line="+123"/> <source>Set focus to terminal when running a command from within another widget</source> - <translation>Aplicar enfoque al terminal cuando se ejecute un comando desde otro widget</translation> + <translation>Foco al terminal cuando se ejecute un comando desde otro widget</translation> </message> <message> <location line="+73"/> @@ -2173,7 +2125,7 @@ <message> <location line="-1715"/> <source>Interface</source> - <translation>Interfase</translation> + <translation>Interfaz</translation> </message> <message> <location line="+52"/> @@ -2205,7 +2157,7 @@ <message> <location line="+19"/> <source>3D</source> - <translation type="unfinished"></translation> + <translation>3D</translation> </message> <message> <location line="+54"/> @@ -2216,53 +2168,53 @@ <location line="+41"/> <location line="+1392"/> <source>Startup path</source> - <translation type="unfinished">Dirección de inicio</translation> + <translation>Dirección de inicio</translation> </message> <message> <location line="-1379"/> <location line="+1409"/> <source>Browse</source> - <translation type="unfinished">Explorar</translation> + <translation>Explorar</translation> </message> <message> <location line="-1322"/> <source>After Column</source> - <translation type="unfinished">Despues de columna</translation> + <translation>Despues de la columna</translation> </message> <message> <location line="+144"/> <source>Tab width min.</source> - <translation type="unfinished">Ancho min. de tabulador.</translation> + <translation>Anchura mínima del tabulador.</translation> </message> <message> <location line="+64"/> <source>max.</source> - <translation>max.</translation> + <translation>máx.</translation> </message> <message> <location line="+31"/> <source>This works well for monospaced fonts. The line is drawn at a position based on the width of a space character in the default font. It may not work very well if styles use proportional fonts or if varied font sizes or bold, italic and normal texts are used.</source> - <translation>Esto funciona correctamente con fuentes monoespaciadas. La línea es dibujada en una posición basada en lo ancho de un caracter en la fuente por defecto. Esta podría no funcionar correctamente si los estilos utilizan fuentes proporcionales o si se utilizan fuentes de varios tamaños o negritas, itálicas y textos normales.</translation> + <translation>Esto funciona correctamente con fuentes con espaciado fijo. Se dibuja la línea en una posición basada la anchura de un carácter de la fuente por defecto. Esto podría no funcionar correctamente si los estilos utilizan fuentes proporcionales o si se utilizan fuentes de varios tamaños, negrita, cursiva y textos normales.</translation> </message> <message> <location line="+19"/> <source>Enable Code Folding</source> - <translation type="unfinished">Activar código plegable</translation> + <translation>Activar plegado de código</translation> </message> <message> <location line="+61"/> <source>Windows (CRLF)</source> - <translation type="unfinished">Windows (CRLF)</translation> + <translation>Windows (CRLF)</translation> </message> <message> <location line="+5"/> <source>Mac (CR)</source> - <translation type="unfinished">Mac (CR)</translation> + <translation>Mac (CR)</translation> </message> <message> <location line="+5"/> <source>Unix (LF)</source> - <translation type="unfinished">Unix (LF)</translation> + <translation>Unix (LF)</translation> </message> <message> <location line="+32"/> @@ -2272,22 +2224,22 @@ <message> <location line="+68"/> <source>Indentation</source> - <translation type="unfinished"></translation> + <translation>Sangrado</translation> </message> <message> <location line="+117"/> <source>Indentation uses tabs</source> - <translation type="unfinished">Sangrado por medio de tabulador</translation> + <translation>Sangrado con tabulador</translation> </message> <message> <location line="+38"/> <source>Auto completion</source> - <translation type="unfinished">Terminación automática</translation> + <translation>Completado automático</translation> </message> <message> <location line="+101"/> <source>With Octave builtins</source> - <translation type="unfinished">Con funciones internas de Octave</translation> + <translation>Con funciones internas de Octave</translation> </message> <message> <location line="+10"/> @@ -2297,42 +2249,42 @@ <message> <location line="+64"/> <source>Show completion list automatically</source> - <translation type="unfinished">Mostrar lista de terminación automáticamente</translation> + <translation>Mostrar lista de comandos coincidentes automáticamente</translation> </message> <message> <location line="+31"/> <source>File handling</source> - <translation type="unfinished"></translation> + <translation>Manejo de ficheros</translation> </message> <message> <location line="+40"/> <source>Reload externally changed files without prompt</source> - <translation type="unfinished">Recargar los archivos modificados externamente sin preguntar</translation> + <translation>Recargar los archivos modificados externamente sin consultar</translation> </message> <message> <location line="+53"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color, and background color (for the latter, the color magenta (255,0,255) is a placeholder for the default background color).</p></body></html></source> - <translation type="unfinished"></translation> + <translation><html><head/><body><p>Selección de fuente, tamaño (como diferencia con respecto al tamaño por defecto), estilo (<b>n</b>egrita, <b>c</b>ursiva, <b>s</b>ubrayado), color y color de fondo (para el último caso, el magenta (255,0,255) es un sustituto para el color de fondo por defecto).</p></body></html></translation> </message> <message> <location line="+192"/> <source>(Changing buffer size clears history)</source> - <translation>(Cambiar el tamaño del búfer elimina el historial)</translation> + <translation>(Cambiar el tamaño del buffer elimina el historial)</translation> </message> <message> <location line="+28"/> <source>History buffer Size</source> - <translation>Tamaño del búfer de historial</translation> + <translation>Tamaño del buffer para el historial</translation> </message> <message> <location line="+34"/> <source>Print debug location in terminal window in addition to the marker in the editor</source> - <translation type="unfinished">Imprimir ubicación de depuración en la ventana del terminal además de en el editor</translation> + <translation>Imprimir la ubicación de depuración en la ventana del terminal además de en el editor</translation> </message> <message> <location line="+87"/> <source>Display</source> - <translation type="unfinished">Mostrar</translation> + <translation>Mostrar</translation> </message> <message> <location line="+39"/> @@ -2347,7 +2299,7 @@ <message> <location line="+34"/> <source>Restore last directory of previous session</source> - <translation>Restaurar último directorio de sesión previa</translation> + <translation>Restaurar último directorio de la sesión previa</translation> </message> <message> <location line="+71"/> @@ -2357,12 +2309,12 @@ <message> <location line="+42"/> <source>Hide tool tips</source> - <translation type="unfinished"></translation> + <translation>Ocultar sugerencias automáticas</translation> </message> <message> <location line="+182"/> <source>Edit a shortcut by double-clicking in a cell</source> - <translation type="unfinished"></translation> + <translation>Los atajos se pueden editar haciendo doble clic en la celda correspondiente</translation> </message> <message> <location line="+108"/> @@ -2372,7 +2324,7 @@ <message> <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> - <translation>Permitir a Octave la conexión al sitio web para desplegar las últimas noticias e información</translation> + <translation>Permitir a Octave la conexión al sitio web para mostrar las últimas noticias e información</translation> </message> <message> <location line="+46"/> @@ -2387,12 +2339,12 @@ <message> <location line="-2083"/> <source>Icon set for dock widgets</source> - <translation>Iconos para widget acoplados</translation> + <translation>Iconos para widget</translation> </message> <message> <location line="-48"/> <source>Language (requires restart)</source> - <translation>Lenguaje (reinicio requerido)</translation> + <translation>Lenguaje (requiere reinicio)</translation> </message> <message> <location line="-58"/> @@ -2412,17 +2364,17 @@ <message> <location line="+34"/> <source>Shortcuts</source> - <translation>Accesos directos</translation> + <translation>Atajos de teclado</translation> </message> <message> <location line="+31"/> <source>Select this option to prevent conflicts with readline shortcuts</source> - <translation type="unfinished">Seleccione esta opción para evitar conflictos con los atajos de la línea de lectura</translation> + <translation>Seleccione esta opción para evitar conflictos con los atajos de la línea de comandos</translation> </message> <message> <location line="+3"/> <source>Disable global shortcuts when terminal window has focus</source> - <translation type="unfinished">Deshabilitar accesos directos globales cuando la ventana del terminal se enfoque </translation> + <translation>Deshabilitar loa atajos globales cuando la ventana del terminal se enfoque </translation> </message> <message> <location line="+31"/> @@ -2450,7 +2402,7 @@ <message> <location line="+7"/> <source>Set 2:</source> - <translation>Set 2:</translation> + <translation>Conjunto 2:</translation> </message> <message> <location line="+86"/> @@ -2465,7 +2417,7 @@ <message> <location line="+5"/> <source>Set 1 Actual</source> - <translation type="unfinished">Conjunto 1 actual</translation> + <translation>Conjunto 1 actual</translation> </message> <message> <location line="+5"/> @@ -2475,7 +2427,7 @@ <message> <location line="+10"/> <source>Set 2 Actual</source> - <translation type="unfinished">Conjunto 2 actual</translation> + <translation>Conjunto 2 actual</translation> </message> <message> <location line="+68"/> @@ -2537,35 +2489,35 @@ <message> <location line="+6"/> <source>Background color, pink (255,0,255) means default</source> - <translation>Color de fondo, rosa (255,0,255) significa predeterminado</translation> + <translation>Color de fondo. Rosa (255,0,255) significa predeterminado</translation> </message> <message> <location line="+2"/> <source>b</source> <comment>short form for bold</comment> - <translation>b</translation> + <translation>n</translation> </message> <message> <location line="+1"/> <source>i</source> <comment>short form for italic</comment> - <translation>i</translation> + <translation>c</translation> </message> <message> <location line="+1"/> <source>u</source> <comment>short form for underlined</comment> - <translation>u</translation> + <translation>s</translation> </message> <message> <location line="+497"/> <source>Set Octave Startup Directory</source> - <translation>Ajuste directorio de inicio de Octave</translation> + <translation>Ajuste del directorio de inicio de Octave</translation> </message> <message> <location line="+6"/> <source>Set File Browser Startup Directory</source> - <translation>Ajuste directorio de inicio del explorador de archivos</translation> + <translation>Ajuste del directorio de inicio del explorador de archivos</translation> </message> </context> <context> @@ -2599,7 +2551,7 @@ <a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a>.</p> </body></html></source> <translation><html><body> -<p>Cuando la GUI de Octave se inicia, chequeará el sitio web de Octave para obtener novedades e información acerca de la comunidad. +<p>Cuando la GUI se inicia, chequeará el sitio web de Octave para obtener novedades e información acerca de la comunidad. Esta verificación se hará una vez cada día como máximo, y las noticias serán desplegadas únicamente si hay algo nuevo desde la última vez que se vieron.</p> <p>También puede revisar las noticias seleccionando "Noticias de la Comunidad" en el menú de ayuda en la GUI o visitando <a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a>.</p> @@ -2619,7 +2571,7 @@ a:link { text-decoration: underline; color: #0000ff; } </style> <head/><body> -<p>Permitir la conexión con el sitio web de Octave al arranque para desplegar novedades e información acerca de la comunidad.</p> +<p>Permitir la conexión con el sitio web de Octave en el arranque para desplegar novedades e información acerca de la comunidad.</p> </body></html></translation> </message> </context> @@ -2653,7 +2605,7 @@ <message> <location line="+1"/> <source>Save Workspace As</source> - <translation>Guardar espacio de trabajo como</translation> + <translation>Guardar el espacio de trabajo como</translation> </message> <message> <location line="+1"/> @@ -2718,17 +2670,17 @@ <message> <location line="+3"/> <source>Step Over</source> - <translation type="unfinished">Saltar</translation> + <translation>Saltar</translation> </message> <message> <location line="+2"/> <source>Step Into</source> - <translation type="unfinished">Entrar a</translation> + <translation>Entrar a</translation> </message> <message> <location line="+2"/> <source>Step Out</source> - <translation type="unfinished">Abandonar</translation> + <translation>Salir</translation> </message> <message> <location line="+2"/> @@ -2738,7 +2690,7 @@ <message> <location line="+2"/> <source>Quit Debug Mode</source> - <translation>Abandonar modo de depuración</translation> + <translation>Abandonar el modo de depuración</translation> </message> <message> <location line="+4"/> @@ -2804,12 +2756,12 @@ <message> <location line="+2"/> <source>Reset Window Layout</source> - <translation>Reestablecer esquema de ventana</translation> + <translation>Restablecer esquema de ventana</translation> </message> <message> <location line="+3"/> <source>Show Ondisk Documentation</source> - <translation type="unfinished">Mostrar la documentación del disco</translation> + <translation>Mostrar la documentación almacenada en disco</translation> </message> <message> <location line="+2"/> @@ -2834,7 +2786,7 @@ <message> <location line="+1"/> <source>Contribute to Octave</source> - <translation>Colaborar en Octave</translation> + <translation>Colaborar con Octave</translation> </message> <message> <location line="+1"/> @@ -2909,22 +2861,22 @@ <message> <location line="+2"/> <source>Delete to Start of Word</source> - <translation type="unfinished">Eliminar hasta el inicio de palabra</translation> + <translation>Eliminar hasta el inicio de palabra</translation> </message> <message> <location line="+2"/> <source>Delete to End of Word</source> - <translation type="unfinished">Eliminar hasta el fin de palabra</translation> + <translation>Eliminar hasta el fin de palabra</translation> </message> <message> <location line="+2"/> <source>Delete to Start of Line</source> - <translation type="unfinished">Eliminar hasta el inicio de línea</translation> + <translation>Eliminar hasta el inicio de línea</translation> </message> <message> <location line="+2"/> <source>Delete to End of Line</source> - <translation type="unfinished">Eliminar hasta el final de línea</translation> + <translation>Eliminar hasta el final de línea</translation> </message> <message> <location line="+2"/> @@ -2949,44 +2901,44 @@ <message> <location line="+2"/> <source>Transpose Line</source> - <translation>Transponer línea</translation> + <translation>Intercambiar con línea anterior</translation> </message> <message> <location line="+2"/> <source>Completion List</source> - <translation type="unfinished">Lista de terminación</translation> + <translation>Lista de comandos coincidentes</translation> </message> <message> <location line="+3"/> <source>Comment Selection</source> - <translation>Comentar selección</translation> + <translation>Comentar la selección</translation> </message> <message> <location line="+2"/> <source>Uncomment Selection</source> - <translation>Descomentar selección</translation> + <translation>Descomentar la selección</translation> </message> <message> <location line="+2"/> <source>Uppercase Selection</source> - <translation>Aplicar mayúsculas a selección</translation> + <translation>Convertir la selección a mayúsculas</translation> </message> <message> <location line="+2"/> <source>Lowercase Selection</source> - <translation>Aplicar minúsculas a selección</translation> + <translation>Convertir la selección a minúsculas</translation> </message> <message> <location line="+4"/> <location line="+5"/> <source>Indent Selection</source> - <translation>Aplicar sangría a selección</translation> + <translation>Aplicar sangría a la selección</translation> </message> <message> <location line="-3"/> <location line="+5"/> <source>Unindent Selection</source> - <translation>Reducir sangría a selección</translation> + <translation>Reducir sangría a la selección</translation> </message> <message> <location line="+4"/> @@ -3006,37 +2958,37 @@ <message> <location line="+3"/> <source>Goto Line</source> - <translation>Ir a línea</translation> + <translation>Ir a la línea</translation> </message> <message> <location line="+2"/> <source>Move to Matching Brace</source> - <translation>Mover a la llave correspondiente</translation> + <translation>Mover el paréntesis/corchete/llave correspondiente</translation> </message> <message> <location line="+2"/> <source>Select to Matching Brace</source> - <translation>Seleccionar a la llave correspondiente</translation> + <translation>Seleccionar el paréntesis/corchete/llave correspondiente</translation> </message> <message> <location line="+2"/> <source>Toggle Bookmark</source> - <translation type="unfinished">Alternar marcador (Bookmark)</translation> + <translation>Alternar marcador</translation> </message> <message> <location line="+2"/> <source>Next Bookmark</source> - <translation type="unfinished">Marcador siguiente (Sig. Bookmark)</translation> + <translation>Siguiente marcador</translation> </message> <message> <location line="+2"/> <source>Previous Bookmark</source> - <translation type="unfinished">Marcador anterior (Ant. Bookmark)</translation> + <translation>Marcador anterior</translation> </message> <message> <location line="+2"/> <source>Remove All Bookmark</source> - <translation type="unfinished">Eliminar todos los marcadores (Bookmarks)</translation> + <translation>Eliminar todos los marcadores</translation> </message> <message> <location line="+4"/> @@ -3056,7 +3008,7 @@ <message> <location line="+2"/> <source>Show Line Endings</source> - <translation>Mostrar fin de líneas</translation> + <translation>Mostrar fin de línea</translation> </message> <message> <location line="+1"/> @@ -3066,17 +3018,17 @@ <message> <location line="+2"/> <source>Show Long Line Marker</source> - <translation>Mostrar marcador largo de línea</translation> + <translation>Mostrar marcador de longitud de línea</translation> </message> <message> <location line="+2"/> <source>Zoom In</source> - <translation type="unfinished">Aumentar zoom</translation> + <translation>Aumentar</translation> </message> <message> <location line="+1"/> <source>Zoom Out</source> - <translation type="unfinished">Disminuir zoom</translation> + <translation>Disminuir</translation> </message> <message> <location line="+2"/> @@ -3097,7 +3049,7 @@ <message> <location line="+2"/> <source>Previous Breakpoint</source> - <translation>Punto de interrupción previo</translation> + <translation>Punto de interrupción anterior</translation> </message> <message> <location line="+2"/> @@ -3127,7 +3079,7 @@ <message> <location line="+42"/> <source>Main</source> - <translation type="unfinished">Principal</translation> + <translation>Principal</translation> </message> <message> <location line="+3"/> @@ -3176,37 +3128,37 @@ <message> <location line="+124"/> <source>Enter new Shortcut for Set %1</source> - <translation type="unfinished">Introduzca nuevo acceso directo para conjunto %1</translation> + <translation>Introduzca nuevo atajo para conjunto %1</translation> </message> <message> <location line="+5"/> <source>Apply the desired shortcut or click on the right button to reset the shortcut to its default.</source> - <translation type="unfinished">Aplicar acceso directo que desee o haga clic en el botón derecho para restablecer el acceso directo a su valor predeterminado.</translation> + <translation>Aplique el atajo que desee o haga clic en el botón derecho para restablecer el atajo a su valor predeterminado.</translation> </message> <message> <location line="+7"/> <source>Enter shortcut directly by performing it</source> - <translation type="unfinished">Introduzca directamente un acceso directo</translation> + <translation>Introduzca directamente un atajo de teclado</translation> </message> <message> <location line="+6"/> <source>Actual shortcut</source> - <translation type="unfinished">Acceso directo actual</translation> + <translation>Atajo de teclado actual</translation> </message> <message> <location line="+6"/> <source>Default shortcut</source> - <translation type="unfinished">Acceso directo por defecto</translation> + <translation>Atajo de teclado por defecto</translation> </message> <message> <location line="+6"/> <source>Set to default</source> - <translation type="unfinished">Establecer como por defecto</translation> + <translation>Establecer como por defecto</translation> </message> <message> <location line="+53"/> <source>Double Shortcut</source> - <translation type="unfinished">Acceso directo doble</translation> + <translation>Atajo de teclado doble</translation> </message> <message> <location line="+1"/> @@ -3215,32 +3167,32 @@ is already used for the action "%2". Do you want to use the shortcut anyhow removing it from the previous action?</source> - <translation type="unfinished">El acceso directo seleccionado + <translation>El atajo de teclado seleccionado "%1" ya se utiliza para la acción "%2". -¿Desea utilizar el acceso directo de cualquier modo removiendo la acción previamente asignada?</translation> +¿Desea utilizar el atajo de cualquier modo suprimiendo la acción previamente asignada?</translation> </message> <message> <location line="+71"/> <source>Import shortcut set %1 from file ...</source> - <translation type="unfinished">Importar conjunto de acceso directo %1 del archivo ...</translation> + <translation>Importar conjunto de atajos de teclado %1 del archivo ...</translation> </message> <message> <location line="+1"/> <location line="+6"/> <source>Octave Shortcut Files (*.osc);;All Files (*)</source> - <translation type="unfinished">Archivo de accesos directos de Octave (*.osc);;Todos los archivos (*)</translation> + <translation>Archivo de atajos de teclado de Octave (*.osc);;Todos los archivos (*)</translation> </message> <message> <location line="-1"/> <source>Export shortcut set %1 into file ...</source> - <translation type="unfinished">Exportar conjunto de accesos directos %1 al archivo ...</translation> + <translation>Exportar conjunto de atajos de teclado %1 al archivo ...</translation> </message> <message> <location line="+15"/> <source>Failed to open %1 as octave shortcut file</source> - <translation type="unfinished">No se ha podido abrir %1 como archivo de accesos directos de Octave</translation> + <translation>No se ha podido abrir %1 como archivo de atajos de teclado de Octave</translation> </message> </context> <context> @@ -3256,7 +3208,7 @@ <message> <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> - <translation>Escriba aquí y pulse la tecla 'Retorno' para buscar</translation> + <translation>Escriba aquí y pulse la tecla 'enter' para buscar</translation> </message> <message> <location line="+4"/> @@ -3271,7 +3223,7 @@ <message> <location line="+3"/> <source>The info file<p>%1<p>or compressed versions do not exist</source> - <translation type="unfinished">El archivo de información <p>%1<p> o la versión comprimida no existen</translation> + <translation>El archivo de información <p>%1<p> o la versión comprimida no existen</translation> </message> </context> <context>
--- a/libgui/languages/it_IT.ts Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/languages/it_IT.ts Wed Apr 01 12:45:04 2015 -0400 @@ -112,12 +112,12 @@ <message> <location line="+3"/> <source>&Cancel</source> - <translation type="unfinished"></translation> + <translation>&Annulla</translation> </message> <message> <location line="+0"/> <source>Cancel</source> - <translation type="unfinished"></translation> + <translation>Annulla</translation> </message> <message> <location line="+3"/> @@ -132,12 +132,12 @@ <message> <location line="+3"/> <source>Apply</source> - <translation type="unfinished"></translation> + <translation>Applica</translation> </message> <message> <location line="+3"/> <source>Reset</source> - <translation type="unfinished"></translation> + <translation>Reset</translation> </message> <message> <location line="+3"/> @@ -147,62 +147,62 @@ <message> <location line="+4"/> <source>Don't Save</source> - <translation type="unfinished"></translation> + <translation>Non salvare</translation> </message> <message> <location line="+2"/> <source>Close without Saving</source> - <translation type="unfinished"></translation> + <translation>Chiudi senza salvare</translation> </message> <message> <location line="+2"/> <source>Discard</source> - <translation type="unfinished"></translation> + <translation>Elimina</translation> </message> <message> <location line="+3"/> <source>&Yes</source> - <translation type="unfinished"></translation> + <translation>&Sì</translation> </message> <message> <location line="+3"/> <source>Yes to &All</source> - <translation type="unfinished"></translation> + <translation>Sì a &tutto</translation> </message> <message> <location line="+3"/> <source>&No</source> - <translation type="unfinished"></translation> + <translation>&No</translation> </message> <message> <location line="+3"/> <source>N&o to All</source> - <translation type="unfinished"></translation> + <translation>N&o a tutto</translation> </message> <message> <location line="+3"/> <source>Save All</source> - <translation type="unfinished"></translation> + <translation>Salva tutto</translation> </message> <message> <location line="+3"/> <source>Abort</source> - <translation type="unfinished"></translation> + <translation>Annulla</translation> </message> <message> <location line="+3"/> <source>Retry</source> - <translation type="unfinished"></translation> + <translation>Riprova</translation> </message> <message> <location line="+3"/> <source>Ignore</source> - <translation type="unfinished"></translation> + <translation>Ignora</translation> </message> <message> <location line="+3"/> <source>Restore Defaults</source> - <translation type="unfinished"></translation> + <translation>Ripristina defaults</translation> </message> </context> <context> @@ -1832,12 +1832,12 @@ <message> <location line="+2"/> <source>Zoom In</source> - <translation type="unfinished">Ingrandisci</translation> + <translation>Ingrandisci</translation> </message> <message> <location line="+4"/> <source>Zoom Out</source> - <translation type="unfinished">Riduci</translation> + <translation>Riduci</translation> </message> <message> <location line="+4"/> @@ -2496,7 +2496,7 @@ <message> <location line="-4"/> <source>One directory up</source> - <translation type="unfinished">Livello precedente</translation> + <translation>Livello precedente</translation> </message> <message> <location line="+6"/> @@ -3011,7 +3011,7 @@ <message> <location line="+24"/> <source>Double-click a command to transfer it to the terminal.</source> - <translation>Fare doppio click su un comando per trasferirlo nel termianle.</translation> + <translation>Fare doppio click su un comando per trasferirlo nel terminale.</translation> </message> <message> <location line="+8"/> @@ -3601,7 +3601,7 @@ <location line="+19"/> <location line="+468"/> <source>General</source> - <translation>Genrale</translation> + <translation>Generale</translation> </message> <message> <location line="-338"/> @@ -3913,22 +3913,22 @@ <message> <location line="+61"/> <source>Small</source> - <translation type="unfinished"></translation> + <translation>Piccolo</translation> </message> <message> <location line="+7"/> <source> Normal</source> - <translation type="unfinished"></translation> + <translation>Normale</translation> </message> <message> <location line="+10"/> <source>Large</source> - <translation type="unfinished"></translation> + <translation>Grande</translation> </message> <message> <location line="+200"/> <source>3D</source> - <translation type="unfinished"></translation> + <translation>3D</translation> </message> <message> <location line="+54"/> @@ -3960,7 +3960,7 @@ <message> <location line="+221"/> <source>Indentation</source> - <translation type="unfinished"></translation> + <translation>Indentazione</translation> </message> <message> <location line="+256"/> @@ -3980,7 +3980,7 @@ <message> <location line="+31"/> <source>File handling</source> - <translation type="unfinished"></translation> + <translation>Gestione file</translation> </message> <message> <location line="+40"/>
--- a/libgui/src/files-dock-widget.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/files-dock-widget.cc Wed Apr 01 12:45:04 2015 -0400 @@ -108,7 +108,7 @@ = new QAction (resource_manager::icon ("go-last"), tr ("Set Octave directory"), _navigation_tool_bar); _sync_octave_directory_action->setToolTip ( - tr ("Set Octave directroy to current browser directory")); + tr ("Set Octave directory to current browser directory")); _sync_octave_directory_action->setEnabled ("false"); QToolButton * popdown_button = new QToolButton ();
--- a/libgui/src/m-editor/file-editor.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/m-editor/file-editor.cc Wed Apr 01 12:45:04 2015 -0400 @@ -1447,7 +1447,7 @@ _show_linenum_action->setCheckable (true); _show_whitespace_action = add_action (_view_editor_menu, QIcon (), - tr ("Show &White Spaces"), SLOT (show_white_space (bool))); + tr ("Show &Whitespace Characters"), SLOT (show_white_space (bool))); _show_whitespace_action->setCheckable (true); _show_eol_action = add_action (_view_editor_menu, QIcon (), @@ -1571,7 +1571,7 @@ resize (500, 400); setWindowIcon (QIcon (":/actions/icons/logo.png")); - set_title ("Editor"); + set_title (tr ("Editor")); //restore previous session if (settings->value ("editor/restoreSession", true).toBool ())
--- a/libgui/src/main-window.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/main-window.cc Wed Apr 01 12:45:04 2015 -0400 @@ -204,6 +204,10 @@ // signal to all dock widgets for updating the style emit active_dock_changed (_active_dock, dock); + QList<QDockWidget *> tabbed = tabifiedDockWidgets (dock); + if (tabbed.contains (_active_dock)) + dock->set_predecessor_widget (_active_dock); + if (edit_dock_widget == dock) emit editor_focus_changed (true); else if (edit_dock_widget == _active_dock) @@ -1954,7 +1958,7 @@ void main_window::construct_tool_bar (void) { - _main_tool_bar = addToolBar ("Main"); + _main_tool_bar = addToolBar (tr ("Toolbar")); _main_tool_bar->setObjectName ("MainToolBar"); _main_tool_bar->addAction (_new_script_action); @@ -1964,7 +1968,6 @@ _main_tool_bar->addAction (_copy_action); _main_tool_bar->addAction (_paste_action); - _main_tool_bar->addAction (_undo_action); _main_tool_bar->addSeparator ();
--- a/libgui/src/octave-dock-widget.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/octave-dock-widget.cc Wed Apr 01 12:45:04 2015 -0400 @@ -43,6 +43,7 @@ _parent = static_cast<QMainWindow *> (p); // store main window _floating = false; + _predecessor_widget = 0; connect (this, SIGNAL (visibilityChanged (bool)), this, SLOT (handle_visibility_changed (bool))); @@ -155,6 +156,13 @@ } +// set the widget which previously had focus when tabified +void +octave_dock_widget::set_predecessor_widget (octave_dock_widget *prev_widget) +{ + _predecessor_widget = prev_widget; +} + // set the title in the dockwidgets title bar void octave_dock_widget::set_title (const QString& title) @@ -169,6 +177,16 @@ setWindowTitle (title); } +// set focus to previously active widget in tabbed widget stack +void +octave_dock_widget::set_focus_predecessor () +{ + if (_predecessor_widget) // only != 0 if widget was tabbed + _predecessor_widget->focus (); + + _predecessor_widget = 0; +} + // make the widget floating void octave_dock_widget::make_window () @@ -207,8 +225,11 @@ #endif _floating = true; + + set_focus_predecessor (); // set focus previously active widget if tabbed } + // dock the widget void octave_dock_widget::make_widget (bool dock) @@ -455,3 +476,13 @@ update (); } } + + +// close event +void +octave_dock_widget::closeEvent (QCloseEvent *e) +{ + emit active_changed (false); + set_focus_predecessor (); + QDockWidget::closeEvent (e); +}
--- a/libgui/src/octave-dock-widget.h Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/octave-dock-widget.h Wed Apr 01 12:45:04 2015 -0400 @@ -43,7 +43,7 @@ void make_window (void); void make_widget (bool dock=true); void set_title (const QString&); - + void set_predecessor_widget (octave_dock_widget *prev_widget); signals: /** Custom signal that tells whether a user has clicked away @@ -53,11 +53,7 @@ protected: - virtual void closeEvent (QCloseEvent *e) - { - emit active_changed (false); - QDockWidget::closeEvent (e); - } + virtual void closeEvent (QCloseEvent *e); QWidget * focusWidget (); @@ -114,6 +110,7 @@ private: void set_style (bool active); + void set_focus_predecessor (); QMainWindow *_parent; // store the parent since we are reparenting to 0 bool _floating; @@ -126,6 +123,7 @@ QColor _fg_color_active; QString _icon_color; QString _icon_color_active; + octave_dock_widget *_predecessor_widget; #if defined (Q_OS_WIN32) QWidget *_title_widget;
--- a/libgui/src/settings-dialog.ui Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/settings-dialog.ui Wed Apr 01 12:45:04 2015 -0400 @@ -128,7 +128,7 @@ <item> <widget class="QRadioButton" name="icon_size_normal"> <property name="text"> - <string> Normal</string> + <string>Normal</string> </property> <property name="checked"> <bool>true</bool>
--- a/libgui/src/shortcut-manager.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/shortcut-manager.cc Wed Apr 01 12:45:04 2015 -0400 @@ -249,11 +249,11 @@ QKeySequence (ctrl_shift + Qt::Key_Tab)); #endif - init (tr ("Convert Line Ednings to Windows"), "editor_edit:conv_eol_winows", + init (tr ("Convert Line Endings to Windows"), "editor_edit:conv_eol_winows", QKeySequence ()); - init (tr ("Convert Line Ednings to Unix"), "editor_edit:conv_eol_unix", + init (tr ("Convert Line Endings to Unix"), "editor_edit:conv_eol_unix", QKeySequence ()); - init (tr ("Convert Line Ednings to Mac"), "editor_edit:conv_eol_mac", + init (tr ("Convert Line Endings to Mac"), "editor_edit:conv_eol_mac", QKeySequence ()); init (tr ("Goto Line"), "editor_edit:goto_line", @@ -278,7 +278,7 @@ // view init (tr ("Show Line Numbers"), "editor_view:show_line_numbers", QKeySequence ()); - init (tr ("Show White Spaces"), "editor_view:show_white_spaces", + init (tr ("Show Whitespace Characters"), "editor_view:show_white_spaces", QKeySequence ()); init (tr ("Show Line Endings"), "editor_view:show_eol_chars", QKeySequence ()); init (tr ("Show Indentation Guides"), "editor_view:show_ind_guides", @@ -292,7 +292,7 @@ QKeySequence (ctrl + Qt::Key_Underscore)); #else init (tr ("Zoom Normal"), "editor_view:zoom_normal", - QKeySequence (ctrl_alt + Qt::Key_0)); + QKeySequence (ctrl + Qt::Key_Period)); #endif // debug
--- a/libgui/src/welcome-wizard.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/welcome-wizard.cc Wed Apr 01 12:45:04 2015 -0400 @@ -211,7 +211,7 @@ message->setText (tr ("<html><body>\n" "<p>We hope you find Octave to be a useful tool.</p>\n" - "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels.\n" + "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other community-based support channels.\n" "You can find more information about each of these by visiting <a href=\"http://octave.org/support.html\">http://octave.org/support.html</a> (opens in external browser).</p>\n" "</body></html>")); message->setWordWrap (true);
--- a/libgui/src/workspace-view.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libgui/src/workspace-view.cc Wed Apr 01 12:45:04 2015 -0400 @@ -92,6 +92,13 @@ QSettings *settings = resource_manager::get_settings (); + //enable sorting as previously configured + view->setSortingEnabled (true); + view->sortByColumn ( + settings->value ("workspaceview/sort_by_column",0).toInt (), + static_cast<Qt::SortOrder> + (settings->value ("workspaceview/sort_order", Qt::AscendingOrder).toUInt ()) + ); // Initialize column order and width of the workspace view->horizontalHeader ()->restoreState ( settings->value ("workspaceview/column_state").toByteArray ()); @@ -127,6 +134,12 @@ settings->setValue ("workspaceview/column_state", view->horizontalHeader ()->saveState ()); + + int sort_column = view->horizontalHeader ()->sortIndicatorSection (); + Qt::SortOrder sort_order = view->horizontalHeader ()->sortIndicatorOrder (); + settings->setValue ("workspaceview/sort_by_column", sort_column); + settings->setValue ("workspaceview/sort_order", sort_order); + settings->setValue ("workspaceview/filter_active", _filter_checkbox->isChecked ()); @@ -144,6 +157,7 @@ _filter_model.setFilterKeyColumn(0); view->setModel (&_filter_model); + _model = model; }
--- a/libinterp/corefcn/graphics.in.h Fri Mar 20 16:19:47 2015 -0400 +++ b/libinterp/corefcn/graphics.in.h Wed Apr 01 12:45:04 2015 -0400 @@ -3401,8 +3401,11 @@ } else { - set_toolkit (b); - mark_modified (); + if (nm != get___graphics_toolkit__ ()) + { + set_toolkit (b); + mark_modified (); + } } } else
--- a/libinterp/dldfcn/__init_fltk__.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/libinterp/dldfcn/__init_fltk__.cc Wed Apr 01 12:45:04 2015 -0400 @@ -1454,15 +1454,16 @@ set_currentpoint (pos_x, pos_y); - if (Fl::event_button () == FL_LEFT_MOUSE - && Fl::event_shift ()) + if (Fl::event_clicks ()) + fp.set_selectiontype ("open"); + else if (Fl::event_button () == FL_MIDDLE_MOUSE + || (Fl::event_button () == FL_LEFT_MOUSE + && Fl::event_shift ())) fp.set_selectiontype ("extend"); - else if ((Fl::event_button () == FL_LEFT_MOUSE - && Fl::event_ctrl ()) - || Fl::event_button () == FL_RIGHT_MOUSE) - fp.set_selectiontype ("alternate"); - else if (Fl::event_clicks ()) - fp.set_selectiontype ("open"); + else if (Fl::event_button () == FL_RIGHT_MOUSE + || (Fl::event_button () == FL_LEFT_MOUSE + && Fl::event_ctrl ())) + fp.set_selectiontype ("alt"); else fp.set_selectiontype ("normal");
--- a/scripts/miscellaneous/private/__w2mpth__.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/miscellaneous/private/__w2mpth__.m Wed Apr 01 12:45:04 2015 -0400 @@ -26,14 +26,14 @@ ## ## @example ## @group -## mpth = __w2mpth ('D:\full\path\to\file.dat') +## mpth = __w2mpth__ ('D:\full\path\to\file.dat') ## @result{} '/D/full/path/to/file.dat' ## @end group ## @end example ## ## @example ## @group -## mpth = __w2mpth ('relative\path\to\file.dat') +## mpth = __w2mpth__ ('relative\path\to\file.dat') ## @result{} 'relative/path/to/file.dat' ## @end group ## @end example @@ -47,7 +47,7 @@ ## Check for platform if (! ispc) - error ("__m2wpath__ should only be called on Windows platforms\n"); + error ("__w2mpth__ should only be called on Windows platforms\n"); endif ## Replace backslash file separators by forward slashes @@ -59,13 +59,14 @@ ## Use single quote strings for winpaths to cope with backslashes. -%!test -%! if (ispc) -%! assert (__w2mpth__ ('file.fil'), 'file.fil'); -%! assert (__w2mpth__ ('\file.fil'), '/file.fil'); -%! assert (__w2mpth__ ('G:\file.fil'), '/G/file.fil'); -%! assert (__w2mpth__ ('r:\subdir\file.fil'), '/r/subdir/file.fil'); -%! assert (__w2mpth__ ('relative\path\to\file.dat'), -%! 'relative/path/to/file.dat') -%! endif +## These tests are commented out until a better place is found (bug #44581) +##%!test +##%! if (ispc) +##%! assert (__w2mpth__ ('file.fil'), 'file.fil'); +##%! assert (__w2mpth__ ('\file.fil'), '/file.fil'); +##%! assert (__w2mpth__ ('G:\file.fil'), '/G/file.fil'); +##%! assert (__w2mpth__ ('r:\subdir\file.fil'), '/r/subdir/file.fil'); +##%! assert (__w2mpth__ ('relative\path\to\file.dat'), +##%! 'relative/path/to/file.dat') +##%! endif
--- a/scripts/miscellaneous/run.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/miscellaneous/run.m Wed Apr 01 12:45:04 2015 -0400 @@ -64,7 +64,7 @@ d = canonicalize_file_name (d); unwind_protect cd (d); - evalin ("caller", sprintf ('source ("%s%s");', f, ext), + evalin ("caller", sprintf ("source ('%s%s');", f, ext), "rethrow (lasterror ())"); unwind_protect_cleanup if (strcmp (d, pwd ())) @@ -81,7 +81,7 @@ ## Search PATH with null extension ('.' will be stripped and ext = "") script = which ([script "."]); endif - evalin ("caller", sprintf ('source ("%s");', script), + evalin ("caller", sprintf ("source ('%s');", script), "rethrow (lasterror ())"); endif endfunction
--- a/scripts/plot/draw/pcolor.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/plot/draw/pcolor.m Wed Apr 01 12:45:04 2015 -0400 @@ -111,10 +111,18 @@ endif endif if (all (xrng == fix (xrng))) - xlim ([min(xrng), max(xrng)]); + xmin = min (xrng); + xmax = max (xrng); + if (xmin < xmax) + xlim ([xmin, xmax]); + endif endif if (all (yrng == fix (yrng))) - ylim ([min(yrng), max(yrng)]); + ymin = min (yrng); + ymax = max (yrng); + if (ymin < ymax) + ylim ([ymin, ymax]); + endif endif endif
--- a/scripts/plot/draw/private/__stem__.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/plot/draw/private/__stem__.m Wed Apr 01 12:45:04 2015 -0400 @@ -239,7 +239,9 @@ y = repmat ([1:nr]', 1, nc); endif endif - if (! (isnumeric (x) && isnumeric (y) && isnumeric (z))) + if (! (isnumeric (x) || islogical (x)) + || ! (isnumeric (y) || islogical (y)) + || ! (isnumeric (z) || islogical (z))) error ("stem3: X, Y, and Z must be numeric"); endif else @@ -250,7 +252,8 @@ x = 1:rows (y); endif endif - if (! (isnumeric (x) && isnumeric (y))) + if (! (isnumeric (x) || islogical (x)) + || ! (isnumeric (y) || islogical (y))) error ("stem: X and Y must be numeric"); endif endif
--- a/scripts/plot/util/findobj.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/plot/util/findobj.m Wed Apr 01 12:45:04 2015 -0400 @@ -227,11 +227,11 @@ match(nh,np) = true; else if (regularexpression(np)) - foo = regexp (p.(pname{np}), pvalue{np}, "once"); - if (isempty (foo)) + found = regexp (p.(pname{np}), pvalue{np}, "once"); + if (isempty (found)) match(nh,np) = false; else - match(nh,np) = foo; + match(nh,np) = true; endif elseif (numel (p.(pname{np})) == numel (pvalue{np})) if (ischar (pvalue{np}) && ischar (p.(pname{np})))
--- a/scripts/plot/util/print.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/plot/util/print.m Wed Apr 01 12:45:04 2015 -0400 @@ -301,6 +301,10 @@ error ("print: no figure to print"); endif + if (isempty (findall (opts.figure, "-depth", "1", "type", "axes"))) + error ("print: no axes object in figure to print"); + endif + orig_figure = get (0, "currentfigure"); set (0, "currentfigure", opts.figure);
--- a/scripts/set/intersect.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/set/intersect.m Wed Apr 01 12:45:04 2015 -0400 @@ -22,11 +22,11 @@ ## @deftypefnx {Function File} {@var{c} =} intersect (@var{a}, @var{b}, "rows") ## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} intersect (@dots{}) ## -## Return the elements common to both @var{a} and @var{b} sorted in ascending -## order. +## Return the unique elements common to both @var{a} and @var{b} sorted in +## ascending order. ## -## If @var{a} and @var{b} are both column vectors then return a column vector; -## Otherwise, return a row vector. The inputs may also be cell arrays of +## If @var{a} and @var{b} are both row vectors then return a row vector; +## Otherwise, return a column vector. The inputs may also be cell arrays of ## strings. ## ## If the optional input @qcode{"rows"} is given then return the common rows of @@ -50,7 +50,7 @@ c = ia = ib = []; else by_rows = nargin == 3; - iscol = isvector (a) && isvector (b) && iscolumn (a) && iscolumn (b); + isrowvec = isvector (a) && isvector (b) && isrow (a) && isrow (b); ## Form A and B into sets if (nargout > 1) @@ -85,7 +85,7 @@ endif ## Adjust output orientation for Matlab compatibility - if (! by_rows && ! iscol) + if (! by_rows && isrowvec) c = c.'; endif endif @@ -99,8 +99,8 @@ %! b = 2:5; %!assert (size (intersect (a, b)), [1 3]) -%!assert (size (intersect (a', b)), [1 3]) -%!assert (size (intersect (a, b')), [1 3]) +%!assert (size (intersect (a', b)), [3 1]) +%!assert (size (intersect (a, b')), [3 1]) %!assert (size (intersect (a', b')), [3 1]) ## Test multi-dimensional arrays @@ -108,7 +108,7 @@ %! a = rand (3,3,3); %! b = a; %! b(1,1,1) = 2; -%! assert (intersect (a, b), sort (a(2:end))); +%! assert (intersect (a, b), sort (a(2:end)')); ## Test the routine for index vectors ia and ib %!test
--- a/scripts/set/setdiff.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/set/setdiff.m Wed Apr 01 12:45:04 2015 -0400 @@ -21,11 +21,11 @@ ## @deftypefn {Function File} {@var{c} =} setdiff (@var{a}, @var{b}) ## @deftypefnx {Function File} {@var{c} =} setdiff (@var{a}, @var{b}, "rows") ## @deftypefnx {Function File} {[@var{c}, @var{ia}] =} setdiff (@dots{}) -## Return the elements in @var{a} that are not in @var{b} sorted in +## Return the unique elements in @var{a} that are not in @var{b} sorted in ## ascending order. ## -## If @var{a} and @var{b} are both column vectors return a column vector; -## Otherwise, return a row vector. The inputs may also be cell arrays of +## If @var{a} is a row vector return a column vector; +## Otherwise, return a column vector. The inputs may also be cell arrays of ## strings. ## ## If the optional input @qcode{"rows"} is given then return the rows in @@ -49,7 +49,7 @@ [a, b] = validsetargs ("setdiff", a, b, varargin{:}); by_rows = nargin == 3; - iscol = isvector (a) && isvector (b) && iscolumn (a) && iscolumn (b); + isrowvec = isvector (a) && isrow (a); if (by_rows) if (nargout > 1) @@ -89,10 +89,10 @@ ia(idx(dups)) = []; endif ## Reshape if necessary for Matlab compatibility. - if (iscol) + if (isrowvec) + c = c(:).'; + else c = c(:); - else - c = c(:).'; endif endif endif @@ -120,11 +120,11 @@ %!assert (setdiff ([1:5]', 2), [1;3;4;5]) %!assert (setdiff ([1:5], [2:3]), [1,4,5]) %!assert (setdiff ([1:5], [2:3]'), [1,4,5]) -%!assert (setdiff ([1:5]', [2:3]), [1,4,5]) +%!assert (setdiff ([1:5]', [2:3]), [1;4;5]) %!assert (setdiff ([1:5]', [2:3]'), [1;4;5]) %!test %! a = rand (3,3,3); %! b = a(1); -%! assert (setdiff (a, b), sort (a(2:end))); +%! assert (setdiff (a, b), sort (a(2:end)'));
--- a/scripts/set/setxor.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/set/setxor.m Wed Apr 01 12:45:04 2015 -0400 @@ -23,11 +23,11 @@ ## @deftypefnx {Function File} {@var{c} =} setxor (@var{a}, @var{b}, "rows") ## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} setxor (@dots{}) ## -## Return the elements exclusive to sets @var{a} or @var{b} sorted in +## Return the unique elements exclusive to sets @var{a} or @var{b} sorted in ## ascending order. ## -## If @var{a} and @var{b} are both column vectors return a column vector; -## Otherwise, return a row vector. The inputs may also be cell arrays of +## If @var{a} and @var{b} are both row vectors then return a row vector; +## Otherwise, return a column vector. The inputs may also be cell arrays of ## strings. ## ## If the optional input @qcode{"rows"} is given then return the rows exclusive @@ -50,7 +50,7 @@ [a, b] = validsetargs ("setxor", a, b, varargin{:}); by_rows = nargin == 3; - iscol = isvector (a) && isvector (b) && iscolumn (a) && iscolumn (b); + isrowvec = isvector (a) && isvector (b) && isrow (a) && isrow (b); ## Form A and B into sets. if (nargout > 1) @@ -91,7 +91,7 @@ endif ## Adjust output orientation for Matlab compatibility - if (! iscol) + if (isrowvec) c = c.'; endif endif @@ -112,8 +112,8 @@ %! a = [3, 1, 4, 1, 5]; %! b = [1, 2, 3, 4]; %! [c, ia, ib] = setxor (a, b.'); -%! assert (c, [2, 5]); -%! assert (c, sort ([a(ia), b(ib)])); +%! assert (c, [2; 5]); +%! assert (c, sort ([a(ia)'; b(ib)'])); %!test %! a = [1 2; 4 5; 1 3]; @@ -156,8 +156,8 @@ %! y = 2:5; %!assert (size (setxor (x, y)), [1 3]) -%!assert (size (setxor (x', y)), [1 3]) -%!assert (size (setxor (x, y')), [1 3]) +%!assert (size (setxor (x', y)), [3 1]) +%!assert (size (setxor (x, y')), [3 1]) %!assert (size (setxor (x', y')), [3 1]) ## Test multi-dimensional arrays @@ -165,5 +165,5 @@ %! a = rand (3,3,3); %! b = a; %! b(1,1,1) = 2; -%! assert (intersect (a, b), sort (a(2:end))); +%! assert (intersect (a, b), sort (a(2:end)'));
--- a/scripts/set/union.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/set/union.m Wed Apr 01 12:45:04 2015 -0400 @@ -22,11 +22,11 @@ ## @deftypefnx {Function File} {@var{c} =} union (@var{a}, @var{b}, "rows") ## @deftypefnx {Function File} {[@var{c}, @var{ia}, @var{ib}] =} union (@dots{}) ## -## Return the elements that are in either @var{a} or @var{b} sorted in -## ascending order with duplicates removed. +## Return the unique elements that are in either @var{a} or @var{b} sorted in +## ascending order. ## -## If @var{a} and @var{b} are both column vectors return a column vector; -## Otherwise, return a row vector. The inputs may also be cell arrays of +## If @var{a} and @var{b} are both row vectors then return a row vector; +## Otherwise, return a column vector. The inputs may also be cell arrays of ## strings. ## ## If the optional input @qcode{"rows"} is given then return rows that are in @@ -51,14 +51,14 @@ [a, b] = validsetargs ("union", a, b, varargin{:}); by_rows = nargin == 3; - iscol = isvector (a) && isvector (b) && iscolumn (a) && iscolumn (b); + isrowvec = isvector (a) && isvector (b) && isrow (a) && isrow (b); if (by_rows) y = [a; b]; else y = [a(:); b(:)]; ## Adjust output orientation for Matlab compatibility - if (! iscol) + if (isrowvec) y = y.'; endif endif @@ -76,23 +76,23 @@ %!assert (union ([1, 2, 4], [2, 3, 5]), [1, 2, 3, 4, 5]) -%!assert (union ([1; 2; 4], [2, 3, 5]), [1, 2, 3, 4, 5]) +%!assert (union ([1; 2; 4], [2, 3, 5]), [1; 2; 3; 4; 5]) %!assert (union ([1; 2; 4], [2; 3; 5]), [1; 2; 3; 4; 5]) -%!assert (union ([1, 2, 3], [5; 7; 9]), [1, 2, 3, 5, 7, 9]) +%!assert (union ([1, 2, 3], [5; 7; 9]), [1; 2; 3; 5; 7; 9]) ## Test multi-dimensional arrays %!test %! a = rand (3,3,3); %! b = a; %! b(1,1,1) = 2; -%! assert (union (a, b), sort ([a(1:end), 2])); +%! assert (union (a, b), sort ([a(1:end)'; 2])); %!test %! a = [3, 1, 4, 1, 5]; %! b = [1, 2, 3, 4]; %! [y, ia, ib] = union (a, b.'); -%! assert (y, [1, 2, 3, 4, 5]); -%! assert (y, sort ([a(ia), b(ib)])); +%! assert (y, [1; 2; 3; 4; 5]); +%! assert (y, sort ([a(ia)'; b(ib)'])); ## Test common input validation for set routines contained in validsetargs %!error <cell array of strings cannot be combined> union ({"a"}, 1)
--- a/scripts/strings/strsplit.m Fri Mar 20 16:19:47 2015 -0400 +++ b/scripts/strings/strsplit.m Wed Apr 01 12:45:04 2015 -0400 @@ -17,21 +17,35 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {[@var{cstr}] =} strsplit (@var{s}) -## @deftypefnx {Function File} {[@var{cstr}] =} strsplit (@var{s}, @var{del}) +## @deftypefn {Function File} {[@var{cstr}] =} strsplit (@var{str}) +## @deftypefnx {Function File} {[@var{cstr}] =} strsplit (@var{str}, @var{del}) ## @deftypefnx {Function File} {[@var{cstr}] =} strsplit (@dots{}, @var{name}, @var{value}) ## @deftypefnx {Function File} {[@var{cstr}, @var{matches}] =} strsplit (@dots{}) -## Split the string @var{s} using the delimiters specified by @var{del} -## and return a cell string array of substrings. If a delimiter is not -## specified the string, @var{s}, is split at whitespace. The delimiter, -## @var{del} may be a string, a scalar cell string, or cell string array. -## By default, consecutive delimiters in the input string @var{s} are -## collapsed into one. +## Split the string @var{str} using the delimiters specified by @var{del} +## and return a cell string array of substrings. +## +## If a delimiter is not specified the string is split at whitespace +## @code{@{" ", "\f", "\n", "\r", "\t", "\v"@}}. Otherwise, the delimiter, +## @var{del} must be a string or cell array of strings. By default, +## consecutive delimiters in the input string @var{s} are collapsed into one +## resulting in a single split. +## +## Supported @var{name}/@var{value} pair arguments are: ## -## The second output, @var{matches}, returns the delimiters which were matched -## in the original string. +## @itemize +## @item @var{collapsedelimiters} which may take the value of @code{true} +## (default) or @code{false}. ## -## Example: +## @item @var{delimitertype} which may take the value of @qcode{"simple"} +## (default) or @qcode{"regularexpression"}. A simple delimiter matches the +## text exactly as written. Otherwise, the syntax for regular expressions +## outlined in @code{regexp} is used. +## @end itemize +## +## The optional second output, @var{matches}, returns the delimiters which were +## matched in the original string. +## +## Examples with simple delimiters: ## ## @example ## strsplit ("a b c") @@ -50,7 +64,7 @@ ## [1,3] = c ## @} ## -## strsplit ("a foo b,bar c", @{"\s", "foo", "bar"@}) +## strsplit ("a foo b,bar c", @{" ", ",", "foo", "bar"@}) ## @result{} ## @{ ## [1,1] = a @@ -58,7 +72,7 @@ ## [1,3] = c ## @} ## -## strsplit ("a,,b, c", @{",", " "@}, false) +## strsplit ("a,,b, c", @{",", " "@}, "collapsedelimiters", false) ## @result{} ## @{ ## [1,1] = a @@ -70,21 +84,10 @@ ## ## @end example ## -## Supported @var{name}/@var{value} pair arguments are; -## -## @itemize -## @item @var{collapsedelimiters} may take the value of @var{true} or -## @var{false} with the default being @var{false}. -## -## @item @var{delimitertype} may take the value of @code{simple} or -## @code{regularexpression}. The default is @var{delimitertype} is -## @code{simple}. -## @end itemize -## -## Example: +## Examples with regularexpression delimiters: ## ## @smallexample -## strsplit ("a foo b,bar c", ",|\\s|foo|bar", "delimitertype", "regularexpression") +## strsplit ("a foo b,bar c", ',|\s|foo|bar', "delimitertype", "regularexpression") ## @result{} ## @{ ## [1,1] = a @@ -92,7 +95,7 @@ ## [1,3] = c ## @} ## -## strsplit ("a,,b, c", "[, ]", false, "delimitertype", "regularexpression") +## strsplit ("a,,b, c", '[, ]', "collapsedelimiters", false, "delimitertype", "regularexpression") ## @result{} ## @{ ## [1,1] = a @@ -125,10 +128,10 @@ ## @seealso{ostrsplit, strjoin, strtok, regexp} ## @end deftypefn -function [result, matches] = strsplit (str, del, varargin) +function [cstr, matches] = strsplit (str, del, varargin) args.collapsedelimiters = true; - args.delimitertype = "default"; + args.delimitertype = "simple"; [reg, params] = parseparams (varargin); @@ -137,16 +140,17 @@ elseif (numel (reg) > 1) print_usage (); elseif (numel (reg) == 1) - if (islogical (reg{1}) || isnumeric (reg{1})) + ## This is undocumented behavior to accept a logical 3rd arg. + if (islogical (reg{1})) args.collapsedelimiters = reg{1}; else print_usage (); endif endif fields = fieldnames (args); - for n = 1:2:numel(params) + for n = 1:2:numel (params) if (any (strcmpi (params{n}, fields))) - args.(lower(params{n})) = params{n+1}; + args.(tolower (params{n})) = params{n+1}; elseif (ischar (varargin{n})) error ("strsplit:invalid_parameter_name", "strsplit: invalid parameter name, '%s'", varargin{n}); @@ -155,23 +159,19 @@ endif endfor - if (strcmpi (args.delimitertype, "default")) - args.delimitertype = "simple"; - endif - ## Save the length of the "delimitertype" parameter length_deltype = length (args.delimitertype); - if (nargin == 1 || (nargin > 1 && (islogical (del) || isnumeric (del)))) + if (nargin == 1 || (nargin > 1 && islogical (del))) if (nargin > 1) ## Second input is the "collapsedelimiters" parameter args.collapsedelimiters = del; endif ## Set proper default for the delimiter type - if (strncmpi (args.delimitertype, "simple", length (args.delimitertype))) - del = {" ","\f","\n","\r","\t","\v"}; + if (strncmpi (args.delimitertype, "simple", length_deltype)) + del = {" ", "\f", "\n", "\r", "\t", "\v"}; else - del = "\\s"; + del = '\s'; endif endif @@ -182,58 +182,69 @@ endif if (strncmpi (args.delimitertype, "simple", length_deltype)) + is_simple = true; + elseif (strncmpi (args.delimitertype, "regularexpression", length_deltype)) + is_simple = false; + else + error ("strsplit:invalid_delimitertype", "strsplit: Invalid DELIMITERTYPE"); + endif + + if (is_simple) if (iscellstr (del)) del = cellfun (@do_string_escapes, del, "uniformoutput", false); else del = do_string_escapes (del); endif - ## This is clumsy, but needed for multi-row strings - del = regexprep (del, '([^\w])', '\\$1'); + ## Escape characters which have a special meaning in regexp. + del = regexprep (del, '([{}()[\]^$.*?|\\])', '\\$1'); endif if (isempty (str)) - result = {str}; - elseif (strncmpi (args.delimitertype, "regularexpression", length_deltype) - || strncmpi (args.delimitertype, "simple", length_deltype)) + cstr = {str}; + else if (iscellstr (del)) - del = sprintf ('%s|', del{:}); + del = sprintf ("%s|", del{:}); del(end) = []; endif if (args.collapsedelimiters) - del = ["(", del, ")+"]; + del = [ "(" del ")+" ]; endif - [result, ~, ~, ~, matches] = regexp (str, del, "split"); - else - error ("strsplit:invalid_delimitertype", - "strsplit: Invalid DELIMITERTYPE"); + [cstr, matches] = regexp (str, del, "split", "match"); endif + endfunction %!shared str %! str = "The rain in Spain stays mainly in the plain."; -% Split on all whitespace. + +## Split on all whitespace. %!assert (strsplit (str), {"The", "rain", "in", "Spain", "stays", ... -%! "mainly", "in", "the", "plain."}) -% Split on "ain". +%! "mainly", "in", "the", "plain."}) +## Split on "ain". %!assert (strsplit (str, "ain"), {"The r", " in Sp", " stays m", ... -%! "ly in the pl", "."}) -% Split on " " and "ain" (treating multiple delimiters as one). +%! "ly in the pl", "."}) +## Split on " " and "ain" (treating multiple delimiters as one). +%!test +%! s = strsplit (str, '\s|ain', true, "delimitertype", "r"); +%! assert (s, {"The", "r", "in", "Sp", "stays", ... +%! "m", "ly", "in", "the", "pl", "."}); %!test %! s = strsplit (str, '\s|ain', true, "delimitertype", "r"); -%! assert (s, {"The", "r", "in", "Sp", "stays", "m", "ly", "in", "the", "pl", "."}) -%!test -%! s = strsplit (str, "\\s|ain", true, "delimitertype", "r"); -%! assert (s, {"The", "r", "in", "Sp", "stays", "m", "ly", "in", "the", "pl", "."}) +%! assert (s, {"The", "r", "in", "Sp", "stays", ... +%! "m", "ly", "in", "the", "pl", "."}); %!test -%! [s, m] = strsplit (str, {"\\s", "ain"}, true, "delimitertype", "r"); -%! assert (s, {"The", "r", "in", "Sp", "stays", "m", "ly", "in", "the", "pl", "."}) -%! assert (m, {" ", "ain ", " ", "ain ", " ", "ain", " ", " ", " ", "ain"}) -% Split on " " and "ain", and treat multiple delimiters separately. +%! [s, m] = strsplit (str, {'\s', 'ain'}, true, "delimitertype", "r"); +%! assert (s, {"The", "r", "in", "Sp", "stays", ... +%! "m", "ly", "in", "the", "pl", "."}); +%! assert (m, {" ", "ain ", " ", "ain ", " ", "ain", " ", " ", " ", "ain"}); +## Split on " " and "ain", and treat multiple delimiters separately. %!test %! [s, m] = strsplit (str, {" ", "ain"}, "collapsedelimiters", false); -%! assert (s, {"The", "r", "", "in", "Sp", "", "stays", "m", "ly", "in", "the", "pl", "."}) -%! assert (m, {" ", "ain", " ", " ", "ain", " ", " ", "ain", " ", " ", " ", "ain"}) +%! assert (s, {"The", "r", "", "in", "Sp", "", "stays", ... +%! "m", "ly", "in", "the", "pl", "."}); +%! assert (m, {" ", "ain", " ", " ", "ain", " ", " ", "ain", ... +%! " ", " ", " ", "ain"}); %!assert (strsplit ("road to hell"), {"road", "to", "hell"}) %!assert (strsplit ("road to hell", " "), {"road", "to", "hell"}) @@ -252,19 +263,19 @@ %!assert (strsplit (["a,bc,,de"], ",", false, "delimitertype", "r"), {"a", "bc", "", "de"}) %!assert (strsplit (["a,bc,de"], ",", true, "delimitertype", "r"), {"a", "bc", "de"}) %!assert (strsplit (["a,bc,de"], "[, ]", true, "delimitertype", "r"), {"a", "bc", "de"}) -%!assert (strsplit ("hello \t world", 1, "delimitertype", "r"), {"hello", "world"}); +%!assert (strsplit ("hello \t world", true, "delimitertype", "r"), {"hello", "world"}); %!assert (strsplit ("foo\tbar", '\t', "delimitertype", "r"), {"foo", "bar"}) %!assert (strsplit ("foo\tbar", '\t', "delimitertype", "s"), {"foo", "bar"}) ## Test "match" for consecutive delmiters %!test -%! [a, m] = strsplit ("a\t \nb", '\s', 'delimitertype', 'regularexpression', -%! 'collapsedelimiters', false); +%! [a, m] = strsplit ("a\t \nb", '\s', "delimitertype", "regularexpression", +%! "collapsedelimiters", false); %! assert (a, {"a", "", "", "b"}) %! assert (m, {"\t", " ", "\n"}) %!test -%! [a, m] = strsplit ("a\t \nb", '\s', false, 'delimitertype', 'regularexpression'); +%! [a, m] = strsplit ("a\t \nb", '\s', false, "delimitertype", "regularexpression"); %! assert (a, {"a", "", "", "b"}) %! assert (m, {"\t", " ", "\n"}) %!test @@ -276,7 +287,7 @@ %! assert (a, {"a", "b"}) %! assert (m, {"\t \n"}) %!test -%! [s, m] = strsplit ("hello \t world", 1); +%! [s, m] = strsplit ("hello \t world", true); %! assert (s, {"hello", "world"}); %! assert (m, {" \t "}); @@ -286,9 +297,15 @@ %! assert (strsplit ("aa", "a"), {"", ""}) %! assert (strsplit ("aaa", "a"), {"", ""}) +## Bug #44641 +%!assert (strsplit ("xxx<yyy", "<"), {"xxx", "yyy"}) +%!assert (strsplit ('xxx\yyy', '\'), {"xxx", "yyy"}) + ## Test input validation %!error strsplit () %!error strsplit ("abc", "b", true, 4) +%!error <invalid parameter name, 'foo'> strsplit ("abc", "b", "foo", "true") %!error <S and DEL must be string values> strsplit (123, "b") -%!error <COLLAPSEDELIMITERS must be a scalar value> strsplit ("abc", "def", ones (3,3)) +%!error <COLLAPSEDELIMITERS must be a scalar value> strsplit ("abc", "def", "collapsedelimiters", ones (3,3)) +%!error <Invalid DELIMITERTYPE> strsplit ("abc", "b", "delimitertype", "foobar")
--- a/src/octave-config.in.cc Fri Mar 20 16:19:47 2015 -0400 +++ b/src/octave-config.in.cc Wed Apr 01 12:45:04 2015 -0400 @@ -64,13 +64,14 @@ " DATAROOTDIR LOCALVERFCNFILEDIR\n" " DEFAULT_PAGER LOCALVEROCTFILEDIR\n" " EXEC_PREFIX MAN1DIR\n" -" FCNFILEDIR MAN1EXT\n" -" IMAGEDIR MANDIR\n" -" INCLUDEDIR OCTDATADIR\n" -" INFODIR OCTFILEDIR\n" -" INFOFILE OCTINCLUDEDIR\n" -" LIBDIR OCTLIBDIR\n" -" LIBEXECDIR PREFIX\n" +" EXEEXT MAN1EXT\n" +" FCNFILEDIR MANDIR\n" +" IMAGEDIR OCTDATADIR\n" +" INCLUDEDIR OCTFILEDIR\n" +" INFODIR OCTINCLUDEDIR\n" +" INFOFILE OCTLIBDIR\n" +" LIBDIR PREFIX\n" +" LIBEXECDIR SHLEXT\n" " LOCALAPIARCHLIBDIR STARTUPFILEDIR\n" " LOCALAPIFCNFILEDIR VERSION\n" " LOCALAPIOCTFILEDIR\n" @@ -95,6 +96,7 @@ vars["DATADIR"] = subst_octave_home (%OCTAVE_DATADIR%); vars["DATAROOTDIR"] = subst_octave_home (%OCTAVE_DATAROOTDIR%); vars["EXEC_PREFIX"] = subst_octave_home (%OCTAVE_EXEC_PREFIX%); + vars["EXEEXT"] = subst_octave_home (%OCTAVE_EXEEXT%); vars["FCNFILEDIR"] = subst_octave_home (%OCTAVE_FCNFILEDIR%); vars["IMAGEDIR"] = subst_octave_home (%OCTAVE_IMAGEDIR%); vars["INCLUDEDIR"] = subst_octave_home (%OCTAVE_INCLUDEDIR%); @@ -118,6 +120,7 @@ vars["OCTFILEDIR"] = subst_octave_home (%OCTAVE_OCTFILEDIR%); vars["OCTINCLUDEDIR"] = subst_octave_home (%OCTAVE_OCTINCLUDEDIR%); vars["OCTLIBDIR"] = subst_octave_home (%OCTAVE_OCTLIBDIR%); + vars["SHLEXT"] = subst_octave_home (%OCTAVE_SHLEXT%); vars["STARTUPFILEDIR"] = subst_octave_home (%OCTAVE_STARTUPFILEDIR%); }