Mercurial > octave-dspies
changeset 18351:cd897532aaec
maint: Periodic merge of gui-release to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 23 Jan 2014 16:16:07 -0500 |
| parents | 052cc933aea6 (current diff) 26eac61ebab2 (diff) |
| children | c9b284dd28c6 |
| files | configure.ac libgui/languages/pt_BR.ts src/Makefile.am src/mkoctfile.in.sh src/octave-config.in.sh |
| diffstat | 29 files changed, 2826 insertions(+), 2657 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Jan 23 12:53:32 2014 -0800 +++ b/configure.ac Thu Jan 23 16:16:07 2014 -0500 @@ -1636,7 +1636,6 @@ OCTGRAPHICS_DLL_DEFS= library_path_var=LD_LIBRARY_PATH ldpreloadsep=" " -BUILD_COMPILED_AUX_PROGRAMS=no case $canonical_host_type in *-*-386bsd* | *-*-netbsd*) SH_LD=ld @@ -1689,7 +1688,6 @@ ldpreloadsep=":" ;; *-*-mingw*) - BUILD_COMPILED_AUX_PROGRAMS=yes if test $have_msvc = yes; then DL_LDFLAGS="-shared" CPICFLAG= @@ -1730,7 +1728,6 @@ ;; *-*-msdosmsvc) - BUILD_COMPILED_AUX_PROGRAMS=yes DL_LDFLAGS="-shared" CPICFLAG= CXXPICFLAG= @@ -1827,9 +1824,6 @@ ;; esac -AM_CONDITIONAL([AMCOND_BUILD_COMPILED_AUX_PROGRAMS], - [test $BUILD_COMPILED_AUX_PROGRAMS = yes]) - AC_MSG_NOTICE([defining FPICFLAG to be $FPICFLAG]) AC_MSG_NOTICE([defining CPICFLAG to be $CPICFLAG]) AC_MSG_NOTICE([defining CXXPICFLAG to be $CXXPICFLAG])
--- a/libgui/languages/be_BY.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/be_BY.ts Thu Jan 23 16:16:07 2014 -0500 @@ -475,7 +475,7 @@ <translation>курсор</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -1684,17 +1684,12 @@ ужо адкрыты ў рэдактары</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Новы файл</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>&Захаваць файл</translation> </message> @@ -1704,7 +1699,12 @@ <translation>&Адкрыць файл...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Захаваць файл &як...</translation> </message> @@ -1790,6 +1790,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Знайсці і замяніць...</translation> </message> @@ -1804,7 +1814,7 @@ <translation>П&ерайсці да радка...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>&Ранейшыя файлы</translation> </message> @@ -1829,7 +1839,7 @@ <translation>Закрыць іншыя файлы</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Настаўленні...</translation> </message> @@ -1859,7 +1869,7 @@ <translation>&Дакументацыя па ключавым слове</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -1891,7 +1901,7 @@ <translation>Асацыяваная картка рэдактара знікла.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -1906,7 +1916,7 @@ <translation>&Змяніць</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Адладка</translation> </message> @@ -1919,7 +1929,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Перайсці да радка</translation> </message> @@ -1929,7 +1939,7 @@ <translation>Нумар радка</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><без назвы></translation> @@ -1946,15 +1956,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Рэдактар Octave</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -1965,20 +1975,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Файлы Octave (*.m);;Усе файлы (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -1996,14 +1998,14 @@ быў выдалены або пераназваны. Можа, захаваць яго зараз?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Не выйшла адкрыць файл %1 на запіс: %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Радок:</translation> </message> @@ -2013,7 +2015,18 @@ <translation>Слупок:</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Выглядае на тое, што '%1' быў зменены іншай праграмай. Перачытаць яго?</translation> </message> @@ -2046,7 +2059,12 @@ <translation>Дзеянні з дзейным каталогам</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Шукаць файлы...</translation> </message> @@ -2067,7 +2085,7 @@ <translation>Двойчы пстрыкніце па файле для адкрыцця</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Перайсці да каталогу Octave</translation> </message> @@ -2092,12 +2110,7 @@ <translation>Перайсці да хатняга каталогу</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Шукаць каталог...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Шукаць файлы...</translation> </message> @@ -2112,7 +2125,7 @@ <translation>Новы каталог...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Памер файла</translation> </message> @@ -2427,12 +2440,7 @@ <translation>Маска назваў:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Задайце выраз для назваў файлаў</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Пачынаць з:</translation> </message> @@ -2452,22 +2460,12 @@ <translation>Пазначыць каталог пачатку пошуку</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Рэкурсіўна</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Шукаць ува ўсіх падкаталогах</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Знаходзіць каталогі</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Дадаваць пасавальныя каталогі ў вынікі пошуку</translation> </message> @@ -2487,9 +2485,24 @@ <translation>Змяшчае тэкст:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>Улічваць файлы, што ўтрымліваюць пэўны тэкст</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -2647,13 +2660,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Загрузіць прастору зменных</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Пра Octave</translation> </message> @@ -2668,12 +2681,7 @@ <translation>Новы</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Новы сцэнар</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Графік</translation> </message> @@ -2713,12 +2721,23 @@ <translation>Уставіць</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Захаваць прастору зменных як</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>Файл заўваг да выпуску '%1' пусты.</translation> </message> @@ -2733,12 +2752,12 @@ <translation>Заўвагі да выпуску Octave</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Навіны супольнасці Octave</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Ачысціць буфер</translation> </message> @@ -2803,22 +2822,12 @@ <translation>Крок наперад</translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Загрузіць прастору зменных...</translation> </message> @@ -2828,7 +2837,12 @@ <translation>Захаваць прастору зменных як...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Функцыя...</translation> </message> @@ -2919,8 +2933,8 @@ <translation>Перайсці каталогам вышэй</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Агляд каталогаў</translation> </message> @@ -2994,7 +3008,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -3095,7 +3109,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -3122,13 +3136,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>Файл %1 не існуе ў дзейным шляху. Для адладкі функцыі, якую вы рэдагуеце, трэба змяніць каталог на %2 або дадаць яго да дзейнага шляху.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>Файлу %1 замінае файл з такой самай назвай у дзейным шляху. Для адладкі функцыі, якую вы рэдагуеце, змяніце каталог на %2.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -3179,17 +3193,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Настаўленні</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Агульныя</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Толькі эмблема Octave</translation> </message> @@ -3200,12 +3214,12 @@ <translation>Літарныя значкі</translation> </message> <message> - <location line="+29"/> + <location line="-172"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -3220,22 +3234,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Рэдактар</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Колер</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Даўжыня водступу</translation> </message> @@ -3292,67 +3301,114 @@ <translation>Памятаць карткі папярэдняга сеансу</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Свой файлавы рэдактар</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Выгляд рэдактара</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <translation><html><head/><body><p>Пазначце шрыфт, ягоны памер (як розніцу ад стандартнага памеру), стыль шрыфту (<b>т</b>оўсты, <b>к</b>урсіўны, <b>п</b>адкрэслены), колер тэксту і колер фону (для фону ружовы (255,0,255) азначае стандартны колер фону).</p></body></html></translation> </message> <message> - <location line="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation>Колеры тэрміналу</translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Шрыфт</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Паказваць нумары радкоў</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Фарбаваць дзейны радок</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Аўтадапаўненне</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Паказваць поўны шлях у загалоўку акна</translation> </message> <message> - <location line="-161"/> + <location line="-366"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+187"/> <source>Graphic icons</source> <translation>Графічныя значкі</translation> </message> <message> - <location line="+144"/> + <location line="+34"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+61"/> <source>Show whitespace</source> <translation>Паказваць прагальныя знакі</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>Не паказваць прагальныя знакі ў водступах</translation> </message> <message> - <location line="+346"/> + <location line="+120"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+197"/> <source># of characters typed before completion list displayed</source> <translation>Пасля ўводу колькі знакаў прапаноўваць дапаўненні</translation> </message> @@ -3362,92 +3418,102 @@ <translation>Ствараць няісныя файлы без пытанняў</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>Загад (%f=файл, %l-радок):</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Тэрмінал</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Тып курсора:</translation> </message> <message> + <location line="-11"/> + <source>Cursor blinking</source> + <translation>Мігценне курсора</translation> + </message> + <message> + <location line="-7"/> + <source>Use foreground color</source> + <translation>Выкар. колер пярэдняга плану</translation> + </message> + <message> + <location line="+53"/> + <source>Font size</source> + <translation>Памер шрыфту</translation> + </message> + <message> + <location line="+99"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <source>File Browser</source> + <translation>Файлавы агляднік</translation> + </message> + <message> + <location line="+46"/> + <source>Show file size</source> + <translation>Паказваць памеры файлаў</translation> + </message> + <message> + <location line="-14"/> + <source>Show file type</source> + <translation>Паказваць тыпы файлаў</translation> + </message> + <message> + <location line="+21"/> + <source>Show date of last modification</source> + <translation>Паказваць дату апошняга змянення</translation> + </message> + <message> + <location line="-14"/> + <source>Show hidden files</source> + <translation>Паказваць схаваныя файлы</translation> + </message> + <message> + <location line="-18"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> + <source>Alternating row colors</source> + <translation>Колеры радкоў чаргуюцца</translation> + </message> + <message> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> + <source>Workspace</source> + <translation>Прастора зменных</translation> + </message> + <message> + <location line="+38"/> + <source>Storage Class Colors</source> + <translation>Колеры класаў памяці</translation> + </message> + <message> + <location line="+40"/> + <source>Network</source> + <translation>Сетка</translation> + </message> + <message> <location line="+23"/> - <source>Cursor blinking</source> - <translation>Мігценне курсора</translation> - </message> - <message> - <location line="+7"/> - <source>Use foreground color</source> - <translation>Выкар. колер пярэдняга плану</translation> - </message> - <message> - <location line="-67"/> - <source>Font size</source> - <translation>Памер шрыфту</translation> - </message> - <message> - <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> - <message> - <location line="+6"/> - <source>Show file size</source> - <translation>Паказваць памеры файлаў</translation> - </message> - <message> - <location line="+7"/> - <source>Show file type</source> - <translation>Паказваць тыпы файлаў</translation> - </message> - <message> - <location line="+7"/> - <source>Show date of last modification</source> - <translation>Паказваць дату апошняга змянення</translation> - </message> - <message> - <location line="+7"/> - <source>Show hidden files</source> - <translation>Паказваць схаваныя файлы</translation> - </message> - <message> - <location line="+14"/> - <source>Alternating row colors</source> - <translation>Колеры радкоў чаргуюцца</translation> - </message> - <message> - <location line="+21"/> - <source>Workspace</source> - <translation>Прастора зменных</translation> - </message> - <message> - <location line="+30"/> - <source>Storage Class Colors</source> - <translation>Колеры класаў памяці</translation> - </message> - <message> - <location line="+35"/> - <source>Network</source> - <translation>Сетка</translation> - </message> - <message> - <location line="+8"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Дазволіць Octave злучацца з вэб-сайтам Octave для адлюстравання навінаў і свежай інфармацыі</translation> </message> @@ -3462,27 +3528,27 @@ <translation>HttpProxy</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Набор значкоў для віджэтаў</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Мова (патрэбны перазапуск)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Памер значкоў</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation>Сінхранізаваць дзейны каталог Octave з файлавым агляднікам</translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>Socks5Proxy</translation> </message> @@ -3512,9 +3578,9 @@ <translation>Пароль:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Сістэмная</translation> </message> @@ -3561,6 +3627,16 @@ <comment>short form for underlined</comment> <translation>п</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -3680,8 +3756,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Клас памяці</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -3729,8 +3805,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Колеры для класаў памяці:</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/de_DE.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/de_DE.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation>Cursor</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -144,17 +144,12 @@ ist im Editor bereits geöffnet</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Neue Datei</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>Datei &speichern</translation> </message> @@ -164,7 +159,12 @@ <translation>Datei &Öffnen...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Datei speichern &als...</translation> </message> @@ -250,6 +250,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Suchen und Ersetzen...</translation> </message> @@ -264,7 +274,7 @@ <translation>&Gehe zu Zeile...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>&Zuletzt bearbeitete Dateien</translation> </message> @@ -289,7 +299,7 @@ <translation>Andere Dokumente schließen</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Einstellungen...</translation> </message> @@ -319,7 +329,7 @@ <translation>&Dokumentation zum Schlüsselwort</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -353,7 +363,7 @@ <translation>Der zugehörige Editor-Reiter ist nicht mehr vorhanden.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Datei</translation> </message> @@ -368,7 +378,7 @@ <translation>&Bearbeiten</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Debuggen</translation> </message> @@ -381,7 +391,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Gehe zu Zeile</translation> </message> @@ -391,7 +401,7 @@ <translation>Zeilennummer</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><unbenannt></translation> @@ -408,15 +418,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Octave Editor</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -427,20 +437,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Octave Dateien (*.m);;All Files (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -456,14 +458,14 @@ wurde gelöscht oder umbenannt. Soll die Datei jetzt gespeichert werden?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Die Datei %1 konnte nicht zum Schreiben geöffnet werden: %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Zeile:</translation> </message> @@ -473,7 +475,18 @@ <translation>Spalte:</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <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> @@ -506,7 +519,12 @@ <translation>Aktionen mit aktuellem Verzeichnis</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Dateien suchen ...</translation> </message> @@ -527,7 +545,7 @@ <translation>Doppelklick auf eine Datei um diese zu öffnen</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Aktuelles Octave Verzeichnis anzeigen</translation> </message> @@ -552,12 +570,7 @@ <translation>Wechsle zum Heimatverzeichnis</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Verzeichnis suchen...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translatorcomment>Dateien suchen...</translatorcomment> <translation>Suche Dateien...</translation> @@ -573,7 +586,7 @@ <translation>Neues Verzeichnis...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Dateigröße</translation> </message> @@ -889,12 +902,7 @@ <translation>Name:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Eingabe eines Ausdrucks für den Dateinamen</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Beginne in:</translation> </message> @@ -914,22 +922,12 @@ <translation>Suche Startverzeichnis</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Unterverzeichnisse durchsuchen</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Rekursive Dateisuche durch Unterverzeichnisse</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Verzeichnisse einbeziehen</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Auch Verzeichnisse berücksichtigen, die die Suchanfrage erfüllen</translation> </message> @@ -949,9 +947,24 @@ <translation>In Datei vorkommender Text:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>Suche Dateien mit übereinstimmendem Text</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -1109,13 +1122,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Lade Arbeitsumgebung</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Über Octave</translation> </message> @@ -1130,12 +1143,7 @@ <translation>Neu</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Skript</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Abbildung</translation> </message> @@ -1175,12 +1183,23 @@ <translation>Einfügen</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Arbeitsumgebung speichern als</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>Die Datei '%1' mit Versionshinweisen ist leer.</translation> </message> @@ -1195,12 +1214,12 @@ <translation>Versionshinweise zu Octave</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Neuigkeiten aus der Octave Community</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Zwischenablage leeren</translation> </message> @@ -1265,22 +1284,12 @@ <translation>Hineinspringen</translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Lade Arbeitsumgebung...</translation> </message> @@ -1290,7 +1299,12 @@ <translation>Arbeitsumgebung speichern als...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Funktion...</translation> </message> @@ -1381,8 +1395,8 @@ <translation>Ein Verzeichnis höher</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Verzeichnis suchen</translation> </message> @@ -1456,7 +1470,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -1557,7 +1571,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -1584,13 +1598,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>Die Datei %1 exisitiert nicht im Suchpfad. Um die editierte Funktion zu debuggen, muss entweder in das Verzeichnis %2 gewechselt werden oder dieses Verzeichnis dem Suchpfad hinzugefügt werden.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>Die Datei %1 wird von einer gleichnamigen Datei im Suchpfad überdeckt. Um die editierte Funktion zu debuggen, muss in das Verzeichnis %2 gewechselt werden.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -1641,17 +1655,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Einstellungen</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Allgemein</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Nur Octave Logo</translation> </message> @@ -1661,12 +1675,12 @@ <translation>Icons mit Buchstaben</translation> </message> <message> - <location line="+29"/> + <location line="-172"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -1681,22 +1695,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Einrücken um</translation> </message> @@ -1751,67 +1760,114 @@ <translation>Editor Dateien der letzten Sitzung wiederherstellen</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Externen Editor verwenden</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Editor Stile</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <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="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation>Farben des Befehlsfensters</translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Schriftart</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Zeilennummern anzeigen</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Aktuelle Zeile hervorheben</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Vervollständigung</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Kompletten Pfad im Reiter anzeigen</translation> </message> <message> - <location line="-161"/> + <location line="-366"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+187"/> <source>Graphic icons</source> <translation>Grafische Icons</translation> </message> <message> - <location line="+144"/> + <location line="+34"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+61"/> <source>Show whitespace</source> <translation>Leerzeichen anzeigen</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>Leerzeichen der Einrückung nicht anzeigen</translation> </message> <message> - <location line="+346"/> + <location line="+120"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+197"/> <source># of characters typed before completion list displayed</source> <translation>Anzahl der eingegebenen Zeichen bis Vervollständigungsliste</translation> </message> @@ -1821,92 +1877,102 @@ <translation>Nicht existierende Dateien ohne Nachfrage anlegen</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>Kommandozeile (%f=Datei, %l=Zeile):</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Befehlsfenster</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Cursortyp:</translation> </message> <message> - <location line="+23"/> + <location line="-11"/> <source>Cursor blinking</source> <translation>Blinkender Cursor</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use foreground color</source> <translation>Vordergrundfarbe verwenden</translation> </message> <message> - <location line="-67"/> + <location line="+53"/> <source>Font size</source> <translation>Schriftgröße</translation> </message> <message> - <location line="+109"/> + <location line="+99"/> <source>Set focus to terminal when running a command from within another widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+34"/> <source>File Browser</source> <translation>Dateibrowser</translation> </message> <message> - <location line="+6"/> + <location line="+46"/> <source>Show file size</source> <translation>Dateigröße anzeigen</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show file type</source> <translation>Dateityp anzeigen</translation> </message> <message> - <location line="+7"/> + <location line="+21"/> <source>Show date of last modification</source> <translation>Datum der letzten Änderung anzeigen</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show hidden files</source> <translation>Versteckte Dateien anzeigen</translation> </message> <message> - <location line="+14"/> + <location line="-18"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Alternating row colors</source> <translation>Alternierende Farben für die Zeilen verwenden</translation> </message> <message> - <location line="+21"/> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Workspace</source> <translation>Arbeitsumgebung</translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>Storage Class Colors</source> <translation>Farben der Speicherklassen festlegen</translation> </message> <message> - <location line="+35"/> + <location line="+40"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location line="+8"/> + <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Octave erlauben Neuigkeiten und Informationen von der Octave Webseite anzuzeigen</translation> </message> @@ -1921,27 +1987,27 @@ <translation>HTTP Proxy</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Icons der Unterfenster</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Sprache (Neustart erforderlich)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Icongröße</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation>Octave Arbeitsverzeichnis und Dateibrowser synchronisieren</translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>Socks5Proxy</translation> </message> @@ -1971,9 +2037,9 @@ <translation>Passwort:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Systemeinstellung</translation> </message> @@ -2020,6 +2086,16 @@ <comment>short form for underlined</comment> <translation>u</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2139,8 +2215,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Speicherklasse</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -2188,8 +2264,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Farben der Speicherklassen:</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/en_US.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/en_US.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -141,17 +141,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation type="unfinished"></translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation type="unfinished"></translation> </message> @@ -161,7 +156,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation type="unfinished"></translation> </message> @@ -247,6 +247,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation type="unfinished"></translation> </message> @@ -261,7 +271,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> @@ -286,7 +296,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation type="unfinished"></translation> </message> @@ -316,7 +326,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -342,7 +352,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation type="unfinished"></translation> </message> @@ -357,7 +367,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation type="unfinished"></translation> </message> @@ -370,7 +380,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation type="unfinished"></translation> </message> @@ -380,7 +390,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation type="unfinished"></translation> @@ -397,15 +407,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -413,20 +423,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -440,13 +442,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -456,7 +458,18 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -489,7 +502,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation type="unfinished"></translation> </message> @@ -510,7 +528,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation type="unfinished"></translation> </message> @@ -535,12 +553,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation type="unfinished"></translation> </message> @@ -555,7 +568,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation type="unfinished"></translation> </message> @@ -852,12 +865,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation type="unfinished"></translation> </message> @@ -877,22 +885,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation type="unfinished"></translation> </message> @@ -912,8 +910,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> <translation type="unfinished"></translation> </message> <message> @@ -1068,13 +1081,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation type="unfinished"></translation> </message> @@ -1089,12 +1102,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation type="unfinished"></translation> </message> @@ -1134,12 +1142,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1154,12 +1173,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation type="unfinished"></translation> </message> @@ -1224,22 +1243,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation type="unfinished"></translation> </message> @@ -1249,7 +1258,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation type="unfinished"></translation> </message> @@ -1340,8 +1354,8 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation type="unfinished"></translation> </message> @@ -1415,7 +1429,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -1493,7 +1507,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -1518,12 +1532,12 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> <translation type="unfinished"></translation> </message> <message> @@ -1569,17 +1583,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation type="unfinished"></translation> </message> @@ -1589,12 +1603,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="-172"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -1609,22 +1623,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation type="unfinished"></translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation type="unfinished"></translation> </message> @@ -1679,67 +1688,114 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation type="unfinished"></translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation type="unfinished"></translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation type="unfinished"></translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation type="unfinished"></translation> </message> <message> - <location line="-161"/> + <location line="-366"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+187"/> <source>Graphic icons</source> <translation type="unfinished"></translation> </message> <message> - <location line="+144"/> + <location line="+34"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+61"/> <source>Show whitespace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation type="unfinished"></translation> </message> <message> - <location line="+346"/> + <location line="+120"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+197"/> <source># of characters typed before completion list displayed</source> <translation type="unfinished"></translation> </message> @@ -1749,92 +1805,102 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation type="unfinished"></translation> </message> <message> - <location line="+23"/> + <location line="-11"/> <source>Cursor blinking</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use foreground color</source> <translation type="unfinished"></translation> </message> <message> - <location line="-67"/> + <location line="+53"/> <source>Font size</source> <translation type="unfinished"></translation> </message> <message> - <location line="+109"/> + <location line="+99"/> <source>Set focus to terminal when running a command from within another widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+34"/> <source>File Browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+46"/> <source>Show file size</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show file type</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="+21"/> <source>Show date of last modification</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show hidden files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+14"/> + <location line="-18"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Alternating row colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="+21"/> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>Storage Class Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+40"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location line="+8"/> + <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation type="unfinished"></translation> </message> @@ -1849,27 +1915,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation type="unfinished"></translation> </message> @@ -1899,9 +1965,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation type="unfinished"></translation> </message> @@ -1948,6 +2014,16 @@ <comment>short form for underlined</comment> <translation type="unfinished"></translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2056,7 +2132,7 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> + <source>Attribute</source> <translation type="unfinished"></translation> </message> <message> @@ -2105,7 +2181,7 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> + <source>Colors for variable attributes:</source> <translation type="unfinished"></translation> </message> </context>
--- a/libgui/languages/es_ES.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/es_ES.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation>cursor</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -134,17 +134,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+536"/> + <location line="+549"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Nuevo archivo</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>&Guardar archivo</translation> </message> @@ -154,7 +149,12 @@ <translation>&Abrir archivo...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Guardar archivo &como...</translation> </message> @@ -240,6 +240,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Buscar y reemplazar...</translation> </message> @@ -254,7 +264,7 @@ <translation>&Ir a línea...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>Archivos &recientes</translation> </message> @@ -279,7 +289,7 @@ <translation>Cerrar otros archivos</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Preferencias...</translation> </message> @@ -309,7 +319,7 @@ <translation>&Documentación de palabras clave</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -342,7 +352,7 @@ <translation>La pestaña para la edición del archivo ha desaparecido.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Archivo</translation> </message> @@ -357,7 +367,7 @@ <translation>&Editar</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Depurar</translation> </message> @@ -370,7 +380,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Ir a línea</translation> </message> @@ -380,7 +390,7 @@ <translation>Número de línea</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><sin nombre></translation> @@ -397,15 +407,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor de Octave</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -413,20 +423,12 @@ <translation>El archivo\n%1\nestá a punto de ser cerrado, pero ha sido modificado.\n%2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Archivos de Octave(*.m);;Todos los archivos(*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -440,13 +442,13 @@ <translation>Parece que el archivo\n%1\nha sido eliminado o renombrado.¿Desea guardarlo ahora?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>No se ha podido abrir el archivo %1 para escritura:\n%2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Línea:</translation> </message> @@ -456,7 +458,18 @@ <translation>Col:</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <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> @@ -489,7 +502,12 @@ <translation>Acciones en el directorio actual</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Buscar archivos ...</translation> </message> @@ -510,7 +528,7 @@ <translation>Pulse dos veces en un archivo para abrirlo</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Mostrar el directorio de Octave</translation> </message> @@ -535,12 +553,7 @@ <translation>Mostrar el directorio de inicio</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Buscar directorio...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Buscar archivos...</translation> </message> @@ -555,7 +568,7 @@ <translation>Nuevo directorio...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Tamaño del archivo</translation> </message> @@ -872,12 +885,7 @@ <translation>Nombrado:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Introducir la expresión del nombre de archivo</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Iniciar en:</translation> </message> @@ -897,22 +905,12 @@ <translation>Explorar para seleccionar el directorio de inicio</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Explorar directorios de forma recursiva</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Buscar archivos de forma recursiva en los directorios</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Incluir directorios</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Incluir directorios que coicidan en los resultados de la búsqueda</translation> </message> @@ -932,9 +930,24 @@ <translation>Contiene el texto:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>La búsqueda debe coincidir con el texto</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -1093,13 +1106,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Cargar espacio de trabajo</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Acerca de Octave</translation> </message> @@ -1114,13 +1127,7 @@ <translation>Nuevo</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translatorcomment>Guión/"Script"</translatorcomment> - <translation>Guión</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Figura</translation> </message> @@ -1160,12 +1167,23 @@ <translation>Pegar</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Guardar espacio de trabajo como</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>El archivo de las notas de versión %1 está vacío.</translation> </message> @@ -1180,12 +1198,12 @@ <translation>Notas de la versión de Octave</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Noticas de la comunidad Octave</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Limpiar el portapapeles</translation> </message> @@ -1250,22 +1268,12 @@ <translation>Iniciar</translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Cargar espacio de trabajo...</translation> </message> @@ -1275,7 +1283,12 @@ <translation>Guardar espacio de trabajo como...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Función...</translation> </message> @@ -1366,8 +1379,8 @@ <translation>Directorio superior</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Explorar directorios</translation> </message> @@ -1441,7 +1454,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -1546,7 +1559,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -1571,14 +1584,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translatorcomment>Uso la traducción "ruta" para "path": http://es.wikipedia.org/wiki/Ruta_(informática)</translatorcomment> - <translation>El archivo %1 no existe en la ruta de carga. Para depurar la función que acualmente edita tiene que cambiar al directorio %2 o bien agregar ese directorio a la ruta de carga.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>El archivo %1 se solapa con un archivo con el mismo nombre en la ruta de carga. Para depurar la función que edita, cambie al directorio %2.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -1625,17 +1637,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Configuración</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>General</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Sólo logo de Octave</translation> </message> @@ -1650,12 +1662,12 @@ <translation>Iconos gráficos</translation> </message> <message> - <location line="+22"/> + <location line="-179"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -1670,22 +1682,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Color</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Ancho de sangría</translation> </message> @@ -1740,63 +1747,68 @@ <translation>Restaurar las pestañas del editor de la sesión anterior en el arranque </translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Utilizar editor de archivos personalizado</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Estilos del editor</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <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="+154"/> + <location line="+191"/> <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="-106"/> + <location line="-100"/> <source>Font</source> <translation>Tipo de fuente</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Mostrar numeros de línea</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Resaltar línea actual</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Autocompletar código</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Mostrar ruta completa en el título de la ventana</translation> </message> <message> - <location line="-17"/> + <location line="-23"/> <source>Show whitespace</source> <translation>Mostrar espacios en blanco</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>No mostrar los espacios usados para la sangría</translation> </message> <message> - <location line="+346"/> + <location line="+369"/> <source># of characters typed before completion list displayed</source> <translation># de caracteres pulsados antes de completar la lista desplegada</translation> </message> @@ -1806,92 +1818,144 @@ <translation>Crear archivos no existentes sin consultar</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>línea de comando(%f=archivo, %l=linea):</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Terminal</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Tipo de cursor:</translation> </message> <message> - <location line="+23"/> + <location line="-11"/> <source>Cursor blinking</source> <translation>Cursor parpadeante</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use foreground color</source> <translation>Usar color de primer plano</translation> </message> <message> - <location line="-67"/> + <location line="+53"/> <source>Font size</source> <translation>Tamaño de fuente</translation> </message> <message> - <location line="+109"/> + <location line="+99"/> <source>Set focus to terminal when running a command from within another widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+34"/> <source>File Browser</source> <translation>Explorador de archivos</translation> </message> <message> - <location line="+6"/> + <location line="+46"/> <source>Show file size</source> <translation>Mostrar tamaño de archivo</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show file type</source> <translation>Mostrar tipo de archivo</translation> </message> <message> - <location line="+7"/> + <location line="+21"/> <source>Show date of last modification</source> <translation>Mostrar fecha de la última modificación</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show hidden files</source> <translation>Mostrar archivos ocultos</translation> </message> <message> - <location line="+14"/> + <location line="-1316"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+221"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+214"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+750"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Alternating row colors</source> <translation>Alternar colores de filas</translation> </message> <message> - <location line="+21"/> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Workspace</source> <translation>Espacio de trabajo</translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>Storage Class Colors</source> <translation>Colores para las clases de almacenamiento</translation> </message> <message> - <location line="+35"/> + <location line="+40"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location line="+8"/> + <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Permitir a Octave la conexión al sitio web para desplegar las últimas noticias e información</translation> </message> @@ -1906,27 +1970,27 @@ <translation>HttpProxy</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Iconos para widget acoplados</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Lenguaje (reinicio requerido)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Tamaño de icono</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation>Sincronizar el directorio de trabajo de Octave con el explorador de archivos</translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>"Socks5Proxy"</translation> </message> @@ -1956,9 +2020,9 @@ <translation>Contraseña:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Configuración del sistema</translation> </message> @@ -2005,6 +2069,16 @@ <comment>short form for underlined</comment> <translation>u</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2124,8 +2198,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Clase de almacenamiento</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -2173,8 +2247,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Colores para cada clase de almacenamiento:</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/fr_FR.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/fr_FR.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation>curseur</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -143,17 +143,12 @@ est déjà ouvert dans l'éditeur</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Nouveau</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>&Enregistrer</translation> </message> @@ -163,7 +158,12 @@ <translation>&Ouvrir...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Enregistrer &sous...</translation> </message> @@ -249,6 +249,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Rechercher et remplacer...</translation> </message> @@ -263,7 +273,7 @@ <translation>&Aller à la ligne...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>Fichiers &récents</translation> </message> @@ -288,7 +298,7 @@ <translation>Fermer les autres fichiers</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Préférences...</translation> </message> @@ -318,7 +328,7 @@ <translation>&Documentation sur le mot de clés</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -350,7 +360,7 @@ <translation>L'onglet éditeur de fichier associé a disparu.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Fichier</translation> </message> @@ -365,7 +375,7 @@ <translation>&Editer</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Déboguer</translation> </message> @@ -378,7 +388,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Aller à la ligne</translation> </message> @@ -388,7 +398,7 @@ <translation>Numéro de ligne</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><sans nom></translation> @@ -405,15 +415,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Éditeur d'Octave</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -424,20 +434,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Fichiers d'Octave (*.m);;Tous les fichiers (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -455,14 +457,14 @@ a été supprimé ou rénommé. Voulez-vous l'enregistrer maintenant ?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Impossible d'ouvrir le fichier %1 pour écrire : %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Ligne :</translation> </message> @@ -472,7 +474,18 @@ <translation>Col :</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <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> @@ -505,7 +518,12 @@ <translation>Actions sur le répertoire courant</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Rechercher des fichiers...</translation> </message> @@ -526,7 +544,7 @@ <translation>Double-cliquer sur un fichier pour l'ouvrir</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Revenir au répertoire d'Octave</translation> </message> @@ -551,12 +569,7 @@ <translation>Aller au répertoire personnel</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Rechercher dans le répertoire...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Rechercher des fichiers...</translation> </message> @@ -571,7 +584,7 @@ <translation>Nouveau répertoire...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Taille du fichier</translation> </message> @@ -888,12 +901,7 @@ <translation>Nommé:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Entrer le nom du fichier ou une expression</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Demarrer dans :</translation> </message> @@ -913,22 +921,12 @@ <translation>Choisir le répertoire de démarrage</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Parcourir récursivement les sous-répertoires</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Rechercher les fichiers recursivement dans les sous-répertoires</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Inclure les répertoires</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Inclure les répertoires concordants dans des résultats de la recherche</translation> </message> @@ -948,9 +946,24 @@ <translation>Contenant le texte :</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>La recherche doit contenir le texte</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -1108,13 +1121,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Charger l'espace de travail</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>À propos d'Octave</translation> </message> @@ -1129,12 +1142,7 @@ <translation>Nouveau</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Fichier de script</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Figure</translation> </message> @@ -1174,12 +1182,23 @@ <translation>Coller</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Enregistrer l'espace de travail sous</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>Le fichier de notes de version '%1' est vide.</translation> </message> @@ -1194,12 +1213,12 @@ <translation>Notes de la version d'Octave</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Nouvelles de la communauté Octave</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Effacer le presse-papiers</translation> </message> @@ -1264,22 +1283,12 @@ <translation>Avancer d'un pas avec entrée</translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Charger l'espace de travail...</translation> </message> @@ -1289,7 +1298,12 @@ <translation>Enregistrer l'espace de travail sous...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Fonction...</translation> </message> @@ -1380,8 +1394,8 @@ <translation>Monter au répertoire parent</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Naviguer dans les répertoires</translation> </message> @@ -1455,7 +1469,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -1556,7 +1570,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -1583,13 +1597,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>Le fichier %1 n'existe pas dans les chemins accessibles. Pour déboguer la fonction que vous éditez, vous devez soit modifier le répertoire pour %2 ou ajouter le répertoire aux chemins accessibles.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>Le fichier %1 est occulté par un fichier du même nom dans les chemins accessibles. Pour déboguer la fonction que vous éditez, vous devez modifier le répertoire pour %2.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -1640,17 +1654,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Configuration</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Général</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Logo d'Octave seulement</translation> </message> @@ -1665,12 +1679,12 @@ <translation>Icones graphiques</translation> </message> <message> - <location line="+22"/> + <location line="-179"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -1685,22 +1699,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Éditeur</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Couleur</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Largeur de l'indentation</translation> </message> @@ -1755,62 +1764,67 @@ <translation>Restaurer les onglets de la session précédente</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Utiliser un éditeur externe</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Affichage</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <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="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation>Couleurs de la fenetre de commandes</translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Police</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Afficher les numéros des lignes</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Surligner la ligne courante</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Suggestions de saisie</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Afficher le chemin complet dans le titre de la fenetre</translation> </message> <message> - <location line="-17"/> + <location line="-23"/> <source>Show whitespace</source> <translation>Afficher les espaces</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>Ne pas afficher les espaces utilisés pour l'indentation</translation> </message> <message> - <location line="+346"/> + <location line="+369"/> <source># of characters typed before completion list displayed</source> <translation>Nb. de caractères avant affichage de la liste de complétion</translation> </message> @@ -1820,92 +1834,144 @@ <translation>Créer les fichiers non-existants sans prévenir</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>ligne de commande (%f=fichier, %l=ligne) :</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Terminal</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Type de curseur :</translation> </message> <message> - <location line="+23"/> + <location line="-11"/> <source>Cursor blinking</source> <translation>Curseur clignotant</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use foreground color</source> <translation>Utiliser la couleur de l'avant plan</translation> </message> <message> - <location line="-67"/> + <location line="+53"/> <source>Font size</source> <translation>Taille de police</translation> </message> <message> - <location line="+109"/> + <location line="+99"/> <source>Set focus to terminal when running a command from within another widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+34"/> <source>File Browser</source> <translation>Explorateur de fichiers</translation> </message> <message> - <location line="+6"/> + <location line="+46"/> <source>Show file size</source> <translation>Afficher la taille des fichiers</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show file type</source> <translation>Afficher le type des fichiers</translation> </message> <message> - <location line="+7"/> + <location line="+21"/> <source>Show date of last modification</source> <translation>Afficher la date de la dernière modification</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show hidden files</source> <translation>Afficher les fichiers cachés</translation> </message> <message> - <location line="+14"/> + <location line="-1316"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+221"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+214"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+750"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Alternating row colors</source> <translation>Alterner les couleurs des lignes</translation> </message> <message> - <location line="+21"/> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Workspace</source> <translation>Espace de travail</translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>Storage Class Colors</source> <translation>Couleurs des variables</translation> </message> <message> - <location line="+35"/> + <location line="+40"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location line="+8"/> + <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Autoriser Octave à se connecter à son site internet afin d'afficher les informations et nouvelle fraîches</translation> </message> @@ -1920,27 +1986,27 @@ <translation>Proxy HTTP</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Jeu d'icones pour les widgets</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Langue (nécessite un redémarrage)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Taille des icones</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <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> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>Proxy Socks5</translation> </message> @@ -1970,9 +2036,9 @@ <translation>Mot de passe :</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Reglages système</translation> </message> @@ -2019,6 +2085,16 @@ <comment>short form for underlined</comment> <translation>s</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2138,8 +2214,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Type de stockage</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -2187,8 +2263,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Couleurs pour le type de stockage :</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/nl_NL.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/nl_NL.ts Thu Jan 23 16:16:07 2014 -0500 @@ -474,7 +474,7 @@ <translation>Aanwijzer</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -1683,17 +1683,12 @@ is reeds geopend in de editor</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation></translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Nieuw Bestand</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>Op&slaan</translation> </message> @@ -1703,7 +1698,12 @@ <translation>&Openen...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Opslaan &als...</translation> </message> @@ -1789,6 +1789,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>Zoek en Vervang...</translation> </message> @@ -1803,7 +1813,7 @@ <translation>Ga naar regel...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>&Recent geopend</translation> </message> @@ -1828,7 +1838,7 @@ <translation>Andere bestanden sluiten</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>Voorkeuren...</translation> </message> @@ -1858,7 +1868,7 @@ <translation>&Documentatie bij sleutelwoord</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -1890,7 +1900,7 @@ <translation>Het bijbehorende tabblad in de editor is verdwenen.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>Bestand</translation> </message> @@ -1905,7 +1915,7 @@ <translation>B&ewerken</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Debuggen</translation> </message> @@ -1918,7 +1928,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Ga naar regel</translation> </message> @@ -1928,7 +1938,7 @@ <translation>Regelnummer</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation>naamloos</translation> @@ -1945,15 +1955,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation></translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -1964,20 +1974,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Octave bestanden (*.m);;Alle bestanden (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -1994,14 +1996,14 @@ is gewist of hernoemd. Wil je het nu opslaan?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Kon bestand %1 niet openen om te schrijven: %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Regel:</translation> </message> @@ -2011,7 +2013,18 @@ <translation>Kolom:</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <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> @@ -2044,7 +2057,12 @@ <translation>Bewerkingen op huidige map</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Zoek bestanden ...</translation> </message> @@ -2065,7 +2083,7 @@ <translation>Dubbelklik een bestand om te openen</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Laat Octave map zien</translation> </message> @@ -2090,12 +2108,7 @@ <translation>Laat home map zien</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Zoek in map...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Zoek bestanden...</translation> </message> @@ -2110,7 +2123,7 @@ <translation>Nieuwe map...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Bestandsgrootte</translation> </message> @@ -2428,12 +2441,7 @@ <translation>Genaamd:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Voer de bestandnaam-expressie in</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Begin in:</translation> </message> @@ -2453,22 +2461,12 @@ <translation>Blader naar begin map</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Ook in onderliggende mappen</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Zoek ook in onderliggende mappen naar overeenkomende bestanden</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Neem mappen ook mee</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Neem overeenkomende mappen mee in zoekresultaten</translation> </message> @@ -2488,9 +2486,24 @@ <translation>Met tekst:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>Zoeken naar overeenkomende tekst</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -2648,13 +2661,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Werkruimte laden</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Over Octave</translation> </message> @@ -2669,12 +2682,7 @@ <translation>Nieuw</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Script</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Figuur</translation> </message> @@ -2714,12 +2722,23 @@ <translation>Plakken</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Sla Werkruimte Op Als</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>Bestand met Release Notes '%1' is leeg.</translation> </message> @@ -2734,12 +2753,12 @@ <translation>Octave Release Notes</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Octave Community Nieuws</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Wis klembord</translation> </message> @@ -2804,22 +2823,12 @@ <translation>Stap In</translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Werkruimte laden...</translation> </message> @@ -2829,7 +2838,12 @@ <translation>Sla Werkruimte Op Als...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Functie...</translation> </message> @@ -2920,8 +2934,8 @@ <translation>Eén mapniveau omhoog</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Blader door mappen</translation> </message> @@ -2995,7 +3009,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -3096,7 +3110,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -3123,13 +3137,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>Het bestand %1 is niet in zoekpad. Om de functie die je edit te debuggen moet je òf naar debetreffende map %2 gaan, of die map aan het zoekpad toevoegen.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>Het bestand %1 is overschaduwd door een bestand met dezelfde naam in het zoekpad. Ga naar de map %2 om de functie de je edit te kunnen debuggen.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -3180,17 +3194,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Instellingen</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Algemeen</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Alleen Octave logo</translation> </message> @@ -3205,12 +3219,12 @@ <translation>Grafische iconen</translation> </message> <message> - <location line="+22"/> + <location line="-179"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -3225,22 +3239,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Kleur</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Inspringafstand</translation> </message> @@ -3295,62 +3304,67 @@ <translation>Herstel bij opstarten de editor tabs uit de vorige sessie</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Gebruik een andere editor</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Editorstijlen</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <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="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation>Terminalkleuren</translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Lettertype</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Regelnummers weergeven</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Markeer huidige regel</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Automatisch aanvullen</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Hele pad in schermtitel weergeven</translation> </message> <message> - <location line="-17"/> + <location line="-23"/> <source>Show whitespace</source> <translation>Laat witruimte zien</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>Laat geen voor inspringen gebruikte witruimte zien</translation> </message> <message> - <location line="+346"/> + <location line="+369"/> <source># of characters typed before completion list displayed</source> <translation>Getypt aantal karakters voordat de aanvullijst verschijnt</translation> </message> @@ -3360,92 +3374,144 @@ <translation>Maak niet bestaande bestanden aan zonder te vragen</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>command line (%f=bestand, %l=regel):</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation></translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Opdrachtvenster</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Type aanwijzer:</translation> </message> <message> + <location line="-11"/> + <source>Cursor blinking</source> + <translation>Knipperende aanwijzer</translation> + </message> + <message> + <location line="-7"/> + <source>Use foreground color</source> + <translation>Gebruik voorgrondkleur</translation> + </message> + <message> + <location line="+53"/> + <source>Font size</source> + <translation>Lettergrootte</translation> + </message> + <message> + <location line="+99"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <source>File Browser</source> + <translation>Bestandsbrowser</translation> + </message> + <message> + <location line="+46"/> + <source>Show file size</source> + <translation>Bestandsgrootte weergeven</translation> + </message> + <message> + <location line="-14"/> + <source>Show file type</source> + <translation>Bestandstype weergeven</translation> + </message> + <message> + <location line="+21"/> + <source>Show date of last modification</source> + <translation>Datum van laatste wijziging weergeven</translation> + </message> + <message> + <location line="-14"/> + <source>Show hidden files</source> + <translation>Verborgen bestanden weergeven</translation> + </message> + <message> + <location line="-1316"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+221"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+214"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+750"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> + <source>Alternating row colors</source> + <translation>Om en om andere regelkleuren</translation> + </message> + <message> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> + <source>Workspace</source> + <translation>Werkruimte</translation> + </message> + <message> + <location line="+38"/> + <source>Storage Class Colors</source> + <translation>Kleuren voor klasse</translation> + </message> + <message> + <location line="+40"/> + <source>Network</source> + <translation>Netwerk</translation> + </message> + <message> <location line="+23"/> - <source>Cursor blinking</source> - <translation>Knipperende aanwijzer</translation> - </message> - <message> - <location line="+7"/> - <source>Use foreground color</source> - <translation>Gebruik voorgrondkleur</translation> - </message> - <message> - <location line="-67"/> - <source>Font size</source> - <translation>Lettergrootte</translation> - </message> - <message> - <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> - <message> - <location line="+6"/> - <source>Show file size</source> - <translation>Bestandsgrootte weergeven</translation> - </message> - <message> - <location line="+7"/> - <source>Show file type</source> - <translation>Bestandstype weergeven</translation> - </message> - <message> - <location line="+7"/> - <source>Show date of last modification</source> - <translation>Datum van laatste wijziging weergeven</translation> - </message> - <message> - <location line="+7"/> - <source>Show hidden files</source> - <translation>Verborgen bestanden weergeven</translation> - </message> - <message> - <location line="+14"/> - <source>Alternating row colors</source> - <translation>Om en om andere regelkleuren</translation> - </message> - <message> - <location line="+21"/> - <source>Workspace</source> - <translation>Werkruimte</translation> - </message> - <message> - <location line="+30"/> - <source>Storage Class Colors</source> - <translation>Kleuren voor klasse</translation> - </message> - <message> - <location line="+35"/> - <source>Network</source> - <translation>Netwerk</translation> - </message> - <message> - <location line="+8"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Sta Octave toe om te verbinden met de Octave website om recent nieuws en informatie weer te geven</translation> </message> @@ -3460,27 +3526,27 @@ <translation>http proxy</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Iconenset voor dock widgets</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Taal instellen (vereist herstart)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Icoongrootte</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation>Synchroniseer Octave werkmap met bestandsverkenner</translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation></translation> </message> @@ -3510,9 +3576,9 @@ <translation>Wachtwoord:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Systeeminstelling</translation> </message> @@ -3559,6 +3625,16 @@ <comment>short form for underlined</comment> <translation>o</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -3678,8 +3754,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Klasse</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -3727,8 +3803,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Kleuren voor klasse:</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/pt_BR.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/pt_BR.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation>indicador</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -141,17 +141,12 @@ <translation>Arquivo não foi salvo! Um arquivo com o nome selecionado %1 já está aberto no editor</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Novo Script</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>&Salvar Arquivo</translation> </message> @@ -161,7 +156,12 @@ <translation>&Abrir Arquivo...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Salvar Arquivo &Como...</translation> </message> @@ -247,6 +247,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Buscar e Substituir...</translation> </message> @@ -261,7 +271,7 @@ <translation>Vá para &Linha...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>Arquivos &Recentes</translation> </message> @@ -286,7 +296,7 @@ <translation>Fechar Demais Arquivos</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Preferências...</translation> </message> @@ -316,7 +326,7 @@ <translation>&Documentação da Palavra-chave</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -348,7 +358,7 @@ <translation>A aba do editor associada ao arquivo desapareceu.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Arquivo</translation> </message> @@ -363,7 +373,7 @@ <translation>&Editar</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Depurar</translation> </message> @@ -376,7 +386,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Vá para linha...</translation> </message> @@ -386,7 +396,7 @@ <translation>Número da linha</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><sem_nome></translation> @@ -403,15 +413,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor do Octave</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -422,20 +432,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Arquivos do Octave (*.m);; Todos os Arquivos (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -453,14 +455,14 @@ foi removido ou renomeado. Gostaria de salvá-lo agora?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Não foi possível abrir arquivo %1 para escrita: %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Linha:</translation> </message> @@ -470,7 +472,18 @@ <translation>Coluna:</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <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> @@ -503,7 +516,12 @@ <translation>Ações no diretório atual</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Buscar Arquivos...</translation> </message> @@ -524,7 +542,7 @@ <translation>Clique duas vezes em um arquivo para abrí-lo</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Exibir o diretório do Octave</translation> </message> @@ -549,12 +567,7 @@ <translation>Exibir diretório pessoal</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Buscar no diretório...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Buscar Arquivos...</translation> </message> @@ -569,7 +582,7 @@ <translation>Novo Diretório...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Tamanho do arquivo</translation> </message> @@ -884,12 +897,7 @@ <translation>Nome de arquivo:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Digite a expressão de busca para os nomes de arquivo</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Diretório inicial:</translation> </message> @@ -909,22 +917,12 @@ <translation>Escolha o diretório inicial</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Buscar em sub-diretórios</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Buscar recursivamente nos sub-diretórios</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Inclur nomes de diretórios</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Incluir diretórios no resultado da busca</translation> </message> @@ -944,9 +942,24 @@ <translation>Contém texto:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>Digite a expressão de busca para conteúdo dos arquivos</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -1104,13 +1117,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Carregar Ambiente de Trabalho...</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Sobre o Octave</translation> </message> @@ -1125,12 +1138,7 @@ <translation>Novo</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Script</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Figura</translation> </message> @@ -1170,12 +1178,23 @@ <translation>Colar</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Salvar Ambiente de Trabalho Como...</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>O arquivo de notas da versão '%1' está vazio.</translation> </message> @@ -1190,12 +1209,12 @@ <translation>Notas da Versão do Octave</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Novidades da Comunidade</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Limpar Área de Transferência</translation> </message> @@ -1260,22 +1279,12 @@ <translation>Passo adentro</translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Carregar ambiente de trabalho...</translation> </message> @@ -1285,7 +1294,12 @@ <translation>Salvar Ambiente de Trabalho Como...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Função...</translation> </message> @@ -1376,8 +1390,8 @@ <translation>Diretório um nível acima</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Escolher diretório</translation> </message> @@ -1451,7 +1465,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -1552,7 +1566,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -1579,13 +1593,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>O arquivo %1 não existe no caminho de pesquisa. Para depurar a função que você está editando, é preciso ou mudar para o diretório %2 ou adicionar esse diretório ao caminho de pesquisa.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>Existe um arquivo com o mesmo nome %1 no caminho de pesquisa. Para depurar a função que você está editando, é preciso mudar para o diretório %2.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -1636,17 +1650,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Configurações</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Apenas logotipo do Octave</translation> </message> @@ -1661,12 +1675,12 @@ <translation>Ícones gráficos</translation> </message> <message> - <location line="+22"/> + <location line="-179"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -1681,22 +1695,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Largura de identação</translation> </message> @@ -1751,62 +1760,67 @@ <translation>Restaurar abas de edição da sessão anterior durante inicialização</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Usar editor de texto externo</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Apresentação</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <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="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation>Cores do Terminal</translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Fonte</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Exibir números de linha</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Destacar linha atual</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Oferecer sugestões de preenchimento</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Exibir caminho completo no título da janela</translation> </message> <message> - <location line="-17"/> + <location line="-23"/> <source>Show whitespace</source> <translation>Exibir espaços em branco</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>Não exibir espaços em branco usados para identação</translation> </message> <message> - <location line="+346"/> + <location line="+369"/> <source># of characters typed before completion list displayed</source> <translation>Número de caracteres digitados antes da apresentar sugestões de preenchimento</translation> </message> @@ -1816,92 +1830,144 @@ <translation>Criar arquivos não existentes sem confirmar</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>linha de comando (%f=arquivo, %l=linha):</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Terminal</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Tipo do Indicador:</translation> </message> <message> - <location line="+23"/> + <location line="-11"/> <source>Cursor blinking</source> <translation>Indicador piscante</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use foreground color</source> <translation>Usar cor de primeiro plano</translation> </message> <message> - <location line="-67"/> + <location line="+53"/> <source>Font size</source> <translation>Tamanho de fonte</translation> </message> <message> - <location line="+109"/> + <location line="+99"/> <source>Set focus to terminal when running a command from within another widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+34"/> <source>File Browser</source> <translation>Navegador de Arquivos</translation> </message> <message> - <location line="+6"/> + <location line="+46"/> <source>Show file size</source> <translation>Exibir tamanho do arquivo</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show file type</source> <translation>Exibir tipo do arquivo</translation> </message> <message> - <location line="+7"/> + <location line="+21"/> <source>Show date of last modification</source> <translation>Exibir data de última modificação</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show hidden files</source> <translation>Exibir arquivos ocultos</translation> </message> <message> - <location line="+14"/> + <location line="-1316"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+221"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+214"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+750"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Alternating row colors</source> <translation>Cores de linhas alternantes</translation> </message> <message> - <location line="+21"/> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Workspace</source> <translation>Ambiente de Trabalho</translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>Storage Class Colors</source> <translation>Cores das Categorias</translation> </message> <message> - <location line="+35"/> + <location line="+40"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location line="+8"/> + <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Permitir Octave se conectar à Internet para mostrar notícias e informações recentes</translation> </message> @@ -1916,27 +1982,27 @@ <translation>Proxy HTTP</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Conjunto de ícones para painéis</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Idioma (alteração exige reinicialização do Octave)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Tamanho dos ícones</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation>Sincronizar diretório atual do Octave com o Navegador de Arquivos</translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>Proxy Socks 5</translation> </message> @@ -1966,9 +2032,9 @@ <translation>Senha:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Configuração do sistema</translation> </message> @@ -2015,6 +2081,16 @@ <comment>short form for underlined</comment> <translation>s</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2134,8 +2210,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Categoria</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -2183,8 +2259,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Cores das categorias:</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/pt_PT.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/pt_PT.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation>indicador</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -810,17 +810,12 @@ já está aberto no editor</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>&Novo Ficheiro</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>&Guardar Ficheiro</translation> </message> @@ -830,7 +825,12 @@ <translation>&Abrir Ficheiro...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Guardar Ficheiro &Como...</translation> </message> @@ -916,6 +916,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Buscar e Substituir...</translation> </message> @@ -930,7 +940,7 @@ <translation>Ir para &Linha...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>Ficheiros &recentes</translation> </message> @@ -955,7 +965,7 @@ <translation>Fechar os Outros Ficheiros</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Preferências...</translation> </message> @@ -985,7 +995,7 @@ <translation>&Documentação da Palavra-chave</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -1017,7 +1027,7 @@ <translation>A aba do editor associada ao ficheiro desapareceu.</translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Ficheiro</translation> </message> @@ -1032,7 +1042,7 @@ <translation>&Editar</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Depurar</translation> </message> @@ -1045,7 +1055,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Ir para linha</translation> </message> @@ -1055,7 +1065,7 @@ <translation>Número da linha</translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><sem_nome></translation> @@ -1072,15 +1082,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Editor do Octave</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -1091,20 +1101,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Ficheiros de Octave (*.m);; Todos os Ficheiros (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -1122,14 +1124,14 @@ foi removido ou renomeado. Pretende guardá-lo agora?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Não foi possível abrir o ficheiro %1 para escrita: %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation>Linha:</translation> </message> @@ -1139,7 +1141,18 @@ <translation>Col:</translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <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> @@ -1172,7 +1185,12 @@ <translation>Acções no directório actual</translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Procurar Ficheiros...</translation> </message> @@ -1193,7 +1211,7 @@ <translation>Clicar duas vezes num ficheiro para o abrir</translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Mostrar o directório actual do Octave</translation> </message> @@ -1218,12 +1236,7 @@ <translation>Mostrar directório pessoal</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation>Procurar no directório...</translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Encontrar Ficheiros...</translation> </message> @@ -1238,7 +1251,7 @@ <translation>Novo Directório...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation>Tamanho de ficheiro</translation> </message> @@ -1555,12 +1568,7 @@ <translation>Chamados:</translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation>Introduza a expressão para o nome do ficheiro</translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation>Iniciar em:</translation> </message> @@ -1580,22 +1588,12 @@ <translation>Navegar por directório inicial</translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation>Entrar em sub-directórios</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Procurar recursivamente pelos directórios por ficheiros correspondentes</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation>Incluir directórios</translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation>Incluir directórios correspondentes nos resultado da pesquisa</translation> </message> @@ -1615,9 +1613,24 @@ <translation>Contém texto:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> - <translation>Pesquisa precisa corresponder ao texto</translation> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> + <translation type="unfinished"></translation> </message> <message> <location line="+5"/> @@ -1775,13 +1788,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Sobre o Octave</translation> </message> @@ -1796,12 +1809,7 @@ <translation>Novo</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Script</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation>Figura</translation> </message> @@ -1841,12 +1849,23 @@ <translation>Colar</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation>Guardar Ambiente de Trabalho como</translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation>O ficheiro de notas da versão '%1' está vazio.</translation> </message> @@ -1861,12 +1880,12 @@ <translation>Notas da Versão do Octave</translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation>Notícias da comunidade Octave</translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation>Limpar Área de Transferência</translation> </message> @@ -1931,22 +1950,12 @@ <translation></translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Carregar ambiente de trabalho...</translation> </message> @@ -1956,7 +1965,12 @@ <translation>Guardar Ambiente de Trabalho como...</translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Função...</translation> </message> @@ -2047,8 +2061,8 @@ <translation>Um nível de directório acima</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Navegar directórios</translation> </message> @@ -2122,7 +2136,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -2223,7 +2237,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -2250,13 +2264,13 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>O ficheiro %1 não existe no caminho de pesquisa. Para depurar a função que está a ser editada, é preciso mudar para o directório %2 ou adicionar esse directório ao caminho de pesquisa.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> - <translation>O ficheiro %1 é ignorado a favor de outro ficheiro no caminho de pesquisa com o mesmo nome. Para depurar a função, é preciso mudar para o directório %2.</translation> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+2"/> @@ -2307,17 +2321,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Configurações</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Geral</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation>Apenas logotipo do Octave</translation> </message> @@ -2332,12 +2346,12 @@ <translation>Ícones gráficos</translation> </message> <message> - <location line="+22"/> + <location line="-179"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -2352,22 +2366,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Editor</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Largura da identação</translation> </message> @@ -2422,62 +2431,67 @@ <translation>Restaurar abas de edição da sessão anterior durante inicialização</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation>Usar editor de texto externo</translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation>Estilos do Editor</translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <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="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation>Cores do Terminal</translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Tipo de Letra</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Exibir número de linha</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Enfatizar linha actual</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Sguestões para copletar código</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Exibir caminho completo no título da janela</translation> </message> <message> - <location line="-17"/> + <location line="-23"/> <source>Show whitespace</source> <translation>Mostrar whitespace</translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation>Não mostrar whitespace usado para indentação</translation> </message> <message> - <location line="+346"/> + <location line="+369"/> <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> @@ -2487,92 +2501,144 @@ <translation>Criar ficheiros não existentes automaticamente</translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation>linha do comando (%f=ficheiro, %l=linha):</translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Terminal</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Tipo de Cursor:</translation> </message> <message> + <location line="-11"/> + <source>Cursor blinking</source> + <translation>Indicador piscante</translation> + </message> + <message> + <location line="-7"/> + <source>Use foreground color</source> + <translation>Usar cor do fundo</translation> + </message> + <message> + <location line="+53"/> + <source>Font size</source> + <translation>Tamanho da letra</translation> + </message> + <message> + <location line="+99"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <source>File Browser</source> + <translation>Navegador de Ficheiros</translation> + </message> + <message> + <location line="+46"/> + <source>Show file size</source> + <translation>Mostrar tamanho do ficheiro</translation> + </message> + <message> + <location line="-14"/> + <source>Show file type</source> + <translation>Mostrar tipo de ficheiro</translation> + </message> + <message> + <location line="+21"/> + <source>Show date of last modification</source> + <translation>Mostrar data da última modificação</translation> + </message> + <message> + <location line="-14"/> + <source>Show hidden files</source> + <translation>Mostrar ficheiros escondidos</translation> + </message> + <message> + <location line="-1316"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+221"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+214"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+750"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> + <source>Alternating row colors</source> + <translation>Cores de linhas alternantes</translation> + </message> + <message> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> + <source>Workspace</source> + <translation>Ambiente de trabalho</translation> + </message> + <message> + <location line="+38"/> + <source>Storage Class Colors</source> + <translation>Cores das Classes de Armazenamento</translation> + </message> + <message> + <location line="+40"/> + <source>Network</source> + <translation>Rede</translation> + </message> + <message> <location line="+23"/> - <source>Cursor blinking</source> - <translation>Indicador piscante</translation> - </message> - <message> - <location line="+7"/> - <source>Use foreground color</source> - <translation>Usar cor do fundo</translation> - </message> - <message> - <location line="-67"/> - <source>Font size</source> - <translation>Tamanho da letra</translation> - </message> - <message> - <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> - <message> - <location line="+6"/> - <source>Show file size</source> - <translation>Mostrar tamanho do ficheiro</translation> - </message> - <message> - <location line="+7"/> - <source>Show file type</source> - <translation>Mostrar tipo de ficheiro</translation> - </message> - <message> - <location line="+7"/> - <source>Show date of last modification</source> - <translation>Mostrar data da última modificação</translation> - </message> - <message> - <location line="+7"/> - <source>Show hidden files</source> - <translation>Mostrar ficheiros escondidos</translation> - </message> - <message> - <location line="+14"/> - <source>Alternating row colors</source> - <translation>Cores de linhas alternantes</translation> - </message> - <message> - <location line="+21"/> - <source>Workspace</source> - <translation>Ambiente de trabalho</translation> - </message> - <message> - <location line="+30"/> - <source>Storage Class Colors</source> - <translation>Cores das Classes de Armazenamento</translation> - </message> - <message> - <location line="+35"/> - <source>Network</source> - <translation>Rede</translation> - </message> - <message> - <location line="+8"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation>Permitir ao Octave ligar-se ao site do Octave para mostrar notícias e informações</translation> </message> @@ -2587,27 +2653,27 @@ <translation>Proxy HTTP</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation>Conjunto de ícones para paineis</translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Idioma (reinicialização do Octave necessária)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Tamanho do Ícone</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <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> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>Proxy Socks 5</translation> </message> @@ -2637,9 +2703,9 @@ <translation>Senha:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation>Configuração do sistema</translation> </message> @@ -2686,6 +2752,16 @@ <comment>short form for underlined</comment> <translation>s</translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2805,8 +2881,8 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> - <translation>Classe de Armazenamento</translation> + <source>Attribute</source> + <translation type="unfinished"></translation> </message> <message> <location line="+109"/> @@ -2854,8 +2930,8 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> - <translation>Cores para classe de armazenamento:</translation> + <source>Colors for variable attributes:</source> + <translation type="unfinished"></translation> </message> </context> </TS>
--- a/libgui/languages/ru_RU.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/ru_RU.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -143,17 +143,12 @@ уже открыт в редакторе</translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation>Созд&ать</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation>&Сохранить</translation> </message> @@ -163,7 +158,12 @@ <translation>&Открыть...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Сохранить &как...</translation> </message> @@ -249,6 +249,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation>&Найти и заменить...</translation> </message> @@ -263,7 +273,7 @@ <translation>&Перейти к строчке...</translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation>&Недавние файлы редактора</translation> </message> @@ -288,7 +298,7 @@ <translation>Закрыть другие файлы</translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation>&Настройки...</translation> </message> @@ -318,7 +328,7 @@ <translation>&Документация по зарезервированному слову</translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -350,7 +360,7 @@ <translation></translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -365,7 +375,7 @@ <translation>&Правка</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation>&Отладка</translation> </message> @@ -378,7 +388,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation>Перейти к строчке</translation> </message> @@ -388,7 +398,7 @@ <translation></translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation><без названия></translation> @@ -405,15 +415,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation>Редактор Octave</translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -424,20 +434,12 @@ %2</translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation>Файлы Octave (*.m);;Все файлы (*)</translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -455,14 +457,14 @@ был удален или переименован. Вы хотите сохранить его?%2</translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation>Не удалось открыть файл %1 для записи: %2.</translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation></translation> </message> @@ -472,7 +474,18 @@ <translation></translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое?</translation> </message> @@ -505,7 +518,12 @@ <translation></translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation>Найти файлы...</translation> </message> @@ -526,7 +544,7 @@ <translation></translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation>Перейти к текущей директории Octave</translation> </message> @@ -551,12 +569,7 @@ <translation>Показывать домашнюю директорию</translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation></translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation>Найти файлы...</translation> </message> @@ -571,7 +584,7 @@ <translation>Новая директория...</translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation></translation> </message> @@ -870,12 +883,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation type="unfinished"></translation> </message> @@ -895,22 +903,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation>Искать рекурсивно в директориях подходящие файлы</translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation type="unfinished"></translation> </message> @@ -930,8 +928,23 @@ <translation>Содержит текст:</translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> <translation type="unfinished"></translation> </message> <message> @@ -1086,13 +1099,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation>Загрузить область переменных</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation>Об Octave</translation> </message> @@ -1107,12 +1120,7 @@ <translation>Новый</translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation>Скрипт</translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation></translation> </message> @@ -1152,12 +1160,23 @@ <translation>Вставить</translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1172,12 +1191,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation type="unfinished"></translation> </message> @@ -1242,22 +1261,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation>Загрузить область переменных...</translation> </message> @@ -1267,7 +1276,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation>Функция...</translation> </message> @@ -1358,8 +1372,8 @@ <translation>Одной директорией вверх</translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation>Просмотр директорий</translation> </message> @@ -1433,7 +1447,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -1511,7 +1525,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -1538,12 +1552,12 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> - <translation>Файл %1 не существует в пути загрузки. Чтобы отладить редактируемую вами функцию, вы должны либо изменить директорию на %2, или добавить эту директорию в путь загрузки.</translation> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> <translation type="unfinished"></translation> </message> <message> @@ -1589,17 +1603,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation>Параметры</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation>Основное</translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation type="unfinished">Только логотип Octave</translation> </message> @@ -1609,12 +1623,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="-172"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -1629,22 +1643,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation>Редактор</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation>Ширина отступа</translation> </message> @@ -1699,67 +1708,114 @@ <translation>Восстанавливать вкладки редактора с предыдущей сессии во время запуска</translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation type="unfinished"></translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation>Шрифт</translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation>Показывать количество строк</translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation>Подсвечивать текущую строку</translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation>Дополнение кода</translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation>Показывать полный путь в заголовке окна</translation> </message> <message> - <location line="-161"/> + <location line="-366"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+187"/> <source>Graphic icons</source> <translation type="unfinished"></translation> </message> <message> - <location line="+144"/> + <location line="+34"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+61"/> <source>Show whitespace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation type="unfinished"></translation> </message> <message> - <location line="+346"/> + <location line="+120"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+197"/> <source># of characters typed before completion list displayed</source> <translation type="unfinished"></translation> </message> @@ -1769,92 +1825,102 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation>emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation>Командная строка</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation>Тип курсора:</translation> </message> <message> - <location line="+23"/> + <location line="-11"/> <source>Cursor blinking</source> <translation>Мигающий курсор</translation> </message> <message> - <location line="+7"/> + <location line="-7"/> <source>Use foreground color</source> <translation type="unfinished"></translation> </message> <message> - <location line="-67"/> + <location line="+53"/> <source>Font size</source> <translation>Размер шрифта</translation> </message> <message> - <location line="+109"/> + <location line="+99"/> <source>Set focus to terminal when running a command from within another widget</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+34"/> <source>File Browser</source> <translation>Файловый менеджер</translation> </message> <message> - <location line="+6"/> + <location line="+46"/> <source>Show file size</source> <translation>Показывать размер файлов</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show file type</source> <translation>Показывать типы файлов</translation> </message> <message> - <location line="+7"/> + <location line="+21"/> <source>Show date of last modification</source> <translation>Показывать дату последнего изменения</translation> </message> <message> - <location line="+7"/> + <location line="-14"/> <source>Show hidden files</source> <translation>Показывать скрытые файлы</translation> </message> <message> - <location line="+14"/> + <location line="-18"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> <source>Alternating row colors</source> <translation>Чередующиеся цвета строк</translation> </message> <message> - <location line="+21"/> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> <source>Workspace</source> <translation>Область переменных</translation> </message> <message> - <location line="+30"/> + <location line="+38"/> <source>Storage Class Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="+35"/> + <location line="+40"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location line="+8"/> + <location line="+23"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation type="unfinished"></translation> </message> @@ -1869,27 +1935,27 @@ <translation>HttpProxy</translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation>Язык (требуется перезапуск)</translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation>Размер иконок</translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation>Socks5Proxy</translation> </message> @@ -1919,9 +1985,9 @@ <translation>Пароль:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation type="unfinished"></translation> </message> @@ -1968,6 +2034,16 @@ <comment>short form for underlined</comment> <translation type="unfinished"></translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2076,7 +2152,7 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> + <source>Attribute</source> <translation type="unfinished"></translation> </message> <message> @@ -2125,7 +2201,7 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> + <source>Colors for variable attributes:</source> <translation type="unfinished"></translation> </message> </context>
--- a/libgui/languages/uk_UA.ts Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/languages/uk_UA.ts Thu Jan 23 16:16:07 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1929"/> + <location filename="../src/main-window.cc" line="+1963"/> <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> @@ -807,17 +807,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+255"/> + <location line="+268"/> <source>&%1 %2</source> <translation type="unfinished"></translation> </message> <message> - <location line="+187"/> - <source>&New File</source> - <translation type="unfinished">&Створити</translation> - </message> - <message> - <location line="+6"/> + <location line="+207"/> <source>&Save File</source> <translation type="unfinished">&Зберегти</translation> </message> @@ -827,7 +822,12 @@ <translation>&Відкрити...</translation> </message> <message> - <location line="+6"/> + <location line="-3"/> + <source>&New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+9"/> <source>Save File &As...</source> <translation>Зберегти &як...</translation> </message> @@ -913,6 +913,16 @@ </message> <message> <location line="+3"/> + <source>&Indent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>&Unindent</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>&Find and Replace...</source> <translation type="unfinished"></translation> </message> @@ -927,7 +937,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+57"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> @@ -952,7 +962,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>&Preferences...</source> <translation type="unfinished"></translation> </message> @@ -982,7 +992,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-753"/> + <location line="-790"/> <source>Could not open file %1 for read: %2.</source> @@ -1008,7 +1018,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+533"/> + <location line="+567"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> @@ -1023,7 +1033,7 @@ <translation type="unfinished">&Правка</translation> </message> <message> - <location line="+30"/> + <location line="+33"/> <source>&Debug</source> <translation type="unfinished"></translation> </message> @@ -1036,7 +1046,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+824"/> <source>Goto line</source> <translation type="unfinished"></translation> </message> @@ -1046,7 +1056,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+108"/> <location line="+69"/> <source><unnamed></source> <translation type="unfinished"></translation> @@ -1063,15 +1073,15 @@ </message> <message> <location line="+10"/> - <location line="+122"/> - <location line="+109"/> - <location line="+67"/> + <location line="+123"/> + <location line="+112"/> + <location line="+69"/> <location line="+22"/> <source>Octave Editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="-319"/> + <location line="-325"/> <source>The file %1 is about to be closed but has been modified. @@ -1079,20 +1089,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+201"/> + <location line="+203"/> <source>Octave Files (*.m);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <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"/> + <location line="+116"/> <source> Warning: The contents in the editor is modified!</source> @@ -1106,13 +1108,13 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-198"/> + <location line="-203"/> <source>Could not open file %1 for write: %2.</source> <translation type="unfinished"></translation> </message> <message> - <location line="-975"/> + <location line="-1032"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -1122,7 +1124,18 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1148"/> + <location line="+1141"/> + <source>"%1" +is not a valid identifier. + +If you keep this file name, you will not be able to +call your script using its name as an Octave command. + +Do you want to choose another name?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+69"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -1155,7 +1168,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+373"/> + <location line="+15"/> + <source>Set Browser Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+379"/> <source>Find Files ...</source> <translation type="unfinished"></translation> </message> @@ -1176,7 +1194,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-79"/> + <location line="-100"/> <source>Show Octave directory</source> <translation type="unfinished"></translation> </message> @@ -1201,12 +1219,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Search Directory...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+16"/> <source>Find Files...</source> <translation type="unfinished"></translation> </message> @@ -1221,7 +1234,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+276"/> + <location line="+297"/> <source>File size</source> <translation type="unfinished"></translation> </message> @@ -1518,12 +1531,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Enter the filename expression</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+8"/> <source>Start in:</source> <translation type="unfinished"></translation> </message> @@ -1543,22 +1551,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Recurse directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Search recursively through directories for matching files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+2"/> - <source>Include directories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+6"/> <source>Include matching directories in search results</source> <translation type="unfinished"></translation> </message> @@ -1578,8 +1576,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1"/> - <source>Search must match text</source> + <location line="-35"/> + <source>Enter the filename search expression</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+18"/> + <source>Search subdirectories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Include directory names</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+12"/> + <source>Enter the file content search expression</source> <translation type="unfinished"></translation> </message> <message> @@ -1734,13 +1747,13 @@ <context> <name>main_window</name> <message> - <location filename="../src/main-window.cc" line="-1725"/> + <location filename="../src/main-window.cc" line="-1758"/> <source>Load Workspace</source> <translation type="unfinished">Завантажити область змінних</translation> </message> <message> - <location line="+674"/> - <location line="+876"/> + <location line="+678"/> + <location line="+905"/> <source>About Octave</source> <translation type="unfinished">Про Octave</translation> </message> @@ -1755,12 +1768,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Script</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> + <location line="+11"/> <source>Figure</source> <translation type="unfinished"></translation> </message> @@ -1800,12 +1808,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1294"/> + <location line="-1327"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="+156"/> + <location line="+84"/> + <source>The file %1 +can not be executed because its name +is not a valid identifier. + +Do you want to execute +%2 +instead?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+73"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1820,12 +1839,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+186"/> + <location line="+189"/> <source>Octave Community News</source> <translation type="unfinished"></translation> </message> <message> - <location line="+939"/> + <location line="+968"/> <source>Clear Clipboard</source> <translation type="unfinished"></translation> </message> @@ -1890,22 +1909,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1278"/> + <location line="-1311"/> <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"/> + <location line="+1160"/> <source>Load Workspace...</source> <translation type="unfinished"></translation> </message> @@ -1915,7 +1924,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> + <location line="+38"/> + <source>New Script</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Function...</source> <translation type="unfinished"></translation> </message> @@ -2006,8 +2020,8 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1283"/> - <location line="+1286"/> + <location line="-1312"/> + <location line="+1315"/> <source>Browse directories</source> <translation type="unfinished"></translation> </message> @@ -2081,7 +2095,7 @@ <context> <name>news_reader</name> <message> - <location line="-1282"/> + <location line="-1311"/> <source><html> <body> <p> @@ -2159,7 +2173,7 @@ <context> <name>octave_qt_link</name> <message> - <location filename="../src/octave-qt-link.cc" line="+94"/> + <location filename="../src/octave-qt-link.cc" line="+97"/> <location line="+6"/> <location line="+7"/> <source>Yes</source> @@ -2184,12 +2198,12 @@ </message> <message> <location line="+211"/> - <source>The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> + <source>The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.</source> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> - <source>The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.</source> + <source>The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.</source> <translation type="unfinished"></translation> </message> <message> @@ -2235,17 +2249,17 @@ <context> <name>settings_dialog</name> <message> - <location filename="../src/settings-dialog.ui" line="+29"/> + <location filename="../src/settings-dialog.ui" line="+23"/> <source>Settings</source> <translation type="unfinished">Налаштування</translation> </message> <message> - <location line="+13"/> + <location line="+19"/> <source>General</source> <translation type="unfinished"></translation> </message> <message> - <location line="+97"/> + <location line="+191"/> <source>Octave logo only</source> <translation type="unfinished"></translation> </message> @@ -2255,12 +2269,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="-172"/> <source>Dock widget title bar</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+40"/> <source>Custom style</source> <translation type="unfinished"></translation> </message> @@ -2275,22 +2289,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+212"/> <source>Editor</source> <translation type="unfinished">Редактор</translation> </message> <message> - <location line="+84"/> + <location line="+102"/> <source>Color</source> <translation type="unfinished"></translation> </message> <message> - <location line="+79"/> - <source>Max. tab width in pixel</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+68"/> + <location line="+170"/> <source>Indent width</source> <translation type="unfinished"></translation> </message> @@ -2345,67 +2354,114 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+60"/> + <location line="+34"/> <source>Use custom file editor</source> <translation type="unfinished"></translation> </message> <message> - <location line="+32"/> + <location line="+20"/> + <source>emacs +%l %f </source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> <source>Editor Styles</source> <translation type="unfinished"></translation> </message> <message> - <location line="+24"/> + <location line="+17"/> <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (<b>b</b>old, <b>i</b>talic, <b>u</b>nderline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</p></body></html></source> <translation type="unfinished"></translation> </message> <message> - <location line="+154"/> + <location line="+191"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> <message> - <location line="-106"/> + <location line="-100"/> <source>Font</source> <translation type="unfinished"></translation> </message> <message> - <location line="-708"/> + <location line="-770"/> <source>Show line numbers</source> <translation type="unfinished"></translation> </message> <message> - <location line="+40"/> + <location line="+46"/> <source>Highlight current line</source> <translation type="unfinished"></translation> </message> <message> - <location line="+305"/> + <location line="+328"/> <source>Code completion</source> <translation type="unfinished"></translation> </message> <message> - <location line="-338"/> + <location line="-361"/> <source>Show complete path in window title</source> <translation type="unfinished"></translation> </message> <message> - <location line="-161"/> + <location line="-366"/> + <source>Interface</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+187"/> <source>Graphic icons</source> <translation type="unfinished"></translation> </message> <message> - <location line="+144"/> + <location line="+34"/> + <source>Octave Startup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>These preferences are applied after the startup files like .octaverc.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+35"/> + <location line="+1104"/> + <source>Startup path</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1091"/> + <location line="+1108"/> + <source>Browse</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-1101"/> + <source>Restore last Octave directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+61"/> <source>Show whitespace</source> <translation type="unfinished"></translation> </message> <message> - <location line="+27"/> + <location line="+33"/> <source>Do not show whitespace used for indentation</source> <translation type="unfinished"></translation> </message> <message> - <location line="+346"/> + <location line="+120"/> + <source>Tab width min.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+52"/> + <source>max.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+197"/> <source># of characters typed before completion list displayed</source> <translation type="unfinished"></translation> </message> @@ -2415,92 +2471,102 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> + <location line="+31"/> <source>command line (%f=file, %l=line):</source> <translation type="unfinished"></translation> </message> <message> - <location line="+10"/> - <source>emacs</source> - <translation type="unfinished">emacs</translation> - </message> - <message> - <location line="+67"/> + <location line="+94"/> <source>Terminal</source> <translation type="unfinished">Командний рядок</translation> </message> <message> - <location line="+71"/> + <location line="+45"/> <source>Cursor type:</source> <translation type="unfinished"></translation> </message> <message> + <location line="-11"/> + <source>Cursor blinking</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-7"/> + <source>Use foreground color</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+53"/> + <source>Font size</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+99"/> + <source>Set focus to terminal when running a command from within another widget</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> + <source>File Browser</source> + <translation type="unfinished">Файловий менеджер</translation> + </message> + <message> + <location line="+46"/> + <source>Show file size</source> + <translation type="unfinished">Показувати розмір файлів</translation> + </message> + <message> + <location line="-14"/> + <source>Show file type</source> + <translation type="unfinished">Показувати типи файлів</translation> + </message> + <message> + <location line="+21"/> + <source>Show date of last modification</source> + <translation type="unfinished">Показувати дату останньої зміни</translation> + </message> + <message> + <location line="-14"/> + <source>Show hidden files</source> + <translation type="unfinished">Показувати приховані файли</translation> + </message> + <message> + <location line="-18"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+39"/> + <source>Alternating row colors</source> + <translation type="unfinished">Чергувати колір рядків</translation> + </message> + <message> + <location line="+12"/> + <source>Behavior</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+27"/> + <source>Restore last directory of previous session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+65"/> + <source>Workspace</source> + <translation type="unfinished">Область змінних</translation> + </message> + <message> + <location line="+38"/> + <source>Storage Class Colors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+40"/> + <source>Network</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+23"/> - <source>Cursor blinking</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+7"/> - <source>Use foreground color</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-67"/> - <source>Font size</source> - <translation type="unfinished"></translation> - </message> - <message> - <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> - <message> - <location line="+6"/> - <source>Show file size</source> - <translation type="unfinished">Показувати розмір файлів</translation> - </message> - <message> - <location line="+7"/> - <source>Show file type</source> - <translation type="unfinished">Показувати типи файлів</translation> - </message> - <message> - <location line="+7"/> - <source>Show date of last modification</source> - <translation type="unfinished">Показувати дату останньої зміни</translation> - </message> - <message> - <location line="+7"/> - <source>Show hidden files</source> - <translation type="unfinished">Показувати приховані файли</translation> - </message> - <message> - <location line="+14"/> - <source>Alternating row colors</source> - <translation type="unfinished">Чергувати колір рядків</translation> - </message> - <message> - <location line="+21"/> - <source>Workspace</source> - <translation type="unfinished">Область змінних</translation> - </message> - <message> - <location line="+30"/> - <source>Storage Class Colors</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+35"/> - <source>Network</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+8"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> <translation type="unfinished"></translation> </message> @@ -2515,27 +2581,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-1272"/> + <location line="-1356"/> <source>Icon set for dock widgets</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-48"/> <source>Language (requires restart)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+7"/> + <location line="-122"/> <source>Icon size</source> <translation type="unfinished"></translation> </message> <message> - <location line="+1134"/> + <location line="+1318"/> <source>Synchronize Octave working directory with file browser</source> <translation type="unfinished"></translation> </message> <message> - <location line="+129"/> + <location line="+213"/> <source>Socks5Proxy</source> <translation type="unfinished"></translation> </message> @@ -2565,9 +2631,9 @@ <translation type="unfinished">Пароль:</translation> </message> <message> - <location filename="../src/settings-dialog.cc" line="+71"/> + <location filename="../src/settings-dialog.cc" line="+74"/> <location line="+4"/> - <location line="+416"/> + <location line="+437"/> <source>System setting</source> <translation type="unfinished"></translation> </message> @@ -2614,6 +2680,16 @@ <comment>short form for underlined</comment> <translation type="unfinished"></translation> </message> + <message> + <location line="+419"/> + <source>Set Octave Startup Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Set File Browser Startup Directory</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>setup_community_news</name> @@ -2722,7 +2798,7 @@ </message> <message> <location line="+1"/> - <source>Storage Class</source> + <source>Attribute</source> <translation type="unfinished"></translation> </message> <message> @@ -2771,7 +2847,7 @@ </message> <message> <location line="+1"/> - <source>Colors for the storage class:</source> + <source>Colors for variable attributes:</source> <translation type="unfinished"></translation> </message> </context>
--- a/libgui/src/files-dock-widget.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/files-dock-widget.cc Thu Jan 23 16:16:07 2014 -0500 @@ -127,7 +127,7 @@ popdown_menu->addSeparator (); popdown_menu->addAction (QIcon (":/actions/icons/folder.png"), - tr ("Search Directory..."), + tr ("Set Browser Directory..."), this, SLOT (popdownmenu_search_dir (bool))); popdown_menu->addSeparator (); popdown_menu->addAction (QIcon (":/actions/icons/findf.png"),
--- a/libgui/src/find-files-dialog.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/find-files-dialog.cc Thu Jan 23 16:16:07 2014 -0500 @@ -61,7 +61,7 @@ QLabel * file_name_label = new QLabel (tr ("Named:")); _file_name_edit = new QLineEdit; - _file_name_edit->setToolTip (tr ("Enter the filename expression")); + _file_name_edit->setToolTip (tr ("Enter the filename search expression")); _file_name_edit->setText (settings->value ("findfiles/file_name", "*").toString ()); @@ -79,13 +79,13 @@ _browse_button->setToolTip (tr ("Browse for start directory")); connect (_browse_button, SIGNAL (clicked ()), this, SLOT (browse_folders ())); - _recurse_dirs_check = new QCheckBox (tr ("Recurse directories")); + _recurse_dirs_check = new QCheckBox (tr ("Search subdirectories")); _recurse_dirs_check->setChecked (settings->value ("findfiles/recurse_dirs", false).toBool ()); _recurse_dirs_check->setToolTip ( tr ("Search recursively through directories for matching files")); - _include_dirs_check = new QCheckBox (tr ("Include directories")); + _include_dirs_check = new QCheckBox (tr ("Include directory names")); _include_dirs_check->setChecked (settings->value ("findfiles/include_dirs", false).toBool ()); _include_dirs_check->setToolTip ( @@ -97,7 +97,7 @@ _name_case_check->setToolTip (tr ("Set matching name is case insensitive")); _contains_text_check = new QCheckBox (tr ("Contains text:")); - _contains_text_check->setToolTip (tr ("Search must match text")); + _contains_text_check->setToolTip (tr ("Enter the file content search expression")); _contains_text_check->setChecked (settings->value ("findfiles/check_text", false).toBool ());
--- a/libgui/src/m-editor/file-editor.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/m-editor/file-editor.cc Thu Jan 23 16:16:07 2014 -0500 @@ -856,10 +856,26 @@ int icon_size = settings->value ("toolbar_icon_size", 16).toInt (); _tool_bar->setIconSize (QSize (icon_size, icon_size)); - int tab_width = settings->value ("editor/notebook_tab_width", 300).toInt (); - QString style_sheet = QString ("QTabBar::tab {max-height: 4ex; " - "max-width: %1px; text-align: right }"). - arg (tab_width); + int tab_width_min = settings->value ("editor/notebook_tab_width_min", 160) + .toInt (); + int tab_width_max = settings->value ("editor/notebook_tab_width_max", 300) + .toInt (); + + QString style_sheet; + if (settings->value ("editor/longWindowTitle", false).toBool ()) + { + style_sheet = QString ("QTabBar::tab {max-height: 4ex; " + "min-width: %1px; max-width: %2px;}") + .arg (tab_width_min).arg (tab_width_max); + _tab_widget->setElideMode (Qt::ElideLeft); + } + else + { + style_sheet = QString ("QTabBar::tab {max-height: 4ex;}"); + _tab_widget->setElideMode (Qt::ElideNone); + } + + _tab_widget->setUsesScrollButtons (true); _tab_widget->setStyleSheet (style_sheet); // Relay signal to file editor tabs. @@ -894,11 +910,9 @@ #ifdef HAVE_QTABWIDGET_SETMOVABLE _tab_widget->setMovable (true); #endif - _tab_widget->setElideMode (Qt::ElideLeft); - QAction *new_action = new QAction (QIcon (":/actions/icons/filenew.png"), - tr ("&New File"), _tool_bar); + tr ("&New Script"), _tool_bar); QAction *open_action = new QAction (QIcon (":/actions/icons/folder_documents.png"), tr ("&Open File..."), _tool_bar);
--- a/libgui/src/main-window.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/main-window.cc Thu Jan 23 16:16:07 2014 -0500 @@ -1472,7 +1472,7 @@ _new_script_action = new_menu->addAction (QIcon (":/actions/icons/filenew.png"), - tr ("Script")); + tr ("New Script")); _new_script_action->setShortcutContext (Qt::ApplicationShortcut); _new_function_action = new_menu->addAction (tr ("Function..."));
--- a/libgui/src/octave-qt-link.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/octave-qt-link.cc Thu Jan 23 16:16:07 2014 -0500 @@ -311,8 +311,8 @@ QString msg = (addpath_option - ? tr ("The file %1 does not exist in the load path. To debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir) - : tr ("The file %1 is shadowed by a file with the same name in the load path. To debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir)); + ? tr ("The file %1 does not exist in the load path. To run or debug the function you are editing, you must either change to the directory %2 or add that directory to the load path.").arg (qfile).arg (qdir) + : tr ("The file %1 is shadowed by a file with the same name in the load path. To run or debug the function you are editing, change to the directory %2.").arg (qfile).arg (qdir)); QString title = tr ("Change Directory or Add Directory to Load Path");
--- a/libgui/src/settings-dialog.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/settings-dialog.cc Thu Jan 23 16:16:07 2014 -0500 @@ -173,8 +173,10 @@ settings->value ("editor/tab_width", 2).toInt ()); ui->editor_longWindowTitle->setChecked ( settings->value ("editor/longWindowTitle",false).toBool ()); - ui->editor_notebook_tab_width->setValue ( - settings->value ("editor/notebook_tab_width", 300).toInt ()); + ui->editor_notebook_tab_width_min->setValue ( + settings->value ("editor/notebook_tab_width_min", 160).toInt ()); + ui->editor_notebook_tab_width_max->setValue ( + settings->value ("editor/notebook_tab_width_max", 300).toInt ()); ui->editor_restoreSession->setChecked ( settings->value ("editor/restoreSession", true).toBool ()); ui->editor_create_new_file->setChecked ( @@ -570,8 +572,10 @@ ui->editor_tab_width_spinbox->value ()); settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked ()); - settings->setValue ("editor/notebook_tab_width", - ui->editor_notebook_tab_width->value ()); + settings->setValue ("editor/notebook_tab_width_min", + ui->editor_notebook_tab_width_min->value ()); + settings->setValue ("editor/notebook_tab_width_max", + ui->editor_notebook_tab_width_max->value ()); settings->setValue ("editor/restoreSession", ui->editor_restoreSession->isChecked ()); settings->setValue ("editor/create_new_file",
--- a/libgui/src/settings-dialog.ui Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/settings-dialog.ui Thu Jan 23 16:16:07 2014 -0500 @@ -32,7 +32,7 @@ </size> </property> <property name="currentIndex"> - <number>0</number> + <number>5</number> </property> <widget class="QWidget" name="tab_general"> <property name="enabled"> @@ -388,7 +388,7 @@ <rect> <x>0</x> <y>0</y> - <width>554</width> + <width>662</width> <height>399</height> </rect> </property> @@ -554,16 +554,45 @@ <item row="1" column="2"> <layout class="QGridLayout" name="gridLayout_6"> <item row="0" column="0"> - <widget class="QLabel" name="label_16"> + <widget class="QLabel" name="editor_lbl_min_tab_width"> <property name="text"> - <string>Max. tab width in pixel</string> + <string>Tab width min.</string> </property> </widget> </item> - <item row="0" column="1"> - <widget class="QSpinBox" name="editor_notebook_tab_width"> + <item row="0" column="3"> + <widget class="QSpinBox" name="editor_notebook_tab_width_min"> <property name="minimum"> - <number>100</number> + <number>80</number> + </property> + <property name="maximum"> + <number>600</number> + </property> + <property name="singleStep"> + <number>20</number> + </property> + <property name="value"> + <number>160</number> + </property> + </widget> + </item> + <item row="0" column="6"> + <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> + <item row="0" column="5"> + <widget class="QSpinBox" name="editor_notebook_tab_width_max"> + <property name="minimum"> + <number>180</number> </property> <property name="maximum"> <number>600</number> @@ -576,18 +605,12 @@ </property> </widget> </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_25"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + <item row="0" column="4"> + <widget class="QLabel" name="editor_lbl_max_tab_width"> + <property name="text"> + <string>max.</string> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> + </widget> </item> </layout> </item> @@ -1017,7 +1040,7 @@ <bool>false</bool> </property> <property name="text"> - <string>emacs</string> + <string>emacs +%l %f </string> </property> </widget> </item> @@ -1327,8 +1350,8 @@ <rect> <x>0</x> <y>0</y> - <width>474</width> - <height>318</height> + <width>678</width> + <height>378</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_18"> @@ -1491,8 +1514,8 @@ <rect> <x>0</x> <y>0</y> - <width>154</width> - <height>114</height> + <width>678</width> + <height>378</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_19"> @@ -1516,7 +1539,7 @@ </size> </property> <property name="title"> - <string>Storage Class Colors</string> + <string>Colors for variable attributes </string> </property> </widget> </item> @@ -1569,8 +1592,8 @@ <rect> <x>0</x> <y>0</y> - <width>529</width> - <height>204</height> + <width>678</width> + <height>378</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_20"> @@ -2174,5 +2197,69 @@ </hint> </hints> </connection> + <connection> + <sender>editor_longWindowTitle</sender> + <signal>toggled(bool)</signal> + <receiver>editor_lbl_min_tab_width</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>145</x> + <y>72</y> + </hint> + <hint type="destinationlabel"> + <x>343</x> + <y>72</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_longWindowTitle</sender> + <signal>toggled(bool)</signal> + <receiver>editor_notebook_tab_width_max</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>145</x> + <y>72</y> + </hint> + <hint type="destinationlabel"> + <x>437</x> + <y>72</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_longWindowTitle</sender> + <signal>toggled(bool)</signal> + <receiver>editor_lbl_max_tab_width</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>145</x> + <y>72</y> + </hint> + <hint type="destinationlabel"> + <x>439</x> + <y>72</y> + </hint> + </hints> + </connection> + <connection> + <sender>editor_longWindowTitle</sender> + <signal>toggled(bool)</signal> + <receiver>editor_notebook_tab_width_min</receiver> + <slot>setEnabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>145</x> + <y>72</y> + </hint> + <hint type="destinationlabel"> + <x>393</x> + <y>72</y> + </hint> + </hints> + </connection> </connections> </ui>
--- a/libgui/src/workspace-model.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/workspace-model.cc Thu Jan 23 16:16:07 2014 -0500 @@ -39,7 +39,7 @@ _columnNames.append (tr ("Class")); _columnNames.append (tr ("Dimension")); _columnNames.append (tr ("Value")); - _columnNames.append (tr ("Storage Class")); + _columnNames.append (tr ("Attribute")); for (int i = 0; i < resource_manager::storage_class_chars ().length (); i++) _storage_class_colors.append (QColor (Qt::white));
--- a/libgui/src/workspace-view.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/libgui/src/workspace-view.cc Thu Jan 23 16:16:07 2014 -0500 @@ -258,7 +258,7 @@ QString tool_tip; tool_tip = QString (tr ("View the variables in the active workspace.<br>")); - tool_tip += QString (tr ("Colors for the storage class:")); + tool_tip += QString (tr ("Colors for variable attributes:")); for (int i = 0; i < resource_manager::storage_class_chars ().length (); i++) { tool_tip +=
--- a/scripts/plot/draw/errorbar.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/errorbar.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,47 +17,79 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} errorbar (@var{args}) +## @deftypefn {Function File} {} errorbar (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} errorbar (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} errorbar (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) ## @deftypefnx {Function File} {} errorbar (@var{hax}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} errorbar (@dots{}) -## Create a 2-D with errorbars. +## Create a 2-D plot with errorbars. ## -## Many different combinations of arguments are possible. The simplest -## form is +## Many different combinations of arguments are possible. The simplest form is ## ## @example ## errorbar (@var{y}, @var{ey}) ## @end example ## ## @noindent -## where the first argument is taken as the set of @var{y} coordinates -## and the second argument @var{ey} is taken as the errors of the -## @var{y} values. @var{x} coordinates are taken to be the indices -## of the elements, starting with 1. +## where the first argument is taken as the set of @var{y} coordinates, the +## second argument @var{ey} are the errors around the @var{y} values, and the +## @var{x} coordinates are taken to be the indices of the elements +## (@code{1:numel (@var{y})}). ## -## If more than two arguments are given, they are interpreted as +## The general form of the function is ## ## @example -## errorbar (@var{x}, @var{y}, @dots{}, @var{fmt}, @dots{}) +## errorbar (@var{x}, @var{y}, @var{err1}, @dots{}, @var{fmt}, @dots{}) ## @end example ## ## @noindent -## where after @var{x} and @var{y} there can be up to four error -## parameters such as @var{ey}, @var{ex}, @var{ly}, @var{uy}, etc., -## depending on the plot type. Any number of argument sets may appear, -## as long as they are separated with a format string @var{fmt}. +## After the @var{x} and @var{y} arguments there can be 1, 2, or 4 +## parameters specifying the error values depending on the nature of the error +## values and the plot format @var{fmt}. +## +## @table @asis +## @item @var{err} (scalar) +## When the error is a scalar all points share the same error value. +## The errorbars are symmetric and are drawn from @var{data}-@var{err} to +## @var{data}+@var{err}. +## The @var{fmt} argument determines whether @var{err} is in the x-direction, +## y-direction (default), or both. +## +## @item @var{err} (vector or matrix) +## Each data point has a particular error value. +## The errorbars are symmetric and are drawn from @var{data}(n)-@var{err}(n) to +## @var{data}(n)+@var{err}(n). ## -## If @var{y} is a matrix, @var{x} and error parameters must also be matrices -## having same dimensions. The columns of @var{y} are plotted versus the -## corresponding columns of @var{x} and errorbars are drawn from -## the corresponding columns of error parameters. +## @item @var{lerr}, @var{uerr} (scalar) +## The errors have a single low-side value and a single upper-side value. +## The errorbars are not symmetric and are drawn from @var{data}-@var{lerr} to +## @var{data}+@var{uerr}. +## +## @item @var{lerr}, @var{uerr} (vector or matrix) +## Each data point has a low-side error and an upper-side error. +## The errorbars are not symmetric and are drawn from +## @var{data}(n)-@var{lerr}(n) to @var{data}(n)+@var{uerr}(n). +## @end table ## -## If @var{fmt} is missing, yerrorbars ("~") plot style is assumed. +## Any number of data sets (@var{x1},@var{y1}, @var{x2},@var{y2}, @dots{}) may +## appear as long as they are separated by a format string @var{fmt}. ## -## If the @var{fmt} argument is supplied, it is interpreted as in -## normal plots. In addition, @var{fmt} may include an errorbar style -## which must precede the line and marker format. The following plot -## styles are supported by errorbar: +## If @var{y} is a matrix, @var{x} and the error parameters must also be +## matrices having the same dimensions. The columns of @var{y} are plotted +## versus the corresponding columns of @var{x} and errorbars are taken from +## the corresponding columns of the error parameters. +## +## If @var{fmt} is missing, the yerrorbars ("~") plot style is assumed. +## +## If the @var{fmt} argument is supplied then it is interpreted, as in normal +## plots, to specify the line style, marker, and color. In addition, +## @var{fmt} may include an errorbar style which @strong{must precede} the +## ordinary format codes. The following errorbar styles are supported: ## ## @table @samp ## @item ~ @@ -69,14 +101,14 @@ ## @item ~> ## Set xyerrorbars plot style. ## -## @item # -## Set boxes plot style. +## @item #~ +## Set yboxes plot style. ## -## @item #~ -## Set boxerrorbars plot style. +## @item # +## Set xboxes plot style. ## ## @item #~> -## Set boxxyerrorbars plot style. +## Set xyboxes plot style. ## @end table ## ## If the first argument @var{hax} is an axes handle, then plot into this axis, @@ -85,15 +117,24 @@ ## The optional return value @var{h} is a handle to the hggroup object ## representing the data plot and errorbars. ## +## Note: For compatibility with @sc{matlab} a line is drawn through all data +## points. However, most scientific errorbar plots are a scatter plot of +## points with errorbars. To accomplish this, add a marker style to the +## @var{fmt} argument such as @qcode{"."}. Alternatively, remove the line +## by modifying the returned graphic handle with +## @code{set (h, "linestyle", "none")}. +## ## Examples: ## ## @example -## errorbar (@var{x}, @var{y}, @var{ex}, ">") +## errorbar (@var{x}, @var{y}, @var{ex}, ">.r") ## @end example ## ## @noindent ## produces an xerrorbar plot of @var{y} versus @var{x} with @var{x} -## errorbars drawn from @var{x}-@var{ex} to @var{x}+@var{ex}. +## errorbars drawn from @var{x}-@var{ex} to @var{x}+@var{ex}. The marker +## @qcode{"."} is used so no connecting line is drawn and the errorbars +## appear in red. ## ## @example ## @group
--- a/scripts/plot/draw/loglogerr.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/loglogerr.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,7 +17,14 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} loglogerr (@var{args}) +## @deftypefn {Function File} {} loglogerr (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} loglogerr (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} loglogerr (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) ## @deftypefnx {Function File} {} loglogerr (@var{hax}, @dots{}) ## @deftypefnx {Function File} {@var{h} =} loglogerr (@dots{}) ## Produce 2-D plots on a double logarithm axis with errorbars.
--- a/scripts/plot/draw/semilogxerr.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/semilogxerr.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,9 +17,16 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} semilogxerr (@var{args}) -## @deftypefnx {Function File} {} semilogxerr (@var{hax}, @var{args}) -## @deftypefnx {Function File} {@var{h} =} semilogxerr (@var{args}) +## @deftypefn {Function File} {} semilogxerr (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogxerr (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} semilogxerr (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) +## @deftypefnx {Function File} {} semilogxerr (@var{hax}, @dots{}) +## @deftypefnx {Function File} {@var{h} =} semilogxerr (@dots{}) ## Produce 2-D plots using a logarithmic scale for the x-axis and ## errorbars at each data point. ##
--- a/scripts/plot/draw/semilogyerr.m Thu Jan 23 12:53:32 2014 -0800 +++ b/scripts/plot/draw/semilogyerr.m Thu Jan 23 16:16:07 2014 -0500 @@ -17,9 +17,16 @@ ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- -## @deftypefn {Function File} {} semilogyerr (@var{args}) -## @deftypefnx {Function File} {} semilogyerr (@var{hax}, @var{args}) -## @deftypefnx {Function File} {@var{h} =} semilogyerr (@var{args}) +## @deftypefn {Function File} {} semilogyerr (@var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogyerr (@var{y}, @dots{}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{ey}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{err}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{lerr}, @var{uerr}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{ex}, @var{ey}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x}, @var{y}, @var{lx}, @var{ux}, @var{ly}, @var{uy}, @var{fmt}) +## @deftypefnx {Function File} {} semilogyerr (@var{x1}, @var{y1}, @dots{}, @var{fmt}, @var{xn}, @var{yn}, @dots{}) +## @deftypefnx {Function File} {} semilogyerr (@var{hax}, @dots{}) +## @deftypefnx {Function File} {@var{h} =} semilogyerr (@dots{}) ## Produce 2-D plots using a logarithmic scale for the y-axis and ## errorbars at each data point. ##
--- a/src/Makefile.am Thu Jan 23 12:53:32 2014 -0800 +++ b/src/Makefile.am Thu Jan 23 16:16:07 2014 -0500 @@ -38,16 +38,18 @@ EXTRA_DIST = \ main.in.cc \ mkoctfile.in.cc \ - mkoctfile.in.sh \ - octave-config.in.cc \ - octave-config.in.sh + octave-config.in.cc DISTCLEANFILES = \ - main.cc + main.cc \ + mkoctfile.cc \ + octave-config.cc -OCTAVE_BINARIES = \ +bin_PROGRAMS = \ + mkoctfile \ octave \ - octave-cli + octave-cli \ + octave-config OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT) @@ -111,12 +113,6 @@ $(NO_UNDEFINED_LDFLAG) \ $(OCTAVE_GUI_LINK_OPTS) -if AMCOND_BUILD_COMPILED_AUX_PROGRAMS -bin_PROGRAMS = \ - $(OCTAVE_BINARIES) \ - mkoctfile \ - octave-config - mkoctfile_SOURCES = nodist_mkoctfile_SOURCES = mkoctfile.cc mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS) @@ -128,36 +124,14 @@ $(top_builddir)/libgnu/libgnu.la \ $(LIBS) -DISTCLEANFILES += mkoctfile.cc octave-config.cc - -else -bin_PROGRAMS = \ - $(OCTAVE_BINARIES) - -bin_SCRIPTS = \ - mkoctfile \ - octave-config -endif - all-local: $(OCTAVE_VERSION_LINKS) -if AMCOND_BUILD_COMPILED_AUX_PROGRAMS octave-config.cc: octave-config.in.cc Makefile @$(do_subst_default_vals) mkoctfile.cc: mkoctfile.in.cc Makefile @$(do_subst_config_vals) -else -octave-config: octave-config.in.sh Makefile - @$(do_subst_default_vals) - chmod a+rx $@ - -mkoctfile: mkoctfile.in.sh Makefile - @$(do_subst_config_vals) - chmod a+rx $@ -endif - ## main.cc must depend on Makefile. Calling configure may change ## default/config values. However, calling configure will also ## regenerate the Makefiles from Makefile.am and trigger the rules below. @@ -174,23 +148,11 @@ mv $$f$(EXEEXT) $$f-$(version)$(EXEEXT) && \ $(LN_S) $$f-$(version)$(EXEEXT) $$f$(EXEEXT); \ done -if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS - cd $(DESTDIR)$(bindir) && \ - for f in $(basename $(bin_SCRIPTS)); do \ - mv $$f $$f-$(version) && \ - $(LN_S) $$f-$(version) $$f; \ - done -endif remove-version-links: for f in $(basename $(bin_PROGRAMS)); do \ rm -f $(DESTDIR)$(bindir)/$$f-$(version)$(EXEEXT); \ done -if ! AMCOND_BUILD_COMPILED_AUX_PROGRAMS - for f in $(basename $(bin_SCRIPTS)); do \ - rm -f $(DESTDIR)$(bindir)/$$f-$(version); \ - done -endif .PHONY: make-version-links remove-version-links @@ -206,5 +168,4 @@ $(LN_S) $< $@ CLEANFILES = \ - $(bin_SCRIPTS) \ $(OCTAVE_VERSION_LINKS)
--- a/src/mkoctfile.in.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/src/mkoctfile.in.cc Thu Jan 23 16:16:07 2014 -0500 @@ -34,6 +34,8 @@ #include <vector> #include <cstdlib> +#include <unistd.h> + #if defined (__WIN32__) && ! defined (_POSIX_VERSION) #include <windows.h> #ifdef _MSC_VER @@ -242,11 +244,14 @@ vars["FFTW3F_LIBS"] = get_variable ("FFTW3F_LIBS", %OCTAVE_CONF_FFTW3F_LIBS%); vars["LIBS"] = get_variable ("LIBS", %OCTAVE_CONF_LIBS%); vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - vars["OCTAVE_LINK_DEPS"] = get_variable ("FLIBS", + vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS", %OCTAVE_CONF_OCTAVE_LINK_DEPS%); - vars["OCT_LINK_DEPS"] = get_variable ("FLIBS", %OCTAVE_CONF_OCT_LINK_DEPS%); - vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%); - + vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS", + %OCTAVE_CONF_OCTAVE_LINK_OPTS%); + vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS", + %OCTAVE_CONF_OCT_LINK_DEPS%); + vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS", + %OCTAVE_CONF_OCT_LINK_OPTS%); vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%); vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%); vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG", @@ -294,6 +299,10 @@ "\n" " -M, --depend Generate dependency files (.d) for C and C++\n" " source files.\n" +#if ! defined (__WIN32__) || defined (_POSIX_VERSION) +"\n" +" -pthread Add -pthread to link command.\n" +#endif "\n" " -RDIR Add -RDIR to link command.\n" "\n" @@ -312,29 +321,33 @@ " -p VAR, --print VAR Print configuration variable VAR. Recognized\n" " variables are:\n" "\n" -" ALL_CFLAGS FFTW3F_LDFLAGS\n" -" ALL_CXXFLAGS FFTW3F_LIBS\n" -" ALL_FFLAGS FLIBS\n" -" ALL_LDFLAGS FPICFLAG\n" -" AR INCFLAGS\n" -" BLAS_LIBS LAPACK_LIBS\n" -" CC LDFLAGS\n" -" CFLAGS LD_CXX\n" -" CPICFLAG LD_STATIC_FLAG\n" -" CPPFLAGS LFLAGS\n" -" CXX LIBOCTAVE\n" -" CXXFLAGS LIBOCTINTERP\n" -" CXXPICFLAG LIBS\n" -" DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" -" DEPEND_FLAGS OCTAVE_LINK_DEPS\n" -" DL_LD OCT_LINK_DEPS\n" -" DL_LDFLAGS RANLIB\n" -" EXEEXT RDYNAMIC_FLAG\n" -" F77 READLINE_LIBS\n" -" F77_INTEGER_8_FLAG SED\n" -" FFLAGS XTRA_CFLAGS\n" -" FFTW3_LDFLAGS XTRA_CXXFLAGS\n" -" FFTW3_LIBS\n" +" ALL_CFLAGS INCFLAGS\n" +" ALL_CXXFLAGS INCLUDEDIR\n" +" ALL_FFLAGS LAPACK_LIBS\n" +" ALL_LDFLAGS LD_CXX\n" +" AR LDFLAGS\n" +" BLAS_LIBS LD_STATIC_FLAG\n" +" CC LFLAGS\n" +" CFLAGS LIBDIR\n" +" CPICFLAG LIBOCTAVE\n" +" CPPFLAGS LIBOCTINTERP\n" +" CXX LIBS\n" +" CXXFLAGS OCTAVE_HOME\n" +" CXXPICFLAG OCTAVE_LIBS\n" +" DEPEND_EXTRA_SED_PATTERN OCTAVE_LINK_DEPS\n" +" DEPEND_FLAGS OCTAVE_LINK_OPTS\n" +" DL_LD OCTAVE_PREFIX\n" +" DL_LDFLAGS OCTINCLUDEDIR\n" +" F77 OCTLIBDIR\n" +" F77_INTEGER8_FLAG OCT_LINK_DEPS\n" +" FFLAGS OCT_LINK_OPTS\n" +" FFTW3F_LDFLAGS RANLIB\n" +" FFTW3F_LIBS RDYNAMIC_FLAG\n" +" FFTW3_LDFLAGS READLINE_LIBS\n" +" FFTW3_LIBS SED\n" +" FFTW_LIBS SPECIAL_MATH_LIB\n" +" FLIBS XTRA_CFLAGS\n" +" FPICFLAG XTRA_CXXFLAGS\n" "\n" " --link-stand-alone Link a stand-alone executable file.\n" "\n" @@ -523,6 +536,12 @@ { ldflags += (" " + arg); } +#if ! defined (__WIN32__) || defined (_POSIX_VERSION) + else if (arg == "-pthread") + { + ldflags += (" " + arg); + } +#endif else if (arg == "-M" || arg == "-depend" || arg == "--depend") { depend = true; @@ -779,7 +798,7 @@ + objfiles + " " + libfiles + " " + ldflags + " " + vars["LFLAGS"] + " -loctinterp -loctave " - + " " + vars["OCT_LINK_OPTS"] + + " " + vars["OCTAVE_LINK_OPTS"] + " " + vars["OCTAVE_LINK_DEPS"]; result = run_command (cmd); }
--- a/src/mkoctfile.in.sh Thu Jan 23 12:53:32 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,561 +0,0 @@ -#! /bin/sh -## -## mkoctfile -- create a .oct file suitable for dynamic linking by -## Octave. -## -## Copyright (C) 1996-2013 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by the -## Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but WITHOUT -## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -## for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. - -# Exit immediately on any error. - -set -e - -: ${SED=%OCTAVE_CONF_SED%} - -OCTAVE_VERSION=%OCTAVE_CONF_VERSION% -OCTAVE_PREFIX=%OCTAVE_CONF_PREFIX% - -DEFAULT_BINDIR=%OCTAVE_BINDIR% -DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% -DEFAULT_LIBDIR=%OCTAVE_CONF_LIBDIR% -DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% -DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR% - -if [ -n "$OCTAVE_HOME" ]; then - DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_LIBDIR="`echo $DEFAULT_LIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" -fi - -: ${BINDIR=$DEFAULT_BINDIR} -: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} -: ${LIBDIR=$DEFAULT_LIBDIR} -: ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} -: ${OCTLIBDIR=$DEFAULT_OCTLIBDIR} - -DEFAULT_INCFLAGS="-I$OCTINCLUDEDIR/.. -I$OCTINCLUDEDIR" -if [ "$INCLUDEDIR" != /usr/include ]; then - DEFAULT_INCFLAGS="$DEFAULT_INCFLAGS -I$INCLUDEDIR" -fi - -DEFAULT_LFLAGS="-L$OCTLIBDIR" -if [ "$LIBDIR" != /usr/lib ]; then - DEFAULT_LFLAGS="$DEFAULT_LFLAGS -L$LIBDIR" -fi - -# Default values for these variables are filled in when Octave is -# compiled. - -: ${EXEEXT=%OCTAVE_CONF_EXEEXT%} - -: ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} -: ${INCFLAGS=$DEFAULT_INCFLAGS} -: ${F77=%OCTAVE_CONF_MKOCTFILE_F77%} -: ${FFLAGS=%OCTAVE_CONF_FFLAGS%} -: ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%} -: ${CC=%OCTAVE_CONF_MKOCTFILE_CC%} -: ${CFLAGS=%OCTAVE_CONF_CFLAGS%} -: ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%} -: ${CXX=%OCTAVE_CONF_MKOCTFILE_CXX%} -: ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%} -: ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%} -: ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%} -: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%} - -: ${AR=%OCTAVE_CONF_MKOCTFILE_AR%} -: ${RANLIB=%OCTAVE_CONF_MKOCTFILE_RANLIB%} - -: ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%} -: ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%} - -: ${DL_LD=%OCTAVE_CONF_MKOCTFILE_DL_LD%} -: ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%} - -: ${RDYNAMIC_FLAG=%OCTAVE_CONF_RDYNAMIC_FLAG%} -: ${LIBOCTAVE=-loctave} -: ${LIBOCTINTERP=-loctinterp} -: ${READLINE_LIBS=-lreadline} -: ${LAPACK_LIBS=%OCTAVE_CONF_LAPACK_LIBS%} -: ${BLAS_LIBS=%OCTAVE_CONF_BLAS_LIBS%} -: ${FFTW3_LDFLAGS=%OCTAVE_CONF_FFTW3_LDFLAGS%} -: ${FFTW3_LIBS=%OCTAVE_CONF_FFTW3_LIBS%} -: ${FFTW3F_LDFLAGS=%OCTAVE_CONF_FFTW3F_LDFLAGS%} -: ${FFTW3F_LIBS=%OCTAVE_CONF_FFTW3F_LIBS%} -: ${LIBS=%OCTAVE_CONF_LIBS%} -: ${FLIBS=%OCTAVE_CONF_FLIBS%} -: ${OCTAVE_LINK_DEPS=%OCTAVE_CONF_OCTAVE_LINK_DEPS%} -: ${OCTAVE_LINK_OPTS=%OCTAVE_CONF_OCTAVE_LINK_OPTS%} -: ${OCT_LINK_DEPS=%OCTAVE_CONF_OCT_LINK_DEPS%} -: ${OCT_LINK_OPTS=%OCTAVE_CONF_OCT_LINK_OPTS%} -: ${LD_CXX=%OCTAVE_CONF_MKOCTFILE_LD_CXX%} -: ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%} -: ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%} -: ${LFLAGS=$DEFAULT_LFLAGS} -: ${F77_INTEGER_8_FLAG=%OCTAVE_CONF_F77_INTEGER_8_FLAG%} - -: ${ALL_FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"} - -: ${ALL_CFLAGS="$INCFLAGS $XTRA_CFLAGS $CFLAGS"} - -: ${ALL_CXXFLAGS="$INCFLAGS $XTRA_CXXFLAGS $CXXFLAGS"} - -: ${ALL_LDFLAGS="$LD_STATIC_FLAG $CPICFLAG $LDFLAGS"} - -: ${OCTAVE_LIBS="$LIBOCTINTERP $LIBOCTAVE $SPECIAL_MATH_LIB"} - -# Local variables. - -FFTW_LIBS="$FFTW3_LDFLAGS $FFTW3_LIBS $FFTW3F_LDFLAGS $FFTW3F_LIBS" - -usage_msg="usage: mkoctfile [options] file ..." - -version_msg="mkoctfile, version $OCTAVE_VERSION" - -cfiles= -ccfiles= -f77files= -objfiles= -libfiles= -octfiles= -octfile= -outputfile= -incflags= -defs= -ldflags= -dbg=: -pass_on_options= -strip=false -no_oct_file_strip_on_this_platform=%NO_OCT_FILE_STRIP% -link=true -link_stand_alone=false -output_ext=".oct" -depend=false -compile=true - -if [ $# -eq 0 ]; then - echo $usage_msg 1>&2 - exit 1 -fi - -if [ $# -eq 1 ]; then - case "$1" in - -v | -version | --version) - echo $version_msg 1>&2 - exit 0 - ;; - esac -fi - -while [ $# -gt 0 ]; do - file= - case "$1" in - *.c) - file=$1 - cfiles="$cfiles $file" - ;; - *.cc | *.C | *.cpp) - file=$1 - ccfiles="$ccfiles $file" - ;; - *.f | *.F | *.f90 | *.F90) - file=$1 - f77files="$f77files $file" - ;; - *.o) - file=$1 - objfiles="$objfiles $file" - ;; - *.a) - file=$1 - libfiles="$libfiles $file" - ;; - -d | -debug | --debug | -v | -verbose | --verbose) - dbg=echo - ;; - -h | -\? | -help | --help) - echo $usage_msg 1>&2 - cat << EOF - -Options: - - -h, -?, --help Print this message. - - -IDIR Add -IDIR to compile commands. - - -idirafter DIR Add -idirafter DIR to compile commands. - - -DDEF Add -DDEF to compile commands. - - -lLIB Add -lLIB to link command. - - -LDIR Add -LDIR to link command. - - -RDIR Add -RDIR to link command. - - -g Enable debugging option for all compilers. - - -pthread Add -pthread to link command. - - -W... Pass flags to the compiler such as -Wa,OPTION. - - -Wl,... Pass flags to the linker such as -Wl,-rpath=... - - -M, --depend Generate dependency files (.d) for C and C++ - source files. - - -c, --compile Compile, but do not link. - - --link-stand-alone Link a stand-alone executable file. - - -s, --strip Strip output file. - - --mex Create a MEX file. - Set the default output extension to ".mex". - - -o FILE, --output FILE Output file name. Default extension is .oct - (or .mex if --mex is specified) unless linking - a stand-alone executable. - - -p VAR, --print VAR Print configuration variable VAR. Recognized - variables are: - - ALL_CFLAGS FFTW3F_LDFLAGS - ALL_CXXFLAGS FFTW3F_LIBS - ALL_FFLAGS FLIBS - ALL_LDFLAGS FPICFLAG - AR INCFLAGS - BLAS_LIBS LAPACK_LIBS - CC LDFLAGS - CFLAGS LD_CXX - CPICFLAG LD_STATIC_FLAG - CPPFLAGS LFLAGS - CXX LIBOCTAVE - CXXFLAGS LIBOCTINTERP - CXXPICFLAG LIBS - DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS - DEPEND_FLAGS OCTAVE_LINK_DEPS - DL_LD OCT_LINK_DEPS - DL_LDFLAGS RANLIB - EXEEXT RDYNAMIC_FLAG - F77 READLINE_LIBS - F77_INTEGER_8_FLAG SED - FFLAGS XTRA_CFLAGS - FFTW3_LDFLAGS XTRA_CXXFLAGS - FFTW3_LIBS - - - -v, --verbose Echo commands as they are executed. - - FILE Compile or link FILE. Recognized file types are: - - .c C source - .cc C++ source - .C C++ source - .cpp C++ source - .f Fortran source (fixed form) - .F Fortran source (fixed form) - .f90 Fortran source (free form) - .F90 Fortran source (free form) - .o object file - .a library file - -EOF - exit 0 - ;; - -I*) - incflags="$incflags $1" - ;; - -idirafter) - shift - if [ $# -gt 0 ]; then - incflags="$incflags -idirafter $1" - else - echo "mkoctfile: include directory name missing" 1>&2 - fi - ;; - -D*) - defs="$defs $1" - ;; - -[lLR]* | -Wl,*) - ldflags="$ldflags $1" - ;; - -pthread) - ldflags="$ldflags $1" - ;; - -M | -depend | --depend) - depend=true - compile=false - ;; - -o | -ouput | --output) - shift - if [ $# -gt 0 ]; then - outputfile="$1" - else - echo "mkoctfile: output file name missing" 1>&2 - fi - ;; - -p | -print | --print) - shift - if [ $# -gt 0 ]; then - eval echo \${$1} - exit 0 - else - echo "mkoctfile: --print requires argument" 1>&2 - exit 1 - fi - ;; - -s | -strip | --strip) - if $no_oct_file_strip_on_this_platform; then - echo "mkoctfile: stripping disabled on this platform" 1>&2 - else - strip=true - fi - ;; - -c | -compile | --compile) - link=false - ;; - -g) - ALL_CFLAGS="$ALL_CFLAGS -g" - ALL_CXXFLAGS="$ALL_CXXFLAGS -g" - ALL_FFLAGS="$ALL_FFLAGS -g" - ;; - -link-stand-alone | --link-stand-alone) - link_stand_alone=true - ;; - -mex | --mex) - incflags="$incflags -I." - output_ext=".mex" - ;; - -W*) - pass_on_options="$pass_on_options $1" - ;; - *) - echo "mkoctfile: unrecognized argument $1" 1>&2 - exit 1 - ;; - esac - if [ -n "$file" ]; then - if [ -z "$octfile" ]; then - octfile="$file" - fi - fi - shift -done - -if $link_stand_alone; then - if [ -n "$outputfile" ]; then - output_option="-o $outputfile" - fi -else - if [ -n "$outputfile" ]; then - octfile="$outputfile" - case "$octfile" in - *$output_ext) - ;; - *) - octfile="$octfile$output_ext" - ;; - esac - else - octfile=`basename $octfile` - octfile=`echo $octfile | $SED 's,\.[^.]*$,,'`$output_ext - fi -fi - -# Generate dependency files for C and C++ files. - -if $depend; then - if [ -n "$cfiles" ]; then - for f in $cfiles; do - b=`echo $f | $SED 's,\.c$,,'` - d=$b.d - cmd="rm -f $d" - $dbg $cmd - eval $cmd - cmd="$CC $DEPEND_FLAGS $CPPFLAGS $ALL_CFLAGS $incflags $def $f | $SED $DEPEND_EXTRA_SED_PATTERN -e 's,^[^:]*/\(.*\.o\):,\1:,' -e 's,$b\.o,pic/& & $d,g' > $d-t && mv $d-t $d" - $dbg $cmd - eval $cmd - done - fi - - if [ -n "$ccfiles" ]; then - for f in $ccfiles; do - case $f in - *.cc) - b=`echo $f | $SED 's,\.cc$,,'` - ;; - *.C) - b=`echo $f | $SED 's,\.C$,,'` - ;; - *.cpp) - b=`echo $f | $SED 's,\.cpp$,,'` - ;; - esac - d=$b.d - cmd="rm -f $d" - $dbg $cmd - eval $cmd - cmd="$CXX $DEPEND_FLAGS $CPPFLAGS $ALL_CXXFLAGS $incflags $defs $f | $SED $DEPEND_EXTRA_SED_PATTERN -e 's,^[^:]*/\(.*\.o\):,\1:,' -e 's,$b\.o,pic/& & $d,g' > $d-t && mv $d-t $d" - $dbg $cmd - eval $cmd - done - fi - # If generating dependencies, that's all we do. - exit 0 -fi - -# Compile Fortran, C, and C++ files. Add the name of each object file -# that is produced to the overall list of object files. - -if [ -n "$f77files" ]; then - for f in $f77files; do - case $f in - *.f) - b=`echo $f | $SED 's,.*/,,; s,\.f$,,'` - ;; - *.F) - b=`echo $f | $SED 's,.*/,,; s,\.F$,,'` - ;; - *.f90) - b=`echo $f | $SED 's,.*/,,; s,\.f90$,,'` - ;; - *.F90) - b=`echo $f | $SED 's,.*/,,; s,\.F90$,,'` - ;; - esac - if [ -n "$F77" ]; then - if [ -n "$outputfile" ]; then - if $link; then - o=$b.o - else - o=$outputfile - fi - else - o=$b.o - fi - objfiles="$objfiles $o" - cmd="$F77 -c $FPICFLAG $ALL_FFLAGS $incflags $defs $pass_on_options $f -o $o" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to compile Fortran file $f" 1>&2 - fi - done -fi - -if [ -n "$cfiles" ]; then - for f in $cfiles; do - if [ -n "$CC" ]; then - b=`echo $f | $SED 's,.*/,,; s,\.c$,,'` - if [ -n "$outputfile" ]; then - if $link; then - o=$b.o - else - o=$outputfile - fi - else - o=$b.o - fi - objfiles="$objfiles $o" - cmd="$CC -c $CPPFLAGS $CPICFLAG $ALL_CFLAGS $pass_on_options $incflags $defs $f -o $o" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to compile C++ file $f" 1>&2 - fi - done -fi - -if [ -n "$ccfiles" ]; then - for f in $ccfiles; do - if [ -n "$CXX" ]; then - case $f in - *.cc) - b=`echo $f | $SED 's,.*/,,; s,\.cc$,,'` - ;; - *.C) - b=`echo $f | $SED 's,.*/,,; s,\.C$,,'` - ;; - *.cpp) - b=`echo $f | $SED 's,.*/,,; s,\.cpp$,,'` - ;; - esac - if [ -n "$outputfile" ]; then - if $link; then - o=$b.o - else - o=$outputfile - fi - else - o=$b.o - fi - objfiles="$objfiles $o" - cmd="$CXX -c $CPPFLAGS $CXXPICFLAG $ALL_CXXFLAGS $pass_on_options $incflags $defs $f -o $o" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to compile C++ file $f" 1>&2 - fi - done -fi - -## Uncomment the following group of lines if you get `Text file busy' -## errors from ld. This may happen if the .oct file is currently -## running while you are trying to recompile it. We try moving first, -## since on some systems (HP-UX, maybe others) it is possible to -## rename running programs but not remove them. - -## if [ -f "$octfile" ]; then -## cmd="mv $octfile $octfile.bak" -## $dbg $cmd -## eval $cmd -## cmd="rm -f $octfile.bak" -## $dbg $cmd -## eval $cmd -## fi - -# Link all the object files. - -if $link && [ -n "$objfiles" ]; then - if $link_stand_alone; then - if [ -n "$LD_CXX" ]; then - cmd="$LD_CXX $CPPFLAGS $ALL_CXXFLAGS $RDYNAMIC_FLAG $ALL_LDFLAGS $pass_on_options $output_option $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave $OCTAVE_LINK_OPTS $OCTAVE_LINK_DEPS" - $dbg $cmd - eval $cmd - else - echo "mkoctfile: no way to link stand-alone executable file" 1>&2 - exit 1 - fi - else - cmd="$DL_LD $DL_LDFLAGS $pass_on_options -o $octfile $objfiles $libfiles $ldflags $LFLAGS -loctinterp -loctave $OCT_LINK_OPTS $OCT_LINK_DEPS" - $dbg $cmd - eval $cmd - fi - -# Maybe strip it. - - if $strip; then - cmd="strip $octfile" - $dbg $cmd - eval $cmd - fi -fi - -exit 0
--- a/src/octave-config.in.cc Thu Jan 23 12:53:32 2014 -0800 +++ b/src/octave-config.in.cc Thu Jan 23 16:16:07 2014 -0500 @@ -53,23 +53,23 @@ " -p VAR, --print VAR Print the value of the given configuration\n" " variable VAR. Recognized variables are:\n" "\n" -" API_VERSION LOCALAPIARCHLIBDIR\n" -" CANONICAL_HOST_TYPE LOCALAPIFCNFILEDIR\n" -" DEFAULT_PAGER LOCALAPIOCTFILEDIR\n" +" API_VERSION LOCALAPIOCTFILEDIR\n" " ARCHLIBDIR LOCALARCHLIBDIR\n" " BINDIR LOCALFCNFILEDIR\n" -" DATADIR LOCALOCTFILEDIR\n" -" DATAROOTDIR LOCALSTARTUPFILEDIR\n" -" EXEC_PREFIX LOCALVERARCHLIBDIR\n" -" FCNFILEDIR LOCALVERFCNFILEDIR\n" -" LOCALVEROCTFILEDIR MAN1DIR\n" -" IMAGEDIR MANDIR\n" -" MAN1EXT OCTFILEDIR\n" -" INCLUDEDIR OCTINCLUDEDIR\n" -" INFODIR OCTLIBDIR\n" -" INFOFILE PREFIX\n" -" LIBDIR STARTUPFILEDIR\n" -" LIBEXECDIR VERSION\n" +" CANONICAL_HOST_TYPE LOCALOCTFILEDIR\n" +" DATADIR LOCALSTARTUPFILEDIR\n" +" DATAROOTDIR LOCALVERARCHLIBDIR\n" +" DEFAULT_PAGER LOCALVERFCNFILEDIR\n" +" EXEC_PREFIX LOCALVEROCTFILEDIR\n" +" FCNFILEDIR MAN1DIR\n" +" IMAGEDIR MAN1EXT\n" +" INCLUDEDIR MANDIR\n" +" INFODIR OCTFILEDIR\n" +" INFOFILE OCTINCLUDEDIR\n" +" LIBDIR OCTLIBDIR\n" +" LIBEXECDIR PREFIX\n" +" LOCALAPIARCHLIBDIR STARTUPFILEDIR\n" +" LOCALAPIFCNFILEDIR VERSION\n" "\n" " -v, --version Print the Octave version number.\n" "\n";
--- a/src/octave-config.in.sh Thu Jan 23 12:53:32 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ -#! /bin/sh - -## -## octave-config - reports some configuration values for Octave -## -## Copyright (C) 2001-2013 John W. Eaton -## -## This file is part of Octave. -## -## Octave is free software; you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 3 of the License, or (at -## your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## <http://www.gnu.org/licenses/>. -## -## Original version by Rafael Laboissiere <rafael@laboissiere.net> -## distributed as free software in the public domain. - -API_VERSION=%OCTAVE_API_VERSION% -CANONICAL_HOST_TYPE=%OCTAVE_CANONICAL_HOST_TYPE% -DEFAULT_PAGER=%OCTAVE_DEFAULT_PAGER% -ARCHLIBDIR=%OCTAVE_ARCHLIBDIR% -BINDIR=%OCTAVE_BINDIR% -DATADIR=%OCTAVE_DATADIR% -DATAROOTDIR=%OCTAVE_DATAROOTDIR% -EXEC_PREFIX=%OCTAVE_EXEC_PREFIX% -FCNFILEDIR=%OCTAVE_FCNFILEDIR% -IMAGEDIR=%OCTAVE_IMAGEDIR% -INCLUDEDIR=%OCTAVE_INCLUDEDIR% -INFODIR=%OCTAVE_INFODIR% -INFOFILE=%OCTAVE_INFOFILE% -LIBDIR=%OCTAVE_LIBDIR% -LIBEXECDIR=%OCTAVE_LIBEXECDIR% -LOCALAPIARCHLIBDIR=%OCTAVE_LOCALAPIARCHLIBDIR% -LOCALAPIFCNFILEDIR=%OCTAVE_LOCALAPIFCNFILEDIR% -LOCALAPIOCTFILEDIR=%OCTAVE_LOCALAPIOCTFILEDIR% -LOCALARCHLIBDIR=%OCTAVE_LOCALARCHLIBDIR% -LOCALFCNFILEDIR=%OCTAVE_LOCALFCNFILEDIR% -LOCALOCTFILEDIR=%OCTAVE_LOCALOCTFILEDIR% -LOCALSTARTUPFILEDIR=%OCTAVE_LOCALSTARTUPFILEDIR% -LOCALVERARCHLIBDIR=%OCTAVE_LOCALVERARCHLIBDIR% -LOCALVERFCNFILEDIR=%OCTAVE_LOCALVERFCNFILEDIR% -LOCALVEROCTFILEDIR=%OCTAVE_LOCALVEROCTFILEDIR% -MAN1DIR=%OCTAVE_MAN1DIR% -MAN1EXT=%OCTAVE_MAN1EXT% -MANDIR=%OCTAVE_MANDIR% -OCTFILEDIR=%OCTAVE_OCTFILEDIR% -OCTINCLUDEDIR=%OCTAVE_OCTINCLUDEDIR% -OCTLIBDIR=%OCTAVE_OCTLIBDIR% -PREFIX=%OCTAVE_PREFIX% -STARTUPFILEDIR=%OCTAVE_STARTUPFILEDIR% -VERSION=%OCTAVE_VERSION% -SED=%SED% - -if [ -n "$OCTAVE_HOME" ]; then - ARCHLIBDIR="`echo $ARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - BINDIR="`echo $BINDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - DATADIR="`echo $DATADIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - DATAROOTDIR="`echo $DATAROOTDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - EXEC_PREFIX="`echo $EXEC_PREFIX | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - FCNFILEDIR="`echo $FCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - IMAGEDIR="`echo $IMAGEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - INCLUDEDIR="`echo $INCLUDEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - INFODIR="`echo $INFODIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - INFOFILE="`echo $INFOFILE | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LIBDIR="`echo $LIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LIBEXECDIR="`echo $LIBEXECDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALAPIARCHLIBDIR="`echo $LOCALAPIARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALAPIFCNFILEDIR="`echo $LOCALAPIFCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALAPIOCTFILEDIR="`echo $LOCALAPIOCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALARCHLIBDIR="`echo $LOCALARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALFCNFILEDIR="`echo $LOCALFCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALOCTFILEDIR="`echo $LOCALOCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALSTARTUPFILEDIR="`echo $LOCALSTARTUPFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALVERARCHLIBDIR="`echo $LOCALVERARCHLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALVERFCNFILEDIR="`echo $LOCALVERFCNFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - LOCALVEROCTFILEDIR="`echo $LOCALVEROCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - MAN1DIR="`echo $MAN1DIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - MANDIR="`echo $MANDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - OCTFILEDIR="`echo $OCTFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - OCTINCLUDEDIR="`echo $OCTINCLUDEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - OCTLIBDIR="`echo $OCTLIBDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - STARTUPFILEDIR="`echo $STARTUPFILEDIR | $SED "s,^$PREFIX,$OCTAVE_HOME,"`" - - PREFIX="$OCTAVE_HOME" -fi - -usage_msg="usage: octave-config [options]" - -if [ $# -eq 0 ]; then - echo "$usage_msg" 1>&2 - exit 1 -fi - -while [ $# -gt 0 ] -do - case "$1" in - -h | -\? | --help) - echo "$usage_msg" - cat << EOF - -Options: - - -h, -?, --help Print this message. - - --m-site-dir Print the name of the directory where Octave - expects to find locally installed .m files. - - --oct-site-dir Print the name of the directory where Octave - expects to find locally installed .oct files. - - -p VAR, --print VAR Print the value of the given configuration - variable VAR. Recognized variables are: - - API_VERSION LOCALAPIOCTFILEDIR - ARCHLIBDIR LOCALARCHLIBDIR - BINDIR LOCALFCNFILEDIR - CANONICAL_HOST_TYPE LOCALOCTFILEDIR - DATADIR LOCALSTARTUPFILEDIR - DATAROOTDIR LOCALVERARCHLIBDIR - DEFAULT_PAGER LOCALVERFCNFILEDIR - EXEC_PREFIX LOCALVEROCTFILEDIR - FCNFILEDIR MAN1DIR - IMAGEDIR MAN1EXT - INCLUDEDIR MANDIR - INFODIR OCTFILEDIR - INFOFILE OCTINCLUDEDIR - LIBDIR OCTLIBDIR - LIBEXECDIR PREFIX - LOCALAPIARCHLIBDIR STARTUPFILEDIR - LOCALAPIFCNFILEDIR VERSION - - -v, --version Print the Octave version number. - -EOF - exit 0 - ;; - --m-site-dir) - echo $LOCALVERFCNFILEDIR - ;; - --oct-site-dir) - echo $LOCALVEROCTFILEDIR - ;; - -v | --version) - echo $VERSION - ;; - -p | --print) - opt="$1" - shift - if [ $# -eq 0 ]; then - echo "octave-config: $opt option requires argument" 1>&2 - exit 1 - fi - eval echo \${$1} - ;; - *) - echo "octave-config: unrecognized argument $1" 2>&1 - exit 1 - ;; - esac - shift -done