# HG changeset patch # User John W. Eaton # Date 1390511767 18000 # Node ID cd897532aaeca2a7e45548b8d61143ab6389a9a0 # Parent 052cc933aea63a1caffdafd89507de37369a5e4e# Parent 26eac61ebab2b210f77af4deba580a4b4b2c5461 maint: Periodic merge of gui-release to default. diff -r 052cc933aea6 -r cd897532aaec configure.ac --- a/configure.ac Thu Jan 23 12:53:32 2014 -0800 +++ b/configure.ac Thu Jan 23 16:16:07 2014 -0500 @@ -1636,7 +1636,6 @@ OCTGRAPHICS_DLL_DEFS= library_path_var=LD_LIBRARY_PATH ldpreloadsep=" " -BUILD_COMPILED_AUX_PROGRAMS=no case $canonical_host_type in *-*-386bsd* | *-*-netbsd*) SH_LD=ld @@ -1689,7 +1688,6 @@ ldpreloadsep=":" ;; *-*-mingw*) - BUILD_COMPILED_AUX_PROGRAMS=yes if test $have_msvc = yes; then DL_LDFLAGS="-shared" CPICFLAG= @@ -1730,7 +1728,6 @@ ;; *-*-msdosmsvc) - BUILD_COMPILED_AUX_PROGRAMS=yes DL_LDFLAGS="-shared" CPICFLAG= CXXPICFLAG= @@ -1827,9 +1824,6 @@ ;; esac -AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], - [test $BUILD_COMPILED_AUX_PROGRAMS = yes]) - AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG]) diff -r 052cc933aea6 -r cd897532aaec libgui/languages/be_BY.ts --- a/libgui/languages/be_BY.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/be_BY.ts Thu Jan 23 16:16:07 2014 -0500 @@ -475,7 +475,7 @@ курсор - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! Нататка пра новы GUI OctaveАдна з найбольшых адметнасцяў Octave 3.8 - графічны інтэрфэйс. Карыстальнікі апошнімі гадамі прасілі яго найбольш часта, і нарэшце ён амаль гатовы. Але ён пакуль не такі дасканалы, як бы мы жадалі, таму мы вырашылі пачакаць выпуску з серыі 4.0.x перад тым, як рабіць яго стандартным.Да таго ж, улічваючы час і колькасць выпраўленняў і паляпшэнняў у параўнанні з апошнім буйным выпускам Octave, мы вырашылі затрымліваць новы выпуск толькі дзеля ўдасканалення GUI, не зважаючы на новыя магчымасці. Таму прыемнага вам карстання выпускам 3.8 і першай версіяй новага інтэрфэйсу. Нам здаецца, ён працуе даволі добра, але мы ведаем, што ёсць некаторыя відавочныя грубыя недарэчнасці і шмат чаго, што можна палепшыць.Нам патрабуецца ваша дапамогаЁсць шмат спосабаў, якімі вы можаце дапамагчы нам выправіць праблемы, што яшчэ засталіся, скончыць GUI і палепшыць агульнае уражанне як для новых карыстальнікаў, так і для экспертаў (спасылкі адкрыюцца ў знешнім браўзэры):<ul><li>Калі вы спрактыкаваны распрацоўнік праграм, то можаце выдаткаваць час, каб дапамагчы ў <a href="http://octave.org/get-involved.html">распрацоўцы Octave</a>.</li><li>Калі Octave працуе з памылкамі, вы можаце <a href="http://octave.org/bugs.html">паведаміць пра праблемы</a>, з якімі сутыкнуліся.</li><li>Няхай вы хоць карыстальнік, хоць распрацоўнік, вы можаце <a href="http://octave.org/donate.html">прафундаваць праект</a>. Распрацоўка Octave патрабуе шмат часу і навыкаў. Ваш удзел дапаможа гарантаваць, што Octave і надалей будзе ўдасканальвацца.</li></ul>Спадзяемся, вы знойдзеце Octave карыснай. Калі ласка, дапамажыце нам зрабіць яго лепшым для будучыні! @@ -1684,17 +1684,12 @@ ужо адкрыты ў рэдактары - + &%1 %2 &%1 %2 - - &New File - &Новы файл - - - + &Save File &Захаваць файл @@ -1704,7 +1699,12 @@ &Адкрыць файл... - + + &New Script + + + + Save File &As... Захаваць файл &як... @@ -1790,6 +1790,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Знайсці і замяніць... @@ -1804,7 +1814,7 @@ П&ерайсці да радка... - + &Recent Editor Files &Ранейшыя файлы @@ -1829,7 +1839,7 @@ Закрыць іншыя файлы - + &Preferences... &Настаўленні... @@ -1859,7 +1869,7 @@ &Дакументацыя па ключавым слове - + Could not open file %1 for read: %2. @@ -1891,7 +1901,7 @@ Асацыяваная картка рэдактара знікла. - + &File &Файл @@ -1906,7 +1916,7 @@ &Змяніць - + &Debug &Адладка @@ -1919,7 +1929,7 @@ file_editor_tab - + Goto line Перайсці да радка @@ -1929,7 +1939,7 @@ Нумар радка - + <unnamed> <без назвы> @@ -1946,15 +1956,15 @@ - - - + + + Octave Editor Рэдактар Octave - + The file %1 is about to be closed but has been modified. @@ -1965,20 +1975,12 @@ %2 - + Octave Files (*.m);;All Files (*) Файлы Octave (*.m);;Усе файлы (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -1996,14 +1998,14 @@ быў выдалены або пераназваны. Можа, захаваць яго зараз?%2 - + Could not open file %1 for write: %2. Не выйшла адкрыць файл %1 на запіс: %2. - + Line: Радок: @@ -2013,7 +2015,18 @@ Слупок: - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + It seems that '%1' has been modified by another application. Do you want to reload it? Выглядае на тое, што '%1' быў зменены іншай праграмай. Перачытаць яго? @@ -2046,7 +2059,12 @@ Дзеянні з дзейным каталогам - + + Set Browser Directory... + + + + Find Files ... Шукаць файлы... @@ -2067,7 +2085,7 @@ Двойчы пстрыкніце па файле для адкрыцця - + Show Octave directory Перайсці да каталогу Octave @@ -2092,12 +2110,7 @@ Перайсці да хатняга каталогу - - Search Directory... - Шукаць каталог... - - - + Find Files... Шукаць файлы... @@ -2112,7 +2125,7 @@ Новы каталог... - + File size Памер файла @@ -2427,12 +2440,7 @@ Маска назваў: - - Enter the filename expression - Задайце выраз для назваў файлаў - - - + Start in: Пачынаць з: @@ -2452,22 +2460,12 @@ Пазначыць каталог пачатку пошуку - - Recurse directories - Рэкурсіўна - - - + Search recursively through directories for matching files Шукаць ува ўсіх падкаталогах - - Include directories - Знаходзіць каталогі - - - + Include matching directories in search results Дадаваць пасавальныя каталогі ў вынікі пошуку @@ -2487,9 +2485,24 @@ Змяшчае тэкст: - - Search must match text - Улічваць файлы, што ўтрымліваюць пэўны тэкст + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -2647,13 +2660,13 @@ main_window - + Load Workspace Загрузіць прастору зменных - - + + About Octave Пра Octave @@ -2668,12 +2681,7 @@ Новы - - Script - Новы сцэнар - - - + Figure Графік @@ -2713,12 +2721,23 @@ Уставіць - + Save Workspace As Захаваць прастору зменных як - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. Файл заўваг да выпуску '%1' пусты. @@ -2733,12 +2752,12 @@ Заўвагі да выпуску Octave - + Octave Community News Навіны супольнасці Octave - + Clear Clipboard Ачысціць буфер @@ -2803,22 +2822,12 @@ Крок наперад - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Загрузіць прастору зменных... @@ -2828,7 +2837,12 @@ Захаваць прастору зменных як... - + + New Script + + + + Function... Функцыя... @@ -2919,8 +2933,8 @@ Перайсці каталогам вышэй - - + + Browse directories Агляд каталогаў @@ -2994,7 +3008,7 @@ news_reader - + <html> <body> @@ -3095,7 +3109,7 @@ octave_qt_link - + Yes @@ -3122,13 +3136,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - Файл %1 не існуе ў дзейным шляху. Для адладкі функцыі, якую вы рэдагуеце, трэба змяніць каталог на %2 або дадаць яго да дзейнага шляху. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - Файлу %1 замінае файл з такой самай назвай у дзейным шляху. Для адладкі функцыі, якую вы рэдагуеце, змяніце каталог на %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -3179,17 +3193,17 @@ settings_dialog - + Settings Настаўленні - + General Агульныя - + Octave logo only Толькі эмблема Octave @@ -3200,12 +3214,12 @@ Літарныя значкі - + Dock widget title bar - + Custom style @@ -3220,22 +3234,17 @@ - + Editor Рэдактар - + Color Колер - - Max. tab width in pixel - - - - + Indent width Даўжыня водступу @@ -3292,67 +3301,114 @@ Памятаць карткі папярэдняга сеансу - + Use custom file editor Свой файлавы рэдактар - + + emacs +%l %f + + + + Editor Styles Выгляд рэдактара - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Пазначце шрыфт, ягоны памер (як розніцу ад стандартнага памеру), стыль шрыфту (тоўсты, курсіўны, падкрэслены), колер тэксту і колер фону (для фону ружовы (255,0,255) азначае стандартны колер фону).</body></html> - + Terminal Colors Колеры тэрміналу - + Font Шрыфт - + Show line numbers Паказваць нумары радкоў - + Highlight current line Фарбаваць дзейны радок - + Code completion Аўтадапаўненне - + Show complete path in window title Паказваць поўны шлях у загалоўку акна - + + Interface + + + + Graphic icons Графічныя значкі - + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + Show whitespace Паказваць прагальныя знакі - + Do not show whitespace used for indentation Не паказваць прагальныя знакі ў водступах - + + Tab width min. + + + + + max. + + + + # of characters typed before completion list displayed Пасля ўводу колькі знакаў прапаноўваць дапаўненні @@ -3362,92 +3418,102 @@ Ствараць няісныя файлы без пытанняў - + command line (%f=file, %l=line): Загад (%f=файл, %l-радок): - - emacs - emacs - - - + Terminal Тэрмінал - + Cursor type: Тып курсора: + + Cursor blinking + Мігценне курсора + + + + Use foreground color + Выкар. колер пярэдняга плану + + + + Font size + Памер шрыфту + + + + Set focus to terminal when running a command from within another widget + + + + + File Browser + Файлавы агляднік + + + + Show file size + Паказваць памеры файлаў + + + + Show file type + Паказваць тыпы файлаў + + + + Show date of last modification + Паказваць дату апошняга змянення + + + + Show hidden files + Паказваць схаваныя файлы + + + + Display + + + + + Alternating row colors + Колеры радкоў чаргуюцца + + + + Behavior + + + + + Restore last directory of previous session + + + + + Workspace + Прастора зменных + + + + Storage Class Colors + Колеры класаў памяці + + + + Network + Сетка + + - Cursor blinking - Мігценне курсора - - - - Use foreground color - Выкар. колер пярэдняга плану - - - - Font size - Памер шрыфту - - - - Set focus to terminal when running a command from within another widget - - - - - File Browser - Файлавы агляднік - - - - Show file size - Паказваць памеры файлаў - - - - Show file type - Паказваць тыпы файлаў - - - - Show date of last modification - Паказваць дату апошняга змянення - - - - Show hidden files - Паказваць схаваныя файлы - - - - Alternating row colors - Колеры радкоў чаргуюцца - - - - Workspace - Прастора зменных - - - - Storage Class Colors - Колеры класаў памяці - - - - Network - Сетка - - - Allow Octave to connect to the Octave web site to display current news and information Дазволіць Octave злучацца з вэб-сайтам Octave для адлюстравання навінаў і свежай інфармацыі @@ -3462,27 +3528,27 @@ HttpProxy - + Icon set for dock widgets Набор значкоў для віджэтаў - + Language (requires restart) Мова (патрэбны перазапуск) - + Icon size Памер значкоў - + Synchronize Octave working directory with file browser Сінхранізаваць дзейны каталог Octave з файлавым агляднікам - + Socks5Proxy Socks5Proxy @@ -3512,9 +3578,9 @@ Пароль: - + - + System setting Сістэмная @@ -3561,6 +3627,16 @@ short form for underlined п + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -3680,8 +3756,8 @@ - Storage Class - Клас памяці + Attribute + @@ -3729,8 +3805,8 @@ - Colors for the storage class: - Колеры для класаў памяці: + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/de_DE.ts --- a/libgui/languages/de_DE.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/de_DE.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ Cursor - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! Einige Hinweise zur neuen Octave GUIEine der größten Neuerungen von Octave 3.8 ist die grafische Benutzerschnittstelle (GUI). Sie ist das, worum die Nutzer in den letzten Jahren am häufigsten gebeten haben, und nun ist sie fast fertig. Aber weil noch der Feinschliff fehlt, haben wir beschlossen, mit der GUI als Standard-Benutzerschnittstelle auf die 4.0.x Veröffentlichungen zu warten.In Anbetracht der vergangenen Zeit, der Anzahl der behobenen Fehler und den Verbesserungen seit der letzten Veröffentlichung haben wir uns dazu entschieden, die nächste Veröffentlichung nicht weiter zu verzögern, nur um die GUI zu perfektionieren. Daher wünschen wir viel Spaß mit der Version 3.8 von Octave und der Vorschau auf die neue GUI. Wir sind der Meinung, dass sie schon ziemlich gut funktioniert, obwohl uns bewusst ist, dass es noch einige Ecken und Kanten sowie viele Dinge zu verbessern gibt.Deshalb brauchen wir Deine Mithilfe!Es gibt viele Möglichkeiten uns zu helfen die verbleibenden Probleme zu beheben, die GUI weiter zu entwickeln und die Benutzererfahrung für Neulinge und Experten gleichermaßen zu verbessern (Links öffnen im externen Browser):<ul><li>Falls Du ein geschickter Software-Entwickler bist, kannst du helfen, indem du dich an der <a href="http://octave.org/get-involved.html">Weiterentwicklung von Octave</a> beteiligst.</li><li>Sollte Octave einmal nicht wie erwartet funktionieren, solltest Du das gefundene <a href="http://octave.org/bugs.html">Problem melden</a>.</li><li>Egal, ob Du Anwender oder Entwickler bist, kannst du <a href="http://octave.org/donate.html">helfen, das Projekt zu finanzieren</a>. Die Weiterentwicklung von Octave braucht viel Zeit und Sachverstand. Dein Beitrag hilft sicherzustellen, dass Octave weiter verbessert wird.</li></ul>Wir hoffen, dass du Octave nützlich findest. Bitte hilf uns Octave zukünftig noch besser zu machen! @@ -144,17 +144,12 @@ ist im Editor bereits geöffnet - + &%1 %2 &%1 %2 - - &New File - &Neue Datei - - - + &Save File Datei &speichern @@ -164,7 +159,12 @@ Datei &Öffnen... - + + &New Script + + + + Save File &As... Datei speichern &als... @@ -250,6 +250,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Suchen und Ersetzen... @@ -264,7 +274,7 @@ &Gehe zu Zeile... - + &Recent Editor Files &Zuletzt bearbeitete Dateien @@ -289,7 +299,7 @@ Andere Dokumente schließen - + &Preferences... &Einstellungen... @@ -319,7 +329,7 @@ &Dokumentation zum Schlüsselwort - + Could not open file %1 for read: %2. @@ -353,7 +363,7 @@ Der zugehörige Editor-Reiter ist nicht mehr vorhanden. - + &File &Datei @@ -368,7 +378,7 @@ &Bearbeiten - + &Debug &Debuggen @@ -381,7 +391,7 @@ file_editor_tab - + Goto line Gehe zu Zeile @@ -391,7 +401,7 @@ Zeilennummer - + <unnamed> <unbenannt> @@ -408,15 +418,15 @@ - - - + + + Octave Editor Octave Editor - + The file %1 is about to be closed but has been modified. @@ -427,20 +437,12 @@ %2 - + Octave Files (*.m);;All Files (*) Octave Dateien (*.m);;All Files (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -456,14 +458,14 @@ wurde gelöscht oder umbenannt. Soll die Datei jetzt gespeichert werden?%2 - + Could not open file %1 for write: %2. Die Datei %1 konnte nicht zum Schreiben geöffnet werden: %2. - + Line: Zeile: @@ -473,7 +475,18 @@ Spalte: - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + It seems that '%1' has been modified by another application. Do you want to reload it? Die Datei %1 wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden? @@ -506,7 +519,12 @@ Aktionen mit aktuellem Verzeichnis - + + Set Browser Directory... + + + + Find Files ... Dateien suchen ... @@ -527,7 +545,7 @@ Doppelklick auf eine Datei um diese zu öffnen - + Show Octave directory Aktuelles Octave Verzeichnis anzeigen @@ -552,12 +570,7 @@ Wechsle zum Heimatverzeichnis - - Search Directory... - Verzeichnis suchen... - - - + Find Files... Dateien suchen... Suche Dateien... @@ -573,7 +586,7 @@ Neues Verzeichnis... - + File size Dateigröße @@ -889,12 +902,7 @@ Name: - - Enter the filename expression - Eingabe eines Ausdrucks für den Dateinamen - - - + Start in: Beginne in: @@ -914,22 +922,12 @@ Suche Startverzeichnis - - Recurse directories - Unterverzeichnisse durchsuchen - - - + Search recursively through directories for matching files Rekursive Dateisuche durch Unterverzeichnisse - - Include directories - Verzeichnisse einbeziehen - - - + Include matching directories in search results Auch Verzeichnisse berücksichtigen, die die Suchanfrage erfüllen @@ -949,9 +947,24 @@ In Datei vorkommender Text: - - Search must match text - Suche Dateien mit übereinstimmendem Text + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -1109,13 +1122,13 @@ main_window - + Load Workspace Lade Arbeitsumgebung - - + + About Octave Über Octave @@ -1130,12 +1143,7 @@ Neu - - Script - Skript - - - + Figure Abbildung @@ -1175,12 +1183,23 @@ Einfügen - + Save Workspace As Arbeitsumgebung speichern als - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. Die Datei '%1' mit Versionshinweisen ist leer. @@ -1195,12 +1214,12 @@ Versionshinweise zu Octave - + Octave Community News Neuigkeiten aus der Octave Community - + Clear Clipboard Zwischenablage leeren @@ -1265,22 +1284,12 @@ Hineinspringen - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Lade Arbeitsumgebung... @@ -1290,7 +1299,12 @@ Arbeitsumgebung speichern als... - + + New Script + + + + Function... Funktion... @@ -1381,8 +1395,8 @@ Ein Verzeichnis höher - - + + Browse directories Verzeichnis suchen @@ -1456,7 +1470,7 @@ news_reader - + <html> <body> @@ -1557,7 +1571,7 @@ octave_qt_link - + Yes @@ -1584,13 +1598,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - Die Datei %1 exisitiert nicht im Suchpfad. Um die editierte Funktion zu debuggen, muss entweder in das Verzeichnis %2 gewechselt werden oder dieses Verzeichnis dem Suchpfad hinzugefügt werden. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - Die Datei %1 wird von einer gleichnamigen Datei im Suchpfad überdeckt. Um die editierte Funktion zu debuggen, muss in das Verzeichnis %2 gewechselt werden. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -1641,17 +1655,17 @@ settings_dialog - + Settings Einstellungen - + General Allgemein - + Octave logo only Nur Octave Logo @@ -1661,12 +1675,12 @@ Icons mit Buchstaben - + Dock widget title bar - + Custom style @@ -1681,22 +1695,17 @@ - + Editor Editor - + Color Farbe - - Max. tab width in pixel - - - - + Indent width Einrücken um @@ -1751,67 +1760,114 @@ Editor Dateien der letzten Sitzung wiederherstellen - + Use custom file editor Externen Editor verwenden - + + emacs +%l %f + + + + Editor Styles Editor Stile - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Auswahl von Schrift, Schriftgröße (als Differenz von der Standardgröße), Schriftstil (fett, kursiv, unterstrichen), Text- und Hintergrundfarbe (für den Hintergrund ist die Farbe Pink (255,0,255) ein Platzhalter für die Standardfarbe)</body></html> - + Terminal Colors Farben des Befehlsfensters - + Font Schriftart - + Show line numbers Zeilennummern anzeigen - + Highlight current line Aktuelle Zeile hervorheben - + Code completion Vervollständigung - + Show complete path in window title Kompletten Pfad im Reiter anzeigen - + + Interface + + + + Graphic icons Grafische Icons - + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + Show whitespace Leerzeichen anzeigen - + Do not show whitespace used for indentation Leerzeichen der Einrückung nicht anzeigen - + + Tab width min. + + + + + max. + + + + # of characters typed before completion list displayed Anzahl der eingegebenen Zeichen bis Vervollständigungsliste @@ -1821,92 +1877,102 @@ Nicht existierende Dateien ohne Nachfrage anlegen - + command line (%f=file, %l=line): Kommandozeile (%f=Datei, %l=Zeile): - - emacs - emacs - - - + Terminal Befehlsfenster - + Cursor type: Cursortyp: - + Cursor blinking Blinkender Cursor - + Use foreground color Vordergrundfarbe verwenden - + Font size Schriftgröße - + Set focus to terminal when running a command from within another widget - + File Browser Dateibrowser - + Show file size Dateigröße anzeigen - + Show file type Dateityp anzeigen - + Show date of last modification Datum der letzten Änderung anzeigen - + Show hidden files Versteckte Dateien anzeigen - + + Display + + + + Alternating row colors Alternierende Farben für die Zeilen verwenden - + + Behavior + + + + + Restore last directory of previous session + + + + Workspace Arbeitsumgebung - + Storage Class Colors Farben der Speicherklassen festlegen - + Network Netzwerk - + Allow Octave to connect to the Octave web site to display current news and information Octave erlauben Neuigkeiten und Informationen von der Octave Webseite anzuzeigen @@ -1921,27 +1987,27 @@ HTTP Proxy - + Icon set for dock widgets Icons der Unterfenster - + Language (requires restart) Sprache (Neustart erforderlich) - + Icon size Icongröße - + Synchronize Octave working directory with file browser Octave Arbeitsverzeichnis und Dateibrowser synchronisieren - + Socks5Proxy Socks5Proxy @@ -1971,9 +2037,9 @@ Passwort: - + - + System setting Systemeinstellung @@ -2020,6 +2086,16 @@ short form for underlined u + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2139,8 +2215,8 @@ - Storage Class - Speicherklasse + Attribute + @@ -2188,8 +2264,8 @@ - Colors for the storage class: - Farben der Speicherklassen: + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/en_US.ts --- a/libgui/languages/en_US.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/en_US.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! @@ -141,17 +141,12 @@ - + &%1 %2 - - &New File - - - - + &Save File @@ -161,7 +156,12 @@ - + + &New Script + + + + Save File &As... @@ -247,6 +247,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... @@ -261,7 +271,7 @@ - + &Recent Editor Files @@ -286,7 +296,7 @@ - + &Preferences... @@ -316,7 +326,7 @@ - + Could not open file %1 for read: %2. @@ -342,7 +352,7 @@ - + &File @@ -357,7 +367,7 @@ - + &Debug @@ -370,7 +380,7 @@ file_editor_tab - + Goto line @@ -380,7 +390,7 @@ - + <unnamed> @@ -397,15 +407,15 @@ - - - + + + Octave Editor - + The file %1 is about to be closed but has been modified. @@ -413,20 +423,12 @@ - + Octave Files (*.m);;All Files (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -440,13 +442,13 @@ - + Could not open file %1 for write: %2. - + Line: @@ -456,7 +458,18 @@ - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + It seems that '%1' has been modified by another application. Do you want to reload it? @@ -489,7 +502,12 @@ - + + Set Browser Directory... + + + + Find Files ... @@ -510,7 +528,7 @@ - + Show Octave directory @@ -535,12 +553,7 @@ - - Search Directory... - - - - + Find Files... @@ -555,7 +568,7 @@ - + File size @@ -852,12 +865,7 @@ - - Enter the filename expression - - - - + Start in: @@ -877,22 +885,12 @@ - - Recurse directories - - - - + Search recursively through directories for matching files - - Include directories - - - - + Include matching directories in search results @@ -912,8 +910,23 @@ - - Search must match text + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression @@ -1068,13 +1081,13 @@ main_window - + Load Workspace - - + + About Octave @@ -1089,12 +1102,7 @@ - - Script - - - - + Figure @@ -1134,12 +1142,23 @@ - + Save Workspace As - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. @@ -1154,12 +1173,12 @@ - + Octave Community News - + Clear Clipboard @@ -1224,22 +1243,12 @@ - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... @@ -1249,7 +1258,12 @@ - + + New Script + + + + Function... @@ -1340,8 +1354,8 @@ - - + + Browse directories @@ -1415,7 +1429,7 @@ news_reader - + <html> <body> @@ -1493,7 +1507,7 @@ octave_qt_link - + Yes @@ -1518,12 +1532,12 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. @@ -1569,17 +1583,17 @@ settings_dialog - + Settings - + General - + Octave logo only @@ -1589,12 +1603,12 @@ - + Dock widget title bar - + Custom style @@ -1609,22 +1623,17 @@ - + Editor - + Color - - Max. tab width in pixel - - - - + Indent width @@ -1679,67 +1688,114 @@ - + Use custom file editor - + + emacs +%l %f + + + + Editor Styles - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> - + Terminal Colors - + Font - + Show line numbers - + Highlight current line - + Code completion - + Show complete path in window title - + + Interface + + + + Graphic icons - + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + Show whitespace - + Do not show whitespace used for indentation - + + Tab width min. + + + + + max. + + + + # of characters typed before completion list displayed @@ -1749,92 +1805,102 @@ - + command line (%f=file, %l=line): - - emacs - - - - + Terminal - + Cursor type: - + Cursor blinking - + Use foreground color - + Font size - + Set focus to terminal when running a command from within another widget - + File Browser - + Show file size - + Show file type - + Show date of last modification - + Show hidden files - + + Display + + + + Alternating row colors - + + Behavior + + + + + Restore last directory of previous session + + + + Workspace - + Storage Class Colors - + Network - + Allow Octave to connect to the Octave web site to display current news and information @@ -1849,27 +1915,27 @@ - + Icon set for dock widgets - + Language (requires restart) - + Icon size - + Synchronize Octave working directory with file browser - + Socks5Proxy @@ -1899,9 +1965,9 @@ - + - + System setting @@ -1948,6 +2014,16 @@ short form for underlined + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2056,7 +2132,7 @@ - Storage Class + Attribute @@ -2105,7 +2181,7 @@ - Colors for the storage class: + Colors for variable attributes: diff -r 052cc933aea6 -r cd897532aaec libgui/languages/es_ES.ts --- a/libgui/languages/es_ES.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/es_ES.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ cursor - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! Nota acerca de la nueva GUI de OctaveUna de las novedades más grandes de Octave 3.8 es la interfaz gráfica de usuario. Esto ha sido algo que los usuarios han solicitado frecuentemente durante los últimos años, y ahora está casi lista. Pero como esta interfaz aún no está tan pulida como a nosotros nos gustaría, hemos decidido esperar hasta la serie de versiones 4.0.x de Octave para hacer a la GUI la interfaz por defecto.Dado el tiempo transcurrido, el número de correcciones de errores del software (bugs) y el número de mejoras desde la última versión mayor de Octave, también hemos decidido retrasar el lanzamiento de todas estas nuevas mejoras durante más tiempo con el fin de perfeccionar la GUI. 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 somos conscientes de que existen muchas cosas que se pueden mejorar.Necesitamos su ayudaHay varias maneras mediante las cuales usted nos puede ayudar a arreglar errores, completar la GUI y, en general, mejorar la experiencia del usuario, ya sean novatos o expertos (los enlaces se abrirán en un navegador externo):<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, puede <a href="http://octave.org/donate.html">ayudar a financiar el proyecto</a>. El desarrollo de Octave necesita tiempo y conocimientos. Su contribución ayudaría en gran medida a asegurar que Octave continúe mejorando.</li></ul>Esperamos que haya encontrado Octave muy útil. Por favor, ¡ayúdenos a hacerlo aún mejor en el futuro! @@ -134,17 +134,12 @@ - + &%1 %2 &%1 %2 - - &New File - &Nuevo archivo - - - + &Save File &Guardar archivo @@ -154,7 +149,12 @@ &Abrir archivo... - + + &New Script + + + + Save File &As... Guardar archivo &como... @@ -240,6 +240,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Buscar y reemplazar... @@ -254,7 +264,7 @@ &Ir a línea... - + &Recent Editor Files Archivos &recientes @@ -279,7 +289,7 @@ Cerrar otros archivos - + &Preferences... &Preferencias... @@ -309,7 +319,7 @@ &Documentación de palabras clave - + Could not open file %1 for read: %2. @@ -342,7 +352,7 @@ La pestaña para la edición del archivo ha desaparecido. - + &File &Archivo @@ -357,7 +367,7 @@ &Editar - + &Debug &Depurar @@ -370,7 +380,7 @@ file_editor_tab - + Goto line Ir a línea @@ -380,7 +390,7 @@ Número de línea - + <unnamed> <sin nombre> @@ -397,15 +407,15 @@ - - - + + + Octave Editor Editor de Octave - + The file %1 is about to be closed but has been modified. @@ -413,20 +423,12 @@ El archivo\n%1\nestá a punto de ser cerrado, pero ha sido modificado.\n%2 - + Octave Files (*.m);;All Files (*) Archivos de Octave(*.m);;Todos los archivos(*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -440,13 +442,13 @@ Parece que el archivo\n%1\nha 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: @@ -456,7 +458,18 @@ Col: - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + It seems that '%1' has been modified by another application. Do you want to reload it? Parece que el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo? @@ -489,7 +502,12 @@ Acciones en el directorio actual - + + Set Browser Directory... + + + + Find Files ... Buscar archivos ... @@ -510,7 +528,7 @@ Pulse dos veces en un archivo para abrirlo - + Show Octave directory Mostrar el directorio de Octave @@ -535,12 +553,7 @@ Mostrar el directorio de inicio - - Search Directory... - Buscar directorio... - - - + Find Files... Buscar archivos... @@ -555,7 +568,7 @@ Nuevo directorio... - + File size Tamaño del archivo @@ -872,12 +885,7 @@ Nombrado: - - Enter the filename expression - Introducir la expresión del nombre de archivo - - - + Start in: Iniciar en: @@ -897,22 +905,12 @@ Explorar para seleccionar el directorio de inicio - - Recurse directories - Explorar directorios de forma recursiva - - - + Search recursively through directories for matching files Buscar archivos de forma recursiva en los directorios - - Include directories - Incluir directorios - - - + Include matching directories in search results Incluir directorios que coicidan en los resultados de la búsqueda @@ -932,9 +930,24 @@ Contiene el texto: - - Search must match text - La búsqueda debe coincidir con el texto + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -1093,13 +1106,13 @@ main_window - + Load Workspace Cargar espacio de trabajo - - + + About Octave Acerca de Octave @@ -1114,13 +1127,7 @@ Nuevo - - Script - Guión/"Script" - Guión - - - + Figure Figura @@ -1160,12 +1167,23 @@ Pegar - + Save Workspace As Guardar espacio de trabajo como - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. El archivo de las notas de versión %1 está vacío. @@ -1180,12 +1198,12 @@ Notas de la versión de Octave - + Octave Community News Noticas de la comunidad Octave - + Clear Clipboard Limpiar el portapapeles @@ -1250,22 +1268,12 @@ Iniciar - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Cargar espacio de trabajo... @@ -1275,7 +1283,12 @@ Guardar espacio de trabajo como... - + + New Script + + + + Function... Función... @@ -1366,8 +1379,8 @@ Directorio superior - - + + Browse directories Explorar directorios @@ -1441,7 +1454,7 @@ news_reader - + <html> <body> @@ -1546,7 +1559,7 @@ octave_qt_link - + Yes @@ -1571,14 +1584,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - Uso la traducción "ruta" para "path": http://es.wikipedia.org/wiki/Ruta_(informática) - El archivo %1 no existe en la ruta de carga. Para depurar la función que acualmente edita tiene que cambiar al directorio %2 o bien agregar ese directorio a la ruta de carga. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - El archivo %1 se solapa con un archivo con el mismo nombre en la ruta de carga. Para depurar la función que edita, cambie al directorio %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -1625,17 +1637,17 @@ settings_dialog - + Settings Configuración - + General General - + Octave logo only Sólo logo de Octave @@ -1650,12 +1662,12 @@ Iconos gráficos - + Dock widget title bar - + Custom style @@ -1670,22 +1682,17 @@ - + Editor Editor - + Color Color - - Max. tab width in pixel - - - - + Indent width Ancho de sangría @@ -1740,63 +1747,68 @@ Restaurar las pestañas del editor de la sesión anterior en el arranque - + Use custom file editor Utilizar editor de archivos personalizado - + + emacs +%l %f + + + + Editor Styles Estilos del editor - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Seleccione fuente, tamaño de fuente (como diferencia con el tamaño por defecto), estilo de fuente (negrita, cursiva, subrayada), color de texto y color de fondo(para este último, el color rosa (255,0,255) es un marcador de posición para el color de fondo por defecto).</body></html> - + Terminal Colors En es_ES, terminal suele ser masculino, aunque en el español iberoamericano suele adoptarse el femenino Colores del terminal - + Font Tipo de fuente - + Show line numbers Mostrar numeros de línea - + Highlight current line Resaltar línea actual - + Code completion Autocompletar código - + Show complete path in window title Mostrar ruta completa en el título de la ventana - + Show whitespace Mostrar espacios en blanco - + Do not show whitespace used for indentation No mostrar los espacios usados para la sangría - + # of characters typed before completion list displayed # de caracteres pulsados antes de completar la lista desplegada @@ -1806,92 +1818,144 @@ Crear archivos no existentes sin consultar - + command line (%f=file, %l=line): línea de comando(%f=archivo, %l=linea): - - emacs - emacs - - - + Terminal Terminal - + Cursor type: Tipo de cursor: - + Cursor blinking Cursor parpadeante - + Use foreground color Usar color de primer plano - + Font size Tamaño de fuente - + Set focus to terminal when running a command from within another widget - + File Browser Explorador de archivos - + Show file size Mostrar tamaño de archivo - + Show file type Mostrar tipo de archivo - + Show date of last modification Mostrar fecha de la última modificación - + Show hidden files Mostrar archivos ocultos - + + Interface + + + + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + + Tab width min. + + + + + max. + + + + + Display + + + + Alternating row colors Alternar colores de filas - + + Behavior + + + + + Restore last directory of previous session + + + + Workspace Espacio de trabajo - + Storage Class Colors Colores para las clases de almacenamiento - + Network Red - + Allow Octave to connect to the Octave web site to display current news and information Permitir a Octave la conexión al sitio web para desplegar las últimas noticias e información @@ -1906,27 +1970,27 @@ HttpProxy - + Icon set for dock widgets Iconos para widget acoplados - + Language (requires restart) Lenguaje (reinicio requerido) - + Icon size Tamaño de icono - + Synchronize Octave working directory with file browser Sincronizar el directorio de trabajo de Octave con el explorador de archivos - + Socks5Proxy "Socks5Proxy" @@ -1956,9 +2020,9 @@ Contraseña: - + - + System setting Configuración del sistema @@ -2005,6 +2069,16 @@ short form for underlined u + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2124,8 +2198,8 @@ - Storage Class - Clase de almacenamiento + Attribute + @@ -2173,8 +2247,8 @@ - Colors for the storage class: - Colores para cada clase de almacenamiento: + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/fr_FR.ts --- a/libgui/languages/fr_FR.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/fr_FR.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ curseur - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! Note à propos du nouveau GUI d'OctaveParmi les nouvelles fonctionnalités d'Ocatve 3.8, l'interface graphique est une grande évolution. C'est bien la fonctionnalité que les utilisateurs ont le plus réclamée durant les dernières années, et elle est maintenant presque prête. Elle n'est pas aussi parfaite que nous le souhaiterions et c'est pourquoi nous avons décidé d'attendre la version 4.0 pour en faire l'interface par défaut.Au vu du nombre de bug résolus et des améliorations apportées depuis la dernière version majeure d'Octave, nous avons décidé de ne pas retarder plus la parution de ces améliorations pour perfectionner le GUI. Vous pouvez maintenant apprécier la version 3.8 et la version préliminaire de la nouvelle interface graphique. Nous pensons qu'elle fonctionne raisonnablement bien, mais nous savons aussi qu'il y a des points durs évidents et beaucoup d'améliorations possibles.Nous avons besoin de votre aideIl y a de multiples manières d'aider à résoudre les bogues restants, à terminer le GUI et à améliorer l'expérience utilisateur aussi bien pour les novices que pour les experts (liens ouverts dans un navigateur externe):<ul><li>Si vous êtes un développeur expérimenté, vous pouvez donner de votre temps et <a href="http://octave.org/get-involved.html">développer Octave</a>.</li><li>Si Octave ne fonctionne pas correctement, vous êtes encouragés à <a href="http://octave.org/bugs.html">signaler les problèmes </a> que vous trouvez.</li><li>Que vous soyez utilisateur ou développeur, vous pouvez <a href="http://octave.org/donate.html">aider à financer le projet</a>. Le développement d'Octave demande beaucoup de temps et d’expertise. Vos contributions permettent d'assurer qu'Octave continuera à s'améliorer.</li></ul>Nous espérons que vous trouverez Octave utile. S'il vous plaît, aidez nous à l'améliorer encore dans le futur ! @@ -143,17 +143,12 @@ est déjà ouvert dans l'éditeur - + &%1 %2 &%1 %2 - - &New File - &Nouveau - - - + &Save File &Enregistrer @@ -163,7 +158,12 @@ &Ouvrir... - + + &New Script + + + + Save File &As... Enregistrer &sous... @@ -249,6 +249,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Rechercher et remplacer... @@ -263,7 +273,7 @@ &Aller à la ligne... - + &Recent Editor Files Fichiers &récents @@ -288,7 +298,7 @@ Fermer les autres fichiers - + &Preferences... &Préférences... @@ -318,7 +328,7 @@ &Documentation sur le mot de clés - + Could not open file %1 for read: %2. @@ -350,7 +360,7 @@ L'onglet éditeur de fichier associé a disparu. - + &File &Fichier @@ -365,7 +375,7 @@ &Editer - + &Debug &Déboguer @@ -378,7 +388,7 @@ file_editor_tab - + Goto line Aller à la ligne @@ -388,7 +398,7 @@ Numéro de ligne - + <unnamed> <sans nom> @@ -405,15 +415,15 @@ - - - + + + Octave Editor Éditeur d'Octave - + The file %1 is about to be closed but has been modified. @@ -424,20 +434,12 @@ %2 - + Octave Files (*.m);;All Files (*) Fichiers d'Octave (*.m);;Tous les fichiers (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -455,14 +457,14 @@ a été supprimé ou rénommé. Voulez-vous l'enregistrer maintenant ?%2 - + Could not open file %1 for write: %2. Impossible d'ouvrir le fichier %1 pour écrire : %2. - + Line: Ligne : @@ -472,7 +474,18 @@ Col : - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + 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 ? @@ -505,7 +518,12 @@ Actions sur le répertoire courant - + + Set Browser Directory... + + + + Find Files ... Rechercher des fichiers... @@ -526,7 +544,7 @@ Double-cliquer sur un fichier pour l'ouvrir - + Show Octave directory Revenir au répertoire d'Octave @@ -551,12 +569,7 @@ Aller au répertoire personnel - - Search Directory... - Rechercher dans le répertoire... - - - + Find Files... Rechercher des fichiers... @@ -571,7 +584,7 @@ Nouveau répertoire... - + File size Taille du fichier @@ -888,12 +901,7 @@ Nommé: - - Enter the filename expression - Entrer le nom du fichier ou une expression - - - + Start in: Demarrer dans : @@ -913,22 +921,12 @@ Choisir le répertoire de démarrage - - Recurse directories - Parcourir récursivement les sous-répertoires - - - + Search recursively through directories for matching files Rechercher les fichiers recursivement dans les sous-répertoires - - Include directories - Inclure les répertoires - - - + Include matching directories in search results Inclure les répertoires concordants dans des résultats de la recherche @@ -948,9 +946,24 @@ Contenant le texte : - - Search must match text - La recherche doit contenir le texte + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -1108,13 +1121,13 @@ main_window - + Load Workspace Charger l'espace de travail - - + + About Octave À propos d'Octave @@ -1129,12 +1142,7 @@ Nouveau - - Script - Fichier de script - - - + Figure Figure @@ -1174,12 +1182,23 @@ Coller - + Save Workspace As Enregistrer l'espace de travail sous - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. Le fichier de notes de version '%1' est vide. @@ -1194,12 +1213,12 @@ Notes de la version d'Octave - + Octave Community News Nouvelles de la communauté Octave - + Clear Clipboard Effacer le presse-papiers @@ -1264,22 +1283,12 @@ Avancer d'un pas avec entrée - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Charger l'espace de travail... @@ -1289,7 +1298,12 @@ Enregistrer l'espace de travail sous... - + + New Script + + + + Function... Fonction... @@ -1380,8 +1394,8 @@ Monter au répertoire parent - - + + Browse directories Naviguer dans les répertoires @@ -1455,7 +1469,7 @@ news_reader - + <html> <body> @@ -1556,7 +1570,7 @@ octave_qt_link - + Yes @@ -1583,13 +1597,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - Le fichier %1 n'existe pas dans les chemins accessibles. Pour déboguer la fonction que vous éditez, vous devez soit modifier le répertoire pour %2 ou ajouter le répertoire aux chemins accessibles. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - Le fichier %1 est occulté par un fichier du même nom dans les chemins accessibles. Pour déboguer la fonction que vous éditez, vous devez modifier le répertoire pour %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -1640,17 +1654,17 @@ settings_dialog - + Settings Configuration - + General Général - + Octave logo only Logo d'Octave seulement @@ -1665,12 +1679,12 @@ Icones graphiques - + Dock widget title bar - + Custom style @@ -1685,22 +1699,17 @@ - + Editor Éditeur - + Color Couleur - - Max. tab width in pixel - - - - + Indent width Largeur de l'indentation @@ -1755,62 +1764,67 @@ Restaurer les onglets de la session précédente - + Use custom file editor Utiliser un éditeur externe - + + emacs +%l %f + + + + Editor Styles Affichage - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Sélectionnez la police, sa taille (différence par rapport à la taille par défaut), son style (gras, italique, souligné), la couleur du texte et de l'arrière plan (pour ce dernier, le rose (255,0,255) fait figure de défaut).</body></html> - + Terminal Colors Couleurs de la fenetre de commandes - + Font Police - + Show line numbers Afficher les numéros des lignes - + Highlight current line Surligner la ligne courante - + Code completion Suggestions de saisie - + Show complete path in window title Afficher le chemin complet dans le titre de la fenetre - + Show whitespace Afficher les espaces - + Do not show whitespace used for indentation Ne pas afficher les espaces utilisés pour l'indentation - + # of characters typed before completion list displayed Nb. de caractères avant affichage de la liste de complétion @@ -1820,92 +1834,144 @@ Créer les fichiers non-existants sans prévenir - + command line (%f=file, %l=line): ligne de commande (%f=fichier, %l=ligne) : - - emacs - emacs - - - + Terminal Terminal - + Cursor type: Type de curseur : - + Cursor blinking Curseur clignotant - + Use foreground color Utiliser la couleur de l'avant plan - + Font size Taille de police - + Set focus to terminal when running a command from within another widget - + File Browser Explorateur de fichiers - + Show file size Afficher la taille des fichiers - + Show file type Afficher le type des fichiers - + Show date of last modification Afficher la date de la dernière modification - + Show hidden files Afficher les fichiers cachés - + + Interface + + + + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + + Tab width min. + + + + + max. + + + + + Display + + + + Alternating row colors Alterner les couleurs des lignes - + + Behavior + + + + + Restore last directory of previous session + + + + Workspace Espace de travail - + Storage Class Colors Couleurs des variables - + Network Réseau - + Allow Octave to connect to the Octave web site to display current news and information Autoriser Octave à se connecter à son site internet afin d'afficher les informations et nouvelle fraîches @@ -1920,27 +1986,27 @@ Proxy HTTP - + Icon set for dock widgets Jeu d'icones pour les widgets - + Language (requires restart) Langue (nécessite un redémarrage) - + Icon size Taille des icones - + Synchronize Octave working directory with file browser Synchroniser le répertoire de travail d'Octave et le navigateur de fichiers - + Socks5Proxy Proxy Socks5 @@ -1970,9 +2036,9 @@ Mot de passe : - + - + System setting Reglages système @@ -2019,6 +2085,16 @@ short form for underlined s + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2138,8 +2214,8 @@ - Storage Class - Type de stockage + Attribute + @@ -2187,8 +2263,8 @@ - Colors for the storage class: - Couleurs pour le type de stockage : + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/nl_NL.ts --- a/libgui/languages/nl_NL.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/nl_NL.ts Thu Jan 23 16:16:07 2014 -0500 @@ -474,7 +474,7 @@ Aanwijzer - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! Een opmerking over Octave's Nieuwe GUIEen van de belangrijkste nieuwe kenmerken van Octave 3.8 is een grafische user interface (GUI). Dat is waar de gebruikers de afgelopen jaren het meest om gevraagd hebben en hij is bijna af. Maar omdat hij nog niet zo gepolijst is als we zouden willen hebben we besloten te wachten tot de versie 4.0 serie voordat we hem de standaard interface maken.Vanwege de lange tijd en het aantal bug fixes en verbeteringen sinds de laatste major release versie hebben we ook besloten om niet langer meer te wachten op de GUI om al die verbeteringen door te voeren. Dus geniet van Octave versie 3.8 en de preview van de nieuwe GUI. We denken dat hij redelijk goed werkt, maar natuurlijk weten we dat er nog ruwe kantjes aan zitten en ruimte voor verbeteringen.We hebben je hulp nodigEr zijn veel manieren waarop je ons kunt helpen de overgebleven problemen te verhelpen, de GUI te completeren, en de gebruikerservaring voor nieuwelingen en experts (de URLs openen een nieuwe browser):<ul><li>Als je een bekwame ontwikkelaar bent kun je ons helpen door bij te dragen <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>Als Octave niet goed wekt raden we je aan om <a href="http://octave.org/bugs.html">de problemen te rapporteren </a> die je tegen komt.</li><li>Of je nu gebruiker of ontwikkelaar bent, je kunt ook <a href="http://octave.org/donate.html">een bijdrage geven</a>. De ontwikkeling van Octave vraagt een hoop tijd en expertise. Je bijdrage helpt er aan mee dat Octave verbeterd blijft worden.</li></ul>We hopen dat je Octave nuttig vindt. Help alsjeblieft om het in de toekomst nog beter te maken! @@ -1683,17 +1683,12 @@ is reeds geopend in de editor - + &%1 %2 - - &New File - &Nieuw Bestand - - - + &Save File Op&slaan @@ -1703,7 +1698,12 @@ &Openen... - + + &New Script + + + + Save File &As... Opslaan &als... @@ -1789,6 +1789,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... Zoek en Vervang... @@ -1803,7 +1813,7 @@ Ga naar regel... - + &Recent Editor Files &Recent geopend @@ -1828,7 +1838,7 @@ Andere bestanden sluiten - + &Preferences... Voorkeuren... @@ -1858,7 +1868,7 @@ &Documentatie bij sleutelwoord - + Could not open file %1 for read: %2. @@ -1890,7 +1900,7 @@ Het bijbehorende tabblad in de editor is verdwenen. - + &File Bestand @@ -1905,7 +1915,7 @@ B&ewerken - + &Debug &Debuggen @@ -1918,7 +1928,7 @@ file_editor_tab - + Goto line Ga naar regel @@ -1928,7 +1938,7 @@ Regelnummer - + <unnamed> naamloos @@ -1945,15 +1955,15 @@ - - - + + + Octave Editor - + The file %1 is about to be closed but has been modified. @@ -1964,20 +1974,12 @@ %2 - + Octave Files (*.m);;All Files (*) Octave bestanden (*.m);;Alle bestanden (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -1994,14 +1996,14 @@ is gewist of hernoemd. Wil je het nu opslaan?%2 - + Could not open file %1 for write: %2. Kon bestand %1 niet openen om te schrijven: %2. - + Line: Regel: @@ -2011,7 +2013,18 @@ Kolom: - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + 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? @@ -2044,7 +2057,12 @@ Bewerkingen op huidige map - + + Set Browser Directory... + + + + Find Files ... Zoek bestanden ... @@ -2065,7 +2083,7 @@ Dubbelklik een bestand om te openen - + Show Octave directory Laat Octave map zien @@ -2090,12 +2108,7 @@ Laat home map zien - - Search Directory... - Zoek in map... - - - + Find Files... Zoek bestanden... @@ -2110,7 +2123,7 @@ Nieuwe map... - + File size Bestandsgrootte @@ -2428,12 +2441,7 @@ Genaamd: - - Enter the filename expression - Voer de bestandnaam-expressie in - - - + Start in: Begin in: @@ -2453,22 +2461,12 @@ Blader naar begin map - - Recurse directories - Ook in onderliggende mappen - - - + Search recursively through directories for matching files Zoek ook in onderliggende mappen naar overeenkomende bestanden - - Include directories - Neem mappen ook mee - - - + Include matching directories in search results Neem overeenkomende mappen mee in zoekresultaten @@ -2488,9 +2486,24 @@ Met tekst: - - Search must match text - Zoeken naar overeenkomende tekst + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -2648,13 +2661,13 @@ main_window - + Load Workspace Werkruimte laden - - + + About Octave Over Octave @@ -2669,12 +2682,7 @@ Nieuw - - Script - Script - - - + Figure Figuur @@ -2714,12 +2722,23 @@ Plakken - + Save Workspace As Sla Werkruimte Op Als - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. Bestand met Release Notes '%1' is leeg. @@ -2734,12 +2753,12 @@ Octave Release Notes - + Octave Community News Octave Community Nieuws - + Clear Clipboard Wis klembord @@ -2804,22 +2823,12 @@ Stap In - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Werkruimte laden... @@ -2829,7 +2838,12 @@ Sla Werkruimte Op Als... - + + New Script + + + + Function... Functie... @@ -2920,8 +2934,8 @@ Eén mapniveau omhoog - - + + Browse directories Blader door mappen @@ -2995,7 +3009,7 @@ news_reader - + <html> <body> @@ -3096,7 +3110,7 @@ octave_qt_link - + Yes @@ -3123,13 +3137,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - Het bestand %1 is niet in zoekpad. Om de functie die je edit te debuggen moet je òf naar debetreffende map %2 gaan, of die map aan het zoekpad toevoegen. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - Het bestand %1 is overschaduwd door een bestand met dezelfde naam in het zoekpad. Ga naar de map %2 om de functie de je edit te kunnen debuggen. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -3180,17 +3194,17 @@ settings_dialog - + Settings Instellingen - + General Algemeen - + Octave logo only Alleen Octave logo @@ -3205,12 +3219,12 @@ Grafische iconen - + Dock widget title bar - + Custom style @@ -3225,22 +3239,17 @@ - + Editor Editor - + Color Kleur - - Max. tab width in pixel - - - - + Indent width Inspringafstand @@ -3295,62 +3304,67 @@ Herstel bij opstarten de editor tabs uit de vorige sessie - + Use custom file editor Gebruik een andere editor - + + emacs +%l %f + + + + Editor Styles Editorstijlen - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Selecteer font, font grootte (als een verschil van de standaard grootte), font stijl (dik, schuin, onderstreept), tekstkleur en achtergrondkleur (wat betreft de laatste, de kleur roze (255,0,255) is een plaatsvervanger voor de standaard achtergrondkleur).</body></html> - + Terminal Colors Terminalkleuren - + Font Lettertype - + Show line numbers Regelnummers weergeven - + Highlight current line Markeer huidige regel - + Code completion Automatisch aanvullen - + Show complete path in window title Hele pad in schermtitel weergeven - + Show whitespace Laat witruimte zien - + Do not show whitespace used for indentation Laat geen voor inspringen gebruikte witruimte zien - + # of characters typed before completion list displayed Getypt aantal karakters voordat de aanvullijst verschijnt @@ -3360,92 +3374,144 @@ Maak niet bestaande bestanden aan zonder te vragen - + command line (%f=file, %l=line): command line (%f=bestand, %l=regel): - - emacs - - - - + Terminal Opdrachtvenster - + Cursor type: Type aanwijzer: + + Cursor blinking + Knipperende aanwijzer + + + + Use foreground color + Gebruik voorgrondkleur + + + + Font size + Lettergrootte + + + + Set focus to terminal when running a command from within another widget + + + + + File Browser + Bestandsbrowser + + + + Show file size + Bestandsgrootte weergeven + + + + Show file type + Bestandstype weergeven + + + + Show date of last modification + Datum van laatste wijziging weergeven + + + + Show hidden files + Verborgen bestanden weergeven + + + + Interface + + + + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + + Tab width min. + + + + + max. + + + + + Display + + + + + Alternating row colors + Om en om andere regelkleuren + + + + Behavior + + + + + Restore last directory of previous session + + + + + Workspace + Werkruimte + + + + Storage Class Colors + Kleuren voor klasse + + + + Network + Netwerk + + - Cursor blinking - Knipperende aanwijzer - - - - Use foreground color - Gebruik voorgrondkleur - - - - Font size - Lettergrootte - - - - Set focus to terminal when running a command from within another widget - - - - - File Browser - Bestandsbrowser - - - - Show file size - Bestandsgrootte weergeven - - - - Show file type - Bestandstype weergeven - - - - Show date of last modification - Datum van laatste wijziging weergeven - - - - Show hidden files - Verborgen bestanden weergeven - - - - Alternating row colors - Om en om andere regelkleuren - - - - Workspace - Werkruimte - - - - Storage Class Colors - Kleuren voor klasse - - - - Network - Netwerk - - - Allow Octave to connect to the Octave web site to display current news and information Sta Octave toe om te verbinden met de Octave website om recent nieuws en informatie weer te geven @@ -3460,27 +3526,27 @@ http proxy - + Icon set for dock widgets Iconenset voor dock widgets - + Language (requires restart) Taal instellen (vereist herstart) - + Icon size Icoongrootte - + Synchronize Octave working directory with file browser Synchroniseer Octave werkmap met bestandsverkenner - + Socks5Proxy @@ -3510,9 +3576,9 @@ Wachtwoord: - + - + System setting Systeeminstelling @@ -3559,6 +3625,16 @@ short form for underlined o + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -3678,8 +3754,8 @@ - Storage Class - Klasse + Attribute + @@ -3727,8 +3803,8 @@ - Colors for the storage class: - Kleuren voor klasse: + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/pt_BR.ts --- a/libgui/languages/pt_BR.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/pt_BR.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ indicador - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! Um aviso sobre a nova interface gráfica do OctaveUma das funcionalidades novas mais importantes no Octave versão 3.8 é a interface gráfica (GUI). É uma coisa que os usuários solicitaram muito frequentemente nos últimos anos, e agora ela está quase pronta. Mas como ela não está tão bem acabada quanto gostaríamos, decidimos esperar até a próxima versão 4.0 antes de tornar a GUI a interface padrão.Dado o tempo transcorrido e o número de correções e melhorias desde a última versão, também decidimos não adiar mais o lançamento de todas essas novidades, ao invés ficar aperfeiçoando a GUI. Portanto, aproveite a versão 3.8 do Octave e a prévia da nova GUI! Acreditamos que ela está funcionando razoavelmente bem, apesar de alguns aspectos obviamente inacabados, além de muitas melhorias possíveis.Ajude-nosHá muitas formas de você nos ajudar a corrigir os problemas que persistirem, a finalizar a GUI e a melhorar a usabilidade do Octave em geral, tanto para usuários iniciantes quanto para aqueles mais experientes (os links abaixo serão abertos no seu navegador padrão do sistema; o conteúdo poderá estar em inglês):<ul><li>Se você for um desenvolvedor de software talentoso, ajude-nos contribuindo com o seu tempo, auxiliando no <a href="http://octave.org/get-involved.html">desenvolvimento do Octave</a>.</li><li>Se o Octave não estiver funcionando corretamente, convidamos-lhe a <a href="http://octave.org/bugs.html">relatar os problemas</a> que você vier a encontrar.</li><li>Quer você seja um usuário ou um desenvolvedor, você poderia <a href="http://octave.org/donate.html">fazer uma doação</a> para auxiliar no financiamento do projeto. Afinal, o desenvolvimento do Octave demanda tempo e conhecimento consideráveis. A sua generosidade contribui para assegurar a melhoria contínua do Octave.</li></ul>Esperamos que você goste do Octave. Ajude-nos a torná-lo ainda melhor no futuro! @@ -141,17 +141,12 @@ Arquivo não foi salvo! Um arquivo com o nome selecionado %1 já está aberto no editor - + &%1 %2 &%1 %2 - - &New File - &Novo Script - - - + &Save File &Salvar Arquivo @@ -161,7 +156,12 @@ &Abrir Arquivo... - + + &New Script + + + + Save File &As... Salvar Arquivo &Como... @@ -247,6 +247,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Buscar e Substituir... @@ -261,7 +271,7 @@ Vá para &Linha... - + &Recent Editor Files Arquivos &Recentes @@ -286,7 +296,7 @@ Fechar Demais Arquivos - + &Preferences... &Preferências... @@ -316,7 +326,7 @@ &Documentação da Palavra-chave - + Could not open file %1 for read: %2. @@ -348,7 +358,7 @@ A aba do editor associada ao arquivo desapareceu. - + &File &Arquivo @@ -363,7 +373,7 @@ &Editar - + &Debug &Depurar @@ -376,7 +386,7 @@ file_editor_tab - + Goto line Vá para linha... @@ -386,7 +396,7 @@ Número da linha - + <unnamed> <sem_nome> @@ -403,15 +413,15 @@ - - - + + + Octave Editor Editor do Octave - + The file %1 is about to be closed but has been modified. @@ -422,20 +432,12 @@ %2 - + Octave Files (*.m);;All Files (*) Arquivos do Octave (*.m);; Todos os Arquivos (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -453,14 +455,14 @@ foi removido ou renomeado. Gostaria de salvá-lo agora?%2 - + Could not open file %1 for write: %2. Não foi possível abrir arquivo %1 para escrita: %2. - + Line: Linha: @@ -470,7 +472,18 @@ Coluna: - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + 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? @@ -503,7 +516,12 @@ Ações no diretório atual - + + Set Browser Directory... + + + + Find Files ... Buscar Arquivos... @@ -524,7 +542,7 @@ Clique duas vezes em um arquivo para abrí-lo - + Show Octave directory Exibir o diretório do Octave @@ -549,12 +567,7 @@ Exibir diretório pessoal - - Search Directory... - Buscar no diretório... - - - + Find Files... Buscar Arquivos... @@ -569,7 +582,7 @@ Novo Diretório... - + File size Tamanho do arquivo @@ -884,12 +897,7 @@ Nome de arquivo: - - Enter the filename expression - Digite a expressão de busca para os nomes de arquivo - - - + Start in: Diretório inicial: @@ -909,22 +917,12 @@ Escolha o diretório inicial - - Recurse directories - Buscar em sub-diretórios - - - + Search recursively through directories for matching files Buscar recursivamente nos sub-diretórios - - Include directories - Inclur nomes de diretórios - - - + Include matching directories in search results Incluir diretórios no resultado da busca @@ -944,9 +942,24 @@ Contém texto: - - Search must match text - Digite a expressão de busca para conteúdo dos arquivos + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -1104,13 +1117,13 @@ main_window - + Load Workspace Carregar Ambiente de Trabalho... - - + + About Octave Sobre o Octave @@ -1125,12 +1138,7 @@ Novo - - Script - Script - - - + Figure Figura @@ -1170,12 +1178,23 @@ Colar - + Save Workspace As Salvar Ambiente de Trabalho Como... - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. O arquivo de notas da versão '%1' está vazio. @@ -1190,12 +1209,12 @@ Notas da Versão do Octave - + Octave Community News Novidades da Comunidade - + Clear Clipboard Limpar Área de Transferência @@ -1260,22 +1279,12 @@ Passo adentro - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Carregar ambiente de trabalho... @@ -1285,7 +1294,12 @@ Salvar Ambiente de Trabalho Como... - + + New Script + + + + Function... Função... @@ -1376,8 +1390,8 @@ Diretório um nível acima - - + + Browse directories Escolher diretório @@ -1451,7 +1465,7 @@ news_reader - + <html> <body> @@ -1552,7 +1566,7 @@ octave_qt_link - + Yes @@ -1579,13 +1593,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - O arquivo %1 não existe no caminho de pesquisa. Para depurar a função que você está editando, é preciso ou mudar para o diretório %2 ou adicionar esse diretório ao caminho de pesquisa. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - Existe um arquivo com o mesmo nome %1 no caminho de pesquisa. Para depurar a função que você está editando, é preciso mudar para o diretório %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -1636,17 +1650,17 @@ settings_dialog - + Settings Configurações - + General Geral - + Octave logo only Apenas logotipo do Octave @@ -1661,12 +1675,12 @@ Ícones gráficos - + Dock widget title bar - + Custom style @@ -1681,22 +1695,17 @@ - + Editor Editor - + Color Cor - - Max. tab width in pixel - - - - + Indent width Largura de identação @@ -1751,62 +1760,67 @@ Restaurar abas de edição da sessão anterior durante inicialização - + Use custom file editor Usar editor de texto externo - + + emacs +%l %f + + + + Editor Styles Apresentação - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Selecionar fonte, tamanho da fonte (como uma diferença do tamanho padrão), estilo da fonte (negrito, itálico, sublinhado), cor de texto e cor de fundo (a cor rosa (255,0,255) é a cor de fundo padrão).</body></html> - + Terminal Colors Cores do Terminal - + Font Fonte - + Show line numbers Exibir números de linha - + Highlight current line Destacar linha atual - + Code completion Oferecer sugestões de preenchimento - + Show complete path in window title Exibir caminho completo no título da janela - + Show whitespace Exibir espaços em branco - + Do not show whitespace used for indentation Não exibir espaços em branco usados para identação - + # of characters typed before completion list displayed Número de caracteres digitados antes da apresentar sugestões de preenchimento @@ -1816,92 +1830,144 @@ Criar arquivos não existentes sem confirmar - + command line (%f=file, %l=line): linha de comando (%f=arquivo, %l=linha): - - emacs - emacs - - - + Terminal Terminal - + Cursor type: Tipo do Indicador: - + Cursor blinking Indicador piscante - + Use foreground color Usar cor de primeiro plano - + Font size Tamanho de fonte - + Set focus to terminal when running a command from within another widget - + File Browser Navegador de Arquivos - + Show file size Exibir tamanho do arquivo - + Show file type Exibir tipo do arquivo - + Show date of last modification Exibir data de última modificação - + Show hidden files Exibir arquivos ocultos - + + Interface + + + + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + + Tab width min. + + + + + max. + + + + + Display + + + + Alternating row colors Cores de linhas alternantes - + + Behavior + + + + + Restore last directory of previous session + + + + Workspace Ambiente de Trabalho - + Storage Class Colors Cores das Categorias - + Network Rede - + Allow Octave to connect to the Octave web site to display current news and information Permitir Octave se conectar à Internet para mostrar notícias e informações recentes @@ -1916,27 +1982,27 @@ Proxy HTTP - + Icon set for dock widgets Conjunto de ícones para painéis - + Language (requires restart) Idioma (alteração exige reinicialização do Octave) - + Icon size Tamanho dos ícones - + Synchronize Octave working directory with file browser Sincronizar diretório atual do Octave com o Navegador de Arquivos - + Socks5Proxy Proxy Socks 5 @@ -1966,9 +2032,9 @@ Senha: - + - + System setting Configuração do sistema @@ -2015,6 +2081,16 @@ short form for underlined s + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2134,8 +2210,8 @@ - Storage Class - Categoria + Attribute + @@ -2183,8 +2259,8 @@ - Colors for the storage class: - Cores das categorias: + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/pt_PT.ts --- a/libgui/languages/pt_PT.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/pt_PT.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ indicador - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! @@ -810,17 +810,12 @@ já está aberto no editor - + &%1 %2 &%1 %2 - - &New File - &Novo Ficheiro - - - + &Save File &Guardar Ficheiro @@ -830,7 +825,12 @@ &Abrir Ficheiro... - + + &New Script + + + + Save File &As... Guardar Ficheiro &Como... @@ -916,6 +916,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Buscar e Substituir... @@ -930,7 +940,7 @@ Ir para &Linha... - + &Recent Editor Files Ficheiros &recentes @@ -955,7 +965,7 @@ Fechar os Outros Ficheiros - + &Preferences... &Preferências... @@ -985,7 +995,7 @@ &Documentação da Palavra-chave - + Could not open file %1 for read: %2. @@ -1017,7 +1027,7 @@ A aba do editor associada ao ficheiro desapareceu. - + &File &Ficheiro @@ -1032,7 +1042,7 @@ &Editar - + &Debug &Depurar @@ -1045,7 +1055,7 @@ file_editor_tab - + Goto line Ir para linha @@ -1055,7 +1065,7 @@ Número da linha - + <unnamed> <sem_nome> @@ -1072,15 +1082,15 @@ - - - + + + Octave Editor Editor do Octave - + The file %1 is about to be closed but has been modified. @@ -1091,20 +1101,12 @@ %2 - + Octave Files (*.m);;All Files (*) Ficheiros de Octave (*.m);; Todos os Ficheiros (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -1122,14 +1124,14 @@ foi removido ou renomeado. Pretende guardá-lo agora?%2 - + Could not open file %1 for write: %2. Não foi possível abrir o ficheiro %1 para escrita: %2. - + Line: Linha: @@ -1139,7 +1141,18 @@ Col: - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + 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? @@ -1172,7 +1185,12 @@ Acções no directório actual - + + Set Browser Directory... + + + + Find Files ... Procurar Ficheiros... @@ -1193,7 +1211,7 @@ Clicar duas vezes num ficheiro para o abrir - + Show Octave directory Mostrar o directório actual do Octave @@ -1218,12 +1236,7 @@ Mostrar directório pessoal - - Search Directory... - Procurar no directório... - - - + Find Files... Encontrar Ficheiros... @@ -1238,7 +1251,7 @@ Novo Directório... - + File size Tamanho de ficheiro @@ -1555,12 +1568,7 @@ Chamados: - - Enter the filename expression - Introduza a expressão para o nome do ficheiro - - - + Start in: Iniciar em: @@ -1580,22 +1588,12 @@ Navegar por directório inicial - - Recurse directories - Entrar em sub-directórios - - - + Search recursively through directories for matching files Procurar recursivamente pelos directórios por ficheiros correspondentes - - Include directories - Incluir directórios - - - + Include matching directories in search results Incluir directórios correspondentes nos resultado da pesquisa @@ -1615,9 +1613,24 @@ Contém texto: - - Search must match text - Pesquisa precisa corresponder ao texto + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression + @@ -1775,13 +1788,13 @@ main_window - + Load Workspace Carregar ambiente de trabalho - - + + About Octave Sobre o Octave @@ -1796,12 +1809,7 @@ Novo - - Script - Script - - - + Figure Figura @@ -1841,12 +1849,23 @@ Colar - + Save Workspace As Guardar Ambiente de Trabalho como - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. O ficheiro de notas da versão '%1' está vazio. @@ -1861,12 +1880,12 @@ Notas da Versão do Octave - + Octave Community News Notícias da comunidade Octave - + Clear Clipboard Limpar Área de Transferência @@ -1931,22 +1950,12 @@ - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Carregar ambiente de trabalho... @@ -1956,7 +1965,12 @@ Guardar Ambiente de Trabalho como... - + + New Script + + + + Function... Função... @@ -2047,8 +2061,8 @@ Um nível de directório acima - - + + Browse directories Navegar directórios @@ -2122,7 +2136,7 @@ news_reader - + <html> <body> @@ -2223,7 +2237,7 @@ octave_qt_link - + Yes @@ -2250,13 +2264,13 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - O ficheiro %1 não existe no caminho de pesquisa. Para depurar a função que está a ser editada, é preciso mudar para o directório %2 ou adicionar esse directório ao caminho de pesquisa. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. - O ficheiro %1 é ignorado a favor de outro ficheiro no caminho de pesquisa com o mesmo nome. Para depurar a função, é preciso mudar para o directório %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. + @@ -2307,17 +2321,17 @@ settings_dialog - + Settings Configurações - + General Geral - + Octave logo only Apenas logotipo do Octave @@ -2332,12 +2346,12 @@ Ícones gráficos - + Dock widget title bar - + Custom style @@ -2352,22 +2366,17 @@ - + Editor Editor - + Color Cor - - Max. tab width in pixel - - - - + Indent width Largura da identação @@ -2422,62 +2431,67 @@ Restaurar abas de edição da sessão anterior durante inicialização - + Use custom file editor Usar editor de texto externo - + + emacs +%l %f + + + + Editor Styles Estilos do Editor - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> <html><head/><body>Seleccionar tipo de letra, tamanho (como diferença para o tamanho padrão), decoração (negrito, itálico, sublinhado), cor do texto e cor do fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão).</body></html> - + Terminal Colors Cores do Terminal - + Font Tipo de Letra - + Show line numbers Exibir número de linha - + Highlight current line Enfatizar linha actual - + Code completion Sguestões para copletar código - + Show complete path in window title Exibir caminho completo no título da janela - + Show whitespace Mostrar whitespace - + Do not show whitespace used for indentation Não mostrar whitespace usado para indentação - + # of characters typed before completion list displayed Número de carácteres antes de mostrar lista de preenchimento automático @@ -2487,92 +2501,144 @@ Criar ficheiros não existentes automaticamente - + command line (%f=file, %l=line): linha do comando (%f=ficheiro, %l=linha): - - emacs - emacs - - - + Terminal Terminal - + Cursor type: Tipo de Cursor: + + Cursor blinking + Indicador piscante + + + + Use foreground color + Usar cor do fundo + + + + Font size + Tamanho da letra + + + + Set focus to terminal when running a command from within another widget + + + + + File Browser + Navegador de Ficheiros + + + + Show file size + Mostrar tamanho do ficheiro + + + + Show file type + Mostrar tipo de ficheiro + + + + Show date of last modification + Mostrar data da última modificação + + + + Show hidden files + Mostrar ficheiros escondidos + + + + Interface + + + + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + + Tab width min. + + + + + max. + + + + + Display + + + + + Alternating row colors + Cores de linhas alternantes + + + + Behavior + + + + + Restore last directory of previous session + + + + + Workspace + Ambiente de trabalho + + + + Storage Class Colors + Cores das Classes de Armazenamento + + + + Network + Rede + + - Cursor blinking - Indicador piscante - - - - Use foreground color - Usar cor do fundo - - - - Font size - Tamanho da letra - - - - Set focus to terminal when running a command from within another widget - - - - - File Browser - Navegador de Ficheiros - - - - Show file size - Mostrar tamanho do ficheiro - - - - Show file type - Mostrar tipo de ficheiro - - - - Show date of last modification - Mostrar data da última modificação - - - - Show hidden files - Mostrar ficheiros escondidos - - - - Alternating row colors - Cores de linhas alternantes - - - - Workspace - Ambiente de trabalho - - - - Storage Class Colors - Cores das Classes de Armazenamento - - - - Network - Rede - - - Allow Octave to connect to the Octave web site to display current news and information Permitir ao Octave ligar-se ao site do Octave para mostrar notícias e informações @@ -2587,27 +2653,27 @@ Proxy HTTP - + Icon set for dock widgets Conjunto de ícones para paineis - + Language (requires restart) Idioma (reinicialização do Octave necessária) - + Icon size Tamanho do Ícone - + Synchronize Octave working directory with file browser Sincronizar o directório de trabalho do Octave com o navegador de ficheiros - + Socks5Proxy Proxy Socks 5 @@ -2637,9 +2703,9 @@ Senha: - + - + System setting Configuração do sistema @@ -2686,6 +2752,16 @@ short form for underlined s + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2805,8 +2881,8 @@ - Storage Class - Classe de Armazenamento + Attribute + @@ -2854,8 +2930,8 @@ - Colors for the storage class: - Cores para classe de armazenamento: + Colors for variable attributes: + diff -r 052cc933aea6 -r cd897532aaec libgui/languages/ru_RU.ts --- a/libgui/languages/ru_RU.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/ru_RU.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! @@ -143,17 +143,12 @@ уже открыт в редакторе - + &%1 %2 &%1 %2 - - &New File - Созд&ать - - - + &Save File &Сохранить @@ -163,7 +158,12 @@ &Открыть... - + + &New Script + + + + Save File &As... Сохранить &как... @@ -249,6 +249,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... &Найти и заменить... @@ -263,7 +273,7 @@ &Перейти к строчке... - + &Recent Editor Files &Недавние файлы редактора @@ -288,7 +298,7 @@ Закрыть другие файлы - + &Preferences... &Настройки... @@ -318,7 +328,7 @@ &Документация по зарезервированному слову - + Could not open file %1 for read: %2. @@ -350,7 +360,7 @@ - + &File &Файл @@ -365,7 +375,7 @@ &Правка - + &Debug &Отладка @@ -378,7 +388,7 @@ file_editor_tab - + Goto line Перейти к строчке @@ -388,7 +398,7 @@ - + <unnamed> <без названия> @@ -405,15 +415,15 @@ - - - + + + Octave Editor Редактор Octave - + The file %1 is about to be closed but has been modified. @@ -424,20 +434,12 @@ %2 - + Octave Files (*.m);;All Files (*) Файлы Octave (*.m);;Все файлы (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -455,14 +457,14 @@ был удален или переименован. Вы хотите сохранить его?%2 - + Could not open file %1 for write: %2. Не удалось открыть файл %1 для записи: %2. - + Line: @@ -472,7 +474,18 @@ - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + It seems that '%1' has been modified by another application. Do you want to reload it? Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое? @@ -505,7 +518,12 @@ - + + Set Browser Directory... + + + + Find Files ... Найти файлы... @@ -526,7 +544,7 @@ - + Show Octave directory Перейти к текущей директории Octave @@ -551,12 +569,7 @@ Показывать домашнюю директорию - - Search Directory... - - - - + Find Files... Найти файлы... @@ -571,7 +584,7 @@ Новая директория... - + File size @@ -870,12 +883,7 @@ - - Enter the filename expression - - - - + Start in: @@ -895,22 +903,12 @@ - - Recurse directories - - - - + Search recursively through directories for matching files Искать рекурсивно в директориях подходящие файлы - - Include directories - - - - + Include matching directories in search results @@ -930,8 +928,23 @@ Содержит текст: - - Search must match text + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression @@ -1086,13 +1099,13 @@ main_window - + Load Workspace Загрузить область переменных - - + + About Octave Об Octave @@ -1107,12 +1120,7 @@ Новый - - Script - Скрипт - - - + Figure @@ -1152,12 +1160,23 @@ Вставить - + Save Workspace As - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. @@ -1172,12 +1191,12 @@ - + Octave Community News - + Clear Clipboard @@ -1242,22 +1261,12 @@ - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... Загрузить область переменных... @@ -1267,7 +1276,12 @@ - + + New Script + + + + Function... Функция... @@ -1358,8 +1372,8 @@ Одной директорией вверх - - + + Browse directories Просмотр директорий @@ -1433,7 +1447,7 @@ news_reader - + <html> <body> @@ -1511,7 +1525,7 @@ octave_qt_link - + Yes @@ -1538,12 +1552,12 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - Файл %1 не существует в пути загрузки. Чтобы отладить редактируемую вами функцию, вы должны либо изменить директорию на %2, или добавить эту директорию в путь загрузки. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. @@ -1589,17 +1603,17 @@ settings_dialog - + Settings Параметры - + General Основное - + Octave logo only Только логотип Octave @@ -1609,12 +1623,12 @@ - + Dock widget title bar - + Custom style @@ -1629,22 +1643,17 @@ - + Editor Редактор - + Color Цвет - - Max. tab width in pixel - - - - + Indent width Ширина отступа @@ -1699,67 +1708,114 @@ Восстанавливать вкладки редактора с предыдущей сессии во время запуска - + Use custom file editor - + + emacs +%l %f + + + + Editor Styles - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> - + Terminal Colors - + Font Шрифт - + Show line numbers Показывать количество строк - + Highlight current line Подсвечивать текущую строку - + Code completion Дополнение кода - + Show complete path in window title Показывать полный путь в заголовке окна - + + Interface + + + + Graphic icons - + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + Show whitespace - + Do not show whitespace used for indentation - + + Tab width min. + + + + + max. + + + + # of characters typed before completion list displayed @@ -1769,92 +1825,102 @@ - + command line (%f=file, %l=line): - - emacs - emacs - - - + Terminal Командная строка - + Cursor type: Тип курсора: - + Cursor blinking Мигающий курсор - + Use foreground color - + Font size Размер шрифта - + Set focus to terminal when running a command from within another widget - + File Browser Файловый менеджер - + Show file size Показывать размер файлов - + Show file type Показывать типы файлов - + Show date of last modification Показывать дату последнего изменения - + Show hidden files Показывать скрытые файлы - + + Display + + + + Alternating row colors Чередующиеся цвета строк - + + Behavior + + + + + Restore last directory of previous session + + + + Workspace Область переменных - + Storage Class Colors - + Network Сеть - + Allow Octave to connect to the Octave web site to display current news and information @@ -1869,27 +1935,27 @@ HttpProxy - + Icon set for dock widgets - + Language (requires restart) Язык (требуется перезапуск) - + Icon size Размер иконок - + Synchronize Octave working directory with file browser - + Socks5Proxy Socks5Proxy @@ -1919,9 +1985,9 @@ Пароль: - + - + System setting @@ -1968,6 +2034,16 @@ short form for underlined + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2076,7 +2152,7 @@ - Storage Class + Attribute @@ -2125,7 +2201,7 @@ - Colors for the storage class: + Colors for variable attributes: diff -r 052cc933aea6 -r cd897532aaec libgui/languages/uk_UA.ts --- a/libgui/languages/uk_UA.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/uk_UA.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ - + A Note about Octave's New GUIOne 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.Given the length of time and the number of bug fixes and improvements since the last major release, 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.We Need Your HelpThere 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):<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>We hope you find Octave to be useful. Please help us make it even better for the future! @@ -807,17 +807,12 @@ - + &%1 %2 - - &New File - &Створити - - - + &Save File &Зберегти @@ -827,7 +822,12 @@ &Відкрити... - + + &New Script + + + + Save File &As... Зберегти &як... @@ -913,6 +913,16 @@ + &Indent + + + + + &Unindent + + + + &Find and Replace... @@ -927,7 +937,7 @@ - + &Recent Editor Files @@ -952,7 +962,7 @@ - + &Preferences... @@ -982,7 +992,7 @@ - + Could not open file %1 for read: %2. @@ -1008,7 +1018,7 @@ - + &File &Файл @@ -1023,7 +1033,7 @@ &Правка - + &Debug @@ -1036,7 +1046,7 @@ file_editor_tab - + Goto line @@ -1046,7 +1056,7 @@ - + <unnamed> @@ -1063,15 +1073,15 @@ - - - + + + Octave Editor - + The file %1 is about to be closed but has been modified. @@ -1079,20 +1089,12 @@ - + Octave Files (*.m);;All Files (*) - - It is not advisable to save an Octave script -in a file with a name containing spaces. - -Do you wnat to chose another name? - - - - + Warning: The contents in the editor is modified! @@ -1106,13 +1108,13 @@ - + Could not open file %1 for write: %2. - + Line: @@ -1122,7 +1124,18 @@ - + + "%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name? + + + + It seems that '%1' has been modified by another application. Do you want to reload it? @@ -1155,7 +1168,12 @@ - + + Set Browser Directory... + + + + Find Files ... @@ -1176,7 +1194,7 @@ - + Show Octave directory @@ -1201,12 +1219,7 @@ - - Search Directory... - - - - + Find Files... @@ -1221,7 +1234,7 @@ - + File size @@ -1518,12 +1531,7 @@ - - Enter the filename expression - - - - + Start in: @@ -1543,22 +1551,12 @@ - - Recurse directories - - - - + Search recursively through directories for matching files - - Include directories - - - - + Include matching directories in search results @@ -1578,8 +1576,23 @@ - - Search must match text + + Enter the filename search expression + + + + + Search subdirectories + + + + + Include directory names + + + + + Enter the file content search expression @@ -1734,13 +1747,13 @@ main_window - + Load Workspace Завантажити область змінних - - + + About Octave Про Octave @@ -1755,12 +1768,7 @@ - - Script - - - - + Figure @@ -1800,12 +1808,23 @@ - + Save Workspace As - + + The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead? + + + + The release notes file '%1' is empty. @@ -1820,12 +1839,12 @@ - + Octave Community News - + Clear Clipboard @@ -1890,22 +1909,12 @@ - + Octave - - The file %1 -contains spaces and can not be executed. - -Do you want to execute -%2 -instead? - - - - + Load Workspace... @@ -1915,7 +1924,12 @@ - + + New Script + + + + Function... @@ -2006,8 +2020,8 @@ - - + + Browse directories @@ -2081,7 +2095,7 @@ news_reader - + <html> <body> @@ -2159,7 +2173,7 @@ octave_qt_link - + Yes @@ -2184,12 +2198,12 @@ - The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. + The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path. - The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2. + The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2. @@ -2235,17 +2249,17 @@ settings_dialog - + Settings Налаштування - + General - + Octave logo only @@ -2255,12 +2269,12 @@ - + Dock widget title bar - + Custom style @@ -2275,22 +2289,17 @@ - + Editor Редактор - + Color - - Max. tab width in pixel - - - - + Indent width @@ -2345,67 +2354,114 @@ - + Use custom file editor - + + emacs +%l %f + + + + Editor Styles - + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> - + Terminal Colors - + Font - + Show line numbers - + Highlight current line - + Code completion - + Show complete path in window title - + + Interface + + + + Graphic icons - + + Octave Startup + + + + + These preferences are applied after the startup files like .octaverc. + + + + + + Startup path + + + + + + Browse + + + + + Restore last Octave directory of previous session + + + + Show whitespace - + Do not show whitespace used for indentation - + + Tab width min. + + + + + max. + + + + # of characters typed before completion list displayed @@ -2415,92 +2471,102 @@ - + command line (%f=file, %l=line): - - emacs - emacs - - - + Terminal Командний рядок - + Cursor type: + + Cursor blinking + + + + + Use foreground color + + + + + Font size + + + + + Set focus to terminal when running a command from within another widget + + + + + File Browser + Файловий менеджер + + + + Show file size + Показувати розмір файлів + + + + Show file type + Показувати типи файлів + + + + Show date of last modification + Показувати дату останньої зміни + + + + Show hidden files + Показувати приховані файли + + + + Display + + + + + Alternating row colors + Чергувати колір рядків + + + + Behavior + + + + + Restore last directory of previous session + + + + + Workspace + Область змінних + + + + Storage Class Colors + + + + + Network + + + - Cursor blinking - - - - - Use foreground color - - - - - Font size - - - - - Set focus to terminal when running a command from within another widget - - - - - File Browser - Файловий менеджер - - - - Show file size - Показувати розмір файлів - - - - Show file type - Показувати типи файлів - - - - Show date of last modification - Показувати дату останньої зміни - - - - Show hidden files - Показувати приховані файли - - - - Alternating row colors - Чергувати колір рядків - - - - Workspace - Область змінних - - - - Storage Class Colors - - - - - Network - - - - Allow Octave to connect to the Octave web site to display current news and information @@ -2515,27 +2581,27 @@ - + Icon set for dock widgets - + Language (requires restart) - + Icon size - + Synchronize Octave working directory with file browser - + Socks5Proxy @@ -2565,9 +2631,9 @@ Пароль: - + - + System setting @@ -2614,6 +2680,16 @@ short form for underlined + + + Set Octave Startup Directory + + + + + Set File Browser Startup Directory + + setup_community_news @@ -2722,7 +2798,7 @@ - Storage Class + Attribute @@ -2771,7 +2847,7 @@ - Colors for the storage class: + Colors for variable attributes: diff -r 052cc933aea6 -r cd897532aaec libgui/src/files-dock-widget.cc --- a/libgui/src/files-dock-widget.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/files-dock-widget.cc Thu Jan 23 16:16:07 2014 -0500 @@ -127,7 +127,7 @@ popdown_menu->addSeparator (); popdown_menu->addAction (QIcon (":/actions/icons/folder.png"), - tr ("Search Directory..."), + tr ("Set Browser Directory..."), this, SLOT (popdownmenu_search_dir (bool))); popdown_menu->addSeparator (); popdown_menu->addAction (QIcon (":/actions/icons/findf.png"), diff -r 052cc933aea6 -r cd897532aaec libgui/src/find-files-dialog.cc --- a/libgui/src/find-files-dialog.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/find-files-dialog.cc Thu Jan 23 16:16:07 2014 -0500 @@ -61,7 +61,7 @@ QLabel * file_name_label = new QLabel (tr ("Named:")); _file_name_edit = new QLineEdit; - _file_name_edit->setToolTip (tr ("Enter the filename expression")); + _file_name_edit->setToolTip (tr ("Enter the filename search expression")); _file_name_edit->setText (settings->value ("findfiles/file_name", "*").toString ()); @@ -79,13 +79,13 @@ _browse_button->setToolTip (tr ("Browse for start directory")); connect (_browse_button, SIGNAL (clicked ()), this, SLOT (browse_folders ())); - _recurse_dirs_check = new QCheckBox (tr ("Recurse directories")); + _recurse_dirs_check = new QCheckBox (tr ("Search subdirectories")); _recurse_dirs_check->setChecked (settings->value ("findfiles/recurse_dirs", false).toBool ()); _recurse_dirs_check->setToolTip ( tr ("Search recursively through directories for matching files")); - _include_dirs_check = new QCheckBox (tr ("Include directories")); + _include_dirs_check = new QCheckBox (tr ("Include directory names")); _include_dirs_check->setChecked (settings->value ("findfiles/include_dirs", false).toBool ()); _include_dirs_check->setToolTip ( @@ -97,7 +97,7 @@ _name_case_check->setToolTip (tr ("Set matching name is case insensitive")); _contains_text_check = new QCheckBox (tr ("Contains text:")); - _contains_text_check->setToolTip (tr ("Search must match text")); + _contains_text_check->setToolTip (tr ("Enter the file content search expression")); _contains_text_check->setChecked (settings->value ("findfiles/check_text", false).toBool ()); diff -r 052cc933aea6 -r cd897532aaec libgui/src/m-editor/file-editor.cc --- a/libgui/src/m-editor/file-editor.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/m-editor/file-editor.cc Thu Jan 23 16:16:07 2014 -0500 @@ -856,10 +856,26 @@ int icon_size = settings->value ("toolbar_icon_size", 16).toInt (); _tool_bar->setIconSize (QSize (icon_size, icon_size)); - int tab_width = settings->value ("editor/notebook_tab_width", 300).toInt (); - QString style_sheet = QString ("QTabBar::tab {max-height: 4ex; " - "max-width: %1px; text-align: right }"). - arg (tab_width); + int tab_width_min = settings->value ("editor/notebook_tab_width_min", 160) + .toInt (); + int tab_width_max = settings->value ("editor/notebook_tab_width_max", 300) + .toInt (); + + QString style_sheet; + if (settings->value ("editor/longWindowTitle", false).toBool ()) + { + style_sheet = QString ("QTabBar::tab {max-height: 4ex; " + "min-width: %1px; max-width: %2px;}") + .arg (tab_width_min).arg (tab_width_max); + _tab_widget->setElideMode (Qt::ElideLeft); + } + else + { + style_sheet = QString ("QTabBar::tab {max-height: 4ex;}"); + _tab_widget->setElideMode (Qt::ElideNone); + } + + _tab_widget->setUsesScrollButtons (true); _tab_widget->setStyleSheet (style_sheet); // Relay signal to file editor tabs. @@ -894,11 +910,9 @@ #ifdef HAVE_QTABWIDGET_SETMOVABLE _tab_widget->setMovable (true); #endif - _tab_widget->setElideMode (Qt::ElideLeft); - QAction *new_action = new QAction (QIcon (":/actions/icons/filenew.png"), - tr ("&New File"), _tool_bar); + tr ("&New Script"), _tool_bar); QAction *open_action = new QAction (QIcon (":/actions/icons/folder_documents.png"), tr ("&Open File..."), _tool_bar); diff -r 052cc933aea6 -r cd897532aaec libgui/src/main-window.cc --- a/libgui/src/main-window.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/main-window.cc Thu Jan 23 16:16:07 2014 -0500 @@ -1472,7 +1472,7 @@ _new_script_action = new_menu->addAction (QIcon (":/actions/icons/filenew.png"), - tr ("Script")); + tr ("New Script")); _new_script_action->setShortcutContext (Qt::ApplicationShortcut); _new_function_action = new_menu->addAction (tr ("Function...")); diff -r 052cc933aea6 -r cd897532aaec libgui/src/octave-qt-link.cc --- a/libgui/src/octave-qt-link.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/octave-qt-link.cc Thu Jan 23 16:16:07 2014 -0500 @@ -311,8 +311,8 @@ QString msg = (addpath_option - ? tr ("The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir) - : tr ("The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir)); + ? tr ("The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir) + : tr ("The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir)); QString title = tr ("Change Directory or Add Directory to Load Path"); diff -r 052cc933aea6 -r cd897532aaec libgui/src/settings-dialog.cc --- a/libgui/src/settings-dialog.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/settings-dialog.cc Thu Jan 23 16:16:07 2014 -0500 @@ -173,8 +173,10 @@ settings->value ("editor/tab_width", 2).toInt ()); ui->editor_longWindowTitle->setChecked ( settings->value ("editor/longWindowTitle",false).toBool ()); - ui->editor_notebook_tab_width->setValue ( - settings->value ("editor/notebook_tab_width", 300).toInt ()); + ui->editor_notebook_tab_width_min->setValue ( + settings->value ("editor/notebook_tab_width_min", 160).toInt ()); + ui->editor_notebook_tab_width_max->setValue ( + settings->value ("editor/notebook_tab_width_max", 300).toInt ()); ui->editor_restoreSession->setChecked ( settings->value ("editor/restoreSession", true).toBool ()); ui->editor_create_new_file->setChecked ( @@ -570,8 +572,10 @@ ui->editor_tab_width_spinbox->value ()); settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked ()); - settings->setValue ("editor/notebook_tab_width", - ui->editor_notebook_tab_width->value ()); + settings->setValue ("editor/notebook_tab_width_min", + ui->editor_notebook_tab_width_min->value ()); + settings->setValue ("editor/notebook_tab_width_max", + ui->editor_notebook_tab_width_max->value ()); settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ()); settings->setValue ("editor/create_new_file", diff -r 052cc933aea6 -r cd897532aaec libgui/src/settings-dialog.ui --- a/libgui/src/settings-dialog.ui Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/settings-dialog.ui Thu Jan 23 16:16:07 2014 -0500 @@ -32,7 +32,7 @@ - 0 + 5 @@ -388,7 +388,7 @@ 0 0 - 554 + 662 399 @@ -554,16 +554,45 @@ - + - Max. tab width in pixel + Tab width min. - - + + - 100 + 80 + + + 600 + + + 20 + + + 160 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 180 600 @@ -576,18 +605,12 @@ - - - - Qt::Horizontal + + + + max. - - - 40 - 20 - - - + @@ -1017,7 +1040,7 @@ false - emacs + emacs +%l %f @@ -1327,8 +1350,8 @@ 0 0 - 474 - 318 + 678 + 378 @@ -1491,8 +1514,8 @@ 0 0 - 154 - 114 + 678 + 378 @@ -1516,7 +1539,7 @@ - Storage Class Colors + Colors for variable attributes @@ -1569,8 +1592,8 @@ 0 0 - 529 - 204 + 678 + 378 @@ -2174,5 +2197,69 @@ + + editor_longWindowTitle + toggled(bool) + editor_lbl_min_tab_width + setEnabled(bool) + + + 145 + 72 + + + 343 + 72 + + + + + editor_longWindowTitle + toggled(bool) + editor_notebook_tab_width_max + setEnabled(bool) + + + 145 + 72 + + + 437 + 72 + + + + + editor_longWindowTitle + toggled(bool) + editor_lbl_max_tab_width + setEnabled(bool) + + + 145 + 72 + + + 439 + 72 + + + + + editor_longWindowTitle + toggled(bool) + editor_notebook_tab_width_min + setEnabled(bool) + + + 145 + 72 + + + 393 + 72 + + + diff -r 052cc933aea6 -r cd897532aaec libgui/src/workspace-model.cc --- a/libgui/src/workspace-model.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/workspace-model.cc Thu Jan 23 16:16:07 2014 -0500 @@ -39,7 +39,7 @@ _columnNames.append (tr ("Class")); _columnNames.append (tr ("Dimension")); _columnNames.append (tr ("Value")); - _columnNames.append (tr ("Storage Class")); + _columnNames.append (tr ("Attribute")); for (int i = 0; i < resource_manager::storage_class_chars ().length (); i++) _storage_class_colors.append (QColor (Qt::white)); diff -r 052cc933aea6 -r cd897532aaec libgui/src/workspace-view.cc --- a/libgui/src/workspace-view.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/workspace-view.cc Thu Jan 23 16:16:07 2014 -0500 @@ -258,7 +258,7 @@ QString tool_tip; tool_tip = QString (tr ("View the variables in the active workspace.
")); - tool_tip += QString (tr ("Colors for the storage class:")); + tool_tip += QString (tr ("Colors for variable attributes:")); for (int i = 0; i < resource_manager::storage_class_chars ().length (); i++) { tool_tip += diff -r 052cc933aea6 -r cd897532aaec scripts/plot/draw/errorbar.m --- a/scripts/plot/draw/errorbar.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/errorbar.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,47 +17,79 @@ ## . ## -*- texinfo -*- -## @deftypefn {Function File} {} errorbar (@var{args}) +## @deftypefn {Function File} {} errorbar (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} errorbar (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) ## @deftypefnx {Function File} {} errorbar (@var{hax}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} errorbar (@dots{}) -## Create a 2-D with errorbars. +## Create a 2-D plot with errorbars. ## -## Many different combinations of arguments are possible. The simplest -## form is +## Many different combinations of arguments are possible. The simplest form is ## ## @example ## errorbar (@var{y}, @var{ey}) ## @end example ## ## @noindent -## where the first argument is taken as the set of @var{y} coordinates -## and the second argument @var{ey} is taken as the errors of the -## @var{y} values. @var{x} coordinates are taken to be the indices -## of the elements, starting with 1. +## where the first argument is taken as the set of @var{y} coordinates, the +## second argument @var{ey} are the errors around the @var{y} values, and the +## @var{x} coordinates are taken to be the indices of the elements +## (@code{1:numel (@var{y})}). ## -## If more than two arguments are given, they are interpreted as +## The general form of the function is ## ## @example -## errorbar (@var{x}, @var{y}, @dots{}, @var{fmt}, @dots{}) +## errorbar (@var{x}, @var{y}, @var{err1}, @dots{}, @var{fmt}, @dots{}) ## @end example ## ## @noindent -## where after @var{x} and @var{y} there can be up to four error -## parameters such as @var{ey}, @var{ex}, @var{ly}, @var{uy}, etc., -## depending on the plot type. Any number of argument sets may appear, -## as long as they are separated with a format string @var{fmt}. +## After the @var{x} and @var{y} arguments there can be 1, 2, or 4 +## parameters specifying the error values depending on the nature of the error +## values and the plot format @var{fmt}. +## +## @table @asis +## @item @var{err} (scalar) +## When the error is a scalar all points share the same error value. +## The errorbars are symmetric and are drawn from @var{data}-@var{err} to +## @var{data}+@var{err}. +## The @var{fmt} argument determines whether @var{err} is in the x-direction, +## y-direction (default), or both. +## +## @item @var{err} (vector or matrix) +## Each data point has a particular error value. +## The errorbars are symmetric and are drawn from @var{data}(n)-@var{err}(n) to +## @var{data}(n)+@var{err}(n). ## -## If @var{y} is a matrix, @var{x} and error parameters must also be matrices -## having same dimensions. The columns of @var{y} are plotted versus the -## corresponding columns of @var{x} and errorbars are drawn from -## the corresponding columns of error parameters. +## @item @var{lerr}, @var{uerr} (scalar) +## The errors have a single low-side value and a single upper-side value. +## The errorbars are not symmetric and are drawn from @var{data}-@var{lerr} to +## @var{data}+@var{uerr}. +## +## @item @var{lerr}, @var{uerr} (vector or matrix) +## Each data point has a low-side error and an upper-side error. +## The errorbars are not symmetric and are drawn from +## @var{data}(n)-@var{lerr}(n) to @var{data}(n)+@var{uerr}(n). +## @end table ## -## If @var{fmt} is missing, yerrorbars ("~") plot style is assumed. +## Any number of data sets (@var{x1},@var{y1}, @var{x2},@var{y2}, @dots{}) may +## appear as long as they are separated by a format string @var{fmt}. ## -## If the @var{fmt} argument is supplied, it is interpreted as in -## normal plots. In addition, @var{fmt} may include an errorbar style -## which must precede the line and marker format. The following plot -## styles are supported by errorbar: +## If @var{y} is a matrix, @var{x} and the error parameters must also be +## matrices having the same dimensions. The columns of @var{y} are plotted +## versus the corresponding columns of @var{x} and errorbars are taken from +## the corresponding columns of the error parameters. +## +## If @var{fmt} is missing, the yerrorbars ("~") plot style is assumed. +## +## If the @var{fmt} argument is supplied then it is interpreted, as in normal +## plots, to specify the line style, marker, and color. In addition, +## @var{fmt} may include an errorbar style which @strong{must precede} the +## ordinary format codes. The following errorbar styles are supported: ## ## @table @samp ## @item ~ @@ -69,14 +101,14 @@ ## @item ~> ## Set xyerrorbars plot style. ## -## @item # -## Set boxes plot style. +## @item #~ +## Set yboxes plot style. ## -## @item #~ -## Set boxerrorbars plot style. +## @item # +## Set xboxes plot style. ## ## @item #~> -## Set boxxyerrorbars plot style. +## Set xyboxes plot style. ## @end table ## ## If the first argument @var{hax} is an axes handle, then plot into this axis, @@ -85,15 +117,24 @@ ## The optional return value @var{h} is a handle to the hggroup object ## representing the data plot and errorbars. ## +## Note: For compatibility with @sc{matlab} a line is drawn through all data +## points. However, most scientific errorbar plots are a scatter plot of +## points with errorbars. To accomplish this, add a marker style to the +## @var{fmt} argument such as @qcode{"."}. Alternatively, remove the line +## by modifying the returned graphic handle with +## @code{set (h, "linestyle", "none")}. +## ## Examples: ## ## @example -## errorbar (@var{x}, @var{y}, @var{ex}, ">") +## errorbar (@var{x}, @var{y}, @var{ex}, ">.r") ## @end example ## ## @noindent ## produces an xerrorbar plot of @var{y} versus @var{x} with @var{x} -## errorbars drawn from @var{x}-@var{ex} to @var{x}+@var{ex}. +## errorbars drawn from @var{x}-@var{ex} to @var{x}+@var{ex}. The marker +## @qcode{"."} is used so no connecting line is drawn and the errorbars +## appear in red. ## ## @example ## @group diff -r 052cc933aea6 -r cd897532aaec scripts/plot/draw/loglogerr.m --- a/scripts/plot/draw/loglogerr.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/loglogerr.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,7 +17,14 @@ ## . ## -*- texinfo -*- -## @deftypefn {Function File} {} loglogerr (@var{args}) +## @deftypefn {Function File} {} loglogerr (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} loglogerr (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) ## @deftypefnx {Function File} {} loglogerr (@var{hax}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} loglogerr (@dots{}) ## Produce 2-D plots on a double logarithm axis with errorbars. diff -r 052cc933aea6 -r cd897532aaec scripts/plot/draw/semilogxerr.m --- a/scripts/plot/draw/semilogxerr.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/semilogxerr.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,9 +17,16 @@ ## . ## -*- texinfo -*- -## @deftypefn {Function File} {} semilogxerr (@var{args}) -## @deftypefnx {Function File} {} semilogxerr (@var{hax}, @var{args}) -## @deftypefnx {Function File} {@var{h} =} semilogxerr (@var{args}) +## @deftypefn {Function File} {} semilogxerr (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogxerr (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) +## @deftypefnx {Function File} {} semilogxerr (@var{hax}, @dots{}) +## @deftypefnx {Function File} {@var{h} =} semilogxerr (@dots{}) ## Produce 2-D plots using a logarithmic scale for the x-axis and ## errorbars at each data point. ## diff -r 052cc933aea6 -r cd897532aaec scripts/plot/draw/semilogyerr.m --- a/scripts/plot/draw/semilogyerr.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/semilogyerr.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,9 +17,16 @@ ## . ## -*- texinfo -*- -## @deftypefn {Function File} {} semilogyerr (@var{args}) -## @deftypefnx {Function File} {} semilogyerr (@var{hax}, @var{args}) -## @deftypefnx {Function File} {@var{h} =} semilogyerr (@var{args}) +## @deftypefn {Function File} {} semilogyerr (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogyerr (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) +## @deftypefnx {Function File} {} semilogyerr (@var{hax}, @dots{}) +## @deftypefnx {Function File} {@var{h} =} semilogyerr (@dots{}) ## Produce 2-D plots using a logarithmic scale for the y-axis and ## errorbars at each data point. ## diff -r 052cc933aea6 -r cd897532aaec src/Makefile.am --- a/src/Makefile.am Thu Jan 23 12:53:32 2014 -0800 +++ b/src/Makefile.am Thu Jan 23 16:16:07 2014 -0500 @@ -38,16 +38,18 @@ EXTRA_DIST = \ main.in.cc \ mkoctfile.in.cc \ - mkoctfile.in.sh \ - octave-config.in.cc \ - octave-config.in.sh + octave-config.in.cc DISTCLEANFILES = \ - main.cc + main.cc \ + mkoctfile.cc \ + octave-config.cc -OCTAVE_BINARIES = \ +bin_PROGRAMS = \ + mkoctfile \ octave \ - octave-cli + octave-cli \ + octave-config OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT) @@ -111,12 +113,6 @@ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_GUI_LINK_OPTS) -if AMCOND_BUILD_COMPILED_AUX_PROGRAMS -bin_PROGRAMS = \ - $(OCTAVE_BINARIES) \ - mkoctfile \ - octave-config - mkoctfile_SOURCES = nodist_mkoctfile_SOURCES = mkoctfile.cc mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS) @@ -128,36 +124,14 @@ $(top_builddir)/libgnu/libgnu.la \ $(LIBS) -DISTCLEANFILES += mkoctfile.cc octave-config.cc - -else -bin_PROGRAMS = \ - $(OCTAVE_BINARIES) - -bin_SCRIPTS = \ - mkoctfile \ - octave-config -endif - all-local: $(OCTAVE_VERSION_LINKS) -if AMCOND_BUILD_COMPILED_AUX_PROGRAMS octave-config.cc: octave-config.in.cc Makefile @$(do_subst_default_vals) mkoctfile.cc: mkoctfile.in.cc Makefile @$(do_subst_config_vals) -else -octave-config: octave-config.in.sh Makefile - @$(do_subst_default_vals) - chmod a+rx $@ - -mkoctfile: mkoctfile.in.sh Makefile - @$(do_subst_config_vals) - chmod a+rx $@ -endif - ## main.cc must depend on Makefile. Calling configure may change ## default/config values. However, calling configure will also ## regenerate the Makefiles from Makefile.am and trigger the rules below. @@ -174,23 +148,11 @@ mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ done -if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS - cd $(DESTDIR)$(bindir) && \ - for f in $(basename $(bin_SCRIPTS)); do \ - mv $$f $$f-$(version) && \ - $(LN_S) $$f-$(version) $$f; \ - done -endif remove-version-links: for f in $(basename $(bin_PROGRAMS)); do \ rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ done -if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS - for f in $(basename $(bin_SCRIPTS)); do \ - rm -f $(DESTDIR)$(bindir)/$$f-$(version); \ - done -endif .PHONY: make-version-links remove-version-links @@ -206,5 +168,4 @@ $(LN_S) $< $@ CLEANFILES = \ - $(bin_SCRIPTS) \ $(OCTAVE_VERSION_LINKS) diff -r 052cc933aea6 -r cd897532aaec src/mkoctfile.in.cc --- a/src/mkoctfile.in.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/src/mkoctfile.in.cc Thu Jan 23 16:16:07 2014 -0500 @@ -34,6 +34,8 @@ #include #include +#include + #if defined (__WIN32__) && ! defined (_POSIX_VERSION) #include #ifdef _MSC_VER @@ -242,11 +244,14 @@ vars["FFTW3F_LIBS"] = get_variable ("FFTW3F_LIBS", %OCTAVE_CONF_FFTW3F_LIBS%); vars["LIBS"] = get_variable ("LIBS", %OCTAVE_CONF_LIBS%); vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - vars["OCTAVE_LINK_DEPS"] = get_variable ("FLIBS", + vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS", %OCTAVE_CONF_OCTAVE_LINK_DEPS%); - vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%); - vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - + vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS", + %OCTAVE_CONF_OCTAVE_LINK_OPTS%); + vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS", + %OCTAVE_CONF_OCT_LINK_DEPS%); + vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS", + %OCTAVE_CONF_OCT_LINK_OPTS%); vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%); vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%); vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", @@ -294,6 +299,10 @@ "\n" " -M, --depend Generate dependency files (.d) for C and C++\n" " source files.\n" +#if ! defined (__WIN32__) || defined (_POSIX_VERSION) +"\n" +" -pthread Add -pthread to link command.\n" +#endif "\n" " -RDIR Add -RDIR to link command.\n" "\n" @@ -312,29 +321,33 @@ " -p VAR, --print VAR Print configuration variable VAR. Recognized\n" " variables are:\n" "\n" -" ALL_CFLAGS FFTW3F_LDFLAGS\n" -" ALL_CXXFLAGS FFTW3F_LIBS\n" -" ALL_FFLAGS FLIBS\n" -" ALL_LDFLAGS FPICFLAG\n" -" AR INCFLAGS\n" -" BLAS_LIBS LAPACK_LIBS\n" -" CC LDFLAGS\n" -" CFLAGS LD_CXX\n" -" CPICFLAG LD_STATIC_FLAG\n" -" CPPFLAGS LFLAGS\n" -" CXX LIBOCTAVE\n" -" CXXFLAGS LIBOCTINTERP\n" -" CXXPICFLAG LIBS\n" -" DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" -" DEPEND_FLAGS OCTAVE_LINK_DEPS\n" -" DL_LD OCT_LINK_DEPS\n" -" DL_LDFLAGS RANLIB\n" -" EXEEXT RDYNAMIC_FLAG\n" -" F77 READLINE_LIBS\n" -" F77_INTEGER_8_FLAG SED\n" -" FFLAGS XTRA_CFLAGS\n" -" FFTW3_LDFLAGS XTRA_CXXFLAGS\n" -" FFTW3_LIBS\n" +" ALL_CFLAGS INCFLAGS\n" +" ALL_CXXFLAGS INCLUDEDIR\n" +" ALL_FFLAGS LAPACK_LIBS\n" +" ALL_LDFLAGS LD_CXX\n" +" AR LDFLAGS\n" +" BLAS_LIBS LD_STATIC_FLAG\n" +" CC LFLAGS\n" +" CFLAGS LIBDIR\n" +" CPICFLAG LIBOCTAVE\n" +" CPPFLAGS LIBOCTINTERP\n" +" CXX LIBS\n" +" CXXFLAGS OCTAVE_HOME\n" +" CXXPICFLAG OCTAVE_LIBS\n" +" DEPEND_EXTRA_SED_PATTERN OCTAVE_LINK_DEPS\n" +" DEPEND_FLAGS OCTAVE_LINK_OPTS\n" +" DL_LD OCTAVE_PREFIX\n" +" DL_LDFLAGS OCTINCLUDEDIR\n" +" F77 OCTLIBDIR\n" +" F77_INTEGER8_FLAG OCT_LINK_DEPS\n" +" FFLAGS OCT_LINK_OPTS\n" +" FFTW3F_LDFLAGS RANLIB\n" +" FFTW3F_LIBS RDYNAMIC_FLAG\n" +" FFTW3_LDFLAGS READLINE_LIBS\n" +" FFTW3_LIBS SED\n" +" FFTW_LIBS SPECIAL_MATH_LIB\n" +" FLIBS XTRA_CFLAGS\n" +" FPICFLAG XTRA_CXXFLAGS\n" "\n" " --link-stand-alone Link a stand-alone executable file.\n" "\n" @@ -523,6 +536,12 @@ { ldflags += (" " + arg); } +#if ! defined (__WIN32__) || defined (_POSIX_VERSION) + else if (arg == "-pthread") + { + ldflags += (" " + arg); + } +#endif else if (arg == "-M" || arg == "-depend" || arg == "--depend") { depend = true; @@ -779,7 +798,7 @@ + objfiles + " " + libfiles + " " + ldflags + " " + vars["LFLAGS"] + " -loctinterp -loctave " - + " " + vars["OCT_LINK_OPTS"] + + " " + vars["OCTAVE_LINK_OPTS"] + " " + vars["OCTAVE_LINK_DEPS"]; result = run_command (cmd); } diff -r 052cc933aea6 -r cd897532aaec src/mkoctfile.in.sh --- a/src/mkoctfile.in.sh Thu Jan 23 12:53:32 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,561 +0,0 @@ -#! /bin/sh -## -## mkoctfile -- create a .oct file suitable for dynamic linking by -## Octave. -## -## Copyright (C) 1996-2013 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by the -## Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but WITHOUT -## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -## for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## . - -# Exit immediately on any error. - -set -e - -: ${SED=%OCTAVE_CONF_SED%} - -OCTAVE_VERSION=%OCTAVE_CONF_VERSION% -OCTAVE_PREFIX=%OCTAVE_CONF_PREFIX% - -DEFAULT_BINDIR=%OCTAVE_BINDIR% -DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% -DEFAULT_LIBDIR=%OCTAVE_CONF_LIBDIR% -DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% -DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR% - -if [ -n "$OCTAVE_HOME" ]; then - DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_LIBDIR="`echo $DEFAULT_LIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" -fi - -: ${BINDIR=$DEFAULT_BINDIR} -: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} -: ${LIBDIR=$DEFAULT_LIBDIR} -: ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} -: ${OCTLIBDIR=$DEFAULT_OCTLIBDIR} - -DEFAULT_INCFLAGS="-I$OCTINCLUDEDIR/.. -I$OCTINCLUDEDIR" -if [ "$INCLUDEDIR" != /usr/include ]; then - DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I$INCLUDEDIR" -fi - -DEFAULT_LFLAGS="-L$OCTLIBDIR" -if [ "$LIBDIR" != /usr/lib ]; then - DEFAULT_LFLAGS="$DEFAULT_LFLAGS -L$LIBDIR" -fi - -# Default values for these variables are filled in when Octave is -# compiled. - -: ${EXEEXT=%OCTAVE_CONF_EXEEXT%} - -: ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} -: ${INCFLAGS=$DEFAULT_INCFLAGS} -: ${F77=%OCTAVE_CONF_MKOCTFILE_F77%} -: ${FFLAGS=%OCTAVE_CONF_FFLAGS%} -: ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%} -: ${CC=%OCTAVE_CONF_MKOCTFILE_CC%} -: ${CFLAGS=%OCTAVE_CONF_CFLAGS%} -: ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%} -: ${CXX=%OCTAVE_CONF_MKOCTFILE_CXX%} -: ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%} -: ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%} -: ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%} -: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%} - -: ${AR=%OCTAVE_CONF_MKOCTFILE_AR%} -: ${RANLIB=%OCTAVE_CONF_MKOCTFILE_RANLIB%} - -: ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%} -: ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%} - -: ${DL_LD=%OCTAVE_CONF_MKOCTFILE_DL_LD%} -: ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%} - -: ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%} -: ${LIBOCTAVE=-loctave} -: ${LIBOCTINTERP=-loctinterp} -: ${READLINE_LIBS=-lreadline} -: ${LAPACK_LIBS=%OCTAVE_CONF_LAPACK_LIBS%} -: ${BLAS_LIBS=%OCTAVE_CONF_BLAS_LIBS%} -: ${FFTW3_LDFLAGS=%OCTAVE_CONF_FFTW3_LDFLAGS%} -: ${FFTW3_LIBS=%OCTAVE_CONF_FFTW3_LIBS%} -: ${FFTW3F_LDFLAGS=%OCTAVE_CONF_FFTW3F_LDFLAGS%} -: ${FFTW3F_LIBS=%OCTAVE_CONF_FFTW3F_LIBS%} -: ${LIBS=%OCTAVE_CONF_LIBS%} -: ${FLIBS=%OCTAVE_CONF_FLIBS%} -: ${OCTAVE_LINK_DEPS=%OCTAVE_CONF_OCTAVE_LINK_DEPS%} -: ${OCTAVE_LINK_OPTS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%} -: ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%} -: ${OCT_LINK_OPTS=%OCTAVE_CONF_OCT_LINK_OPTS%} -: ${LD_CXX=%OCTAVE_CONF_MKOCTFILE_LD_CXX%} -: ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%} -: ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%} -: ${LFLAGS=$DEFAULT_LFLAGS} -: ${F77_INTEGER_8_FLAG=%OCTAVE_CONF_F77_INTEGER_8_FLAG%} - -: ${ALL_FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"} - -: ${ALL_CFLAGS="$INCFLAGS $XTRA_CFLAGS $CFLAGS"} - -: ${ALL_CXXFLAGS="$INCFLAGS $XTRA_CXXFLAGS $CXXFLAGS"} - -: ${ALL_LDFLAGS="$LD_STATIC_FLAG $CPICFLAG $LDFLAGS"} - -: ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB"} - -# Local variables. - -FFTW_LIBS="$FFTW3_LDFLAGS $FFTW3_LIBS $FFTW3F_LDFLAGS $FFTW3F_LIBS" - -usage_msg="usage: mkoctfile [options] file ..." - -version_msg="mkoctfile, version $OCTAVE_VERSION" - -cfiles= -ccfiles= -f77files= -objfiles= -libfiles= -octfiles= -octfile= -outputfile= -incflags= -defs= -ldflags= -dbg=: -pass_on_options= -strip=false -no_oct_file_strip_on_this_platform=%NO_OCT_FILE_STRIP% -link=true -link_stand_alone=false -output_ext=".oct" -depend=false -compile=true - -if [ $# -eq 0 ]; then - echo $usage_msg 1>&2 - exit 1 -fi - -if [ $# -eq 1 ]; then - case "$1" in - -v | -version | --version) - echo $version_msg 1>&2 - exit 0 - ;; - esac -fi - -while [ $# -gt 0 ]; do - file= - case "$1" in - *.c) - file=$1 - cfiles="$cfiles $file" - ;; - *.cc | *.C | *.cpp) - file=$1 - ccfiles="$ccfiles $file" - ;; - *.f | *.F | *.f90 | *.F90) - file=$1 - f77files="$f77files $file" - ;; - *.o) - file=$1 - objfiles="$objfiles $file" - ;; - *.a) - file=$1 - libfiles="$libfiles $file" - ;; - -d | -debug | --debug | -v | -verbose | --verbose) - dbg=echo - ;; - -h | -\? | -help | --help) - echo $usage_msg 1>&2 - cat << EOF - -Options: - - -h, -?, --help Print this message. - - -IDIR Add -IDIR to compile commands. - - -idirafter DIR Add -idirafter DIR to compile commands. - - -DDEF Add -DDEF to compile commands. - - -lLIB Add -lLIB to link command. - - -LDIR Add -LDIR to link command. - - -RDIR Add -RDIR to link command. - - -g Enable debugging option for all compilers. - - -pthread Add -pthread to link command. - - -W... Pass flags to the compiler such as -Wa,OPTION. - - -Wl,... Pass flags to the linker such as -Wl,-rpath=... - - -M, --depend Generate dependency files (.d) for C and C++ - source files. - - -c, --compile Compile, but do not link. - - --link-stand-alone Link a stand-alone executable file. - - -s, --strip Strip output file. - - --mex Create a MEX file. - Set the default output extension to ".mex". - - -o FILE, --output FILE Output file name. Default extension is .oct - (or .mex if --mex is specified) unless linking - a stand-alone executable. - - -p VAR, --print VAR Print configuration variable VAR. Recognized - variables are: - - ALL_CFLAGS FFTW3F_LDFLAGS - ALL_CXXFLAGS FFTW3F_LIBS - ALL_FFLAGS FLIBS - ALL_LDFLAGS FPICFLAG - AR INCFLAGS - BLAS_LIBS LAPACK_LIBS - CC LDFLAGS - CFLAGS LD_CXX - CPICFLAG LD_STATIC_FLAG - CPPFLAGS LFLAGS - CXX LIBOCTAVE - CXXFLAGS LIBOCTINTERP - CXXPICFLAG LIBS - DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS - DEPEND_FLAGS OCTAVE_LINK_DEPS - DL_LD OCT_LINK_DEPS - DL_LDFLAGS RANLIB - EXEEXT RDYNAMIC_FLAG - F77 READLINE_LIBS - F77_INTEGER_8_FLAG SED - FFLAGS XTRA_CFLAGS - FFTW3_LDFLAGS XTRA_CXXFLAGS - FFTW3_LIBS - - - -v, --verbose Echo commands as they are executed. - - FILE Compile or link FILE. Recognized file types are: - - .c C source - .cc C++ source - .C C++ source - .cpp C++ source - .f Fortran source (fixed form) - .F Fortran source (fixed form) - .f90 Fortran source (free form) - .F90 Fortran source (free form) - .o object file - .a library file - -EOF - exit 0 - ;; - -I*) - incflags="$incflags $1" - ;; - -idirafter) - shift - if [ $# -gt 0 ]; then - incflags="$incflags -idirafter $1" - else - echo "mkoctfile: include directory name missing" 1>&2 - fi - ;; - -D*) - defs="$defs $1" - ;; - -[lLR]* | -Wl,*) - ldflags="$ldflags $1" - ;; - -pthread) - ldflags="$ldflags $1" - ;; - -M | -depend | --depend) - depend=true - compile=false - ;; - -o | -ouput | --output) - shift - if [ $# -gt 0 ]; then - outputfile="$1" - else - echo "mkoctfile: output file name missing" 1>&2 - fi - ;; - -p | -print | --print) - shift - if [ $# -gt 0 ]; then - eval echo \${$1} - exit 0 - else - echo "mkoctfile: --print requires argument" 1>&2 - exit 1 - fi - ;; - -s | -strip | --strip) - if $no_oct_file_strip_on_this_platform; then - echo "mkoctfile: stripping disabled on this platform" 1>&2 - else - strip=true - fi - ;; - -c | -compile | --compile) - link=false - ;; - -g) - ALL_CFLAGS="$ALL_CFLAGS -g" - ALL_CXXFLAGS="$ALL_CXXFLAGS -g" - ALL_FFLAGS="$ALL_FFLAGS -g" - ;; - -link-stand-alone | --link-stand-alone) - link_stand_alone=true - ;; - -mex | --mex) - incflags="$incflags -I." - output_ext=".mex" - ;; - -W*) - pass_on_options="$pass_on_options $1" - ;; - *) - echo "mkoctfile: unrecognized argument $1" 1>&2 - exit 1 - ;; - esac - if [ -n "$file" ]; then - if [ -z "$octfile" ]; then - octfile="$file" - fi - fi - shift -done - -if $link_stand_alone; then - if [ -n "$outputfile" ]; then - output_option="-o $outputfile" - fi -else - if [ -n "$outputfile" ]; then - octfile="$outputfile" - case "$octfile" in - *$output_ext) - ;; - *) - octfile="$octfile$output_ext" - ;; - esac - else - octfile=`basename $octfile` - octfile=`echo $octfile | $SED 's,\.[^.]*$,,'`$output_ext - fi -fi - -# Generate dependency files for C and C++ files. - -if $depend; then - if [ -n "$cfiles" ]; then - for f in $cfiles; do - b=`echo $f | $SED 's,\.c$,,'` - d=$b.d - cmd="rm -f $d" - $dbg $cmd - eval $cmd - cmd="$CC $DEPEND_FLAGS $CPPFLAGS $ALL_CFLAGS $incflags $def $f | $SED $DEPEND_EXTRA_SED_PATTERN -e 's,^[^:]*/$.*\.o$:,\1:,' -e 's,$b\.o,pic/& & $d,g' > $d-t && mv $d-t $d" - $dbg $cmd - eval $cmd - done - fi - - if [ -n "$ccfiles" ]; then - for f in $ccfiles; do - case $f in - *.cc) - b=`echo $f | $SED 's,\.cc$,,'` - ;; - *.C) - b=`echo $f | $SED 's,\.C$,,'` - ;; - *.cpp) - b=`echo $f | $SED 's,\.cpp$,,'` - ;; - esac - d=$b.d - cmd="rm -f $d" - $dbg $cmd - eval $cmd - cmd="$CXX $DEPEND_FLAGS $CPPFLAGS $ALL_CXXFLAGS $incflags $defs $f | $SED $DEPEND_EXTRA_SED_PATTERN -e 's,^[^:]*/$.*\.o$:,\1:,' -e 's,$b\.o,pic/& & $d,g' > $d-t && mv $d-t $d" - $dbg $cmd - eval $cmd - done - fi - # If generating dependencies, that's all we do. - exit 0 -fi - -# Compile Fortran, C, and C++ files. Add the name of each object file -# that is produced to the overall list of object files. - -if [ -n "$f77files" ]; then - for f in $f77files; do - case $f in - *.f) - b=`echo $f | $SED 's,.*/,,; s,\.f$,,'` - ;; - *.F) - b=`echo $f | $SED 's,.*/,,; s,\.F$,,'` - ;; - *.f90) - b=`echo $f | $SED 's,.*/,,; s,\.f90$,,'` - ;; - *.F90) - b=`echo $f | $SED 's,.*/,,; s,\.F90$,,'` - ;; - esac - if [ -n "$F77" ]; then - if [ -n "$outputfile" ]; then - if $link; then - o=$b.o - else - o=$outputfile - fi - else - o=$b.o - fi - objfiles="$objfiles $o" - cmd="$F77 -c $FPICFLAG $ALL_FFLAGS $incflags $defs $pass_on_options $f -o $o" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to compile Fortran file $f" 1>&2 - fi - done -fi - -if [ -n "$cfiles" ]; then - for f in $cfiles; do - if [ -n "$CC" ]; then - b=`echo $f | $SED 's,.*/,,; s,\.c$,,'` - if [ -n "$outputfile" ]; then - if $link; then - o=$b.o - else - o=$outputfile - fi - else - o=$b.o - fi - objfiles="$objfiles $o" - cmd="$CC -c $CPPFLAGS $CPICFLAG $ALL_CFLAGS $pass_on_options $incflags $defs $f -o $o" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to compile C++ file $f" 1>&2 - fi - done -fi - -if [ -n "$ccfiles" ]; then - for f in $ccfiles; do - if [ -n "$CXX" ]; then - case $f in - *.cc) - b=`echo $f | $SED 's,.*/,,; s,\.cc$,,'` - ;; - *.C) - b=`echo $f | $SED 's,.*/,,; s,\.C$,,'` - ;; - *.cpp) - b=`echo $f | $SED 's,.*/,,; s,\.cpp$,,'` - ;; - esac - if [ -n "$outputfile" ]; then - if $link; then - o=$b.o - else - o=$outputfile - fi - else - o=$b.o - fi - objfiles="$objfiles $o" - cmd="$CXX -c $CPPFLAGS $CXXPICFLAG $ALL_CXXFLAGS $pass_on_options $incflags $defs $f -o $o" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to compile C++ file $f" 1>&2 - fi - done -fi - -## Uncomment the following group of lines if you get `Text file busy' -## errors from ld. This may happen if the .oct file is currently -## running while you are trying to recompile it. We try moving first, -## since on some systems (HP-UX, maybe others) it is possible to -## rename running programs but not remove them. - -## if [ -f "$octfile" ]; then -## cmd="mv $octfile $octfile.bak" -## $dbg $cmd -## eval $cmd -## cmd="rm -f $octfile.bak" -## $dbg $cmd -## eval $cmd -## fi - -# Link all the object files. - -if $link && [ -n "$objfiles" ]; then - if $link_stand_alone; then - if [ -n "$LD_CXX" ]; then - cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave $OCTAVE_LINK_OPTS $OCTAVE_LINK_DEPS" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to link stand-alone executable file" 1>&2 - exit 1 - fi - else - cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave $OCT_LINK_OPTS $OCT_LINK_DEPS" - $dbg $cmd - eval $cmd - fi - -# Maybe strip it. - - if $strip; then - cmd="strip $octfile" - $dbg $cmd - eval $cmd - fi -fi - -exit 0 diff -r 052cc933aea6 -r cd897532aaec src/octave-config.in.cc --- a/src/octave-config.in.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/src/octave-config.in.cc Thu Jan 23 16:16:07 2014 -0500 @@ -53,23 +53,23 @@ " -p VAR, --print VAR Print the value of the given configuration\n" " variable VAR. Recognized variables are:\n" "\n" -" API_VERSION LOCALAPIARCHLIBDIR\n" -" CANONICAL_HOST_TYPE LOCALAPIFCNFILEDIR\n" -" DEFAULT_PAGER LOCALAPIOCTFILEDIR\n" +" API_VERSION LOCALAPIOCTFILEDIR\n" " ARCHLIBDIR LOCALARCHLIBDIR\n" " BINDIR LOCALFCNFILEDIR\n" -" DATADIR LOCALOCTFILEDIR\n" -" DATAROOTDIR LOCALSTARTUPFILEDIR\n" -" EXEC_PREFIX LOCALVERARCHLIBDIR\n" -" FCNFILEDIR LOCALVERFCNFILEDIR\n" -" LOCALVEROCTFILEDIR MAN1DIR\n" -" IMAGEDIR MANDIR\n" -" MAN1EXT OCTFILEDIR\n" -" INCLUDEDIR OCTINCLUDEDIR\n" -" INFODIR OCTLIBDIR\n" -" INFOFILE PREFIX\n" -" LIBDIR STARTUPFILEDIR\n" -" LIBEXECDIR VERSION\n" +" CANONICAL_HOST_TYPE LOCALOCTFILEDIR\n" +" DATADIR LOCALSTARTUPFILEDIR\n" +" DATAROOTDIR LOCALVERARCHLIBDIR\n" +" DEFAULT_PAGER LOCALVERFCNFILEDIR\n" +" EXEC_PREFIX LOCALVEROCTFILEDIR\n" +" FCNFILEDIR MAN1DIR\n" +" IMAGEDIR MAN1EXT\n" +" INCLUDEDIR MANDIR\n" +" INFODIR OCTFILEDIR\n" +" INFOFILE OCTINCLUDEDIR\n" +" LIBDIR OCTLIBDIR\n" +" LIBEXECDIR PREFIX\n" +" LOCALAPIARCHLIBDIR STARTUPFILEDIR\n" +" LOCALAPIFCNFILEDIR VERSION\n" "\n" " -v, --version Print the Octave version number.\n" "\n"; diff -r 052cc933aea6 -r cd897532aaec src/octave-config.in.sh --- a/src/octave-config.in.sh Thu Jan 23 12:53:32 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ -#! /bin/sh - -## -## octave-config - reports some configuration values for Octave -## -## Copyright (C) 2001-2013 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## . -## -## Original version by Rafael Laboissiere -## distributed as free software in the public domain. - -API_VERSION=%OCTAVE_API_VERSION% -CANONICAL_HOST_TYPE=%OCTAVE_CANONICAL_HOST_TYPE% -DEFAULT_PAGER=%OCTAVE_DEFAULT_PAGER% -ARCHLIBDIR=%OCTAVE_ARCHLIBDIR% -BINDIR=%OCTAVE_BINDIR% -DATADIR=%OCTAVE_DATADIR% -DATAROOTDIR=%OCTAVE_DATAROOTDIR% -EXEC_PREFIX=%OCTAVE_EXEC_PREFIX% -FCNFILEDIR=%OCTAVE_FCNFILEDIR% -IMAGEDIR=%OCTAVE_IMAGEDIR% -INCLUDEDIR=%OCTAVE_INCLUDEDIR% -INFODIR=%OCTAVE_INFODIR% -INFOFILE=%OCTAVE_INFOFILE% -LIBDIR=%OCTAVE_LIBDIR% -LIBEXECDIR=%OCTAVE_LIBEXECDIR% -LOCALAPIARCHLIBDIR=%OCTAVE_LOCALAPIARCHLIBDIR% -LOCALAPIFCNFILEDIR=%OCTAVE_LOCALAPIFCNFILEDIR% -LOCALAPIOCTFILEDIR=%OCTAVE_LOCALAPIOCTFILEDIR% -LOCALARCHLIBDIR=%OCTAVE_LOCALARCHLIBDIR% -LOCALFCNFILEDIR=%OCTAVE_LOCALFCNFILEDIR% -LOCALOCTFILEDIR=%OCTAVE_LOCALOCTFILEDIR% -LOCALSTARTUPFILEDIR=%OCTAVE_LOCALSTARTUPFILEDIR% -LOCALVERARCHLIBDIR=%OCTAVE_LOCALVERARCHLIBDIR% -LOCALVERFCNFILEDIR=%OCTAVE_LOCALVERFCNFILEDIR% -LOCALVEROCTFILEDIR=%OCTAVE_LOCALVEROCTFILEDIR% -MAN1DIR=%OCTAVE_MAN1DIR% -MAN1EXT=%OCTAVE_MAN1EXT% -MANDIR=%OCTAVE_MANDIR% -OCTFILEDIR=%OCTAVE_OCTFILEDIR% -OCTINCLUDEDIR=%OCTAVE_OCTINCLUDEDIR% -OCTLIBDIR=%OCTAVE_OCTLIBDIR% -PREFIX=%OCTAVE_PREFIX% -STARTUPFILEDIR=%OCTAVE_STARTUPFILEDIR% -VERSION=%OCTAVE_VERSION% -SED=%SED% - -if [ -n "$OCTAVE_HOME" ]; then - ARCHLIBDIR="`echo $ARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - BINDIR="`echo $BINDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - DATADIR="`echo $DATADIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - DATAROOTDIR="`echo $DATAROOTDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - EXEC_PREFIX="`echo $EXEC_PREFIX | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - FCNFILEDIR="`echo $FCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - IMAGEDIR="`echo $IMAGEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - INCLUDEDIR="`echo $INCLUDEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - INFODIR="`echo $INFODIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - INFOFILE="`echo $INFOFILE | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LIBDIR="`echo $LIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LIBEXECDIR="`echo $LIBEXECDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALAPIARCHLIBDIR="`echo $LOCALAPIARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALAPIFCNFILEDIR="`echo $LOCALAPIFCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALAPIOCTFILEDIR="`echo $LOCALAPIOCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALARCHLIBDIR="`echo $LOCALARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALFCNFILEDIR="`echo $LOCALFCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALOCTFILEDIR="`echo $LOCALOCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALSTARTUPFILEDIR="`echo $LOCALSTARTUPFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALVERARCHLIBDIR="`echo $LOCALVERARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALVERFCNFILEDIR="`echo $LOCALVERFCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALVEROCTFILEDIR="`echo $LOCALVEROCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - MAN1DIR="`echo $MAN1DIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - MANDIR="`echo $MANDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - OCTFILEDIR="`echo $OCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - OCTINCLUDEDIR="`echo $OCTINCLUDEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - OCTLIBDIR="`echo $OCTLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - STARTUPFILEDIR="`echo $STARTUPFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - - PREFIX="$OCTAVE_HOME" -fi - -usage_msg="usage: octave-config [options]" - -if [ $# -eq 0 ]; then - echo "$usage_msg" 1>&2 - exit 1 -fi - -while [ $# -gt 0 ] -do - case "$1" in - -h | -\? | --help) - echo "$usage_msg" - cat << EOF - -Options: - - -h, -?, --help Print this message. - - --m-site-dir Print the name of the directory where Octave - expects to find locally installed .m files. - - --oct-site-dir Print the name of the directory where Octave - expects to find locally installed .oct files. - - -p VAR, --print VAR Print the value of the given configuration - variable VAR. Recognized variables are: - - API_VERSION LOCALAPIOCTFILEDIR - ARCHLIBDIR LOCALARCHLIBDIR - BINDIR LOCALFCNFILEDIR - CANONICAL_HOST_TYPE LOCALOCTFILEDIR - DATADIR LOCALSTARTUPFILEDIR - DATAROOTDIR LOCALVERARCHLIBDIR - DEFAULT_PAGER LOCALVERFCNFILEDIR - EXEC_PREFIX LOCALVEROCTFILEDIR - FCNFILEDIR MAN1DIR - IMAGEDIR MAN1EXT - INCLUDEDIR MANDIR - INFODIR OCTFILEDIR - INFOFILE OCTINCLUDEDIR - LIBDIR OCTLIBDIR - LIBEXECDIR PREFIX - LOCALAPIARCHLIBDIR STARTUPFILEDIR - LOCALAPIFCNFILEDIR VERSION - - -v, --version Print the Octave version number. - -EOF - exit 0 - ;; - --m-site-dir) - echo $LOCALVERFCNFILEDIR - ;; - --oct-site-dir) - echo $LOCALVEROCTFILEDIR - ;; - -v | --version) - echo $VERSION - ;; - -p | --print) - opt="$1" - shift - if [ $# -eq 0 ]; then - echo "octave-config: $opt option requires argument" 1>&2 - exit 1 - fi - eval echo \${$1} - ;; - *) - echo "octave-config: unrecognized argument $1" 2>&1 - exit 1 - ;; - esac - shift -done