Mercurial > octave
changeset 18069:76006571e45a
maint: Periodic merge of stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 03 Dec 2013 16:06:46 -0800 |
| parents | 23f680301f65 (current diff) 1c4fd938bdef (diff) |
| children | ff05d5b70411 |
| files | configure.ac src/main.in.cc |
| diffstat | 14 files changed, 2318 insertions(+), 311 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Dec 03 15:34:08 2013 -0800 +++ b/configure.ac Tue Dec 03 16:06:46 2013 -0800 @@ -1244,7 +1244,8 @@ if test $native_graphics = yes; then AC_CHECK_HEADERS([gl2ps.h], [GL2PS_LIBS="-lgl2ps"], - [AC_MSG_WARN([gl2ps library not found. OpenGL printing is disabled.])]) + [warn_gl2ps="gl2ps library not found. OpenGL printing is disabled." + OCTAVE_CONFIGURE_WARNING([warn_gl2ps])]) fi AC_SUBST(GL2PS_LIBS) @@ -2491,7 +2492,7 @@ AC_PATH_PROG(JAR, jar, [], [$JAVA_PATH]) if test -z "$JAVAC" || test -z "$JAR"; then - AC_MSG_WARN([No javac compiler or jar executable found. Octave will not be able to call Java methods.]) + warn_java="No javac compiler or jar executable found. Octave will not be able to call Java methods." break fi
--- a/libgui/languages/be_BY.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/be_BY.ts Tue Dec 03 16:06:46 2013 -0800 @@ -10,6 +10,412 @@ </message> </context> <context> + <name>QColorDialog</name> + <message> + <location filename="../../../octave-qt/qcolordialog.cpp" line="+1378"/> + <source>Hu&e:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Sat:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Val:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Red:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Green:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Bl&ue:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A&lpha channel:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+101"/> + <source>Select Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+183"/> + <source>&Basic colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Custom colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Add to Custom Colors</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QDialog</name> + <message> + <location filename="../../../octave-qt/qdialog.cpp" line="+528"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+133"/> + <source>What's This?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QDialogButtonBox</name> + <message> + <location filename="../../../octave-qt/qmessagebox.cpp" line="+1937"/> + <location line="+446"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QErrorMessage</name> + <message> + <location filename="../../../octave-qt/qerrormessage.cpp" line="+208"/> + <source>Debug Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Warning:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Fatal Error:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+208"/> + <source>&Show this message again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QFileDialog</name> + <message> + <location filename="../../../octave-qt/qfiledialog.cpp" line="+557"/> + <location filename="../../../octave-qt/qfiledialog_symbian.cpp" line="+192"/> + <source>Find Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Open</source> + <translation type="unfinished">Адкрыць</translation> + </message> + <message> + <location line="+2"/> + <source>Save As</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <location line="+550"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-540"/> + <source>Show </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show &hidden files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&New Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <location line="+750"/> + <source>Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-748"/> + <location line="+754"/> + <source>File &name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-13"/> + <location line="+55"/> + <location line="+1582"/> + <source>&Open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1637"/> + <location line="+55"/> + <source>&Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-52"/> + <source>Directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <location line="+43"/> + <source>&Choose</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+789"/> + <location line="+866"/> + <source>%1 +Directory not found. +Please verify the correct directory name was given.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-832"/> + <source>%1 already exists. +Do you want to replace it?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>%1 +File not found. +Please verify the correct file name was given.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+462"/> + <source>New Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+128"/> + <source>'%1' is write protected. +Do you want to delete it anyway?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Are sure you want to delete '%1'?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Could not delete directory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+409"/> + <source>Recent Places</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qfiledialog_win.cpp" line="+131"/> + <source>All Files (*.*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QFileSystemModel</name> + <message> + <location filename="../../../octave-qt/qfilesystemmodel.cpp" line="+763"/> + <source>%1 TB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 GB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 MB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 KB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>%1 bytes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+90"/> + <source>Invalid filename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source><b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> + <source>Name</source> + <translation type="unfinished">Ідэнтыфікатар</translation> + </message> + <message> + <location line="+2"/> + <source>Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Kind</source> + <comment>Match OS X Finder</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Type</source> + <comment>All other platforms</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Date Modified</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QFontDialog</name> + <message> + <location filename="../../../octave-qt/qfontdialog.cpp" line="+183"/> + <source>Select Font</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+585"/> + <source>&Font</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Font st&yle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Effects</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Stri&keout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Underline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Sample</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Wr&iting System</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QInputDialog</name> + <message> + <location filename="../../../octave-qt/qinputdialog.cpp" line="+223"/> + <source>Enter a value:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QMessageBox</name> + <message> + <location filename="../../../octave-qt/qmessagebox.cpp" line="-2244"/> + <source>Show Details...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Hide Details...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+288"/> + <location line="+845"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+488"/> + <source><h3>About Qt</h3><p>This program uses Qt version %1.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.digia.com/product/licensing">qt.digia.com/product/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).</p><p>Qt is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+31"/> + <source>About Qt</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>QObject</name> <message> <location filename="../src/workspace-model.cc" line="+75"/> @@ -64,6 +470,465 @@ </message> </context> <context> + <name>QPPDOptionsModel</name> + <message> + <location filename="../../../octave-qt/qprintdialog_unix.cpp" line="+1238"/> + <source>Name</source> + <translation type="unfinished">Ідэнтыфікатар</translation> + </message> + <message> + <location line="+2"/> + <source>Value</source> + <translation type="unfinished">Значэнне</translation> + </message> +</context> +<context> + <name>QPageSetupWidget</name> + <message> + <location filename="../../../octave-qt/qpagesetupdialog_unix.cpp" line="+304"/> + <source>Centimeters (cm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Millimeters (mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Inches (in)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Points (pt)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QPrintDialog</name> + <message> + <location filename="../../../octave-qt/qabstractprintdialog.cpp" line="+116"/> + <location line="+13"/> + <location filename="../../../octave-qt/qprintdialog_win.cpp" line="+270"/> + <source>Print</source> + <translation type="unfinished">Друк</translation> + </message> + <message> + <location filename="../../../octave-qt/qpagesetupdialog_unix.cpp" line="-232"/> + <source>A0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A5</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A7</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A8</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A9</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B5</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B7</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B8</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B9</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B10</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>C5E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>DLE</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Executive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Folio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Ledger</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Legal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Letter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Tabloid</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>US Common #10 Envelope</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Custom</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qprintdialog_qws.cpp" line="+148"/> + <source>File exists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source><qt>Do you want to overwrite it?</qt></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+184"/> + <source>A0 (841 x 1189 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A1 (594 x 841 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A2 (420 x 594 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A3 (297 x 420 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A5 (148 x 210 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A6 (105 x 148 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A7 (74 x 105 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A8 (52 x 74 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A9 (37 x 52 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B0 (1000 x 1414 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B1 (707 x 1000 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B2 (500 x 707 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B3 (353 x 500 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B4 (250 x 353 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B6 (125 x 176 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B7 (88 x 125 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B8 (62 x 88 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B9 (44 x 62 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B10 (31 x 44 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>C5E (163 x 229 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>DLE (110 x 220 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Folio (210 x 330 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Ledger (432 x 279 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Tabloid (279 x 432 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>US Common #10 Envelope (105 x 241 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> + <source>Print all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print current page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qprintdialog_unix.cpp" line="-844"/> + <location line="+68"/> + <source>&Options >></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-63"/> + <source>&Print</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+67"/> + <source>&Options <<</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+260"/> + <source>Print to File (PDF)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print to File (Postscript)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <source>Local file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Write %1 file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+71"/> + <source>Print To File ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+78"/> + <source>%1 is a directory. +Please choose a different file name.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>File %1 is not writable. +Please choose a different file name.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>%1 already exists. +Do you want to overwrite it?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qprintdialog_win.cpp" line="+1"/> + <source>The 'From' value cannot be greater than the 'To' value.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QPrintPreviewDialog</name> + <message> + <location filename="../../../octave-qt/qabstractpagesetupdialog.cpp" line="+68"/> + <location line="+12"/> + <source>Page Setup</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>QTerminal</name> <message> <location filename="../qterminal/libqterminal/QTerminal.h" line="+121"/> @@ -815,7 +1680,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>&Новы файл</translation> </message> @@ -975,7 +1840,7 @@ <translation>&Знайсці і замяніць</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -1002,7 +1867,7 @@ на запіс: %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>П&ерайсці да радка</translation> </message> @@ -1040,7 +1905,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Перайсці да радка</translation> </message> @@ -1067,7 +1932,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -1075,7 +1940,7 @@ <translation>Рэдактар Octave</translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -1086,7 +1951,7 @@ %2</translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Файлы Octave (*.m);;Усе файлы (*)</translation> </message> @@ -1125,7 +1990,7 @@ %2.</translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -1135,7 +2000,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Выглядае на тое, што '%1' быў зменены іншай праграмай. Перачытаць яго?</translation> </message> @@ -1719,13 +2584,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Загрузіць прастору зменных</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>Пра Octave</translation> </message> @@ -1790,13 +2655,13 @@ <translation>Уставіць</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation>Захаваць прастору зменных як</translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation>Файл заўваг да выпуску '%1' пусты.</translation> </message> @@ -1811,17 +2676,12 @@ <translation>Заўвагі да выпуску Octave</translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation>Задаць бягучы каталог</translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation>Ачысціць буфер</translation> </message> @@ -1936,7 +2796,33 @@ <translation>Навіны супольнасці</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Пазначце назву каталогу</translation> </message> @@ -1951,12 +2837,13 @@ <translation>Перайсці каталогам вышэй</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Агляд каталогаў</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>&Акно</translation> </message> @@ -2025,7 +2912,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -2162,7 +3049,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/en_US.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/en_US.ts Tue Dec 03 16:06:46 2013 -0800 @@ -146,7 +146,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation type="unfinished"></translation> </message> @@ -306,7 +306,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -327,7 +327,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation type="unfinished"></translation> </message> @@ -365,7 +365,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation type="unfinished"></translation> </message> @@ -392,7 +392,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -400,7 +400,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -408,7 +408,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -440,7 +440,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -450,7 +450,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -1033,13 +1033,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation type="unfinished"></translation> </message> @@ -1104,13 +1104,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1125,17 +1125,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation type="unfinished"></translation> </message> @@ -1250,7 +1245,33 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation type="unfinished"></translation> </message> @@ -1265,12 +1286,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation type="unfinished"></translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -1339,7 +1361,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -1474,7 +1496,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/es_ES.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/es_ES.ts Tue Dec 03 16:06:46 2013 -0800 @@ -83,7 +83,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1526"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> <source>copied selection to clipboard</source> <translation>selección copiada al portapapeles</translation> </message> @@ -146,7 +146,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>Archivo &nuevo</translation> </message> @@ -306,7 +306,7 @@ <translation>&Buscar y reemplazar</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -329,7 +329,7 @@ para escritura: %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>&Ir a línea</translation> </message> @@ -367,7 +367,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+759"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Ir a línea</translation> </message> @@ -378,11 +378,12 @@ </message> <message> <location line="+71"/> + <location line="+69"/> <source><unnamed></source> <translation><sin nombre></translation> </message> <message> - <location line="+40"/> + <location line="-12"/> <source>Do you want to save or discard the changes?</source> <translation>¿Desea guardar o descartar los cambios?</translation> </message> @@ -392,16 +393,16 @@ <translation>¿Desea cancelar el cierre, guardar o descartar los cambios?</translation> </message> <message> - <location line="+4"/> - <location line="+129"/> - <location line="+115"/> - <location line="+66"/> + <location line="+10"/> + <location line="+122"/> + <location line="+111"/> + <location line="+64"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor de Octave</translation> </message> <message> - <location line="-331"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -409,19 +410,19 @@ <translation>El archivo\n%1\n está a punto de ser cerrado pero ha sido modificado.\n%2</translation> </message> <message> - <location line="+210"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Archivos de Octave(*.m);;Todos los archivos(*)</translation> </message> <message> - <location line="+34"/> + <location line="+32"/> <source>File not saved! The selected file name %1 is the same as the current file name</source> <translation>¡Archivo no guardado! El nombre del archivo seleccionado\n%1\n es el mismo que el nombre del archivo actual</translation> </message> <message> - <location line="+81"/> + <location line="+79"/> <source> Warning: The contents in the editor is modified!</source> @@ -435,13 +436,23 @@ <translation>Al parecer el archivo\n%1\n ha sido eliminado o renombrado.¿Desea guardarlo ahora?%2</translation> </message> <message> - <location line="-203"/> + <location line="-197"/> <source>Could not open file %1 for write: %2.</source> <translation>No se ha podido abrir el archivo %1 para escritura:\n%2.</translation> </message> <message> - <location line="+181"/> + <location line="-966"/> + <source>Line:</source> + <translation>Línea:</translation> + </message> + <message> + <location line="+3"/> + <source>Col:</source> + <translation>Col:</translation> + </message> + <message> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Al parecer el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo?</translation> </message> @@ -449,7 +460,7 @@ <context> <name>files_dock_widget</name> <message> - <location filename="../src/files-dock-widget.cc" line="+67"/> + <location filename="../src/files-dock-widget.cc" line="+68"/> <source>File Browser</source> <translation>Explorador de archivos</translation> </message> @@ -505,29 +516,49 @@ </message> <message> <location line="+3"/> - <location line="+257"/> + <location line="+354"/> <source>Find Files ...</source> <translation>Buscar archivos ...</translation> </message> <message> - <location line="-253"/> - <location line="+266"/> + <location line="-350"/> + <location line="+363"/> <source>New File</source> <translation>Archivo nuevo</translation> </message> <message> - <location line="-263"/> - <location line="+266"/> + <location line="-360"/> + <location line="+363"/> <source>New Directory</source> <translation>Directorio nuevo</translation> </message> <message> - <location line="-237"/> + <location line="-323"/> <source>Double-click a file to open it</source> <translation>Pulse dos veces en un archivo para abrirlo</translation> </message> <message> - <location line="+198"/> + <location line="+236"/> + <source>File size</source> + <translation>Tamaño de archivo</translation> + </message> + <message> + <location line="+8"/> + <source>File type</source> + <translation>Tipo de archivo</translation> + </message> + <message> + <location line="+8"/> + <source>Date modified</source> + <translation>Fecha de modificación</translation> + </message> + <message> + <location line="+8"/> + <source>Show hidden</source> + <translation>Mostrar ocultos</translation> + </message> + <message> + <location line="+24"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -601,7 +632,7 @@ <translation>No se puede eliminar un directorio que no esté vacio</translation> </message> <message> - <location line="+137"/> + <location line="+144"/> <source>Set directory of file browser</source> <translation>Fijar directorio de explorador de archivos</translation> </message> @@ -631,7 +662,7 @@ <context> <name>final_page</name> <message> - <location filename="../src/welcome-wizard.cc" line="+234"/> + <location filename="../src/welcome-wizard.cc" line="+194"/> <source>Enjoy!</source> <translation>Que lo disfrutes!</translation> </message> @@ -995,7 +1026,7 @@ <context> <name>initial_page</name> <message> - <location filename="../src/welcome-wizard.cc" line="-215"/> + <location filename="../src/welcome-wizard.cc" line="-179"/> <source>Welcome to Octave!</source> <translation>¡Bienvenido a Octave!</translation> </message> @@ -1029,13 +1060,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Cargar espacio de trabajo</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>Acerca de Octave</translation> </message> @@ -1101,13 +1132,13 @@ <translation>Pegar</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation>Guardar espacio de trabajo como</translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation>El archivo de las notas de versión %1 está vacío.</translation> </message> @@ -1122,17 +1153,12 @@ <translation>Notas de la versión de Octave</translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation>Noticas de la comunidad Octave</translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation>Fijar directorio de trabajo</translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation>Limpiar el Portapapeles</translation> </message> @@ -1247,7 +1273,33 @@ <translation>Noticias de la comunidad</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation><strong>Usted está utilizando una versión candidata de la GUI experimental de Octave.</strong> Octave se encuentra bajo constante mejoramiento y la GUI será la interfaz por defecto en la versión 4.0. Para mayor información, seleccione "Notas de la versión" en el menú "Ayuda" de la GUI, o visite <a href="http://octave.org">http://octave.org</a>.</translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation>Mas información</translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation>Ocultar</translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation>Información de la GUI experimental</translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation><p><strong>Nota acerca de la nueva GUI de Octave</strong></p><p>Una de las novedades mas grandes para Octave 3.8 es la interfaz gráfica de usuario. Esto ha sido algo que los usuarios han solicitado comúnmente durante los últimos años y ahora está casi lista. Pero como esta interfaz no ha sido aun tan pulida como a nosotros nos gustaría, hemos decidido esperar hasta la serie de la versión 4.0.x de Octave para hacer a la GUI de Octave la interfaz por defecto.</p><p>Dado el tiempo y el número de arreglos de los errores del software (bugs) y de las mejoras desde la última versión de lanzamiento importante de Octave, también hemos decidido refutar todo retraso en el lanzamiento de todas estas nuevas mejoras durante mas tiempo con el fin de perfeccionar la GUI. Así que disfrute de la versión 3.8 de Octave y la versión previa de la nueva GUI. Creemos que está funcionando razonablemente bien, pero también estamos conscientes de que existen muchas cosas que se pueden mejorar.</p><p><strong>Necesitamos Su Ayuda</strong></p><p>Hay varias maneras con las cuales usted nos puede ayudar a arreglar los problemas restantes, completar la GUI, y en general mejorar la experiencia del usuario, ya sean novatos o expertos por igual (las ligas abriran en un navegador externo):</p><p><ul><li>Si usted es un desarrollador de software experimentado, puede contribuir con su tiempo para ayudar <a href="http://octave.org/get-involved.html">Desarrollo de Octave</a>.</li><li>Si Octave no funciona adecuadamente, se le invita a <a href="http://octave.org/bugs.html">reportar problemas </a> que haya encontrado.</li><li>Si usted es usuario o desarrollador, usted puede <a href="http://octave.org/donate.html">ayudar a financiar el proyecto</a>. El desarrollo de Octave toma tiempo y muchas habilidades. Su contribución ayudaría en gran medida a asegurar que Octave continúe mejorando.</li></ul></p><p>Esperamos que haya encontrado Octave muy útil. Por favor ayúdenos a hacerlo aun mejor en el futuro!</p></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Introducir nombre de directorio</translation> </message> @@ -1262,12 +1314,13 @@ <translation>Directorio superior</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Explorar directorios</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>&Ventana</translation> </message> @@ -1336,7 +1389,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -1500,7 +1553,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created. @@ -1869,7 +1922,7 @@ <context> <name>setup_community_news</name> <message> - <location filename="../src/welcome-wizard.cc" line="+60"/> + <location filename="../src/welcome-wizard.cc" line="+44"/> <source>Community News</source> <translation>Noticias de la comunidad</translation> </message> @@ -1945,7 +1998,7 @@ <context> <name>welcome_wizard</name> <message> - <location filename="../src/welcome-wizard.cc" line="+170"/> + <location filename="../src/welcome-wizard.cc" line="+135"/> <source>Welcome to GNU Octave</source> <translation>Bienvenido a GNU Octave</translation> </message>
--- a/libgui/languages/fr_FR.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/fr_FR.ts Tue Dec 03 16:06:46 2013 -0800 @@ -148,7 +148,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>&Nouveau</translation> </message> @@ -308,7 +308,7 @@ <translation>&Rechercher et remplacer</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -335,7 +335,7 @@ pour écrire : %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>&Aller à la ligne</translation> </message> @@ -373,7 +373,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Aller à la ligne</translation> </message> @@ -400,7 +400,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -408,7 +408,7 @@ <translation>Éditeur d'Octave</translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -419,7 +419,7 @@ %2</translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Fichiers d'Octave (*.m);;Tous les fichiers (*)</translation> </message> @@ -458,7 +458,7 @@ %2.</translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -468,7 +468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Il semblerait que '%1' a été modifié par une autre application. Voulez-vous le récharger ?</translation> </message> @@ -1056,13 +1056,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Charger l'espace de travail</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>À propos d'Octave</translation> </message> @@ -1127,13 +1127,13 @@ <translation>Coller</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation>Enregistrer l'espace de travail sous</translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1148,17 +1148,12 @@ <translation>Notes de la version d'Octave</translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation>Définir le répertoire de travail</translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation>Effacer le presse-papiers</translation> </message> @@ -1273,7 +1268,33 @@ <translation>Nouvelles de la Communauté</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Entrez le nom du répertoire</translation> </message> @@ -1288,12 +1309,13 @@ <translation>Monter au répertoire parent</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Naviguer dans les répertoires</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>&Fenêtre</translation> </message> @@ -1362,7 +1384,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -1499,7 +1521,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/nl_NL.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/nl_NL.ts Tue Dec 03 16:06:46 2013 -0800 @@ -10,6 +10,412 @@ </message> </context> <context> + <name>QColorDialog</name> + <message> + <location filename="../../../octave-qt/qcolordialog.cpp" line="+1378"/> + <source>Hu&e:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Sat:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Val:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Red:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Green:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Bl&ue:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A&lpha channel:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+101"/> + <source>Select Color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+183"/> + <source>&Basic colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Custom colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Add to Custom Colors</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QDialog</name> + <message> + <location filename="../../../octave-qt/qdialog.cpp" line="+528"/> + <source>Done</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+133"/> + <source>What's This?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QDialogButtonBox</name> + <message> + <location filename="../../../octave-qt/qmessagebox.cpp" line="+1937"/> + <location line="+446"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QErrorMessage</name> + <message> + <location filename="../../../octave-qt/qerrormessage.cpp" line="+208"/> + <source>Debug Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Warning:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Fatal Error:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+208"/> + <source>&Show this message again</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QFileDialog</name> + <message> + <location filename="../../../octave-qt/qfiledialog.cpp" line="+557"/> + <location filename="../../../octave-qt/qfiledialog_symbian.cpp" line="+192"/> + <source>Find Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Open</source> + <translation type="unfinished">Open</translation> + </message> + <message> + <location line="+2"/> + <source>Save As</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <location line="+550"/> + <source>All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-540"/> + <source>Show </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>&Rename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Delete</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Show &hidden files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&New Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <location line="+750"/> + <source>Directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-748"/> + <location line="+754"/> + <source>File &name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-13"/> + <location line="+55"/> + <location line="+1582"/> + <source>&Open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1637"/> + <location line="+55"/> + <source>&Save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-52"/> + <source>Directories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <location line="+43"/> + <source>&Choose</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+789"/> + <location line="+866"/> + <source>%1 +Directory not found. +Please verify the correct directory name was given.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-832"/> + <source>%1 already exists. +Do you want to replace it?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+20"/> + <source>%1 +File not found. +Please verify the correct file name was given.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+462"/> + <source>New Folder</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+128"/> + <source>'%1' is write protected. +Do you want to delete it anyway?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Are sure you want to delete '%1'?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> + <source>Could not delete directory.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+409"/> + <source>Recent Places</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qfiledialog_win.cpp" line="+131"/> + <source>All Files (*.*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QFileSystemModel</name> + <message> + <location filename="../../../octave-qt/qfilesystemmodel.cpp" line="+763"/> + <source>%1 TB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 GB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 MB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>%1 KB</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>%1 bytes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+90"/> + <source>Invalid filename</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source><b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> + <source>Name</source> + <translation type="unfinished">Naam</translation> + </message> + <message> + <location line="+2"/> + <source>Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Kind</source> + <comment>Match OS X Finder</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Type</source> + <comment>All other platforms</comment> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Date Modified</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QFontDialog</name> + <message> + <location filename="../../../octave-qt/qfontdialog.cpp" line="+183"/> + <source>Select Font</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+585"/> + <source>&Font</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Font st&yle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Effects</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Stri&keout</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>&Underline</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Sample</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Wr&iting System</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QInputDialog</name> + <message> + <location filename="../../../octave-qt/qinputdialog.cpp" line="+223"/> + <source>Enter a value:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QMessageBox</name> + <message> + <location filename="../../../octave-qt/qmessagebox.cpp" line="-2244"/> + <source>Show Details...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Hide Details...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+288"/> + <location line="+845"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+488"/> + <source><h3>About Qt</h3><p>This program uses Qt version %1.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source><p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is also available for embedded devices as Qt for Embedded Linux and Qt for Windows CE.</p><p>Qt is available under three different licensing options designed to accommodate the needs of our various users.</p><p>Qt licensed under our commercial license agreement is appropriate for development of proprietary/commercial software where you do not want to share any source code with third parties or otherwise cannot comply with the terms of the GNU LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the development of Qt applications (proprietary or open source) provided you can comply with the terms and conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU General Public License version 3.0 is appropriate for the development of Qt applications where you wish to use such applications in combination with software subject to the terms of the GNU GPL version 3.0 or where you are otherwise willing to comply with the terms of the GNU GPL version 3.0.</p><p>Please see <a href="http://qt.digia.com/product/licensing">qt.digia.com/product/licensing</a> for an overview of Qt licensing.</p><p>Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).</p><p>Qt is a Digia product. See <a href="http://qt.digia.com/">qt.digia.com</a> for more information.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+31"/> + <source>About Qt</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>QObject</name> <message> <location filename="../src/workspace-model.cc" line="+75"/> @@ -63,6 +469,465 @@ </message> </context> <context> + <name>QPPDOptionsModel</name> + <message> + <location filename="../../../octave-qt/qprintdialog_unix.cpp" line="+1238"/> + <source>Name</source> + <translation type="unfinished">Naam</translation> + </message> + <message> + <location line="+2"/> + <source>Value</source> + <translation type="unfinished">Waarde</translation> + </message> +</context> +<context> + <name>QPageSetupWidget</name> + <message> + <location filename="../../../octave-qt/qpagesetupdialog_unix.cpp" line="+304"/> + <source>Centimeters (cm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Millimeters (mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Inches (in)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+0"/> + <source>Points (pt)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QPrintDialog</name> + <message> + <location filename="../../../octave-qt/qabstractprintdialog.cpp" line="+116"/> + <location line="+13"/> + <location filename="../../../octave-qt/qprintdialog_win.cpp" line="+270"/> + <source>Print</source> + <translation type="unfinished">Afdrukken</translation> + </message> + <message> + <location filename="../../../octave-qt/qpagesetupdialog_unix.cpp" line="-232"/> + <source>A0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A5</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A7</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A8</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A9</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B4</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B5</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B7</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B8</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B9</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B10</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>C5E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>DLE</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Executive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Folio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Ledger</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Legal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Letter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Tabloid</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>US Common #10 Envelope</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Custom</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qprintdialog_qws.cpp" line="+148"/> + <source>File exists</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source><qt>Do you want to overwrite it?</qt></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+184"/> + <source>A0 (841 x 1189 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A1 (594 x 841 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A2 (420 x 594 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A3 (297 x 420 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A4 (210 x 297 mm, 8.26 x 11.7 inches)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A5 (148 x 210 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A6 (105 x 148 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A7 (74 x 105 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A8 (52 x 74 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>A9 (37 x 52 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B0 (1000 x 1414 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B1 (707 x 1000 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B2 (500 x 707 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B3 (353 x 500 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B4 (250 x 353 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B5 (176 x 250 mm, 6.93 x 9.84 inches)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B6 (125 x 176 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B7 (88 x 125 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B8 (62 x 88 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B9 (44 x 62 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>B10 (31 x 44 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>C5E (163 x 229 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>DLE (110 x 220 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Executive (7.5 x 10 inches, 191 x 254 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Folio (210 x 330 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Ledger (432 x 279 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Legal (8.5 x 14 inches, 216 x 356 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Letter (8.5 x 11 inches, 216 x 279 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Tabloid (279 x 432 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>US Common #10 Envelope (105 x 241 mm)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+17"/> + <source>Print all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print selection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print range</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print current page</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qprintdialog_unix.cpp" line="-844"/> + <location line="+68"/> + <source>&Options >></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-63"/> + <source>&Print</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+67"/> + <source>&Options <<</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+260"/> + <source>Print to File (PDF)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Print to File (Postscript)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <source>Local file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Write %1 file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+71"/> + <source>Print To File ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+78"/> + <source>%1 is a directory. +Please choose a different file name.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>File %1 is not writable. +Please choose a different file name.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>%1 already exists. +Do you want to overwrite it?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../../octave-qt/qprintdialog_win.cpp" line="+1"/> + <source>The 'From' value cannot be greater than the 'To' value.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>OK</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>QPrintPreviewDialog</name> + <message> + <location filename="../../../octave-qt/qabstractpagesetupdialog.cpp" line="+68"/> + <location line="+12"/> + <source>Page Setup</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>QTerminal</name> <message> <location filename="../qterminal/libqterminal/QTerminal.h" line="+121"/> @@ -814,7 +1679,7 @@ <translation></translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>&Nieuw Bestand</translation> </message> @@ -974,7 +1839,7 @@ <translation>Zoek en Vervang</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -1001,7 +1866,7 @@ niet openen om te schrijven: %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>Ga naar regel</translation> </message> @@ -1039,7 +1904,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Ga naar regel</translation> </message> @@ -1066,7 +1931,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -1074,7 +1939,7 @@ <translation></translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -1085,7 +1950,7 @@ %2</translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Octave bestanden (*.m);;Alle bestanden (*)</translation> </message> @@ -1123,7 +1988,7 @@ %2.</translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation>Regel:</translation> </message> @@ -1133,7 +1998,7 @@ <translation>Kolom:</translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Het lijkt erop dat '%1' is gewijzigd door een ander programma. Wil je het opnieuw laden?</translation> </message> @@ -1741,13 +2606,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Werkruimte laden</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>Over Octave</translation> </message> @@ -1812,13 +2677,13 @@ <translation>Plakken</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation>Sla Werkruimte Op Als</translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation>Bestand met Release Notes '%1' is leeg.</translation> </message> @@ -1833,17 +2698,12 @@ <translation>Octave Release Notes</translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation>Octave Community Nieuws</translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation>Stel werkmap in</translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation>Wis klembord</translation> </message> @@ -1958,7 +2818,33 @@ <translation>Community Nieuws</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Geef mapnaam op</translation> </message> @@ -1973,12 +2859,13 @@ <translation>Eén mapniveau omhoog</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Blader door mappen</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>Venster</translation> </message> @@ -2047,7 +2934,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -2207,7 +3094,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/pt_BR.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/pt_BR.ts Tue Dec 03 16:06:46 2013 -0800 @@ -146,7 +146,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>&Novo Arquivo</translation> </message> @@ -306,7 +306,7 @@ <translation>&Buscar e Substituir</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -333,7 +333,7 @@ para escrita: %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>Vá para &Linha</translation> </message> @@ -371,7 +371,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Vá para linha</translation> </message> @@ -398,7 +398,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -406,7 +406,7 @@ <translation>Editor do Octave</translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -417,7 +417,7 @@ %2</translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Scripts Octave (*.m);; Todos os Arquivos (*)</translation> </message> @@ -456,7 +456,7 @@ %2.</translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation>Linha:</translation> </message> @@ -466,7 +466,7 @@ <translation>Coluna:</translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o arquivo '%1' foi modificado por outra aplicação. Deseja recarregá-lo?</translation> </message> @@ -1069,13 +1069,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>Sobre o Octave</translation> </message> @@ -1140,13 +1140,13 @@ <translation>Colar</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation>Salvar Ambiente de Trabalho Como</translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation>O arquivo de notas da versão '%1' está vazio.</translation> </message> @@ -1161,17 +1161,12 @@ <translation>Notas da Versão do Octave</translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation>Novidades da Comunidade</translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation>Definir diretório de trabalho</translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation>Limpar Área de Transferência</translation> </message> @@ -1286,7 +1281,33 @@ <translation>Novidades da Comunidade</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Digite nome do diretório</translation> </message> @@ -1301,12 +1322,13 @@ <translation>Um nível de diretório acima</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Navegar por diretórios</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>&Janela</translation> </message> @@ -1375,7 +1397,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -1535,7 +1557,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/pt_PT.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/pt_PT.ts Tue Dec 03 16:06:46 2013 -0800 @@ -608,7 +608,7 @@ <message> <location line="+3"/> <source>Single-quoted here document</source> - <translation type="unfinished"></translation> + <translation type="unfinished">here-doc com apóstrofos</translation> </message> <message> <location line="+3"/> @@ -815,7 +815,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>&Novo Ficheiro</translation> </message> @@ -975,7 +975,7 @@ <translation>&Buscar e Substituir</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -1002,7 +1002,7 @@ para escrita: %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>Ir para &Linha</translation> </message> @@ -1040,7 +1040,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Ir para linha</translation> </message> @@ -1067,7 +1067,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -1075,7 +1075,7 @@ <translation>Editor do Octave</translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -1086,7 +1086,7 @@ %2</translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Ficheiros de Octave (*.m);; Todos os Ficheiros (*)</translation> </message> @@ -1125,7 +1125,7 @@ %2.</translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation>Linha:</translation> </message> @@ -1135,7 +1135,7 @@ <translation>Col:</translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o ficheiro '%1' foi modificado por outro aplicativo. Deseja recarregá-lo?</translation> </message> @@ -1742,13 +1742,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>Sobre o Octave</translation> </message> @@ -1813,13 +1813,13 @@ <translation>Colar</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation>Guardar Ambiente de Trabalho como</translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation>O ficheiro de notas da versão '%1' está vazio.</translation> </message> @@ -1834,17 +1834,12 @@ <translation>Notas da Versão do Octave</translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation>Notícias da comunidade Octave</translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation>Definir directório de trabalho</translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation>Limpar Área de Transferência</translation> </message> @@ -1959,7 +1954,33 @@ <translation>Novidades da Comunidade</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Introduzir nome do directório</translation> </message> @@ -1974,12 +1995,13 @@ <translation>Um nível de directório acima</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Navegar directórios</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>&Janela</translation> </message> @@ -2048,7 +2070,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -2208,7 +2230,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/ru_RU.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/ru_RU.ts Tue Dec 03 16:06:46 2013 -0800 @@ -148,7 +148,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation>Созд&ать</translation> </message> @@ -308,7 +308,7 @@ <translation>&Найти и заменить</translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -335,7 +335,7 @@ для записи: %2.</translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation>&Перейти к строчке</translation> </message> @@ -373,7 +373,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation>Перейти к строчке</translation> </message> @@ -400,7 +400,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -408,7 +408,7 @@ <translation>Редактор Octave</translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -419,7 +419,7 @@ %2</translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Файлы Octave (*.m);;Все файлы (*)</translation> </message> @@ -458,7 +458,7 @@ %2.</translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -468,7 +468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое?</translation> </message> @@ -1051,13 +1051,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation>Загрузить область переменных</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation>Об Octave</translation> </message> @@ -1122,13 +1122,13 @@ <translation>Вставить</translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1143,17 +1143,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation type="unfinished"></translation> </message> @@ -1268,7 +1263,33 @@ <translation>Новости сообщества</translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation>Введите название директории</translation> </message> @@ -1283,12 +1304,13 @@ <translation>Одной директорией вверх</translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation>Просмотр директорий</translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation>&Окно</translation> </message> @@ -1357,7 +1379,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -1494,7 +1516,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libgui/languages/uk_UA.ts Tue Dec 03 15:34:08 2013 -0800 +++ b/libgui/languages/uk_UA.ts Tue Dec 03 16:06:46 2013 -0800 @@ -812,7 +812,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+174"/> + <location line="+175"/> <source>&New File</source> <translation type="unfinished">&Створити</translation> </message> @@ -972,7 +972,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-589"/> + <location line="-590"/> <source>Could not open file %1 for read: %2.</source> @@ -993,7 +993,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+554"/> + <location line="+555"/> <source>Go&to Line</source> <translation type="unfinished"></translation> </message> @@ -1031,7 +1031,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+787"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> <source>Goto line</source> <translation type="unfinished"></translation> </message> @@ -1058,7 +1058,7 @@ </message> <message> <location line="+10"/> - <location line="+123"/> + <location line="+122"/> <location line="+111"/> <location line="+64"/> <location line="+22"/> @@ -1066,7 +1066,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-319"/> + <location line="-318"/> <source>The file %1 is about to be closed but has been modified. @@ -1074,7 +1074,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+202"/> + <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -1106,7 +1106,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-962"/> + <location line="-966"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -1116,7 +1116,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1138"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -1699,13 +1699,13 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="+201"/> - <location line="+1149"/> + <location line="+1163"/> <source>Load Workspace</source> <translation type="unfinished">Завантажити область змінних</translation> </message> <message> - <location line="-511"/> - <location line="+865"/> + <location line="-522"/> + <location line="+876"/> <source>About Octave</source> <translation type="unfinished">Про Octave</translation> </message> @@ -1770,13 +1770,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1247"/> - <location line="+1166"/> + <location line="-1261"/> + <location line="+1180"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1042"/> + <location line="-1056"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1791,17 +1791,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+185"/> + <location line="+186"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+171"/> - <source>Set working directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+754"/> + <location line="+938"/> <source>Clear Clipboard</source> <translation type="unfinished"></translation> </message> @@ -1916,7 +1911,33 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+37"/> + <source><strong>You are using a release candidate of Octave's experimental GUI.</strong> Octave is under continuous improvement and the GUI will be the default interface for the 4.0 release. For more information, select the "Release Notes" item in the "Help" menu of the GUI, or visit <a href="http://octave.org">http://octave.org</a>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>More Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+47"/> + <location line="+66"/> + <source>Experimental GUI Info</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-37"/> + <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release Octave, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+64"/> <source>Enter directory name</source> <translation type="unfinished"></translation> </message> @@ -1931,12 +1952,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="-1283"/> + <location line="+1286"/> <source>Browse directories</source> <translation type="unfinished"></translation> </message> <message> - <location line="-244"/> + <location line="-405"/> <source>&Window</source> <translation type="unfinished"></translation> </message> @@ -2005,7 +2027,7 @@ <context> <name>news_reader</name> <message> - <location line="-1268"/> + <location line="-1281"/> <source><html> <body> <p> @@ -2140,7 +2162,7 @@ <context> <name>resource_manager</name> <message> - <location filename="../src/resource-manager.cc" line="+204"/> + <location filename="../src/resource-manager.cc" line="+235"/> <source>The settings file %1 does not exist and can not be created.
--- a/libinterp/corefcn/utils.cc Tue Dec 03 15:34:08 2013 -0800 +++ b/libinterp/corefcn/utils.cc Tue Dec 03 16:06:46 2013 -0800 @@ -303,7 +303,7 @@ If the second optional argument @qcode{\"all\"} is supplied, return\n\ a cell array containing the list of all files that have the same\n\ name in the path. If no files are found, return an empty cell array.\n\ -@seealso{file_in_path, path}\n\ +@seealso{file_in_path, find_dir_in_path, path}\n\ @end deftypefn") { octave_value retval; @@ -380,7 +380,7 @@ If the third optional argument @qcode{\"all\"} is supplied, return\n\ a cell array containing the list of all files that have the same\n\ name in the path. If no files are found, return an empty cell array.\n\ -@seealso{file_in_loadpath}\n\ +@seealso{file_in_loadpath, find_dir_in_path, path}\n\ @end deftypefn") { octave_value retval; @@ -905,6 +905,7 @@ \n\ The second argument is optional. If it is supplied, return a cell array\n\ containing all name matches rather than just the first.\n\ +@seealso{file_in_path, file_in_loadpath, path}\n\ @end deftypefn") { octave_value retval = std::string ();
--- a/libinterp/corefcn/variables.cc Tue Dec 03 15:34:08 2013 -0800 +++ b/libinterp/corefcn/variables.cc Tue Dec 03 16:06:46 2013 -0800 @@ -548,7 +548,7 @@ Check only for directories.\n\ @end table\n\ \n\ -@seealso{file_in_loadpath, file_in_path, stat}\n\ +@seealso{file_in_loadpath, file_in_path, find_dir_in_path, stat}\n\ @end deftypefn") { octave_value retval = false;
--- a/m4/acinclude.m4 Tue Dec 03 15:34:08 2013 -0800 +++ b/m4/acinclude.m4 Tue Dec 03 16:06:46 2013 -0800 @@ -561,43 +561,80 @@ dnl is the memory allocation that exposes the bug and using statically dnl allocated arrays in Fortran does not? dnl +dnl FIXME: it would be nice to avoid the duplication of F77 macros +dnl and typedefs here and in the f77-fcn.h header file. +dnl AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK], [ AC_CACHE_CHECK([whether the arpack library works], [octave_cv_lib_arpack_ok], [AC_LANG_PUSH(C++) AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -// External functions from ARPACK library -extern "C" int -F77_FUNC (dnaupd, DNAUPD) (int&, const char *, const int&, const char *, - int&, const double&, double*, const int&, - double*, const int&, int*, int*, double*, - double*, const int&, int&, long int, long int); - -extern "C" int -F77_FUNC (dneupd, DNEUPD) (const int&, const char *, int*, double*, - double*, double*, const int&, - const double&, const double&, double*, - const char*, const int&, const char *, - int&, const double&, double*, const int&, - double*, const int&, int*, int*, double*, - double*, const int&, int&, long int, - long int, long int); - -extern "C" int -F77_FUNC (dgemv, DGEMV) (const char *, const int&, const int&, - const double&, const double*, const int&, - const double*, const int&, const double&, - double*, const int&, long int); #include <cfloat> +#include <stdint.h> + +typedef OCTAVE_IDX_TYPE octave_idx_type; +typedef int F77_RET_T; + +#define F77_CHAR_ARG2(x, l) x +#define F77_CONST_CHAR_ARG2(x, l) F77_CHAR_ARG2 (x, l) + +#define F77_CHAR_ARG_LEN(l) , l + +#define F77_CONST_CHAR_ARG_DECL const char * +#define F77_CHAR_ARG_LEN_DECL , long + +extern "C" +{ + F77_RET_T + F77_FUNC (dnaupd, DNAUPD) (octave_idx_type&, + F77_CONST_CHAR_ARG_DECL, + const octave_idx_type&, + F77_CONST_CHAR_ARG_DECL, + octave_idx_type&, const double&, + double*, const octave_idx_type&, double*, + const octave_idx_type&, octave_idx_type*, + octave_idx_type*, double*, double*, + const octave_idx_type&, octave_idx_type& + F77_CHAR_ARG_LEN_DECL + F77_CHAR_ARG_LEN_DECL); + + F77_RET_T + F77_FUNC (dneupd, DNEUPD) (const octave_idx_type&, + F77_CONST_CHAR_ARG_DECL, + octave_idx_type*, double*, double*, + double*, const octave_idx_type&, const double&, + const double&, double*, + F77_CONST_CHAR_ARG_DECL, + const octave_idx_type&, + F77_CONST_CHAR_ARG_DECL, + octave_idx_type&, const double&, double*, + const octave_idx_type&, double*, + const octave_idx_type&, octave_idx_type*, + octave_idx_type*, double*, double*, + const octave_idx_type&, octave_idx_type& + F77_CHAR_ARG_LEN_DECL + F77_CHAR_ARG_LEN_DECL + F77_CHAR_ARG_LEN_DECL); + + F77_RET_T + F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG_DECL, + const octave_idx_type&, const octave_idx_type&, + const double&, const double*, + const octave_idx_type&, const double*, + const octave_idx_type&, const double&, double*, + const octave_idx_type& + F77_CHAR_ARG_LEN_DECL); +} + void doit (void) { // Based on function EigsRealNonSymmetricMatrix from liboctave/eigs-base.cc. // Problem matrix. See bug #31479 - int n = 4; + octave_idx_type n = 4; double *m = new double [n * n]; m[0] = 1, m[4] = 0, m[8] = 0, m[12] = -1; m[1] = 0, m[5] = 1, m[9] = 0, m[13] = 0; @@ -611,7 +648,7 @@ resid[2] = 0.150143; resid[3] = 0.868067; - int *ip = new int [11]; + octave_idx_type *ip = new octave_idx_type [11]; ip[0] = 1; // ishift ip[1] = 0; // ip[1] not referenced @@ -625,34 +662,38 @@ ip[9] = 0; ip[10] = 0; - int *ipntr = new int [14]; + octave_idx_type *ipntr = new octave_idx_type [14]; - int k = 1; - int p = 3; - int lwork = 3 * p * (p + 2); + octave_idx_type k = 1; + octave_idx_type p = 3; + octave_idx_type lwork = 3 * p * (p + 2); double *v = new double [n * (p + 1)]; double *workl = new double [lwork + 1]; double *workd = new double [3 * n + 1]; - int ido = 0; - int info = 0; + octave_idx_type ido = 0; + octave_idx_type info = 0; double tol = DBL_EPSILON; do { - F77_FUNC (dnaupd, DNAUPD) (ido, "I", n, "LM", k, tol, resid, p, - v, n, ip, ipntr, workd, workl, lwork, - info, 1L, 2L); + F77_FUNC (dnaupd, DNAUPD) (ido, F77_CONST_CHAR_ARG2 ("I", 1), + n, F77_CONST_CHAR_ARG2 ("LM", 2), + k, tol, resid, p, v, n, ip, ipntr, + workd, workl, lwork, info + F77_CHAR_ARG_LEN (1) + F77_CHAR_ARG_LEN (2)); if (ido == -1 || ido == 1 || ido == 2) { double *x = workd + ipntr[0] - 1; double *y = workd + ipntr[1] - 1; - F77_FUNC (dgemv, DGEMV) ("N", n, n, 1.0, m, n, x, 1, 0.0, - y, 1, 1L); + F77_FUNC (dgemv, DGEMV) (F77_CONST_CHAR_ARG2 ("N", 1), + n, n, 1.0, m, n, x, 1, 0.0, y, 1 + F77_CHAR_ARG_LEN (1)); } else { @@ -666,17 +707,17 @@ } while (1); - int *sel = new int [p]; + octave_idx_type *sel = new octave_idx_type [p]; // In Octave, the dimensions of dr and di are k+1, but k+2 avoids segfault double *dr = new double [k + 1]; double *di = new double [k + 1]; double *workev = new double [3 * p]; - for (int i = 0; i < k + 1; i++) + for (octave_idx_type i = 0; i < k + 1; i++) dr[i] = di[i] = 0.; - int rvec = 1; + octave_idx_type rvec = 1; double sigmar = 0.0; double sigmai = 0.0; @@ -684,10 +725,15 @@ // In Octave, this is n*(k+1), but n*(k+2) avoids segfault double *z = new double [n * (k + 1)]; - F77_FUNC (dneupd, DNEUPD) (rvec, "A", sel, dr, di, z, n, sigmar, - sigmai, workev, "I", n, "LM", k, tol, + F77_FUNC (dneupd, DNEUPD) (rvec, F77_CONST_CHAR_ARG2 ("A", 1), + sel, dr, di, z, n, sigmar, sigmai, workev, + F77_CONST_CHAR_ARG2 ("I", 1), n, + F77_CONST_CHAR_ARG2 ("LM", 2), k, tol, resid, p, v, n, ip, ipntr, workd, - workl, lwork, info, 1L, 1L, 2L); + workl, lwork, info + F77_CHAR_ARG_LEN (1) + F77_CHAR_ARG_LEN (1) + F77_CHAR_ARG_LEN (2)); } ]], [[
--- a/src/main.in.cc Tue Dec 03 15:34:08 2013 -0800 +++ b/src/main.in.cc Tue Dec 03 16:06:46 2013 -0800 @@ -660,7 +660,7 @@ if (warn_display) { std::cerr << "octave: " << display_check_err_msg << std::endl; - std::cerr << "octave: disabiling GUI features" << std::endl; + std::cerr << "octave: disabling GUI features" << std::endl; } } }