Mercurial > octave-nkf
changeset 18289:906e95708ec1
maint: Periodic merge of gui-release to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 15 Jan 2014 15:28:50 -0500 |
| parents | 1456702a8b24 (current diff) 78c3b4cb0c7f (diff) |
| children | 61dab64aa5a6 |
| files | libgui/languages/pt_BR.ts libgui/src/m-editor/find-dialog.cc |
| diffstat | 21 files changed, 1498 insertions(+), 614 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/install.txi Tue Jan 14 14:50:21 2014 -0800 +++ b/doc/interpreter/install.txi Wed Jan 15 15:28:50 2014 -0500 @@ -170,6 +170,17 @@ Package for building software libraries (@url{http://www.gnu.org/software/libtool}). Libtool is required by Automake. + +@item gperf +Perfect hash function generator (@url{http://www.gnu.org/software/gperf}). +You will need gperf if you modify the @code{octave.gperf} file or if you +delete the file that is generated from it. + +@item Texinfo +Package for generating online and print documentation +(@url{http://www.gnu.org/software/texinfo}). You will need Texinfo to +build Octave's documentation or if you modify the documentation source +files or the docstring of any Octave function. @end table @node External Packages @@ -255,6 +266,12 @@ (@url{http://www.hdfgroup.org/HDF5}). @sc{hdf5} is required for Octave's @code{load} and @code{save} commands to read and write HDF data files. +@item Java Development Kit +Java programming language compiler and libraries. The OpenJDK free +software implementation is recommended (@url{http://openjdk.java.net/}), +although other JDK implementations may work. Java is required to be able +to call Java functions from within Octave. + @item LLVM Compiler framework, (@url{http://www.llvm.org}). LLVM is required for Octave's experimental just-in-time (JIT) compilation for speeding up the
--- a/etc/HACKING Tue Jan 14 14:50:21 2014 -0800 +++ b/etc/HACKING Wed Jan 15 15:28:50 2014 -0500 @@ -54,6 +54,10 @@ - Rsync <http://samba.anu.edu.au/rsync/> - Tar <http://www.gnu.org/software/tar/> +In addition to these maintainer tools, Octave makes use of many external +libraries and packages. See the file doc/interpreter/install.txi for the +complete list of required and optional dependencies. + Only building the initial full source tree will be a bit painful. Later, after synchronizing from the repository, a plain `make' should be sufficient.
--- a/libgui/languages/be_BY.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/be_BY.ts Wed Jan 15 15:28:50 2014 -0500 @@ -475,7 +475,7 @@ <translation>курсор</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Нататка пра новы GUI Octave</strong></p><p>Адна з найбольшых адметнасцяў Octave 3.8 - графічны інтэрфэйс. Карыстальнікі апошнімі гадамі прасілі яго найбольш часта, і нарэшце ён амаль гатовы. Але ён пакуль не такі дасканалы, як бы мы жадалі, таму мы вырашылі пачакаць выпуску з серыі 4.0.x перад тым, як рабіць яго стандартным.</p><p>Да таго ж, улічваючы час і колькасць выпраўленняў і паляпшэнняў у параўнанні з апошнім буйным выпускам Octave, мы вырашылі затрымліваць новы выпуск толькі дзеля ўдасканалення GUI, не зважаючы на новыя магчымасці. Таму прыемнага вам карстання выпускам 3.8 і першай версіяй новага інтэрфэйсу. Нам здаецца, ён працуе даволі добра, але мы ведаем, што ёсць некаторыя відавочныя грубыя недарэчнасці і шмат чаго, што можна палепшыць.</p><p><strong>Нам патрабуецца ваша дапамога</strong></p><p>Ёсць шмат спосабаў, якімі вы можаце дапамагчы нам выправіць праблемы, што яшчэ засталіся, скончыць GUI і палепшыць агульнае уражанне як для новых карыстальнікаў, так і для экспертаў (спасылкі адкрыюцца ў знешнім браўзэры):</p><p><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></p><p>Спадзяемся, вы знойдзеце Octave карыснай. Калі ласка, дапамажыце нам зрабіць яго лепшым для будучыні!</p></translation> </message> @@ -963,7 +963,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>вылучэнне скапіявана ў буфер абмену</translation> </message> @@ -1689,7 +1689,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Новы файл</translation> </message> @@ -1859,7 +1859,7 @@ <translation>&Дакументацыя па ключавым слове</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -1891,7 +1891,7 @@ <translation>Асацыяваная картка рэдактара знікла.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -1947,13 +1947,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Рэдактар Octave</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -1969,7 +1970,15 @@ <translation>Файлы Octave (*.m);;Усе файлы (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -1987,7 +1996,7 @@ быў выдалены або пераназваны. Можа, захаваць яго зараз?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Не выйшла адкрыць файл %1 на запіс: @@ -2004,7 +2013,7 @@ <translation>Слупок:</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Выглядае на тое, што '%1' быў зменены іншай праграмай. Перачытаць яго?</translation> </message> @@ -2037,7 +2046,7 @@ <translation>Дзеянні з дзейным каталогам</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Шукаць файлы...</translation> </message> @@ -2048,16 +2057,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Новы каталог</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Двойчы пстрыкніце па файле для адкрыцця</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Перайсці да каталогу Octave</translation> </message> @@ -2082,7 +2092,7 @@ <translation>Перайсці да хатняга каталогу</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Шукаць каталог...</translation> </message> @@ -2215,7 +2225,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Стварыць каталог</translation> </message> @@ -2294,7 +2309,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>Што &шукаць:</translation> </message> @@ -2364,7 +2384,7 @@ <translation>Шукаць вы&лучанае</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Шукаць ад канца</translation> </message> @@ -2374,7 +2394,7 @@ <translation>Шукаць ад пачатку</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Вынік замены</translation> </message> @@ -2384,7 +2404,7 @@ <translation>%1 элементаў заменена</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Вынік пошуку</translation> </message> @@ -2532,7 +2552,12 @@ <translation>Ідзе пошук...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Пазначыць каталог пошуку</translation> </message> @@ -2622,12 +2647,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Загрузіць прастору зменных</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Пра Octave</translation> @@ -2688,12 +2713,12 @@ <translation>Уставіць</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Захаваць прастору зменных як</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>Файл заўваг да выпуску '%1' пусты.</translation> </message> @@ -2778,7 +2803,22 @@ <translation>Крок наперад</translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Загрузіць прастору зменных...</translation> </message> @@ -3013,18 +3053,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Адчапіць віджэт</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Схаваць віджэт</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Прычапіць віджэт</translation> </message> @@ -3160,17 +3200,42 @@ <translation>Літарныя значкі</translation> </message> <message> - <location line="+46"/> + <location line="+29"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Рэдактар</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Колер</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Даўжыня водступу</translation> </message> @@ -3180,7 +3245,7 @@ <translation>Табуляцыя робіць водступ</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Аўтаводступы</translation> </message> @@ -3242,42 +3307,42 @@ <translation><html><head/><body><p>Пазначце шрыфт, ягоны памер (як розніцу ад стандартнага памеру), стыль шрыфту (<b>т</b>оўсты, <b>к</b>урсіўны, <b>п</b>адкрэслены), колер тэксту і колер фону (для фону ружовы (255,0,255) азначае стандартны колер фону).</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation>Колеры тэрміналу</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Шрыфт</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Паказваць нумары радкоў</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Фарбаваць дзейны радок</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Аўтадапаўненне</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Паказваць поўны шлях у загалоўку акна</translation> </message> <message> - <location line="-72"/> + <location line="-161"/> <source>Graphic icons</source> <translation>Графічныя значкі</translation> </message> <message> - <location line="+55"/> + <location line="+144"/> <source>Show whitespace</source> <translation>Паказваць прагальныя знакі</translation> </message> @@ -3287,7 +3352,7 @@ <translation>Не паказваць прагальныя знакі ў водступах</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation>Пасля ўводу колькі знакаў прапаноўваць дапаўненні</translation> </message> @@ -3312,7 +3377,7 @@ <translation>Тэрмінал</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Тып курсора:</translation> </message> @@ -3327,12 +3392,17 @@ <translation>Выкар. колер пярэдняга плану</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Памер шрыфту</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Файлавы агляднік</translation> </message> @@ -3392,7 +3462,7 @@ <translation>HttpProxy</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Набор значкоў для віджэтаў</translation> </message> @@ -3407,7 +3477,7 @@ <translation>Памер значкоў</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Сінхранізаваць дзейны каталог Octave з файлавым агляднікам</translation> </message> @@ -3444,7 +3514,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Сістэмная</translation> </message> @@ -3558,7 +3628,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Для пошуку ўвядзіце тут штосьці і націсніце Enter</translation> </message> @@ -3567,6 +3637,16 @@ <source>Global search</source> <translation>Глабальны пошук</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished">Памылкі</translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/de_DE.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/de_DE.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation>Cursor</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Einige Hinweise zur neuen Octave GUI</strong></p><p>Eine 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.</p><p>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.</p><p><strong>Deshalb brauchen wir Deine Mithilfe!</strong></p><p>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):</p><p><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></p><p>Wir hoffen, dass du Octave nützlich findest. Bitte hilf uns Octave zukünftig noch besser zu machen!</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>Auswahl in die Zwischenablage kopiert</translation> </message> @@ -149,7 +149,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Neue Datei</translation> </message> @@ -319,7 +319,7 @@ <translation>&Dokumentation zum Schlüsselwort</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -353,7 +353,7 @@ <translation>Der zugehörige Editor-Reiter ist nicht mehr vorhanden.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Datei</translation> </message> @@ -409,13 +409,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Octave Editor</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -431,7 +432,15 @@ <translation>Octave Dateien (*.m);;All Files (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -447,7 +456,7 @@ wurde gelöscht oder umbenannt. Soll die Datei jetzt gespeichert werden?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Die Datei %1 konnte nicht zum Schreiben geöffnet werden: @@ -464,7 +473,7 @@ <translation>Spalte:</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Die Datei %1 wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden?</translation> </message> @@ -497,7 +506,7 @@ <translation>Aktionen mit aktuellem Verzeichnis</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Dateien suchen ...</translation> </message> @@ -508,16 +517,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Neues Verzeichnis</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Doppelklick auf eine Datei um diese zu öffnen</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Aktuelles Octave Verzeichnis anzeigen</translation> </message> @@ -542,7 +552,7 @@ <translation>Wechsle zum Heimatverzeichnis</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Verzeichnis suchen...</translation> </message> @@ -677,7 +687,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Neues Verzeichnis</translation> </message> @@ -756,7 +771,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>&Suche:</translation> </message> @@ -826,7 +846,7 @@ <translation>In Auswah&l suchen</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Vom Ende suchen</translation> </message> @@ -836,7 +856,7 @@ <translation>Suche vom Beginn</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Ergebins der Ersetzungen</translation> </message> @@ -846,7 +866,7 @@ <translation>%1 Vorkommnisse ersetzt</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Suchergebnis</translation> </message> @@ -994,7 +1014,12 @@ <translation>Suche ...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Suchverzeichnis setzen</translation> </message> @@ -1084,12 +1109,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Lade Arbeitsumgebung</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Über Octave</translation> @@ -1150,12 +1175,12 @@ <translation>Einfügen</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Arbeitsumgebung speichern als</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>Die Datei '%1' mit Versionshinweisen ist leer.</translation> </message> @@ -1240,7 +1265,22 @@ <translation>Hineinspringen</translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Lade Arbeitsumgebung...</translation> </message> @@ -1475,18 +1515,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Fenster lösen</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Fenster verbergen</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Fenster andocken</translation> </message> @@ -1621,17 +1661,42 @@ <translation>Icons mit Buchstaben</translation> </message> <message> - <location line="+46"/> + <location line="+29"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Einrücken um</translation> </message> @@ -1641,7 +1706,7 @@ <translation>Tabulator rückt ein</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Auto Einrückung</translation> </message> @@ -1701,42 +1766,42 @@ <translation><html><head/><body><p>Auswahl von Schrift, Schriftgröße (als Differenz von der Standardgröße), Schriftstil (<b>f</b>ett, <b>k</b>ursiv, <b>u</b>nterstrichen), Text- und Hintergrundfarbe (für den Hintergrund ist die Farbe Pink (255,0,255) ein Platzhalter für die Standardfarbe)</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation>Farben des Befehlsfensters</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Zeilennummern anzeigen</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Aktuelle Zeile hervorheben</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Vervollständigung</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Kompletten Pfad im Reiter anzeigen</translation> </message> <message> - <location line="-72"/> + <location line="-161"/> <source>Graphic icons</source> <translation>Grafische Icons</translation> </message> <message> - <location line="+55"/> + <location line="+144"/> <source>Show whitespace</source> <translation>Leerzeichen anzeigen</translation> </message> @@ -1746,7 +1811,7 @@ <translation>Leerzeichen der Einrückung nicht anzeigen</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation>Anzahl der eingegebenen Zeichen bis Vervollständigungsliste</translation> </message> @@ -1771,7 +1836,7 @@ <translation>Befehlsfenster</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Cursortyp:</translation> </message> @@ -1786,12 +1851,17 @@ <translation>Vordergrundfarbe verwenden</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Schriftgröße</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Dateibrowser</translation> </message> @@ -1851,7 +1921,7 @@ <translation>HTTP Proxy</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Icons der Unterfenster</translation> </message> @@ -1866,7 +1936,7 @@ <translation>Icongröße</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Octave Arbeitsverzeichnis und Dateibrowser synchronisieren</translation> </message> @@ -1903,7 +1973,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Systemeinstellung</translation> </message> @@ -2017,7 +2087,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Suchbegriff eingeben und mit 'Enter' die Suche starten</translation> </message> @@ -2026,6 +2096,16 @@ <source>Global search</source> <translation>Globale Suche</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/en_US.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/en_US.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation type="unfinished"></translation> </message> @@ -146,7 +146,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation type="unfinished"></translation> </message> @@ -316,7 +316,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -342,7 +342,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation type="unfinished"></translation> </message> @@ -398,13 +398,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -417,7 +418,15 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -431,7 +440,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> @@ -447,7 +456,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -480,7 +489,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation type="unfinished"></translation> </message> @@ -491,16 +500,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation type="unfinished"></translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation type="unfinished"></translation> </message> @@ -525,7 +535,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation type="unfinished"></translation> </message> @@ -656,7 +666,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation type="unfinished"></translation> </message> @@ -719,7 +734,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation type="unfinished"></translation> </message> @@ -789,7 +809,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation type="unfinished"></translation> </message> @@ -799,7 +819,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation type="unfinished"></translation> </message> @@ -809,7 +829,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation type="unfinished"></translation> </message> @@ -957,7 +977,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation type="unfinished"></translation> </message> @@ -1043,12 +1068,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation type="unfinished"></translation> @@ -1109,12 +1134,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1199,7 +1224,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation type="unfinished"></translation> </message> @@ -1411,18 +1451,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation type="unfinished"></translation> </message> @@ -1549,17 +1589,42 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+29"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation type="unfinished"></translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation type="unfinished"></translation> </message> @@ -1569,7 +1634,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation type="unfinished"></translation> </message> @@ -1629,42 +1694,42 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation type="unfinished"></translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation type="unfinished"></translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-161"/> <source>Graphic icons</source> <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+144"/> <source>Show whitespace</source> <translation type="unfinished"></translation> </message> @@ -1674,7 +1739,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation type="unfinished"></translation> </message> @@ -1699,7 +1764,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation type="unfinished"></translation> </message> @@ -1714,12 +1779,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation type="unfinished"></translation> </message> @@ -1779,7 +1849,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -1794,7 +1864,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation type="unfinished"></translation> </message> @@ -1831,7 +1901,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation type="unfinished"></translation> </message> @@ -1934,7 +2004,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation type="unfinished"></translation> </message> @@ -1943,6 +2013,16 @@ <source>Global search</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/es_ES.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/es_ES.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation>cursor</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Nota acerca de la nueva GUI de Octave</strong></p><p>Una de las novedades 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.</p><p>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.</p><p><strong>Necesitamos su ayuda</strong></p><p>Hay 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):</p><p><ul><li>Si usted es un desarrollador de software experimentado, puede contribuir con su tiempo para ayudar <a href="http://octave.org/get-involved.html">Desarrollo de Octave</a>.</li><li>Si Octave no funciona adecuadamente, se le invita a <a href="http://octave.org/bugs.html">reportar problemas </a> que haya encontrado.</li><li>Si usted es usuario o desarrollador, 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></p><p>Esperamos que haya encontrado Octave muy útil. Por favor, ¡ayúdenos a hacerlo aún mejor en el futuro!</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>selección copiada al portapapeles</translation> </message> @@ -139,7 +139,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Nuevo archivo</translation> </message> @@ -309,7 +309,7 @@ <translation>&Documentación de palabras clave</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -342,7 +342,7 @@ <translation>La pestaña para la edición del archivo ha desaparecido.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Archivo</translation> </message> @@ -398,13 +398,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor de Octave</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -417,7 +418,15 @@ <translation>Archivos de Octave(*.m);;Todos los archivos(*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -431,7 +440,7 @@ <translation>Parece que el archivo\n%1\nha sido eliminado o renombrado.¿Desea guardarlo ahora?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>No se ha podido abrir el archivo %1 para escritura:\n%2.</translation> @@ -447,7 +456,7 @@ <translation>Col:</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo?</translation> </message> @@ -480,7 +489,7 @@ <translation>Acciones en el directorio actual</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Buscar archivos ...</translation> </message> @@ -491,16 +500,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Nuevo directorio</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Pulse dos veces en un archivo para abrirlo</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Mostrar el directorio de Octave</translation> </message> @@ -525,7 +535,7 @@ <translation>Mostrar el directorio de inicio</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Buscar directorio...</translation> </message> @@ -657,7 +667,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Crear directorio</translation> </message> @@ -739,7 +754,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>&Buscar:</translation> </message> @@ -809,7 +829,7 @@ <translation>Buscar se&lección</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Buscar desde el final</translation> </message> @@ -819,7 +839,7 @@ <translation>Buscar desde el inicio</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Reemplazar resultado</translation> </message> @@ -829,7 +849,7 @@ <translation>%1 instancias reemplazadas</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Resultado de la búsqueda</translation> </message> @@ -977,7 +997,12 @@ <translation>Buscando...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Seleccionar directorio de búsqueda</translation> </message> @@ -1068,12 +1093,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Cargar espacio de trabajo</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Acerca de Octave</translation> @@ -1135,12 +1160,12 @@ <translation>Pegar</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Guardar espacio de trabajo como</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>El archivo de las notas de versión %1 está vacío.</translation> </message> @@ -1225,7 +1250,22 @@ <translation>Iniciar</translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Cargar espacio de trabajo...</translation> </message> @@ -1461,20 +1501,20 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translatorcomment>Uso "widget" por ser el término usual: http://es.wikipedia.org/wiki/Widget</translatorcomment> <translation>Desacoplar widget</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translatorcomment>Uso "widget" por ser el término usual: http://es.wikipedia.org/wiki/Widget</translatorcomment> <translation>Ocultar widget</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translatorcomment>Uso "widget" por ser el término usual: http://es.wikipedia.org/wiki/Widget</translatorcomment> <translation>Acoplar widget</translation> @@ -1610,17 +1650,42 @@ <translation>Iconos gráficos</translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Color</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Ancho de sangría</translation> </message> @@ -1630,7 +1695,7 @@ <translation>Sangrar con tabulación</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Sangría automática</translation> </message> @@ -1690,33 +1755,33 @@ <translation><html><head/><body><p>Seleccione fuente, tamaño de fuente (como diferencia con el tamaño por defecto), estilo de fuente (<b>n</b>egrita, <b>c</b>ursiva, <b>s</b>ubrayada), 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).</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translatorcomment>En es_ES, terminal suele ser masculino, aunque en el español iberoamericano suele adoptarse el femenino</translatorcomment> <translation>Colores del terminal</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Tipo de fuente</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Mostrar numeros de línea</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Resaltar línea actual</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Autocompletar código</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Mostrar ruta completa en el título de la ventana</translation> </message> @@ -1731,7 +1796,7 @@ <translation>No mostrar los espacios usados para la sangría</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation># de caracteres pulsados antes de completar la lista desplegada</translation> </message> @@ -1756,7 +1821,7 @@ <translation>Terminal</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Tipo de cursor:</translation> </message> @@ -1771,12 +1836,17 @@ <translation>Usar color de primer plano</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Tamaño de fuente</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Explorador de archivos</translation> </message> @@ -1836,7 +1906,7 @@ <translation>HttpProxy</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Iconos para widget acoplados</translation> </message> @@ -1851,7 +1921,7 @@ <translation>Tamaño de icono</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Sincronizar el directorio de trabajo de Octave con el explorador de archivos</translation> </message> @@ -1888,7 +1958,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Configuración del sistema</translation> </message> @@ -2002,7 +2072,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Escriba aquí y pulse la tecla 'Retorno' para buscar</translation> </message> @@ -2011,6 +2081,16 @@ <source>Global search</source> <translation>Búsqueda global</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/fr_FR.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/fr_FR.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation>curseur</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Note à propos du nouveau GUI d'Octave</strong></p><p>Parmi 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.</p><p>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.</p><p><strong>Nous avons besoin de votre aide</strong></p><p>Il 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):</p><p><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></p><p>Nous espérons que vous trouverez Octave utile. S'il vous plaît, aidez nous à l'améliorer encore dans le futur !</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>sélection copiée vers le presse-papier</translation> </message> @@ -148,7 +148,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Nouveau</translation> </message> @@ -318,7 +318,7 @@ <translation>&Documentation sur le mot de clés</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -350,7 +350,7 @@ <translation>L'onglet éditeur de fichier associé a disparu.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Fichier</translation> </message> @@ -406,13 +406,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Éditeur d'Octave</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -428,7 +429,15 @@ <translation>Fichiers d'Octave (*.m);;Tous les fichiers (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -446,7 +455,7 @@ a été supprimé ou rénommé. Voulez-vous l'enregistrer maintenant ?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Impossible d'ouvrir le fichier %1 pour écrire : @@ -463,7 +472,7 @@ <translation>Col :</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Il semblerait que '%1' a été modifié par une autre application. Voulez-vous le récharger ?</translation> </message> @@ -496,7 +505,7 @@ <translation>Actions sur le répertoire courant</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Rechercher des fichiers...</translation> </message> @@ -507,16 +516,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Nouveau répertoire</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Double-cliquer sur un fichier pour l'ouvrir</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Revenir au répertoire d'Octave</translation> </message> @@ -541,7 +551,7 @@ <translation>Aller au répertoire personnel</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Rechercher dans le répertoire...</translation> </message> @@ -676,7 +686,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Créer un répertoire</translation> </message> @@ -755,7 +770,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>Rechercher &quoi :</translation> </message> @@ -825,7 +845,7 @@ <translation>Recherche dans la sé&lection</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Rechercher depuis la fin</translation> </message> @@ -835,7 +855,7 @@ <translation>Rechercher depuis le début</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Résultats du remplacement</translation> </message> @@ -845,7 +865,7 @@ <translation>%1 instances remplacées</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Résultats de la recherche</translation> </message> @@ -993,7 +1013,12 @@ <translation>Recherche en cours...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Définir le répertoire de recherche</translation> </message> @@ -1083,12 +1108,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Charger l'espace de travail</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>À propos d'Octave</translation> @@ -1149,12 +1174,12 @@ <translation>Coller</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Enregistrer l'espace de travail sous</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>Le fichier de notes de version '%1' est vide.</translation> </message> @@ -1239,7 +1264,22 @@ <translation>Avancer d'un pas avec entrée</translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Charger l'espace de travail...</translation> </message> @@ -1474,18 +1514,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Détacher le widget</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Cacher le widget</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Attacher le widget</translation> </message> @@ -1625,17 +1665,42 @@ <translation>Icones graphiques</translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Éditeur</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Largeur de l'indentation</translation> </message> @@ -1645,7 +1710,7 @@ <translation>Indentation par tabulation</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Indentation automatique</translation> </message> @@ -1705,32 +1770,32 @@ <translation><html><head/><body><p>Sélectionnez la police, sa taille (différence par rapport à la taille par défaut), son style (<b>g</b>ras, <b>i</b>talique, <b>s</b>ouligné), la couleur du texte et de l'arrière plan (pour ce dernier, le rose (255,0,255) fait figure de défaut).</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation>Couleurs de la fenetre de commandes</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Police</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Afficher les numéros des lignes</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Surligner la ligne courante</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Suggestions de saisie</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Afficher le chemin complet dans le titre de la fenetre</translation> </message> @@ -1745,7 +1810,7 @@ <translation>Ne pas afficher les espaces utilisés pour l'indentation</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation>Nb. de caractères avant affichage de la liste de complétion</translation> </message> @@ -1770,7 +1835,7 @@ <translation>Terminal</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Type de curseur :</translation> </message> @@ -1785,12 +1850,17 @@ <translation>Utiliser la couleur de l'avant plan</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Taille de police</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Explorateur de fichiers</translation> </message> @@ -1850,7 +1920,7 @@ <translation>Proxy HTTP</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Jeu d'icones pour les widgets</translation> </message> @@ -1865,7 +1935,7 @@ <translation>Taille des icones</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Synchroniser le répertoire de travail d'Octave et le navigateur de fichiers</translation> </message> @@ -1902,7 +1972,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Reglages système</translation> </message> @@ -2016,7 +2086,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Entrez le texte ici et appuyez sur 'Entrée' pour lancer la recherche</translation> </message> @@ -2025,6 +2095,16 @@ <source>Global search</source> <translation>Recherche globale</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/nl_NL.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/nl_NL.ts Wed Jan 15 15:28:50 2014 -0500 @@ -474,7 +474,7 @@ <translation>Aanwijzer</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Een opmerking over Octave's Nieuwe GUI</strong></p><p>Een 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.</p><p>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.</p><p><strong>We hebben je hulp nodig</strong></p><p>Er 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):</p><p><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></p><p>We hopen dat je Octave nuttig vindt. Help alsjeblieft om het in de toekomst nog beter te maken!</p></translation> </message> @@ -962,7 +962,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>selectie is naar klembord gekopieerd</translation> </message> @@ -1688,7 +1688,7 @@ <translation></translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Nieuw Bestand</translation> </message> @@ -1858,7 +1858,7 @@ <translation>&Documentatie bij sleutelwoord</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -1890,7 +1890,7 @@ <translation>Het bijbehorende tabblad in de editor is verdwenen.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>Bestand</translation> </message> @@ -1946,13 +1946,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation></translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -1968,7 +1969,15 @@ <translation>Octave bestanden (*.m);;Alle bestanden (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -1985,7 +1994,7 @@ is gewist of hernoemd. Wil je het nu opslaan?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Kon bestand %1 niet openen om te schrijven: @@ -2002,7 +2011,7 @@ <translation>Kolom:</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Het lijkt erop dat '%1' is gewijzigd door een ander programma. Wil je het opnieuw laden?</translation> </message> @@ -2035,7 +2044,7 @@ <translation>Bewerkingen op huidige map</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Zoek bestanden ...</translation> </message> @@ -2046,16 +2055,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Nieuwe map</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Dubbelklik een bestand om te openen</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Laat Octave map zien</translation> </message> @@ -2080,7 +2090,7 @@ <translation>Laat home map zien</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Zoek in map...</translation> </message> @@ -2215,7 +2225,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Maak nieuwe map</translation> </message> @@ -2295,7 +2310,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>Zoek naar:</translation> </message> @@ -2365,7 +2385,7 @@ <translation>In se&lectie zoeken</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>vanaf einde terug zoeken</translation> </message> @@ -2375,7 +2395,7 @@ <translation>Zoeken vanaf begin</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Resultaat vervangen</translation> </message> @@ -2385,7 +2405,7 @@ <translation>%1 vervangingen</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Zoek resultaat</translation> </message> @@ -2533,7 +2553,12 @@ <translation>Bezig met zoeken...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Stel zoekmap in</translation> </message> @@ -2623,12 +2648,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Werkruimte laden</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Over Octave</translation> @@ -2689,12 +2714,12 @@ <translation>Plakken</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Sla Werkruimte Op Als</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>Bestand met Release Notes '%1' is leeg.</translation> </message> @@ -2779,7 +2804,22 @@ <translation>Stap In</translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Werkruimte laden...</translation> </message> @@ -3014,18 +3054,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Widget laten zweven</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Widget verbergen</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Widget in venster opnemen</translation> </message> @@ -3165,17 +3205,42 @@ <translation>Grafische iconen</translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Kleur</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Inspringafstand</translation> </message> @@ -3185,7 +3250,7 @@ <translation>Inspringen met tab</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Automatisch inspringen</translation> </message> @@ -3245,32 +3310,32 @@ <translation><html><head/><body><p>Selecteer font, font grootte (als een verschil van de standaard grootte), font stijl (<b>d</b>ik, <b>s</b>chuin, <b>o</b>nderstreept), tekstkleur en achtergrondkleur (wat betreft de laatste, de kleur roze (255,0,255) is een plaatsvervanger voor de standaard achtergrondkleur).</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation>Terminalkleuren</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Lettertype</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Regelnummers weergeven</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Markeer huidige regel</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Automatisch aanvullen</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Hele pad in schermtitel weergeven</translation> </message> @@ -3285,7 +3350,7 @@ <translation>Laat geen voor inspringen gebruikte witruimte zien</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation>Getypt aantal karakters voordat de aanvullijst verschijnt</translation> </message> @@ -3310,7 +3375,7 @@ <translation>Opdrachtvenster</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Type aanwijzer:</translation> </message> @@ -3325,12 +3390,17 @@ <translation>Gebruik voorgrondkleur</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Lettergrootte</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Bestandsbrowser</translation> </message> @@ -3390,7 +3460,7 @@ <translation>http proxy</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Iconenset voor dock widgets</translation> </message> @@ -3405,7 +3475,7 @@ <translation>Icoongrootte</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Synchroniseer Octave werkmap met bestandsverkenner</translation> </message> @@ -3442,7 +3512,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Systeeminstelling</translation> </message> @@ -3556,7 +3626,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Typ hier en druk op 'Enter' om te zoeken</translation> </message> @@ -3565,6 +3635,16 @@ <source>Global search</source> <translation>Globaal zoeken</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished">Fout</translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/pt_BR.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/pt_BR.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation>indicador</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Um aviso sobre a nova interface gráfica do Octave</strong></p><p>Uma 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.</p><p>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.</p><p><strong>Ajude-nos</strong></p><p>Há 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):</p><p><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></p><p>Esperamos que você goste do Octave. Ajude-nos a torná-lo ainda melhor no futuro!</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>seleção copiada para a área de transferência</translation> </message> @@ -146,7 +146,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Novo Script</translation> </message> @@ -316,7 +316,7 @@ <translation>&Documentação da Palavra-chave</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -348,7 +348,7 @@ <translation>A aba do editor associada ao arquivo desapareceu.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Arquivo</translation> </message> @@ -404,13 +404,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor do Octave</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -426,7 +427,15 @@ <translation>Arquivos do Octave (*.m);; Todos os Arquivos (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -444,7 +453,7 @@ foi removido ou renomeado. Gostaria de salvá-lo agora?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Não foi possível abrir arquivo %1 para escrita: @@ -461,7 +470,7 @@ <translation>Coluna:</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o arquivo '%1' foi modificado por outra aplicação. Deseja recarregá-lo?</translation> </message> @@ -494,7 +503,7 @@ <translation>Ações no diretório atual</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Buscar Arquivos...</translation> </message> @@ -505,16 +514,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Novo Diretório</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Clique duas vezes em um arquivo para abrí-lo</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Exibir o diretório do Octave</translation> </message> @@ -539,7 +549,7 @@ <translation>Exibir diretório pessoal</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Buscar no diretório...</translation> </message> @@ -672,7 +682,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Criar Diretório</translation> </message> @@ -751,7 +766,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>&Buscar por:</translation> </message> @@ -821,7 +841,7 @@ <translation>Buscar dentro do texto &selecionado</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Buscar do final para o começo</translation> </message> @@ -831,7 +851,7 @@ <translation>Buscar do começo para o final</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Substituir Resultado</translation> </message> @@ -841,7 +861,7 @@ <translation>%1 itens substituidos</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Buscar Resultado</translation> </message> @@ -989,7 +1009,12 @@ <translation>Buscando...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Alterar diretório de busca</translation> </message> @@ -1079,12 +1104,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Carregar Ambiente de Trabalho...</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Sobre o Octave</translation> @@ -1145,12 +1170,12 @@ <translation>Colar</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Salvar Ambiente de Trabalho Como...</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>O arquivo de notas da versão '%1' está vazio.</translation> </message> @@ -1235,7 +1260,22 @@ <translation>Passo adentro</translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Carregar ambiente de trabalho...</translation> </message> @@ -1470,18 +1510,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Desacoplar painel</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Esconder painel</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Acoplar painel</translation> </message> @@ -1621,17 +1661,42 @@ <translation>Ícones gráficos</translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Largura de identação</translation> </message> @@ -1641,7 +1706,7 @@ <translation>Tecla Tab causa identação na linha</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Auto-identação</translation> </message> @@ -1701,32 +1766,32 @@ <translation><html><head/><body><p>Selecionar fonte, tamanho da fonte (como uma diferença do tamanho padrão), estilo da fonte (<b>n</b>egrito, <b>i</b>tálico, <b>s</b>ublinhado), cor de texto e cor de fundo (a cor rosa (255,0,255) é a cor de fundo padrão).</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation>Cores do Terminal</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Exibir números de linha</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Destacar linha atual</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Oferecer sugestões de preenchimento</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Exibir caminho completo no título da janela</translation> </message> @@ -1741,7 +1806,7 @@ <translation>Não exibir espaços em branco usados para identação</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation>Número de caracteres digitados antes da apresentar sugestões de preenchimento</translation> </message> @@ -1766,7 +1831,7 @@ <translation>Terminal</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Tipo do Indicador:</translation> </message> @@ -1781,12 +1846,17 @@ <translation>Usar cor de primeiro plano</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Tamanho de fonte</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Navegador de Arquivos</translation> </message> @@ -1846,7 +1916,7 @@ <translation>Proxy HTTP</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Conjunto de ícones para painéis</translation> </message> @@ -1861,7 +1931,7 @@ <translation>Tamanho dos ícones</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Sincronizar diretório atual do Octave com o Navegador de Arquivos</translation> </message> @@ -1898,7 +1968,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Configuração do sistema</translation> </message> @@ -2012,7 +2082,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Digite aqui e pressione 'Enter' para buscar</translation> </message> @@ -2021,6 +2091,16 @@ <source>Global search</source> <translation>Busca global</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/pt_PT.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/pt_PT.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation>indicador</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>selecçao copiada para a área de transferência</translation> </message> @@ -815,7 +815,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>&Novo Ficheiro</translation> </message> @@ -985,7 +985,7 @@ <translation>&Documentação da Palavra-chave</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -1017,7 +1017,7 @@ <translation>A aba do editor associada ao ficheiro desapareceu.</translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Ficheiro</translation> </message> @@ -1073,13 +1073,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor do Octave</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -1095,7 +1096,15 @@ <translation>Ficheiros de Octave (*.m);; Todos os Ficheiros (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -1113,7 +1122,7 @@ foi removido ou renomeado. Pretende guardá-lo agora?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Não foi possível abrir o ficheiro %1 para escrita: @@ -1130,7 +1139,7 @@ <translation>Col:</translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o ficheiro '%1' foi modificado por outro aplicativo. Deseja recarregá-lo?</translation> </message> @@ -1163,7 +1172,7 @@ <translation>Acções no directório actual</translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Procurar Ficheiros...</translation> </message> @@ -1174,16 +1183,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Novo Directório</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation>Clicar duas vezes num ficheiro para o abrir</translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Mostrar o directório actual do Octave</translation> </message> @@ -1208,7 +1218,7 @@ <translation>Mostrar directório pessoal</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation>Procurar no directório...</translation> </message> @@ -1343,7 +1353,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Criar Directório</translation> </message> @@ -1422,7 +1437,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>Procurar por:</translation> </message> @@ -1492,7 +1512,7 @@ <translation>Procurar dentro da selecção</translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Procurar a partir do fim</translation> </message> @@ -1502,7 +1522,7 @@ <translation>Procurar a partir do início</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation>Substituir Resultado</translation> </message> @@ -1512,7 +1532,7 @@ <translation>%1 itens substituidos</translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation>Buscar Resultado</translation> </message> @@ -1660,7 +1680,12 @@ <translation>Procurando...</translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Definir directório de procura</translation> </message> @@ -1750,12 +1775,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Sobre o Octave</translation> @@ -1816,12 +1841,12 @@ <translation>Colar</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation>Guardar Ambiente de Trabalho como</translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation>O ficheiro de notas da versão '%1' está vazio.</translation> </message> @@ -1906,7 +1931,22 @@ <translation></translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Carregar ambiente de trabalho...</translation> </message> @@ -2141,18 +2181,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Desacoplar painel</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Esconder painel</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Acoplar painel</translation> </message> @@ -2292,17 +2332,42 @@ <translation>Ícones gráficos</translation> </message> <message> - <location line="+39"/> + <location line="+22"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Largura da identação</translation> </message> @@ -2312,7 +2377,7 @@ <translation>Tabulador identa linha</translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Auto-identação</translation> </message> @@ -2372,32 +2437,32 @@ <translation><html><head/><body><p>Seleccionar tipo de letra, tamanho (como diferença para o tamanho padrão), decoração (<b>n</b>egrito, <b>i</b>tálico, <b>s</b>ublinhado), 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).</p></body></html></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation>Cores do Terminal</translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Tipo de Letra</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Exibir número de linha</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Enfatizar linha actual</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Sguestões para copletar código</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Exibir caminho completo no título da janela</translation> </message> @@ -2412,7 +2477,7 @@ <translation>Não mostrar whitespace usado para indentação</translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation>Número de carácteres antes de mostrar lista de preenchimento automático</translation> </message> @@ -2437,7 +2502,7 @@ <translation>Terminal</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Tipo de Cursor:</translation> </message> @@ -2452,12 +2517,17 @@ <translation>Usar cor do fundo</translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Tamanho da letra</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Navegador de Ficheiros</translation> </message> @@ -2517,7 +2587,7 @@ <translation>Proxy HTTP</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation>Conjunto de ícones para paineis</translation> </message> @@ -2532,7 +2602,7 @@ <translation>Tamanho do Ícone</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation>Sincronizar o directório de trabalho do Octave com o navegador de ficheiros</translation> </message> @@ -2569,7 +2639,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation>Configuração do sistema</translation> </message> @@ -2683,7 +2753,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Digite aqui e pressione 'Enter' para buscar</translation> </message> @@ -2692,6 +2762,16 @@ <source>Global search</source> <translation>Procura global</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished">Erro</translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/ru_RU.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/ru_RU.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation>выделенное скопировано в буфер обмена</translation> </message> @@ -148,7 +148,7 @@ <translation>&%1 %2</translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation>Созд&ать</translation> </message> @@ -318,7 +318,7 @@ <translation>&Документация по зарезервированному слову</translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -350,7 +350,7 @@ <translation></translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -406,13 +406,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation>Редактор Octave</translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -428,7 +429,15 @@ <translation>Файлы Octave (*.m);;Все файлы (*)</translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -446,7 +455,7 @@ был удален или переименован. Вы хотите сохранить его?%2</translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation>Не удалось открыть файл %1 для записи: @@ -463,7 +472,7 @@ <translation></translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое?</translation> </message> @@ -496,7 +505,7 @@ <translation></translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation>Найти файлы...</translation> </message> @@ -507,16 +516,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation>Новая директория</translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation></translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation>Перейти к текущей директории Octave</translation> </message> @@ -541,7 +551,7 @@ <translation>Показывать домашнюю директорию</translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation></translation> </message> @@ -673,7 +683,12 @@ </translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation>Создать директорию</translation> </message> @@ -737,7 +752,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation>&Найти:</translation> </message> @@ -807,7 +827,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation>Искать с конца</translation> </message> @@ -817,7 +837,7 @@ <translation>Искать с начала</translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation type="unfinished"></translation> </message> @@ -827,7 +847,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation type="unfinished"></translation> </message> @@ -975,7 +995,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation>Установить директорию для поиска</translation> </message> @@ -1061,12 +1086,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation>Загрузить область переменных</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation>Об Octave</translation> @@ -1127,12 +1152,12 @@ <translation>Вставить</translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1217,7 +1242,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation>Загрузить область переменных...</translation> </message> @@ -1429,18 +1469,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation>Открепить виджет</translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation>Спрятать виджет</translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation>Закрепить виджет</translation> </message> @@ -1569,17 +1609,42 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+29"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation>Редактор</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation>Ширина отступа</translation> </message> @@ -1589,7 +1654,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation>Авто-отступы</translation> </message> @@ -1649,42 +1714,42 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation>Показывать количество строк</translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation>Подсвечивать текущую строку</translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation>Дополнение кода</translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation>Показывать полный путь в заголовке окна</translation> </message> <message> - <location line="-72"/> + <location line="-161"/> <source>Graphic icons</source> <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+144"/> <source>Show whitespace</source> <translation type="unfinished"></translation> </message> @@ -1694,7 +1759,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation type="unfinished"></translation> </message> @@ -1719,7 +1784,7 @@ <translation>Командная строка</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation>Тип курсора:</translation> </message> @@ -1734,12 +1799,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation>Файловый менеджер</translation> </message> @@ -1799,7 +1869,7 @@ <translation>HttpProxy</translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -1814,7 +1884,7 @@ <translation>Размер иконок</translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation type="unfinished"></translation> </message> @@ -1851,7 +1921,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation type="unfinished"></translation> </message> @@ -1954,7 +2024,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation>Вводите сюда и нажмите 'Enter', чтобы начать поиск</translation> </message> @@ -1963,6 +2033,16 @@ <source>Global search</source> <translation>Глобальный поиск</translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/languages/uk_UA.ts Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/languages/uk_UA.ts Wed Jan 15 15:28:50 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1897"/> + <location filename="../src/main-window.cc" line="+1929"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1539"/> <source>copied selection to clipboard</source> <translation type="unfinished"></translation> </message> @@ -812,7 +812,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+175"/> + <location line="+187"/> <source>&New File</source> <translation type="unfinished">&Створити</translation> </message> @@ -982,7 +982,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-741"/> + <location line="-753"/> <source>Could not open file %1 for read: %2.</source> @@ -1008,7 +1008,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+521"/> + <location line="+533"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> @@ -1064,13 +1064,14 @@ <message> <location line="+10"/> <location line="+122"/> - <location line="+150"/> + <location line="+109"/> + <location line="+67"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-293"/> + <location line="-319"/> <source>The file %1 is about to be closed but has been modified. @@ -1083,7 +1084,15 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+86"/> + <location line="+30"/> + <source>It is not advisable to save an Octave script +in a file with a name containing spaces. + +Do you wnat to chose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+82"/> <source> Warning: The contents in the editor is modified!</source> @@ -1097,7 +1106,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-172"/> + <location line="-198"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> @@ -1113,7 +1122,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1122"/> + <location line="+1148"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -1146,7 +1155,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+372"/> + <location line="+373"/> <source>Find Files ...</source> <translation type="unfinished"></translation> </message> @@ -1157,16 +1166,17 @@ </message> <message> <location line="+3"/> + <location line="+333"/> <source>New Directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="-323"/> + <location line="-656"/> <source>Double-click a file to open it</source> <translation type="unfinished"></translation> </message> <message> - <location line="-78"/> + <location line="-79"/> <source>Show Octave directory</source> <translation type="unfinished"></translation> </message> @@ -1191,7 +1201,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+11"/> + <location line="+12"/> <source>Search Directory...</source> <translation type="unfinished"></translation> </message> @@ -1322,7 +1332,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+17"/> + <location line="+1"/> + <source>New File.txt</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Create Directory</source> <translation type="unfinished"></translation> </message> @@ -1385,7 +1400,12 @@ <context> <name>find_dialog</name> <message> - <location filename="../src/m-editor/find-dialog.cc" line="+77"/> + <location filename="../src/m-editor/find-dialog.cc" line="+74"/> + <source>Find and Replace</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Find &what:</source> <translation type="unfinished"></translation> </message> @@ -1455,7 +1475,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+72"/> <source>Search from end</source> <translation type="unfinished"></translation> </message> @@ -1465,7 +1485,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+121"/> + <location line="+119"/> <source>Replace Result</source> <translation type="unfinished"></translation> </message> @@ -1475,7 +1495,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> + <location line="+12"/> <source>Find Result</source> <translation type="unfinished"></translation> </message> @@ -1623,7 +1643,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+23"/> + <source>%1 match(es)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Set search directory</source> <translation type="unfinished"></translation> </message> @@ -1709,12 +1734,12 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1693"/> + <location filename="../src/main-window.cc" line="-1725"/> <source>Load Workspace</source> <translation type="unfinished">Завантажити область змінних</translation> </message> <message> - <location line="+642"/> + <location line="+674"/> <location line="+876"/> <source>About Octave</source> <translation type="unfinished">Про Octave</translation> @@ -1775,12 +1800,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1262"/> + <location line="-1294"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+124"/> + <location line="+156"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1865,7 +1890,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> + <location line="-1278"/> + <source>Octave</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>The file %1 +contains spaces and can not be executed. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1126"/> <source>Load Workspace...</source> <translation type="unfinished"></translation> </message> @@ -2077,18 +2117,18 @@ <context> <name>octave_dock_widget</name> <message> - <location filename="../src/octave-dock-widget.cc" line="+61"/> - <location line="+163"/> + <location filename="../src/octave-dock-widget.cc" line="+60"/> + <location line="+170"/> <source>Undock widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="-153"/> + <location line="-160"/> <source>Hide widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+104"/> + <location line="+107"/> <source>Dock widget</source> <translation type="unfinished"></translation> </message> @@ -2215,17 +2255,42 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+46"/> + <location line="+29"/> + <source>Dock widget title bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> + <source>Custom style</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+26"/> + <source>Background color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> + <source>Text color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+42"/> <source>Editor</source> <translation type="unfinished">Редактор</translation> </message> <message> - <location line="+71"/> + <location line="+84"/> <source>Color</source> <translation type="unfinished"></translation> </message> <message> - <location line="+120"/> + <location line="+79"/> + <source>Max. tab width in pixel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+68"/> <source>Indent width</source> <translation type="unfinished"></translation> </message> @@ -2235,7 +2300,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+23"/> <source>Auto indentation</source> <translation type="unfinished"></translation> </message> @@ -2295,42 +2360,42 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+108"/> + <location line="+154"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="+45"/> + <location line="-106"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-757"/> + <location line="-708"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+40"/> <source>Highlight current line</source> <translation type="unfinished"></translation> </message> <message> - <location line="+262"/> + <location line="+305"/> <source>Code completion</source> <translation type="unfinished"></translation> </message> <message> - <location line="-282"/> + <location line="-338"/> <source>Show complete path in window title</source> <translation type="unfinished"></translation> </message> <message> - <location line="-72"/> + <location line="-161"/> <source>Graphic icons</source> <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+144"/> <source>Show whitespace</source> <translation type="unfinished"></translation> </message> @@ -2340,7 +2405,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+290"/> + <location line="+346"/> <source># of characters typed before completion list displayed</source> <translation type="unfinished"></translation> </message> @@ -2365,7 +2430,7 @@ <translation type="unfinished">Командний рядок</translation> </message> <message> - <location line="+15"/> + <location line="+71"/> <source>Cursor type:</source> <translation type="unfinished"></translation> </message> @@ -2380,12 +2445,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+94"/> + <location line="-67"/> <source>Font size</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+109"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+29"/> <source>File Browser</source> <translation type="unfinished">Файловий менеджер</translation> </message> @@ -2445,7 +2515,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1129"/> + <location line="-1272"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> @@ -2460,7 +2530,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+991"/> + <location line="+1134"/> <source>Synchronize Octave working directory with file browser</source> <translation type="unfinished"></translation> </message> @@ -2497,7 +2567,7 @@ <message> <location filename="../src/settings-dialog.cc" line="+71"/> <location line="+4"/> - <location line="+389"/> + <location line="+416"/> <source>System setting</source> <translation type="unfinished"></translation> </message> @@ -2600,7 +2670,7 @@ <context> <name>webinfo</name> <message> - <location filename="../src/qtinfo/webinfo.cc" line="+80"/> + <location filename="../src/qtinfo/webinfo.cc" line="+83"/> <source>Type here and press 'Return' to search</source> <translation type="unfinished"></translation> </message> @@ -2609,6 +2679,16 @@ <source>Global search</source> <translation type="unfinished"></translation> </message> + <message> + <location line="+22"/> + <source>Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>The info file %1 does not exist</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>welcome_wizard</name>
--- a/libgui/src/files-dock-widget.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/files-dock-widget.cc Wed Jan 15 15:28:50 2014 -0500 @@ -816,7 +816,7 @@ QString name = QInputDialog::getText (this, tr ("Create File"), tr ("Create file in\n","String ends with \\n!") + parent_dir, - QLineEdit::Normal, "New File.txt", &ok); + QLineEdit::Normal, tr ("New File.txt"), &ok); if (ok && name.length () > 0) { name = parent_dir + "/" + name; @@ -834,7 +834,7 @@ QString name = QInputDialog::getText (this, tr ("Create Directory"), tr ("Create folder in\n","String ends with \\n!") + parent_dir, - QLineEdit::Normal, "New Directory", &ok); + QLineEdit::Normal, tr ("New Directory"), &ok); if (ok && name.length () > 0) { QDir dir (parent_dir);
--- a/libgui/src/find-files-dialog.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/find-files-dialog.cc Wed Jan 15 15:28:50 2014 -0500 @@ -304,7 +304,7 @@ _contains_text_edit->setEnabled (true); find_files_model *m = static_cast<find_files_model *> (_file_list->model ()); - QString res_str = QString ("%1 matches").arg (m->rowCount ()); + QString res_str = QString (tr("%1 match(es)")).arg (m->rowCount ()); _status_bar->showMessage (res_str); }
--- a/libgui/src/m-editor/file-editor.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/m-editor/file-editor.cc Wed Jan 15 15:28:50 2014 -0500 @@ -842,6 +842,13 @@ { int icon_size = settings->value ("toolbar_icon_size", 16).toInt (); _tool_bar->setIconSize (QSize (icon_size, icon_size)); + + int tab_width = settings->value ("editor/tab_width", 300).toInt (); + QString style_sheet = QString ("QTabBar::tab {max-height: 4ex; " + "max-width: %1px; text-align: right }"). + arg (tab_width); + _tab_widget->setStyleSheet (style_sheet); + // Relay signal to file editor tabs. emit fetab_settings_changed (settings); } @@ -874,8 +881,7 @@ #ifdef HAVE_QTABWIDGET_SETMOVABLE _tab_widget->setMovable (true); #endif - _tab_widget->setStyleSheet ("QTabBar::tab {max-height: 4ex; }"); - + _tab_widget->setElideMode (Qt::ElideLeft); QAction *new_action = new QAction (QIcon (":/actions/icons/filenew.png"),
--- a/libgui/src/m-editor/find-dialog.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/m-editor/find-dialog.cc Wed Jan 15 15:28:50 2014 -0500 @@ -71,7 +71,7 @@ find_dialog::find_dialog (QsciScintilla* edit_area, QWidget *p) : QDialog (p) { - setWindowTitle ("Find and Replace"); + setWindowTitle (tr ("Find and Replace")); setWindowIcon (QIcon(":/actions/icons/find.png")); _search_label = new QLabel (tr ("Find &what:"));
--- a/libgui/src/main-window.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/main-window.cc Wed Jan 15 15:28:50 2014 -0500 @@ -399,11 +399,14 @@ std::ostringstream buf; url_transfer octave_dot_org (url.toStdString (), buf); - Array<std::string> param; - octave_dot_org.http_get (param); - - if (octave_dot_org.good ()) - html_text = QString::fromStdString (buf.str ()); + if (octave_dot_org.is_valid ()) + { + Array<std::string> param; + octave_dot_org.http_get (param); + + if (octave_dot_org.good ()) + html_text = QString::fromStdString (buf.str ()); + } if (html_text.contains ("this-is-the-gnu-octave-community-news-page")) {
--- a/libgui/src/settings-dialog.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/settings-dialog.cc Wed Jan 15 15:28:50 2014 -0500 @@ -162,6 +162,8 @@ settings->value ("editor/tab_width", 2).toInt ()); ui->editor_longWindowTitle->setChecked ( settings->value ("editor/longWindowTitle",false).toBool ()); + ui->editor_tab_width->setValue ( + settings->value ("editor/tab_width", 300).toInt ()); ui->editor_restoreSession->setChecked ( settings->value ("editor/restoreSession", true).toBool ()); ui->editor_create_new_file->setChecked ( @@ -539,6 +541,8 @@ ui->editor_tab_width_spinbox->value ()); settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked ()); + settings->setValue ("editor/tab_width", + ui->editor_tab_width->value ()); settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ()); settings->setValue ("editor/create_new_file",
--- a/libgui/src/settings-dialog.ui Tue Jan 14 14:50:21 2014 -0800 +++ b/libgui/src/settings-dialog.ui Wed Jan 15 15:28:50 2014 -0500 @@ -32,7 +32,7 @@ <item> <widget class="QTabWidget" name="tabWidget"> <property name="currentIndex"> - <number>0</number> + <number>1</number> </property> <widget class="QWidget" name="tab_general"> <property name="enabled"> @@ -294,14 +294,14 @@ <property name="spacing"> <number>6</number> </property> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QCheckBox" name="editor_ws_checkbox"> <property name="text"> <string>Show whitespace</string> </property> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QCheckBox" name="editor_showLineNumbers"> <property name="enabled"> <bool>true</bool> @@ -311,14 +311,14 @@ </property> </widget> </item> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QCheckBox" name="editor_longWindowTitle"> <property name="text"> <string>Show complete path in window title</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="2"> <widget class="QCheckBox" name="editor_ws_indent_checkbox"> <property name="enabled"> <bool>false</bool> @@ -328,7 +328,20 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="4" column="4"> + <spacer name="horizontalSpacer_18"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="4" column="0"> <widget class="QCheckBox" name="editor_highlightCurrentLine"> <property name="enabled"> <bool>true</bool> @@ -338,7 +351,7 @@ </property> </widget> </item> - <item row="3" column="1"> + <item row="4" column="2"> <layout class="QGridLayout" name="editor_grid_current_line" rowstretch="0" columnstretch="0,0,0,0,0"> <property name="horizontalSpacing"> <number>12</number> @@ -387,7 +400,7 @@ </item> </layout> </item> - <item row="0" column="2"> + <item row="1" column="4"> <spacer name="horizontalSpacer_12"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -400,41 +413,84 @@ </property> </spacer> </item> + <item row="2" column="4"> + <spacer name="horizontalSpacer_16"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="3" column="4"> + <spacer name="horizontalSpacer_17"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> <item row="1" column="2"> - <spacer name="horizontalSpacer_16"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> + <layout class="QGridLayout" name="gridLayout_6"> + <item row="0" column="0"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>Max. tab width in pixel</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="editor_tab_width"> + <property name="minimum"> + <number>100</number> + </property> + <property name="maximum"> + <number>600</number> + </property> + <property name="singleStep"> + <number>20</number> + </property> + <property name="value"> + <number>300</number> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_25"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> - <item row="2" column="2"> - <spacer name="horizontalSpacer_17"> + <item row="1" column="1"> + <spacer name="horizontalSpacer_24"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="2"> - <spacer name="horizontalSpacer_18"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <property name="sizeType"> + <enum>QSizePolicy::Fixed</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> - <height>20</height> + <width>10</width> + <height>0</height> </size> </property> </spacer> @@ -453,8 +509,22 @@ <property name="verticalSpacing"> <number>0</number> </property> - <item row="0" column="3"> - <spacer name="horizontalSpacer_10"> + <item row="0" column="0"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Indent width</string> + </property> + </widget> + </item> + <item row="2" column="4"> + <widget class="QCheckBox" name="editor_tab_ind_checkbox"> + <property name="text"> + <string>Tab indents line</string> + </property> + </widget> + </item> + <item row="0" column="5"> + <spacer name="horizontalSpacer_14"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -469,20 +539,6 @@ </property> </spacer> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Indent width</string> - </property> - </widget> - </item> - <item row="2" column="4"> - <widget class="QCheckBox" name="editor_tab_ind_checkbox"> - <property name="text"> - <string>Tab indents line</string> - </property> - </widget> - </item> <item row="0" column="4"> <widget class="QCheckBox" name="editor_auto_ind_checkbox"> <property name="text"> @@ -547,8 +603,21 @@ </property> </spacer> </item> - <item row="0" column="5"> - <spacer name="horizontalSpacer_14"> + <item row="2" column="10"> + <spacer name="horizontalSpacer_20"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="3"> + <spacer name="horizontalSpacer_10"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> @@ -563,19 +632,6 @@ </property> </spacer> </item> - <item row="2" column="10"> - <spacer name="horizontalSpacer_20"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> </layout> </item> <item>
--- a/libinterp/corefcn/urlwrite.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/libinterp/corefcn/urlwrite.cc Wed Jan 15 15:28:50 2014 -0500 @@ -189,10 +189,15 @@ url_transfer obj (host, user, passwd, os); - if (! error_state) - handle_map[h] = obj; + if (obj.is_valid ()) + { + if (! error_state) + handle_map[h] = obj; + else + h = curl_handle (); + } else - h = curl_handle (); + error ("support for url transfers was disabled when Octave was built"); return h; } @@ -413,31 +418,36 @@ url_transfer curl = url_transfer (url, ofile); - curl.http_action (param, method); - - ofile.close (); + if (! curl.is_valid ()) + { + curl.http_action (param, method); - if (curl.good ()) - frame.discard (); + ofile.close (); - if (nargout > 0) - { if (curl.good ()) + frame.discard (); + + if (nargout > 0) { - retval(2) = std::string (); - retval(1) = true; - retval(0) = octave_env::make_absolute (filename); + if (curl.good ()) + { + retval(2) = std::string (); + retval(1) = true; + retval(0) = octave_env::make_absolute (filename); + } + else + { + retval(2) = curl.lasterror (); + retval(1) = false; + retval(0) = std::string (); + } } - else - { - retval(2) = curl.lasterror (); - retval(1) = false; - retval(0) = std::string (); - } + + if (nargout < 2 && ! curl.good ()) + error ("urlwrite: %s", curl.lasterror ().c_str ()); } - - if (nargout < 2 && ! curl.good ()) - error ("urlwrite: %s", curl.lasterror ().c_str ()); + else + error ("support for url transfers was disabled when Octave was built"); return retval; } @@ -540,21 +550,26 @@ url_transfer curl = url_transfer (url, buf); - curl.http_action (param, method); + if (curl.is_valid ()) + { + curl.http_action (param, method); - if (curl.good ()) - { - if (nargout > 0) + if (curl.good ()) { - // Return empty string if no error occured. - retval(2) = curl.good () ? "" : curl.lasterror (); - retval(1) = curl.good (); - retval(0) = buf.str (); + if (nargout > 0) + { + // Return empty string if no error occured. + retval(2) = curl.good () ? "" : curl.lasterror (); + retval(1) = curl.good (); + retval(0) = buf.str (); + } } + + if (nargout < 2 && ! curl.good ()) + error ("urlread: %s", curl.lasterror().c_str()); } - - if (nargout < 2 && ! curl.good ()) - error ("urlread: %s", curl.lasterror().c_str()); + else + error ("support for url transfers was disabled when Octave was built"); return retval; }
--- a/liboctave/util/url-transfer.cc Tue Jan 14 14:50:21 2014 -0800 +++ b/liboctave/util/url-transfer.cc Wed Jan 15 15:28:50 2014 -0500 @@ -767,15 +767,6 @@ #undef SETOPT -#else - -static void -disabled_error (void) -{ - (*current_liboctave_error_handler) - ("support for url transfers was disabled when Octave was built"); -} - #endif #if defined (HAVE_CURL) @@ -785,27 +776,15 @@ #endif url_transfer::url_transfer (void) : rep (new REP_CLASS ()) -{ -#if !defined (HAVE_CURL) - disabled_error (); -#endif -} +{ } url_transfer::url_transfer (const std::string& host, const std::string& user, const std::string& passwd, std::ostream& os) : rep (new REP_CLASS (host, user, passwd, os)) -{ -#if !defined (HAVE_CURL) - disabled_error (); -#endif -} +{ } url_transfer::url_transfer (const std::string& url, std::ostream& os) : rep (new REP_CLASS (url, os)) -{ -#if !defined (HAVE_CURL) - disabled_error (); -#endif -} +{ } #undef REP_CLASS