# HG changeset patch # User Rik # Date 1386115606 28800 # Node ID 76006571e45a407ed084734cc9961638fa942d8d # Parent 23f680301f6502a97392f6fb7133f346c3e42d03# Parent 1c4fd938bdefa9b23e0e09291d199e29341843df maint: Periodic merge of stable to default. diff -r 23f680301f65 -r 76006571e45a configure.ac --- 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 diff -r 23f680301f65 -r 76006571e45a libgui/languages/be_BY.ts --- 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 @@ + QColorDialog + + + Hu&e: + + + + + &Sat: + + + + + &Val: + + + + + &Red: + + + + + &Green: + + + + + Bl&ue: + + + + + A&lpha channel: + + + + + Select Color + + + + + &Basic colors + + + + + &Custom colors + + + + + &Add to Custom Colors + + + + + QDialog + + + Done + + + + + What's This? + + + + + QDialogButtonBox + + + + OK + + + + + QErrorMessage + + + Debug Message: + + + + + Warning: + + + + + Fatal Error: + + + + + &Show this message again + + + + + &OK + + + + + QFileDialog + + + + Find Directory + + + + + Open + Адкрыць + + + + Save As + + + + + + All Files (*) + + + + + Show + + + + + &Rename + + + + + &Delete + + + + + Show &hidden files + + + + + &New Folder + + + + + + Directory: + + + + + + File &name: + + + + + + + &Open + + + + + + &Save + + + + + Directories + + + + + + &Choose + + + + + + %1 +Directory not found. +Please verify the correct directory name was given. + + + + + %1 already exists. +Do you want to replace it? + + + + + %1 +File not found. +Please verify the correct file name was given. + + + + + New Folder + + + + + '%1' is write protected. +Do you want to delete it anyway? + + + + + Are sure you want to delete '%1'? + + + + + Could not delete directory. + + + + + Recent Places + + + + + All Files (*.*) + + + + + QFileSystemModel + + + %1 TB + + + + + %1 GB + + + + + %1 MB + + + + + %1 KB + + + + + %1 bytes + + + + + Invalid filename + + + + + <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. + + + + + Name + Ідэнтыфікатар + + + + Size + + + + + Kind + Match OS X Finder + + + + + Type + All other platforms + + + + + Date Modified + + + + + QFontDialog + + + Select Font + + + + + &Font + + + + + Font st&yle + + + + + &Size + + + + + Effects + + + + + Stri&keout + + + + + &Underline + + + + + Sample + + + + + Wr&iting System + + + + + QInputDialog + + + Enter a value: + + + + + QMessageBox + + + Show Details... + + + + + Hide Details... + + + + + + OK + + + + + Help + + + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p> + + + + + <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> + + + + + About Qt + + + + QObject @@ -64,6 +470,465 @@ + QPPDOptionsModel + + + Name + Ідэнтыфікатар + + + + Value + Значэнне + + + + QPageSetupWidget + + + Centimeters (cm) + + + + + Millimeters (mm) + + + + + Inches (in) + + + + + Points (pt) + + + + + QPrintDialog + + + + + Print + Друк + + + + A0 + + + + + A1 + + + + + A2 + + + + + A3 + + + + + A4 + + + + + A5 + + + + + A6 + + + + + A7 + + + + + A8 + + + + + A9 + + + + + B0 + + + + + B1 + + + + + B2 + + + + + B3 + + + + + B4 + + + + + B5 + + + + + B6 + + + + + B7 + + + + + B8 + + + + + B9 + + + + + B10 + + + + + C5E + + + + + DLE + + + + + Executive + + + + + Folio + + + + + Ledger + + + + + Legal + + + + + Letter + + + + + Tabloid + + + + + US Common #10 Envelope + + + + + Custom + + + + + File exists + + + + + <qt>Do you want to overwrite it?</qt> + + + + + A0 (841 x 1189 mm) + + + + + A1 (594 x 841 mm) + + + + + A2 (420 x 594 mm) + + + + + A3 (297 x 420 mm) + + + + + A4 (210 x 297 mm, 8.26 x 11.7 inches) + + + + + A5 (148 x 210 mm) + + + + + A6 (105 x 148 mm) + + + + + A7 (74 x 105 mm) + + + + + A8 (52 x 74 mm) + + + + + A9 (37 x 52 mm) + + + + + B0 (1000 x 1414 mm) + + + + + B1 (707 x 1000 mm) + + + + + B2 (500 x 707 mm) + + + + + B3 (353 x 500 mm) + + + + + B4 (250 x 353 mm) + + + + + B5 (176 x 250 mm, 6.93 x 9.84 inches) + + + + + B6 (125 x 176 mm) + + + + + B7 (88 x 125 mm) + + + + + B8 (62 x 88 mm) + + + + + B9 (44 x 62 mm) + + + + + B10 (31 x 44 mm) + + + + + C5E (163 x 229 mm) + + + + + DLE (110 x 220 mm) + + + + + Executive (7.5 x 10 inches, 191 x 254 mm) + + + + + Folio (210 x 330 mm) + + + + + Ledger (432 x 279 mm) + + + + + Legal (8.5 x 14 inches, 216 x 356 mm) + + + + + Letter (8.5 x 11 inches, 216 x 279 mm) + + + + + Tabloid (279 x 432 mm) + + + + + US Common #10 Envelope (105 x 241 mm) + + + + + Print all + + + + + Print selection + + + + + Print range + + + + + Print current page + + + + + + &Options >> + + + + + &Print + + + + + &Options << + + + + + Print to File (PDF) + + + + + Print to File (Postscript) + + + + + Local file + + + + + Write %1 file + + + + + Print To File ... + + + + + %1 is a directory. +Please choose a different file name. + + + + + File %1 is not writable. +Please choose a different file name. + + + + + %1 already exists. +Do you want to overwrite it? + + + + + The 'From' value cannot be greater than the 'To' value. + + + + + OK + + + + + QPrintPreviewDialog + + + + Page Setup + + + + QTerminal @@ -815,7 +1680,7 @@ &%1 %2 - + &New File &Новы файл @@ -975,7 +1840,7 @@ &Знайсці і замяніць - + Could not open file %1 for read: %2. @@ -1002,7 +1867,7 @@ на запіс: %2. - + Go&to Line П&ерайсці да радка @@ -1040,7 +1905,7 @@ file_editor_tab - + Goto line Перайсці да радка @@ -1067,7 +1932,7 @@ - + @@ -1075,7 +1940,7 @@ Рэдактар Octave - + The file %1 is about to be closed but has been modified. @@ -1086,7 +1951,7 @@ %2 - + Octave Files (*.m);;All Files (*) Файлы Octave (*.m);;Усе файлы (*) @@ -1125,7 +1990,7 @@ %2. - + Line: @@ -1135,7 +2000,7 @@ - + It seems that '%1' has been modified by another application. Do you want to reload it? Выглядае на тое, што '%1' быў зменены іншай праграмай. Перачытаць яго? @@ -1719,13 +2584,13 @@ main_window - + Load Workspace Загрузіць прастору зменных - - + + About Octave Пра Octave @@ -1790,13 +2655,13 @@ Уставіць - - + + Save Workspace As Захаваць прастору зменных як - + The release notes file '%1' is empty. Файл заўваг да выпуску '%1' пусты. @@ -1811,17 +2676,12 @@ Заўвагі да выпуску Octave - + Octave Community News - - Set working directory - Задаць бягучы каталог - - - + Clear Clipboard Ачысціць буфер @@ -1936,7 +2796,33 @@ Навіны супольнасці - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name Пазначце назву каталогу @@ -1951,12 +2837,13 @@ Перайсці каталогам вышэй - + + Browse directories Агляд каталогаў - + &Window &Акно @@ -2025,7 +2912,7 @@ news_reader - + <html> <body> <p> @@ -2162,7 +3049,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/en_US.ts --- 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 @@ - + &New File @@ -306,7 +306,7 @@ - + Could not open file %1 for read: %2. @@ -327,7 +327,7 @@ - + Go&to Line @@ -365,7 +365,7 @@ file_editor_tab - + Goto line @@ -392,7 +392,7 @@ - + @@ -400,7 +400,7 @@ - + The file %1 is about to be closed but has been modified. @@ -408,7 +408,7 @@ - + Octave Files (*.m);;All Files (*) @@ -440,7 +440,7 @@ - + Line: @@ -450,7 +450,7 @@ - + It seems that '%1' has been modified by another application. Do you want to reload it? @@ -1033,13 +1033,13 @@ main_window - + Load Workspace - - + + About Octave @@ -1104,13 +1104,13 @@ - - + + Save Workspace As - + The release notes file '%1' is empty. @@ -1125,17 +1125,12 @@ - + Octave Community News - - Set working directory - - - - + Clear Clipboard @@ -1250,7 +1245,33 @@ - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name @@ -1265,12 +1286,13 @@ - + + Browse directories - + &Window @@ -1339,7 +1361,7 @@ news_reader - + <html> <body> <p> @@ -1474,7 +1496,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/es_ES.ts --- 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 @@ QWinTerminalImpl - + copied selection to clipboard selección copiada al portapapeles @@ -146,7 +146,7 @@ &%1 %2 - + &New File Archivo &nuevo @@ -306,7 +306,7 @@ &Buscar y reemplazar - + Could not open file %1 for read: %2. @@ -329,7 +329,7 @@ para escritura: %2. - + Go&to Line &Ir a línea @@ -367,7 +367,7 @@ file_editor_tab - + Goto line Ir a línea @@ -378,11 +378,12 @@ + <unnamed> <sin nombre> - + Do you want to save or discard the changes? ¿Desea guardar o descartar los cambios? @@ -392,16 +393,16 @@ ¿Desea cancelar el cierre, guardar o descartar los cambios? - - - - + + + + Octave Editor Editor de Octave - + The file %1 is about to be closed but has been modified. @@ -409,19 +410,19 @@ El archivo\n%1\n está a punto de ser cerrado pero ha sido modificado.\n%2 - + Octave Files (*.m);;All Files (*) Archivos de Octave(*.m);;Todos los archivos(*) - + File not saved! The selected file name %1 is the same as the current file name ¡Archivo no guardado! El nombre del archivo seleccionado\n%1\n es el mismo que el nombre del archivo actual - + Warning: The contents in the editor is modified! @@ -435,13 +436,23 @@ Al parecer el archivo\n%1\n ha sido eliminado o renombrado.¿Desea guardarlo ahora?%2 - + Could not open file %1 for write: %2. No se ha podido abrir el archivo %1 para escritura:\n%2. - + + Line: + Línea: + + + + Col: + Col: + + + It seems that '%1' has been modified by another application. Do you want to reload it? Al parecer el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo? @@ -449,7 +460,7 @@ files_dock_widget - + File Browser Explorador de archivos @@ -505,29 +516,49 @@ - + Find Files ... Buscar archivos ... - - + + New File Archivo nuevo - - + + New Directory Directorio nuevo - + Double-click a file to open it Pulse dos veces en un archivo para abrirlo - + + File size + Tamaño de archivo + + + + File type + Tipo de archivo + + + + Date modified + Fecha de modificación + + + + Show hidden + Mostrar ocultos + + + Open Abrir @@ -601,7 +632,7 @@ No se puede eliminar un directorio que no esté vacio - + Set directory of file browser Fijar directorio de explorador de archivos @@ -631,7 +662,7 @@ final_page - + Enjoy! Que lo disfrutes! @@ -995,7 +1026,7 @@ initial_page - + Welcome to Octave! ¡Bienvenido a Octave! @@ -1029,13 +1060,13 @@ main_window - + Load Workspace Cargar espacio de trabajo - - + + About Octave Acerca de Octave @@ -1101,13 +1132,13 @@ Pegar - - + + Save Workspace As Guardar espacio de trabajo como - + The release notes file '%1' is empty. El archivo de las notas de versión %1 está vacío. @@ -1122,17 +1153,12 @@ Notas de la versión de Octave - + Octave Community News Noticas de la comunidad Octave - - Set working directory - Fijar directorio de trabajo - - - + Clear Clipboard Limpiar el Portapapeles @@ -1247,7 +1273,33 @@ Noticias de la comunidad - + + <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>. + <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>. + + + + More Info + Mas información + + + + Hide + Ocultar + + + + + Experimental GUI Info + Información de la GUI experimental + + + + <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> + <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> + + + Enter directory name Introducir nombre de directorio @@ -1262,12 +1314,13 @@ Directorio superior - + + Browse directories Explorar directorios - + &Window &Ventana @@ -1336,7 +1389,7 @@ news_reader - + <html> <body> <p> @@ -1500,7 +1553,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. @@ -1869,7 +1922,7 @@ setup_community_news - + Community News Noticias de la comunidad @@ -1945,7 +1998,7 @@ welcome_wizard - + Welcome to GNU Octave Bienvenido a GNU Octave diff -r 23f680301f65 -r 76006571e45a libgui/languages/fr_FR.ts --- 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 @@ &%1 %2 - + &New File &Nouveau @@ -308,7 +308,7 @@ &Rechercher et remplacer - + Could not open file %1 for read: %2. @@ -335,7 +335,7 @@ pour écrire : %2. - + Go&to Line &Aller à la ligne @@ -373,7 +373,7 @@ file_editor_tab - + Goto line Aller à la ligne @@ -400,7 +400,7 @@ - + @@ -408,7 +408,7 @@ Éditeur d'Octave - + The file %1 is about to be closed but has been modified. @@ -419,7 +419,7 @@ %2 - + Octave Files (*.m);;All Files (*) Fichiers d'Octave (*.m);;Tous les fichiers (*) @@ -458,7 +458,7 @@ %2. - + Line: @@ -468,7 +468,7 @@ - + It seems that '%1' has been modified by another application. Do you want to reload it? Il semblerait que '%1' a été modifié par une autre application. Voulez-vous le récharger ? @@ -1056,13 +1056,13 @@ main_window - + Load Workspace Charger l'espace de travail - - + + About Octave À propos d'Octave @@ -1127,13 +1127,13 @@ Coller - - + + Save Workspace As Enregistrer l'espace de travail sous - + The release notes file '%1' is empty. @@ -1148,17 +1148,12 @@ Notes de la version d'Octave - + Octave Community News - - Set working directory - Définir le répertoire de travail - - - + Clear Clipboard Effacer le presse-papiers @@ -1273,7 +1268,33 @@ Nouvelles de la Communauté - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name Entrez le nom du répertoire @@ -1288,12 +1309,13 @@ Monter au répertoire parent - + + Browse directories Naviguer dans les répertoires - + &Window &Fenêtre @@ -1362,7 +1384,7 @@ news_reader - + <html> <body> <p> @@ -1499,7 +1521,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/nl_NL.ts --- 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 @@ + QColorDialog + + + Hu&e: + + + + + &Sat: + + + + + &Val: + + + + + &Red: + + + + + &Green: + + + + + Bl&ue: + + + + + A&lpha channel: + + + + + Select Color + + + + + &Basic colors + + + + + &Custom colors + + + + + &Add to Custom Colors + + + + + QDialog + + + Done + + + + + What's This? + + + + + QDialogButtonBox + + + + OK + + + + + QErrorMessage + + + Debug Message: + + + + + Warning: + + + + + Fatal Error: + + + + + &Show this message again + + + + + &OK + + + + + QFileDialog + + + + Find Directory + + + + + Open + Open + + + + Save As + + + + + + All Files (*) + + + + + Show + + + + + &Rename + + + + + &Delete + + + + + Show &hidden files + + + + + &New Folder + + + + + + Directory: + + + + + + File &name: + + + + + + + &Open + + + + + + &Save + + + + + Directories + + + + + + &Choose + + + + + + %1 +Directory not found. +Please verify the correct directory name was given. + + + + + %1 already exists. +Do you want to replace it? + + + + + %1 +File not found. +Please verify the correct file name was given. + + + + + New Folder + + + + + '%1' is write protected. +Do you want to delete it anyway? + + + + + Are sure you want to delete '%1'? + + + + + Could not delete directory. + + + + + Recent Places + + + + + All Files (*.*) + + + + + QFileSystemModel + + + %1 TB + + + + + %1 GB + + + + + %1 MB + + + + + %1 KB + + + + + %1 bytes + + + + + Invalid filename + + + + + <b>The name "%1" can not be used.</b><p>Try using another name, with fewer characters or no punctuations marks. + + + + + Name + Naam + + + + Size + + + + + Kind + Match OS X Finder + + + + + Type + All other platforms + + + + + Date Modified + + + + + QFontDialog + + + Select Font + + + + + &Font + + + + + Font st&yle + + + + + &Size + + + + + Effects + + + + + Stri&keout + + + + + &Underline + + + + + Sample + + + + + Wr&iting System + + + + + QInputDialog + + + Enter a value: + + + + + QMessageBox + + + Show Details... + + + + + Hide Details... + + + + + + OK + + + + + Help + + + + + <h3>About Qt</h3><p>This program uses Qt version %1.</p> + + + + + <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> + + + + + About Qt + + + + QObject @@ -63,6 +469,465 @@ + QPPDOptionsModel + + + Name + Naam + + + + Value + Waarde + + + + QPageSetupWidget + + + Centimeters (cm) + + + + + Millimeters (mm) + + + + + Inches (in) + + + + + Points (pt) + + + + + QPrintDialog + + + + + Print + Afdrukken + + + + A0 + + + + + A1 + + + + + A2 + + + + + A3 + + + + + A4 + + + + + A5 + + + + + A6 + + + + + A7 + + + + + A8 + + + + + A9 + + + + + B0 + + + + + B1 + + + + + B2 + + + + + B3 + + + + + B4 + + + + + B5 + + + + + B6 + + + + + B7 + + + + + B8 + + + + + B9 + + + + + B10 + + + + + C5E + + + + + DLE + + + + + Executive + + + + + Folio + + + + + Ledger + + + + + Legal + + + + + Letter + + + + + Tabloid + + + + + US Common #10 Envelope + + + + + Custom + + + + + File exists + + + + + <qt>Do you want to overwrite it?</qt> + + + + + A0 (841 x 1189 mm) + + + + + A1 (594 x 841 mm) + + + + + A2 (420 x 594 mm) + + + + + A3 (297 x 420 mm) + + + + + A4 (210 x 297 mm, 8.26 x 11.7 inches) + + + + + A5 (148 x 210 mm) + + + + + A6 (105 x 148 mm) + + + + + A7 (74 x 105 mm) + + + + + A8 (52 x 74 mm) + + + + + A9 (37 x 52 mm) + + + + + B0 (1000 x 1414 mm) + + + + + B1 (707 x 1000 mm) + + + + + B2 (500 x 707 mm) + + + + + B3 (353 x 500 mm) + + + + + B4 (250 x 353 mm) + + + + + B5 (176 x 250 mm, 6.93 x 9.84 inches) + + + + + B6 (125 x 176 mm) + + + + + B7 (88 x 125 mm) + + + + + B8 (62 x 88 mm) + + + + + B9 (44 x 62 mm) + + + + + B10 (31 x 44 mm) + + + + + C5E (163 x 229 mm) + + + + + DLE (110 x 220 mm) + + + + + Executive (7.5 x 10 inches, 191 x 254 mm) + + + + + Folio (210 x 330 mm) + + + + + Ledger (432 x 279 mm) + + + + + Legal (8.5 x 14 inches, 216 x 356 mm) + + + + + Letter (8.5 x 11 inches, 216 x 279 mm) + + + + + Tabloid (279 x 432 mm) + + + + + US Common #10 Envelope (105 x 241 mm) + + + + + Print all + + + + + Print selection + + + + + Print range + + + + + Print current page + + + + + + &Options >> + + + + + &Print + + + + + &Options << + + + + + Print to File (PDF) + + + + + Print to File (Postscript) + + + + + Local file + + + + + Write %1 file + + + + + Print To File ... + + + + + %1 is a directory. +Please choose a different file name. + + + + + File %1 is not writable. +Please choose a different file name. + + + + + %1 already exists. +Do you want to overwrite it? + + + + + The 'From' value cannot be greater than the 'To' value. + + + + + OK + + + + + QPrintPreviewDialog + + + + Page Setup + + + + QTerminal @@ -814,7 +1679,7 @@ - + &New File &Nieuw Bestand @@ -974,7 +1839,7 @@ Zoek en Vervang - + Could not open file %1 for read: %2. @@ -1001,7 +1866,7 @@ niet openen om te schrijven: %2. - + Go&to Line Ga naar regel @@ -1039,7 +1904,7 @@ file_editor_tab - + Goto line Ga naar regel @@ -1066,7 +1931,7 @@ - + @@ -1074,7 +1939,7 @@ - + The file %1 is about to be closed but has been modified. @@ -1085,7 +1950,7 @@ %2 - + Octave Files (*.m);;All Files (*) Octave bestanden (*.m);;Alle bestanden (*) @@ -1123,7 +1988,7 @@ %2. - + Line: Regel: @@ -1133,7 +1998,7 @@ Kolom: - + It seems that '%1' has been modified by another application. Do you want to reload it? Het lijkt erop dat '%1' is gewijzigd door een ander programma. Wil je het opnieuw laden? @@ -1741,13 +2606,13 @@ main_window - + Load Workspace Werkruimte laden - - + + About Octave Over Octave @@ -1812,13 +2677,13 @@ Plakken - - + + Save Workspace As Sla Werkruimte Op Als - + The release notes file '%1' is empty. Bestand met Release Notes '%1' is leeg. @@ -1833,17 +2698,12 @@ Octave Release Notes - + Octave Community News Octave Community Nieuws - - Set working directory - Stel werkmap in - - - + Clear Clipboard Wis klembord @@ -1958,7 +2818,33 @@ Community Nieuws - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name Geef mapnaam op @@ -1973,12 +2859,13 @@ Eén mapniveau omhoog - + + Browse directories Blader door mappen - + &Window Venster @@ -2047,7 +2934,7 @@ news_reader - + <html> <body> <p> @@ -2207,7 +3094,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/pt_BR.ts --- 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 @@ &%1 %2 - + &New File &Novo Arquivo @@ -306,7 +306,7 @@ &Buscar e Substituir - + Could not open file %1 for read: %2. @@ -333,7 +333,7 @@ para escrita: %2. - + Go&to Line Vá para &Linha @@ -371,7 +371,7 @@ file_editor_tab - + Goto line Vá para linha @@ -398,7 +398,7 @@ - + @@ -406,7 +406,7 @@ Editor do Octave - + The file %1 is about to be closed but has been modified. @@ -417,7 +417,7 @@ %2 - + Octave Files (*.m);;All Files (*) Scripts Octave (*.m);; Todos os Arquivos (*) @@ -456,7 +456,7 @@ %2. - + Line: Linha: @@ -466,7 +466,7 @@ Coluna: - + It seems that '%1' has been modified by another application. Do you want to reload it? Parece que o arquivo '%1' foi modificado por outra aplicação. Deseja recarregá-lo? @@ -1069,13 +1069,13 @@ main_window - + Load Workspace Carregar ambiente de trabalho - - + + About Octave Sobre o Octave @@ -1140,13 +1140,13 @@ Colar - - + + Save Workspace As Salvar Ambiente de Trabalho Como - + The release notes file '%1' is empty. O arquivo de notas da versão '%1' está vazio. @@ -1161,17 +1161,12 @@ Notas da Versão do Octave - + Octave Community News Novidades da Comunidade - - Set working directory - Definir diretório de trabalho - - - + Clear Clipboard Limpar Área de Transferência @@ -1286,7 +1281,33 @@ Novidades da Comunidade - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name Digite nome do diretório @@ -1301,12 +1322,13 @@ Um nível de diretório acima - + + Browse directories Navegar por diretórios - + &Window &Janela @@ -1375,7 +1397,7 @@ news_reader - + <html> <body> <p> @@ -1535,7 +1557,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/pt_PT.ts --- 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 @@ Single-quoted here document - + here-doc com apóstrofos @@ -815,7 +815,7 @@ &%1 %2 - + &New File &Novo Ficheiro @@ -975,7 +975,7 @@ &Buscar e Substituir - + Could not open file %1 for read: %2. @@ -1002,7 +1002,7 @@ para escrita: %2. - + Go&to Line Ir para &Linha @@ -1040,7 +1040,7 @@ file_editor_tab - + Goto line Ir para linha @@ -1067,7 +1067,7 @@ - + @@ -1075,7 +1075,7 @@ Editor do Octave - + The file %1 is about to be closed but has been modified. @@ -1086,7 +1086,7 @@ %2 - + Octave Files (*.m);;All Files (*) Ficheiros de Octave (*.m);; Todos os Ficheiros (*) @@ -1125,7 +1125,7 @@ %2. - + Line: Linha: @@ -1135,7 +1135,7 @@ Col: - + It seems that '%1' has been modified by another application. Do you want to reload it? Parece que o ficheiro '%1' foi modificado por outro aplicativo. Deseja recarregá-lo? @@ -1742,13 +1742,13 @@ main_window - + Load Workspace Carregar ambiente de trabalho - - + + About Octave Sobre o Octave @@ -1813,13 +1813,13 @@ Colar - - + + Save Workspace As Guardar Ambiente de Trabalho como - + The release notes file '%1' is empty. O ficheiro de notas da versão '%1' está vazio. @@ -1834,17 +1834,12 @@ Notas da Versão do Octave - + Octave Community News Notícias da comunidade Octave - - Set working directory - Definir directório de trabalho - - - + Clear Clipboard Limpar Área de Transferência @@ -1959,7 +1954,33 @@ Novidades da Comunidade - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name Introduzir nome do directório @@ -1974,12 +1995,13 @@ Um nível de directório acima - + + Browse directories Navegar directórios - + &Window &Janela @@ -2048,7 +2070,7 @@ news_reader - + <html> <body> <p> @@ -2208,7 +2230,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/ru_RU.ts --- 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 @@ &%1 %2 - + &New File Созд&ать @@ -308,7 +308,7 @@ &Найти и заменить - + Could not open file %1 for read: %2. @@ -335,7 +335,7 @@ для записи: %2. - + Go&to Line &Перейти к строчке @@ -373,7 +373,7 @@ file_editor_tab - + Goto line Перейти к строчке @@ -400,7 +400,7 @@ - + @@ -408,7 +408,7 @@ Редактор Octave - + The file %1 is about to be closed but has been modified. @@ -419,7 +419,7 @@ %2 - + Octave Files (*.m);;All Files (*) Файлы Octave (*.m);;Все файлы (*) @@ -458,7 +458,7 @@ %2. - + Line: @@ -468,7 +468,7 @@ - + It seems that '%1' has been modified by another application. Do you want to reload it? Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое? @@ -1051,13 +1051,13 @@ main_window - + Load Workspace Загрузить область переменных - - + + About Octave Об Octave @@ -1122,13 +1122,13 @@ Вставить - - + + Save Workspace As - + The release notes file '%1' is empty. @@ -1143,17 +1143,12 @@ - + Octave Community News - - Set working directory - - - - + Clear Clipboard @@ -1268,7 +1263,33 @@ Новости сообщества - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name Введите название директории @@ -1283,12 +1304,13 @@ Одной директорией вверх - + + Browse directories Просмотр директорий - + &Window &Окно @@ -1357,7 +1379,7 @@ news_reader - + <html> <body> <p> @@ -1494,7 +1516,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libgui/languages/uk_UA.ts --- 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 @@ - + &New File &Створити @@ -972,7 +972,7 @@ - + Could not open file %1 for read: %2. @@ -993,7 +993,7 @@ - + Go&to Line @@ -1031,7 +1031,7 @@ file_editor_tab - + Goto line @@ -1058,7 +1058,7 @@ - + @@ -1066,7 +1066,7 @@ - + The file %1 is about to be closed but has been modified. @@ -1074,7 +1074,7 @@ - + Octave Files (*.m);;All Files (*) @@ -1106,7 +1106,7 @@ - + Line: @@ -1116,7 +1116,7 @@ - + It seems that '%1' has been modified by another application. Do you want to reload it? @@ -1699,13 +1699,13 @@ main_window - + Load Workspace Завантажити область змінних - - + + About Octave Про Octave @@ -1770,13 +1770,13 @@ - - + + Save Workspace As - + The release notes file '%1' is empty. @@ -1791,17 +1791,12 @@ - + Octave Community News - - Set working directory - - - - + Clear Clipboard @@ -1916,7 +1911,33 @@ - + + <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>. + + + + + More Info + + + + + Hide + + + + + + Experimental GUI Info + + + + + <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> + + + + Enter directory name @@ -1931,12 +1952,13 @@ - + + Browse directories - + &Window @@ -2005,7 +2027,7 @@ news_reader - + <html> <body> <p> @@ -2140,7 +2162,7 @@ resource_manager - + The settings file %1 does not exist and can not be created. diff -r 23f680301f65 -r 76006571e45a libinterp/corefcn/utils.cc --- 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 (); diff -r 23f680301f65 -r 76006571e45a libinterp/corefcn/variables.cc --- 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; diff -r 23f680301f65 -r 76006571e45a m4/acinclude.m4 --- 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 +#include + +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)); } ]], [[ diff -r 23f680301f65 -r 76006571e45a src/main.in.cc --- 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; } } }