Mercurial > octave-nkf
changeset 18269:f227bb47314f gui-release
maint: Merge stable -> gui-release.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 13 Jan 2014 10:48:49 -0800 |
| parents | 7e297c293e4c (current diff) 975480e1be4b (diff) |
| children | 75d7cde2dda4 8449cc186059 |
| files | configure.ac libgui/src/icons/chat.png libgui/src/icons/help_index.png libgui/src/icons/jabber_protocol.png libgui/src/icons/question.png libgui/src/icons/star.png libgui/src/icons/stop.png libgui/src/icons/terminal.png libgui/src/m-editor/file-editor.cc libgui/src/m-editor/find-dialog.cc libgui/src/main-window.cc libgui/src/module.mk libgui/src/resource.qrc libgui/src/settings-dialog.ui |
| diffstat | 32 files changed, 1516 insertions(+), 1234 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Jan 13 10:48:05 2014 -0800 +++ b/configure.ac Mon Jan 13 10:48:49 2014 -0800 @@ -1536,7 +1536,9 @@ if test -n "$UMFPACK_LIBS"; then ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() + save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS"; + CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" xtra_libs= OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME @@ -1559,13 +1561,17 @@ esac fi LIBS="$save_LIBS" + CPPFLAGS="$save_CPPFLAGS" ## Check for UMFPACK separately split complex matrix and RHS. if test -n "$UMFPACK_LIBS"; then + save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS"; + CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS" LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" OCTAVE_UMFPACK_SEPARATE_SPLIT LIBS="$save_LIBS" + CPPFLAGS="$save_CPPFLAGS" fi fi @@ -2186,7 +2192,7 @@ AC_CHECK_FUNCS([log1p log1pf pipe]) AC_CHECK_FUNCS([realpath resolvepath roundl]) AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal]) -AC_CHECK_FUNCS([tempnam tgammaf toascii]) +AC_CHECK_FUNCS([tcgetattr tcsetattr tempnam tgammaf toascii]) AC_CHECK_FUNCS([umask waitpid]) AC_CHECK_FUNCS([_kbhit])
--- a/libgui/languages/be_BY.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/be_BY.ts Mon Jan 13 10:48:49 2014 -0800 @@ -1684,12 +1684,7 @@ ужо адкрыты ў рэдактары</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>Асацыяваная картка рэдактара знікла. Выглядае, што яе з нейкай прычыны закрылі.</translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -1699,24 +1694,24 @@ <translation>&Новы файл</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Адкрыць файл</translation> + <location line="+6"/> + <source>&Save File</source> + <translation>&Захаваць файл</translation> + </message> + <message> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Адкрыць файл...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Захаваць файл &як...</translation> </message> <message> <location line="+3"/> - <source>&Save File</source> - <translation>&Захаваць файл</translation> - </message> - <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Захаваць файл &як</translation> - </message> - <message> - <location line="+3"/> - <source>Print</source> - <translation>Друк</translation> + <source>Print...</source> + <translation>Друк...</translation> </message> <message> <location line="+3"/> @@ -1794,22 +1789,27 @@ <translation>&Раскаментаваць</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Знайсці і замяніць...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Захаваць і выканаць файл</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>П&ерайсці да радка...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>&Ранейшыя файлы</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Новая &функцыя</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>&Змяніць функцыю</translation> </message> @@ -1829,7 +1829,17 @@ <translation>Закрыць іншыя файлы</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Настаўленні...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>&Настаўленні выгляду...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Выканаць &вылучанае</translation> </message> @@ -1849,12 +1859,7 @@ <translation>&Дакументацыя па ключавым слове</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Знайсці і замяніць</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -1881,32 +1886,27 @@ на запіс: %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>П&ерайсці да радка</translation> - </message> - <message> - <location line="+53"/> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation>Асацыяваная картка рэдактара знікла.</translation> + </message> + <message> + <location line="+521"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Новая &функцыя...</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Змяніць</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Настаўленні</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>&Настаўленні выгляду</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Адладка</translation> </message> @@ -2032,55 +2032,22 @@ <translation>Перайсці каталогам вышэй</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Перайсці да каталогу Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Перайсці да дзейнага каталога Octave</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Задаць каталог Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Зрабіць каталогам Octave дзейны каталог аглядніка</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Дзеянні з дзейным каталогам</translation> </message> <message> + <location line="+372"/> + <source>Find Files ...</source> + <translation>Шукаць файлы...</translation> + </message> + <message> + <location line="+13"/> + <source>New File</source> + <translation>Новы файл</translation> + </message> + <message> <location line="+3"/> - <source>Show Home directory</source> - <translation>Перайсці да хатняга каталогу</translation> - </message> - <message> - <location line="+12"/> - <source>Search directory</source> - <translation>Шукаць каталог</translation> - </message> - <message> - <location line="+3"/> - <location line="+354"/> - <source>Find Files ...</source> - <translation>Шукаць файлы...</translation> - </message> - <message> - <location line="-350"/> - <location line="+363"/> - <source>New File</source> - <translation>Новы файл</translation> - </message> - <message> - <location line="-360"/> - <location line="+363"/> <source>New Directory</source> <translation>Новы каталог</translation> </message> @@ -2090,7 +2057,52 @@ <translation>Двойчы пстрыкніце па файле для адкрыцця</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Перайсці да каталогу Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Перайсці да дзейнага каталога Octave</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Задаць каталог Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Зрабіць каталогам Octave дзейны каталог аглядніка</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Перайсці да хатняга каталогу</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Шукаць каталог...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Шукаць файлы...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Новы файл...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Новы каталог...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Памер файла</translation> </message> @@ -2242,7 +2254,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> @@ -2328,8 +2340,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Больш параметраў</translation> + <source>&More...</source> + <translation>&Больш параметраў...</translation> </message> <message> <location line="+13"/> @@ -2598,12 +2610,12 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Выглядае, што на гэтым кампутары вы выкарыстоўваеце графічны інтэрфэйс Octave упершыню. Націсніце 'Далей', каб запісаць файл канфігурацыі і запусціць Octave.</p> -<p>Файл канфігурацыі запісаны ў %1. Калі файл існуе, вы больш не пабачыце гэтае акенца падчас запуску Octave.</p> +<p>Файл канфігурацыі запісаны ў<br>%1.</p> </body></html></translation> </message> </context> @@ -2611,12 +2623,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Загрузіць прастору зменных</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Пра Octave</translation> @@ -2637,12 +2648,7 @@ <translation>Новы сцэнар</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Функцыя</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Графік</translation> </message> @@ -2683,12 +2689,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Захаваць прастору зменных як</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>Файл заўваг да выпуску '%1' пусты.</translation> </message> @@ -2773,7 +2778,22 @@ <translation>Крок наперад</translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Загрузіць прастору зменных...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Захаваць прастору зменных як...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Функцыя...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation>Крок назад</translation> </message> @@ -3217,7 +3237,12 @@ <translation>Выгляд рэдактара</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation>Колеры тэрміналу</translation> </message> @@ -3282,12 +3307,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation><html><head/><body><p>Пазначце шрыфт, ягоны памер (як розніцу ад стандартнага памеру), стыль шрыфту (тоўсты, курсіўны, падкрэслены), колер тэксту і колер фону (для фону ружовы (255,0,255) азначае стандартны колер фону)</p></body></html></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Тэрмінал</translation> </message>
--- a/libgui/languages/de_DE.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/de_DE.ts Mon Jan 13 10:48:49 2014 -0800 @@ -144,12 +144,7 @@ ist im Editor bereits geöffnet</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>Der zugehörige Editor-Reiter ist nicht mehr vorhanden und wurde wahrscheinlich geschlossen.</translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -159,24 +154,24 @@ <translation>&Neue Datei</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>Datei &Öffnen</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>&Save File</source> <translation>Datei &speichern</translation> </message> <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Datei speichern &als</translation> + <location line="-3"/> + <source>&Open File...</source> + <translation>Datei &Öffnen...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Datei speichern &als...</translation> </message> <message> <location line="+3"/> - <source>Print</source> - <translation>Drucken</translation> + <source>Print...</source> + <translation>Drucken...</translation> </message> <message> <location line="+3"/> @@ -254,22 +249,27 @@ <translation>Kommentar &entfernen</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Suchen und Ersetzen...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Datei speichern und Ausführen</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>&Gehe zu Zeile...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>&Zuletzt bearbeitete Dateien</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Neue &Funktion</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>Funktion b&earbeiten</translation> </message> @@ -289,7 +289,17 @@ <translation>Andere Dokumente schließen</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Einstellungen...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>&Stil-Einstellungen...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Markierten Quellcode au&sführen</translation> </message> @@ -309,12 +319,7 @@ <translation>&Dokumentation zum Schlüsselwort</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Suchen und Ersetzen</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -343,32 +348,27 @@ %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>&Gehe zu Zeile</translation> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation>Der zugehörige Editor-Reiter ist nicht mehr vorhanden.</translation> </message> <message> - <location line="+53"/> + <location line="+521"/> <source>&File</source> <translation>&Datei</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Neue &Funktion...</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Bearbeiten</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Einstellungen</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>&Stil-Einstellungen</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Debuggen</translation> </message> @@ -492,55 +492,22 @@ <translation>Ordern darüber anwählen</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Aktuelles Octave Verzeichnis anzeigen</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Zu aktuellem Octave Verezichnis gehen</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Octave Verzeichnis setzen</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Setze Octave Verzeichnis zu aktuellem Browser Verzeichnis</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Aktionen mit aktuellem Verzeichnis</translation> </message> <message> - <location line="+3"/> - <source>Show Home directory</source> - <translation>Wechsle zum Heimatverzeichnis</translation> - </message> - <message> - <location line="+12"/> - <source>Search directory</source> - <translation>Verzeichnis suchen</translation> - </message> - <message> - <location line="+3"/> - <location line="+354"/> + <location line="+372"/> <source>Find Files ...</source> <translation>Dateien suchen ...</translation> </message> <message> - <location line="-350"/> - <location line="+363"/> + <location line="+13"/> <source>New File</source> <translation>Neue Datei</translation> </message> <message> - <location line="-360"/> - <location line="+363"/> + <location line="+3"/> <source>New Directory</source> <translation>Neues Verzeichnis</translation> </message> @@ -550,7 +517,53 @@ <translation>Doppelklick auf eine Datei um diese zu öffnen</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Aktuelles Octave Verzeichnis anzeigen</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Zum aktuellen Octave Verezichnis gehen</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Octave Verzeichnis setzen</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Setze Octave Verzeichnis zu aktuellem Browser Verzeichnis</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Wechsle zum Heimatverzeichnis</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Verzeichnis suchen...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translatorcomment>Dateien suchen...</translatorcomment> + <translation>Suche Dateien...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Neue Datei...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Neues Verzeichnis...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Dateigröße</translation> </message> @@ -703,7 +716,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> @@ -789,8 +802,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Mehr</translation> + <source>&More...</source> + <translation>&Mehr...</translation> </message> <message> <location line="+13"/> @@ -1059,12 +1072,12 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Es scheint, dass die grafische Benutzerschnittstelle (GUI) zum ersten Mal auf diesem Computer gestartet wurde. Klicke auf 'Weiter' um eine Konfigurationsdatei anzulegen und Octave zu starten.</p> -<p>Die Konfigurationsdatei wird in %1 gespeichert. Falls diese Datei existiert, wird dieser Dialog nicht mehr angezeigt.</p> +<p>Die Konfigurationsdatei wird in<br>%1<br>gespeichert.</p> </body></html></translation> </message> </context> @@ -1072,12 +1085,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Lade Arbeitsumgebung</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Über Octave</translation> @@ -1098,12 +1110,7 @@ <translation>Skript</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Funktion</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Abbildung</translation> </message> @@ -1144,12 +1151,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Arbeitsumgebung speichern als</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>Die Datei '%1' mit Versionshinweisen ist leer.</translation> </message> @@ -1234,7 +1240,22 @@ <translation>Hineinspringen</translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Lade Arbeitsumgebung...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Arbeitsumgebung speichern als...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Funktion...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation>Herausspringen</translation> </message> @@ -1675,7 +1696,12 @@ <translation>Editor Stile</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation>Farben des Befehlsfensters</translation> </message> @@ -1740,12 +1766,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</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="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Befehlsfenster</translation> </message>
--- a/libgui/languages/en_US.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/en_US.ts Mon Jan 13 10:48:49 2014 -0800 @@ -141,12 +141,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation type="unfinished"></translation> </message> @@ -156,23 +151,23 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> + <location line="+6"/> + <source>&Save File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-3"/> + <source>&Open File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <source>&Save File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Save File &As</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <source>Print</source> + <source>Print...</source> <translation type="unfinished"></translation> </message> <message> @@ -251,22 +246,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation type="unfinished"></translation> </message> @@ -286,7 +286,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation type="unfinished"></translation> </message> @@ -306,12 +316,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -332,32 +337,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+53"/> + <location line="+521"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation type="unfinished"></translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation type="unfinished"></translation> </message> @@ -475,55 +475,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Show Home directory</source> + <location line="+372"/> + <source>Find Files ...</source> <translation type="unfinished"></translation> </message> <message> - <location line="+12"/> - <source>Search directory</source> + <location line="+13"/> + <source>New File</source> <translation type="unfinished"></translation> </message> <message> <location line="+3"/> - <location line="+354"/> - <source>Find Files ...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-350"/> - <location line="+363"/> - <source>New File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-360"/> - <location line="+363"/> <source>New Directory</source> <translation type="unfinished"></translation> </message> @@ -533,7 +500,52 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation type="unfinished"></translation> </message> @@ -682,7 +694,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation type="unfinished"></translation> @@ -753,7 +765,7 @@ </message> <message> <location line="+2"/> - <source>&More</source> + <source>&More...</source> <translation type="unfinished"></translation> </message> <message> @@ -1023,7 +1035,7 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation type="unfinished"></translation> </message> @@ -1032,12 +1044,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation type="unfinished"></translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation type="unfinished"></translation> @@ -1058,12 +1069,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation type="unfinished"></translation> </message> @@ -1104,12 +1110,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1194,7 +1199,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation type="unfinished"></translation> </message> @@ -1604,7 +1624,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> @@ -1669,12 +1694,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation type="unfinished"></translation> </message>
--- a/libgui/languages/es_ES.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/es_ES.ts Mon Jan 13 10:48:49 2014 -0800 @@ -134,12 +134,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+309"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>La pestaña para la edición del archivo ha desaparecido. Es probable que se haya cerrado por algún medio.</translation> - </message> - <message> - <location line="+227"/> + <location line="+536"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -149,24 +144,24 @@ <translation>&Nuevo archivo</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Abrir archivo</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>&Save File</source> <translation>&Guardar archivo</translation> </message> <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Guardar archivo &como</translation> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Abrir archivo...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Guardar archivo &como...</translation> </message> <message> <location line="+3"/> - <source>Print</source> - <translation>Imprimir</translation> + <source>Print...</source> + <translation>Imprimir...</translation> </message> <message> <location line="+3"/> @@ -244,22 +239,27 @@ <translation>&Eliminar comentario</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Buscar y reemplazar...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Guardar archivo y ejecutar</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>&Ir a línea...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>Archivos &recientes</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Nueva &función</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>&Editar función</translation> </message> @@ -279,7 +279,17 @@ <translation>Cerrar otros archivos</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Preferencias...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>Preferencias de &estilos...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Ejecutar &selección</translation> </message> @@ -299,12 +309,7 @@ <translation>&Documentación de palabras clave</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Buscar y reemplazar</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -332,32 +337,27 @@ <translation>¡Archivo no guardado! Un archivo con el nombre seleccionado\n%1\nya se encuentra abierto en el editor</translation> </message> <message> - <location line="+496"/> - <source>Go&to Line</source> - <translation>&Ir a línea</translation> + <location line="+28"/> + <source>The associated file editor tab has disappeared.</source> + <translation>La pestaña para la edición del archivo ha desaparecido.</translation> </message> <message> - <location line="+53"/> + <location line="+521"/> <source>&File</source> <translation>&Archivo</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Nueva &función...</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Preferencias</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>Preferencias de &estilos</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Depurar</translation> </message> @@ -475,55 +475,22 @@ <translation>Subir un directorio</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Mostrar el directorio de Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Ir al directorio actual de Octave</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Seleccionar el directorio de Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Asignar el directorio de Octave como directorio actual del explorador</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Acciones en el directorio actual</translation> </message> <message> - <location line="+3"/> - <source>Show Home directory</source> - <translation>Mostrar el directorio de inicio</translation> - </message> - <message> - <location line="+12"/> - <source>Search directory</source> - <translation>Buscar directorio</translation> - </message> - <message> - <location line="+3"/> - <location line="+354"/> + <location line="+372"/> <source>Find Files ...</source> <translation>Buscar archivos ...</translation> </message> <message> - <location line="-350"/> - <location line="+363"/> + <location line="+13"/> <source>New File</source> <translation>Nuevo archivo</translation> </message> <message> - <location line="-360"/> - <location line="+363"/> + <location line="+3"/> <source>New Directory</source> <translation>Nuevo directorio</translation> </message> @@ -533,7 +500,52 @@ <translation>Pulse dos veces en un archivo para abrirlo</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Mostrar el directorio de Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Ir al directorio actual de Octave</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Seleccionar el directorio de Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Asignar el directorio de Octave como directorio actual del explorador</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Mostrar el directorio de inicio</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Buscar directorio...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Buscar archivos...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Nuevo archivo...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Nuevo directorio...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Tamaño del archivo</translation> </message> @@ -684,7 +696,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> @@ -773,8 +785,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Más</translation> + <source>&More...</source> + <translation>&Más...</translation> </message> <message> <location line="+13"/> @@ -1044,27 +1056,24 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Parece que está utilizando la interface gráfica de Octave por primera vez en esta computadora. Pulse 'Siguiente' para crear un archivo de configuración e iniciar Octave.</p> -<p>El archivo de configuración se guardará en %1. Si el archivo ya existe, no verá este diálogo cuando Octave se inicie.</p> -</body></html> - -</translation> +<p>El archivo de configuración se guardará en<br>%1.</p> +</body></html></translation> </message> </context> <context> <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Cargar espacio de trabajo</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Acerca de Octave</translation> @@ -1086,12 +1095,7 @@ <translation>Guión</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Función</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Figura</translation> </message> @@ -1132,12 +1136,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Guardar espacio de trabajo como</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>El archivo de las notas de versión %1 está vacío.</translation> </message> @@ -1222,7 +1225,22 @@ <translation>Iniciar</translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Cargar espacio de trabajo...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Guardar espacio de trabajo como...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Función...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation>Terminar</translation> </message> @@ -1667,7 +1685,12 @@ <translation>Estilos del editor</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <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> @@ -1728,12 +1751,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</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 (negrita, cursiva, subrayada), color de texto y color de fondo(para este último, el color rosa (255,0,255) es un marcador de posición para el color de fondo por defecto)</p></body></html></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Terminal</translation> </message>
--- a/libgui/languages/fr_FR.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/fr_FR.ts Mon Jan 13 10:48:49 2014 -0800 @@ -143,12 +143,7 @@ est déjà ouvert dans l'éditeur</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>L'onglet éditeur de fichier associé a disparu. Il a probablement été fermé par un moyen quelconque.</translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -158,24 +153,24 @@ <translation>&Nouveau</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Ouvrir</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>&Save File</source> <translation>&Enregistrer</translation> </message> <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Enregistrer &sous</translation> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Ouvrir...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Enregistrer &sous...</translation> </message> <message> <location line="+3"/> - <source>Print</source> - <translation>Imprimer</translation> + <source>Print...</source> + <translation>Imprimer...</translation> </message> <message> <location line="+3"/> @@ -253,22 +248,27 @@ <translation>&Décommenter</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Rechercher et remplacer...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Enregistrer et Exécuter</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>&Aller à la ligne...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>Fichiers &récents</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Nouvelle &Fonction</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>&Editer Fonction</translation> </message> @@ -288,7 +288,17 @@ <translation>Fermer les autres fichiers</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Préférences...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>Préférences de &Style...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Exécuter la &Selection</translation> </message> @@ -308,12 +318,7 @@ <translation>&Documentation sur le mot de clés</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Rechercher et remplacer</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -340,32 +345,27 @@ pour écrire : %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>&Aller à la ligne</translation> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation>L'onglet éditeur de fichier associé a disparu.</translation> </message> <message> - <location line="+53"/> + <location line="+521"/> <source>&File</source> <translation>&Fichier</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Nouvelle &Fonction...</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Editer</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Préférences</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>Préférences de &Style</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Déboguer</translation> </message> @@ -491,55 +491,22 @@ <translation>Remonter d'un répertoire</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Revenir au répertoire d'Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Aller au répertoire courant d'Octave</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Définir le répertoire d'Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Définir le répertoire du navigateur comme répertoire d'Octave</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Actions sur le répertoire courant</translation> </message> <message> - <location line="+3"/> - <source>Show Home directory</source> - <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="+3"/> - <location line="+354"/> + <location line="+372"/> <source>Find Files ...</source> <translation>Rechercher des fichiers...</translation> </message> <message> - <location line="-350"/> - <location line="+363"/> + <location line="+13"/> <source>New File</source> <translation>Nouveau fichier</translation> </message> <message> - <location line="-360"/> - <location line="+363"/> + <location line="+3"/> <source>New Directory</source> <translation>Nouveau répertoire</translation> </message> @@ -549,7 +516,52 @@ <translation>Double-cliquer sur un fichier pour l'ouvrir</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Revenir au répertoire d'Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Aller au répertoire courant d'Octave</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Définir le répertoire d'Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Définir le répertoire du navigateur comme répertoire d'Octave</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Aller au répertoire personnel</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Rechercher dans le répertoire...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Rechercher des fichiers...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Nouveau fichier...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Nouveau répertoire...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Taille du fichier</translation> </message> @@ -703,7 +715,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> @@ -789,8 +801,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Plus d'options</translation> + <source>&More...</source> + <translation>&Plus d'options...</translation> </message> <message> <location line="+13"/> @@ -1059,12 +1071,12 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Vous semblez utiliser l'interface graphique d'Octave pour la première fois sur cet ordianteur. Cliquez "Suivant" pour créer un fichier de configuration et lancer Octave.</p> -<p>Le fichier de configuration est enregistré dans %1. Si ce fichier existe vous ne verrez plus ce dialogue au démarrage d'Octave.</p> +<p>Le fichier de configuration est enregistré dans<br>%1.</p> </body></html></translation> </message> </context> @@ -1072,12 +1084,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Charger l'espace de travail</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>À propos d'Octave</translation> @@ -1098,12 +1109,7 @@ <translation>Fichier de script</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Fonction</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Figure</translation> </message> @@ -1144,12 +1150,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Enregistrer l'espace de travail sous</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>Le fichier de notes de version '%1' est vide.</translation> </message> @@ -1234,7 +1239,22 @@ <translation>Avancer d'un pas avec entrée</translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Charger l'espace de travail...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Enregistrer l'espace de travail sous...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Fonction...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation>Exécuter jusqu'à l'instruction de retour</translation> </message> @@ -1680,7 +1700,12 @@ <translation>Affichage</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation>Couleurs de la fenetre de commandes</translation> </message> @@ -1740,12 +1765,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</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 (gras, italique, souligné), la couleur du texte et de l'arrière plan (pour ce dernier, le rose (255,0,255) fait figure de défaut)</p></body></html></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Terminal</translation> </message>
--- a/libgui/languages/nl_NL.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/nl_NL.ts Mon Jan 13 10:48:49 2014 -0800 @@ -1683,12 +1683,7 @@ is reeds geopend in de editor</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>Het bijbehorende tabblad in de editor is verdwenen. Het is waarschijnlijk op een of andere manier gesloten.</translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation></translation> </message> @@ -1698,24 +1693,24 @@ <translation>&Nieuw Bestand</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Openen</translation> + <location line="+6"/> + <source>&Save File</source> + <translation>Op&slaan</translation> + </message> + <message> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Openen...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Opslaan &als...</translation> </message> <message> <location line="+3"/> - <source>&Save File</source> - <translation>Op&slaan</translation> - </message> - <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Opslaan &als</translation> - </message> - <message> - <location line="+3"/> - <source>Print</source> - <translation>Afdrukken</translation> + <source>Print...</source> + <translation>Afdrukken...</translation> </message> <message> <location line="+3"/> @@ -1793,22 +1788,27 @@ <translation>Zet om naar code</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>Zoek en Vervang...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Sla Bestand op en Voer uit</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>Ga naar regel...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>&Recent geopend</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Nieuwe &Functie</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>Pas Functie Aan</translation> </message> @@ -1828,7 +1828,17 @@ <translation>Andere bestanden sluiten</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>Voorkeuren...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>&Stijlvoorkeuren...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Geselecteerde tekst uitvoeren</translation> </message> @@ -1848,12 +1858,7 @@ <translation>&Documentatie bij sleutelwoord</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>Zoek en Vervang</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -1880,32 +1885,27 @@ niet openen om te schrijven: %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>Ga naar regel</translation> - </message> - <message> - <location line="+53"/> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation>Het bijbehorende tabblad in de editor is verdwenen.</translation> + </message> + <message> + <location line="+521"/> <source>&File</source> <translation>Bestand</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Nieuwe &Functie...</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>B&ewerken</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>Voorkeuren</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>&Stijlvoorkeuren</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Debuggen</translation> </message> @@ -2030,55 +2030,22 @@ <translation>Eén mapniveau omhoog</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Laat octave map zien</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Ga naar huidige octave map</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Stel octave map in</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Maak huidige browser map de Octave map</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Bewerkingen op huidige map</translation> </message> <message> + <location line="+372"/> + <source>Find Files ...</source> + <translation>Zoek bestanden ...</translation> + </message> + <message> + <location line="+13"/> + <source>New File</source> + <translation>Nieuw bestand</translation> + </message> + <message> <location line="+3"/> - <source>Show Home directory</source> - <translation>Laat home map zien</translation> - </message> - <message> - <location line="+12"/> - <source>Search directory</source> - <translation>Zoek in map</translation> - </message> - <message> - <location line="+3"/> - <location line="+354"/> - <source>Find Files ...</source> - <translation>Zoek bestanden ...</translation> - </message> - <message> - <location line="-350"/> - <location line="+363"/> - <source>New File</source> - <translation>Nieuw bestand</translation> - </message> - <message> - <location line="-360"/> - <location line="+363"/> <source>New Directory</source> <translation>Nieuwe map</translation> </message> @@ -2088,7 +2055,52 @@ <translation>Dubbelklik een bestand om te openen</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Laat Octave map zien</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Ga naar huidige Octave map</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Stel Octave map in</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Maak huidige browser map de Octave map</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Laat home map zien</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Zoek in map...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Zoek bestanden...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Nieuw bestand...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Nieuwe map...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Bestandsgrootte</translation> </message> @@ -2242,7 +2254,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> @@ -2329,7 +2341,7 @@ </message> <message> <location line="+2"/> - <source>&More</source> + <source>&More...</source> <translation>&Meer</translation> </message> <message> @@ -2599,12 +2611,12 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Het lijkt erop dat je de grafische interface van Octave voor het eerst gebruikt op deze computer. Klik 'Volgende' om een configuratiebestand aan te maken en Octave te starten.</p> -<p>Het configuratiebestand is opgeslagen in %1. Als dat bestand bestaat, zal je dit dialoogscherm niet zien wanneer Octave start.</p> +<p>Het configuratiebestand is opgeslagen in<br>%1.</p> </body></html></translation> </message> </context> @@ -2612,12 +2624,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Werkruimte laden</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Over Octave</translation> @@ -2638,12 +2649,7 @@ <translation>Script</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Functie</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Figuur</translation> </message> @@ -2684,12 +2690,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Sla Werkruimte Op Als</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>Bestand met Release Notes '%1' is leeg.</translation> </message> @@ -2774,7 +2779,22 @@ <translation>Stap In</translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Werkruimte laden...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Sla Werkruimte Op Als...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Functie...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation>Stap Uit</translation> </message> @@ -3220,7 +3240,12 @@ <translation>Editorstijlen</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation>Terminalkleuren</translation> </message> @@ -3280,12 +3305,7 @@ <translation></translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation><html><head/><body><p>Selecteer font, font grootte (als een verschil van de standaard grootte), font stijl (dik, schuin, onderstreept), tekstkleur en achtergrondkleur (wat betreft de laatste, de kleur roze (255,0,255) is een plaatsvervanger voor de standaard achtergrondkleur)</p></body></html></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Opdrachtvenster</translation> </message>
--- a/libgui/languages/pt_BR.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/pt_BR.ts Mon Jan 13 10:48:49 2014 -0800 @@ -141,12 +141,7 @@ <translation>Arquivo não foi salvo! Um arquivo com o nome selecionado %1 já está aberto no editor</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>A aba do editor associada ao arquivo desapareceu.</translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -156,23 +151,23 @@ <translation>&Novo Script</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Abrir Arquivo</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>&Save File</source> <translation>&Salvar Arquivo</translation> </message> <message> - <location line="+3"/> - <source>Save File &As</source> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Abrir Arquivo...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> <translation>Salvar Arquivo &Como...</translation> </message> <message> <location line="+3"/> - <source>Print</source> + <source>Print...</source> <translation>Imprimir...</translation> </message> <message> @@ -251,22 +246,27 @@ <translation>&Descomentar</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Buscar e Substituir...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Salvar Arquivo e Executá-lo</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>Vá para &Linha...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>Arquivos &Recentes</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Nova &Função</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>&Editar Função</translation> </message> @@ -286,7 +286,17 @@ <translation>Fechar Demais Arquivos</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Preferências...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>Preferências de &Estilo...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Executar &Seleção</translation> </message> @@ -306,12 +316,7 @@ <translation>&Documentação da Palavra-chave</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Buscar e Substituir</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -338,32 +343,27 @@ para escrita: %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>Vá para &Linha</translation> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation>A aba do editor associada ao arquivo desapareceu.</translation> </message> <message> - <location line="+53"/> + <location line="+521"/> <source>&File</source> <translation>&Arquivo</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Nova &Função...</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Preferências</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>Preferências de &Estilo</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Depurar</translation> </message> @@ -489,55 +489,22 @@ <translation>Subir um nível de diretório</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Exibir o diretório do Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Vá para o diretório atual do Octave</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Escolher o diretório do Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Definir diretório do Octave igual ao diretório atual no navegador</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Ações no diretório atual</translation> </message> <message> - <location line="+3"/> - <source>Show Home directory</source> - <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="+3"/> - <location line="+354"/> + <location line="+372"/> <source>Find Files ...</source> <translation>Buscar Arquivos...</translation> </message> <message> - <location line="-350"/> - <location line="+363"/> + <location line="+13"/> <source>New File</source> <translation>Novo Arquivo</translation> </message> <message> - <location line="-360"/> - <location line="+363"/> + <location line="+3"/> <source>New Directory</source> <translation>Novo Diretório</translation> </message> @@ -547,7 +514,52 @@ <translation>Clique duas vezes em um arquivo para abrí-lo</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Exibir o diretório do Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Vá para o diretório atual do Octave</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Definir o diretório do Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Definir diretório do Octave igual ao diretório atual no navegador</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Exibir diretório pessoal</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Buscar no diretório...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Buscar Arquivos...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Novo Arquivo...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Novo Diretório...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Tamanho do arquivo</translation> </message> @@ -699,13 +711,13 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> -<p>Esperamos que você ache o Octave uma ferramenta útil.</p> -<p>Se encontrar dificuldades, existem várias formas de obter assistência, incluindo suporte comercial, listas de email, wiki, e outros canais de suporte comunitários. -Você pode encontrar mais informações sobre cada um deles visitando <a href="http://octave.org/support.html">http://octave.org/support.html</a> (link abre em navegador externo).</p> +<p>Esperamos que o Octave seja uma ferramenta últil.</p> +<p>Se encontrar problemas, existem várias maneiras de pedir ajuda incluindo suporte comercial, lista de email, wiki, e outros canais de suporte da comunidade. +Você pode encontrar mais informações sobre cada um deles visitando <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></translation> </message> <message> @@ -785,8 +797,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Mais opções...</translation> + <source>&More...</source> + <translation>&Mais...</translation> </message> <message> <location line="+13"/> @@ -1055,12 +1067,12 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Parece que você está usando a interface gráfica pela primeira vez neste computador. -Clique em 'Próximo' para criar um arquivo de configuração e iniciar o Octave.</p> -<p>O arquivo de configuração é armazenado em %1. Se o arquivo existir, você não verá esta mensagem quando o Octave iniciar novamente.</p> +Clique em próximo para criar um arquivo de configuração e lançar o Octave.</p> +<p>O arquivo de configuração é armazenado em<br>%1.</p> </body></html></translation> </message> </context> @@ -1068,12 +1080,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Carregar Ambiente de Trabalho...</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Sobre o Octave</translation> @@ -1094,12 +1105,7 @@ <translation>Script</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Função</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Figura</translation> </message> @@ -1140,12 +1146,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Salvar Ambiente de Trabalho Como...</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>O arquivo de notas da versão '%1' está vazio.</translation> </message> @@ -1230,7 +1235,22 @@ <translation>Passo adentro</translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Carregar ambiente de trabalho...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Salvar Ambiente de Trabalho Como...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Função...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation>Passo afora</translation> </message> @@ -1676,7 +1696,12 @@ <translation>Apresentação</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation>Cores do Terminal</translation> </message> @@ -1736,12 +1761,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation><html><head/><body><p>Selecionar fonte, tamanho da fonte (na forma de diferença com relacão ao tamanho padrão), estilo da fonte (negrito, itálico, sublinhado), cor da fonte e cor de fundo (a cor rosa (255,0,255) é a cor de fundo padrão).</p></body></html></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Terminal</translation> </message>
--- a/libgui/languages/pt_PT.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/pt_PT.ts Mon Jan 13 10:48:49 2014 -0800 @@ -810,12 +810,7 @@ já está aberto no editor</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation>A aba do editor associada ao ficheiro desapareceu. Foi provavelmente fechada de alguma maneira.</translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -825,24 +820,24 @@ <translation>&Novo Ficheiro</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Abrir Ficheiro</translation> + <location line="+6"/> + <source>&Save File</source> + <translation>&Guardar Ficheiro</translation> + </message> + <message> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Abrir Ficheiro...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Guardar Ficheiro &Como...</translation> </message> <message> <location line="+3"/> - <source>&Save File</source> - <translation>&Guardar Ficheiro</translation> - </message> - <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Guardar Ficheiro &Como</translation> - </message> - <message> - <location line="+3"/> - <source>Print</source> - <translation>Imprimir</translation> + <source>Print...</source> + <translation>Imprimir...</translation> </message> <message> <location line="+3"/> @@ -920,22 +915,27 @@ <translation>&Descomentar</translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Buscar e Substituir...</translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation>Gravar ficheiro e executar</translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>Ir para &Linha...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>Ficheiros &recentes</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation>Nova função</translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>&Editar Função</translation> </message> @@ -955,7 +955,17 @@ <translation>Fechar os Outros Ficheiros</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Preferências...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>Preferências de &Estilo...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation>Executar &Selecção</translation> </message> @@ -975,12 +985,7 @@ <translation>&Documentação da Palavra-chave</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Buscar e Substituir</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -1007,32 +1012,27 @@ para escrita: %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>Ir para &Linha</translation> - </message> - <message> - <location line="+53"/> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation>A aba do editor associada ao ficheiro desapareceu.</translation> + </message> + <message> + <location line="+521"/> <source>&File</source> <translation>&Ficheiro</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation>Nova &função</translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Editar</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Preferências</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>Preferências de &Estilo</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Depurar</translation> </message> @@ -1158,55 +1158,22 @@ <translation>Subir um nível de directório</translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Mostrar o directório actual do Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Ir para o directório actual do Octave</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Definir o directório actual do Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation>Definir o directório actual do Octave para o directório actual do navegador</translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation>Acções no directório actual</translation> </message> <message> + <location line="+372"/> + <source>Find Files ...</source> + <translation>Procurar Ficheiros...</translation> + </message> + <message> + <location line="+13"/> + <source>New File</source> + <translation>Novo Ficheiro</translation> + </message> + <message> <location line="+3"/> - <source>Show Home directory</source> - <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="+3"/> - <location line="+354"/> - <source>Find Files ...</source> - <translation>Procurar Ficheiros...</translation> - </message> - <message> - <location line="-350"/> - <location line="+363"/> - <source>New File</source> - <translation>Novo Ficheiro</translation> - </message> - <message> - <location line="-360"/> - <location line="+363"/> <source>New Directory</source> <translation>Novo Directório</translation> </message> @@ -1216,7 +1183,52 @@ <translation>Clicar duas vezes num ficheiro para o abrir</translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Mostrar o directório actual do Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Ir para o directório actual do Octave</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Definir o directório actual do Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation>Definir o directório actual do Octave para o directório actual do navegador</translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Mostrar directório pessoal</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation>Procurar no directório...</translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Encontrar Ficheiros...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Novo Ficheiro...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Novo Directório...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation>Tamanho de ficheiro</translation> </message> @@ -1370,7 +1382,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation><html><body> @@ -1456,8 +1468,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Mais</translation> + <source>&More...</source> + <translation>&Mais...</translation> </message> <message> <location line="+13"/> @@ -1726,12 +1738,12 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation><html><body> <p>Parece que está a utilizar a interface gráfica do Octave pela primeira vez neste computador. Clique 'Próximo' para criar um ficheiro de configuração e iniciar o Octave.</p> -<p>O ficheiro de configuração é gravado em in %1. Se esse ficheiro existir, este diálogo não volta a aparecer ao iniciar Octave..</p> +<p>O ficheiro de configuração é gravado em in<br>%1.</p> </body></html></translation> </message> </context> @@ -1739,12 +1751,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Carregar ambiente de trabalho</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Sobre o Octave</translation> @@ -1765,12 +1776,7 @@ <translation>Script</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Função</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation>Figura</translation> </message> @@ -1811,12 +1817,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation>Guardar Ambiente de Trabalho como</translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation>O ficheiro de notas da versão '%1' está vazio.</translation> </message> @@ -1898,12 +1903,27 @@ <message> <location line="-288"/> <source>Step In</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <translation></translation> + </message> + <message> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Carregar ambiente de trabalho...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation>Guardar Ambiente de Trabalho como...</translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Função...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+108"/> @@ -2347,7 +2367,12 @@ <translation>Estilos do Editor</translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation>Cores do Terminal</translation> </message> @@ -2407,12 +2432,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation><html><head/><body><p>Seleccionar tipo de letra, tamanho (como diferença para o tamanho padrão), decoração (negrito, itálico, sublinhado), cor do texto e cor do fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão)</p></body></html></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Terminal</translation> </message>
--- a/libgui/languages/ru_RU.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/ru_RU.ts Mon Jan 13 10:48:49 2014 -0800 @@ -143,12 +143,7 @@ уже открыт в редакторе</translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation>&%1 %2</translation> </message> @@ -158,24 +153,24 @@ <translation>Созд&ать</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation>&Открыть</translation> - </message> - <message> - <location line="+3"/> + <location line="+6"/> <source>&Save File</source> <translation>&Сохранить</translation> </message> <message> - <location line="+3"/> - <source>Save File &As</source> - <translation>Сохранить &как</translation> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Открыть...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Сохранить &как...</translation> </message> <message> <location line="+3"/> - <source>Print</source> - <translation>Печать</translation> + <source>Print...</source> + <translation>Печать...</translation> </message> <message> <location line="+3"/> @@ -225,22 +220,22 @@ <message> <location line="+4"/> <source>&Next Breakpoint</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+3"/> <source>Pre&vious Breakpoint</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+3"/> <source>Toggle &Breakpoint</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+3"/> <source>&Remove All Breakpoints</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+3"/> @@ -253,22 +248,27 @@ <translation>&Раскомментировать</translation> </message> <message> - <location line="+6"/> - <source>Save File and Run</source> - <translation type="unfinished"></translation> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation>&Найти и заменить...</translation> </message> <message> - <location line="+57"/> + <location line="+3"/> + <source>Save File and Run</source> + <translation></translation> + </message> + <message> + <location line="+2"/> + <source>Go &to Line...</source> + <translation>&Перейти к строчке...</translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation>&Недавние файлы редактора</translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation>&Редактировать функцию</translation> </message> @@ -288,9 +288,19 @@ <translation>Закрыть другие файлы</translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation>&Настройки...</translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation>Настройки &стиля...</translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+5"/> @@ -308,12 +318,7 @@ <translation>&Документация по зарезервированному слову</translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation>&Найти и заменить</translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -340,32 +345,27 @@ для записи: %2.</translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation>&Перейти к строчке</translation> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation></translation> </message> <message> - <location line="+53"/> + <location line="+521"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation></translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation>&Настройки</translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation>Настройки &стиля</translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation>&Отладка</translation> </message> @@ -385,7 +385,7 @@ <message> <location line="+1"/> <source>Line number</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+71"/> @@ -455,12 +455,12 @@ <message> <location line="-975"/> <source>Line:</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+3"/> <source>Col:</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+1122"/> @@ -488,85 +488,97 @@ <message> <location line="+11"/> <source>Move up one directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation>Показывать директорию Octave</translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation>Перейти к текущей директории Octave</translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation>Установить директорию Octave</translation> + <translation></translation> </message> <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> - <location line="+3"/> - <source>Show Home directory</source> - <translation>Показывать домашнюю директорию</translation> - </message> - <message> - <location line="+12"/> - <source>Search directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <location line="+354"/> + <location line="+372"/> <source>Find Files ...</source> <translation>Найти файлы...</translation> </message> <message> - <location line="-350"/> - <location line="+363"/> + <location line="+13"/> <source>New File</source> <translation>Новый файл</translation> </message> <message> - <location line="-360"/> - <location line="+363"/> + <location line="+3"/> <source>New Directory</source> <translation>Новая директория</translation> </message> <message> <location line="-323"/> <source>Double-click a file to open it</source> - <translation type="unfinished"></translation> + <translation></translation> + </message> + <message> + <location line="-78"/> + <source>Show Octave directory</source> + <translation>Перейти к текущей директории Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation>Перейти к текущей директории Octave</translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation>Установить директорию Octave</translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation></translation> </message> <message> - <location line="+236"/> + <location line="+7"/> + <source>Show Home Directory</source> + <translation>Показывать домашнюю директорию</translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation></translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation>Найти файлы...</translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation>Новый файл...</translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation>Новая директория...</translation> + </message> + <message> + <location line="+276"/> <source>File size</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+8"/> <source>File type</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+8"/> <source>Date modified</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+8"/> <source>Show hidden</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+24"/> @@ -645,7 +657,7 @@ <message> <location line="+144"/> <source>Set directory of file browser</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+29"/> @@ -679,31 +691,31 @@ <message> <location filename="../src/welcome-wizard.cc" line="+194"/> <source>Enjoy!</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+4"/> <source>Previous</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+1"/> <source>Finish</source> - <translation type="unfinished">Завершить</translation> + <translation>Завершить</translation> </message> <message> <location line="+1"/> <source>Cancel</source> - <translation type="unfinished">Отмена</translation> + <translation>Отмена</translation> </message> <message> <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+21"/> @@ -719,7 +731,7 @@ <li>Open the documentation browser of the Octave GUI with the help menu</li> </ul> </body></html></source> - <translation type="unfinished"></translation> + <translation></translation> </message> </context> <context> @@ -747,7 +759,7 @@ <message> <location line="+1"/> <source>&Wrap while searching</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="+2"/> @@ -771,8 +783,8 @@ </message> <message> <location line="+2"/> - <source>&More</source> - <translation>&Больше</translation> + <source>&More...</source> + <translation>&Больше...</translation> </message> <message> <location line="+13"/> @@ -1041,7 +1053,7 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation type="unfinished"></translation> </message> @@ -1050,12 +1062,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation>Загрузить область переменных</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation>Об Octave</translation> @@ -1076,14 +1087,9 @@ <translation>Скрипт</translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation>Функция</translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> - <translation type="unfinished"></translation> + <translation></translation> </message> <message> <location line="-59"/> @@ -1122,12 +1128,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1212,7 +1217,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation>Загрузить область переменных...</translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation>Функция...</translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation type="unfinished"></translation> </message> @@ -1624,7 +1644,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> @@ -1689,12 +1714,7 @@ <translation>emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation>Командная строка</translation> </message>
--- a/libgui/languages/uk_UA.ts Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/languages/uk_UA.ts Mon Jan 13 10:48:49 2014 -0800 @@ -807,12 +807,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+28"/> - <source>The associated file editor tab has disappeared. It was likely closed by some means.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+227"/> + <location line="+255"/> <source>&%1 %2</source> <translation type="unfinished"></translation> </message> @@ -822,23 +817,23 @@ <translation type="unfinished">&Створити</translation> </message> <message> - <location line="+3"/> - <source>&Open File</source> - <translation type="unfinished">&Відкрити</translation> + <location line="+6"/> + <source>&Save File</source> + <translation type="unfinished">&Зберегти</translation> + </message> + <message> + <location line="-3"/> + <source>&Open File...</source> + <translation>&Відкрити...</translation> + </message> + <message> + <location line="+6"/> + <source>Save File &As...</source> + <translation>Зберегти &як...</translation> </message> <message> <location line="+3"/> - <source>&Save File</source> - <translation type="unfinished">&Зберегти</translation> - </message> - <message> - <location line="+3"/> - <source>Save File &As</source> - <translation type="unfinished">Зберегти &як</translation> - </message> - <message> - <location line="+3"/> - <source>Print</source> + <source>Print...</source> <translation type="unfinished"></translation> </message> <message> @@ -917,22 +912,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+6"/> + <location line="+3"/> + <source>&Find and Replace...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> <source>Save File and Run</source> <translation type="unfinished"></translation> </message> <message> - <location line="+57"/> + <location line="+2"/> + <source>Go &to Line...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+55"/> <source>&Recent Editor Files</source> <translation type="unfinished"></translation> </message> <message> - <location line="+5"/> - <source>New &Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+6"/> + <location line="+11"/> <source>&Edit Function</source> <translation type="unfinished"></translation> </message> @@ -952,7 +952,17 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+51"/> + <location line="+31"/> + <source>&Preferences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>&Styles Preferences...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+16"/> <source>Run &Selection</source> <translation type="unfinished"></translation> </message> @@ -972,12 +982,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-151"/> - <source>&Find and Replace</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-590"/> + <location line="-741"/> <source>Could not open file %1 for read: %2.</source> @@ -998,32 +1003,27 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+555"/> - <source>Go&to Line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+53"/> + <location line="+87"/> + <source>The associated file editor tab has disappeared.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+521"/> <source>&File</source> <translation type="unfinished">&Файл</translation> </message> <message> - <location line="+41"/> + <location line="+7"/> + <source>New &Function...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+34"/> <source>&Edit</source> <translation type="unfinished">&Правка</translation> </message> <message> - <location line="+22"/> - <source>&Preferences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> - <source>&Styles Preferences</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+30"/> <source>&Debug</source> <translation type="unfinished"></translation> </message> @@ -1141,55 +1141,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> - <source>Show octave directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Goto current octave directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+5"/> - <source>Set octave directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+2"/> - <source>Set octave directroy to current browser directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+17"/> <source>Actions on current directory</source> <translation type="unfinished"></translation> </message> <message> + <location line="+372"/> + <source>Find Files ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+13"/> + <source>New File</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+3"/> - <source>Show Home directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+12"/> - <source>Search directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+3"/> - <location line="+354"/> - <source>Find Files ...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-350"/> - <location line="+363"/> - <source>New File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-360"/> - <location line="+363"/> <source>New Directory</source> <translation type="unfinished"></translation> </message> @@ -1199,7 +1166,52 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+236"/> + <location line="-78"/> + <source>Show Octave directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Go to current Octave directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Set Octave directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+2"/> + <source>Set Octave directroy to current browser directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+7"/> + <source>Show Home Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+11"/> + <source>Search Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Find Files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>New File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>New Directory...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+276"/> <source>File size</source> <translation type="unfinished"></translation> </message> @@ -1348,7 +1360,7 @@ <location line="+7"/> <source><html><body> <p>We hope you find Octave to be a useful tool.</p> -<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels. +<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels. You can find more information about each of these by visiting <a href="http://octave.org/support.html">http://octave.org/support.html</a> (opens in external browser).</p> </body></html></source> <translation type="unfinished"></translation> @@ -1419,7 +1431,7 @@ </message> <message> <location line="+2"/> - <source>&More</source> + <source>&More...</source> <translation type="unfinished"></translation> </message> <message> @@ -1689,7 +1701,7 @@ <source><html><body> <p>You seem to be using the Octave graphical interface for the first time on this computer. Click 'Next' to create a configuration file and launch Octave.</p> -<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p> +<p>The configuration file is stored in<br>%1.</p> </body></html></source> <translation type="unfinished"></translation> </message> @@ -1698,12 +1710,11 @@ <name>main_window</name> <message> <location filename="../src/main-window.cc" line="-1693"/> - <location line="+1164"/> <source>Load Workspace</source> <translation type="unfinished">Завантажити область змінних</translation> </message> <message> - <location line="-522"/> + <location line="+642"/> <location line="+876"/> <source>About Octave</source> <translation type="unfinished">Про Octave</translation> @@ -1724,12 +1735,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Function</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+4"/> + <location line="+7"/> <source>Figure</source> <translation type="unfinished"></translation> </message> @@ -1770,12 +1776,11 @@ </message> <message> <location line="-1262"/> - <location line="+1181"/> <source>Save Workspace As</source> <translation type="unfinished"></translation> </message> <message> - <location line="-1057"/> + <location line="+124"/> <source>The release notes file '%1' is empty.</source> <translation type="unfinished"></translation> </message> @@ -1860,7 +1865,22 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+4"/> + <location line="-151"/> + <source>Load Workspace...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Save Workspace As...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+41"/> + <source>Function...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+111"/> <source>Step Out</source> <translation type="unfinished"></translation> </message> @@ -2270,7 +2290,12 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+132"/> + <location line="+24"/> + <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="+108"/> <source>Terminal Colors</source> <translation type="unfinished"></translation> </message> @@ -2335,12 +2360,7 @@ <translation type="unfinished">emacs</translation> </message> <message> - <location line="+36"/> - <source><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+31"/> + <location line="+67"/> <source>Terminal</source> <translation type="unfinished">Командний рядок</translation> </message>
--- a/libgui/qterminal/libqterminal/unix/kpty.cpp Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/qterminal/libqterminal/unix/kpty.cpp Mon Jan 13 10:48:49 2014 -0800 @@ -116,24 +116,24 @@ # define _NEW_TTY_CTRL #endif -#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) +#if defined(HAVE_TCGETATTR) +# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) +#elif defined(TIOCGETA) # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode) +#elif defined(TCGETS) +# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) #else -# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) -# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) -# else -# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) -# endif +# error No method available to get terminal attributes #endif -#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) +#if defined(HAVE_TCSETATTR) && defined(TCSANOW) +# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) +#elif defined(TIOCSETA) # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode) +#elif defined(TCSETS) +# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) #else -# if defined(_HPUX_SOURCE) || defined(__CYGWIN__) -# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) -# else -# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) -# endif +# error No method available to set terminal attributes #endif #include <QtCore> @@ -145,6 +145,14 @@ #define TTY_GROUP "tty" +#ifndef PATH_MAX +# ifdef MAXPATHLEN +# define PATH_MAX MAXPATHLEN +# else +# define PATH_MAX 1024 +# endif +#endif + /////////////////////// // private functions // ///////////////////////
--- a/libgui/src/files-dock-widget.cc Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/files-dock-widget.cc Mon Jan 13 10:48:49 2014 -0800 @@ -99,23 +99,23 @@ _sync_browser_directory_action = new QAction (QIcon (":/actions/icons/reload.png"), - tr ("Show octave directory"), _navigation_tool_bar); + tr ("Show Octave directory"), _navigation_tool_bar); _sync_browser_directory_action->setToolTip ( - tr ("Goto current octave directory")); + tr ("Go to current Octave directory")); _sync_browser_directory_action->setEnabled ("false"); _sync_octave_directory_action = new QAction (QIcon (":/actions/icons/ok.png"), - tr ("Set octave directory"), _navigation_tool_bar); + tr ("Set Octave directory"), _navigation_tool_bar); _sync_octave_directory_action->setToolTip ( - tr ("Set octave directroy to current browser directory")); + tr ("Set Octave directroy to current browser directory")); _sync_octave_directory_action->setEnabled ("false"); QToolButton * popdown_button = new QToolButton (); popdown_button->setToolTip (tr ("Actions on current directory")); QMenu * popdown_menu = new QMenu (); popdown_menu->addAction (QIcon (":/actions/icons/home.png"), - tr ("Show Home directory"), + tr ("Show Home Directory"), this, SLOT (popdownmenu_home (bool))); popdown_menu->addAction (_sync_browser_directory_action); popdown_menu->addAction (_sync_octave_directory_action); @@ -126,18 +126,19 @@ _navigation_tool_bar)); popdown_menu->addSeparator (); - popdown_menu->addAction (QIcon (":/actions/icons/search.png"), - tr ("Search directory"), + popdown_menu->addAction (QIcon (":/actions/icons/folder.png"), + tr ("Search Directory..."), this, SLOT (popdownmenu_search_dir (bool))); popdown_menu->addSeparator (); - popdown_menu->addAction ( tr ("Find Files ..."), - this, SLOT (popdownmenu_findfiles (bool))); + popdown_menu->addAction (QIcon (":/actions/icons/findf.png"), + tr ("Find Files..."), + this, SLOT (popdownmenu_findfiles (bool))); popdown_menu->addSeparator (); popdown_menu->addAction (QIcon (":/actions/icons/filenew.png"), - tr ("New File"), + tr ("New File..."), this, SLOT (popdownmenu_newfile (bool))); popdown_menu->addAction (QIcon (":/actions/icons/folder_new.png"), - tr ("New Directory"), + tr ("New Directory..."), this, SLOT (popdownmenu_newdir (bool))); _navigation_tool_bar->addWidget (_current_directory);
--- a/libgui/src/icons/icons_license Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/icons/icons_license Mon Jan 13 10:48:49 2014 -0800 @@ -1,7 +1,83 @@ -Icons license for: chat.png help_index.png terminal.png -jabber_protocol.png +======================================== +Icons created by the Octave developpers: +======================================== + +bp_next.png +bp_prev.png +bp_rm_all.png +bp_toggle.png +db_cont.png +db_step_in.png +db_step_out.png +db_step.png +db_stop.png +graphic_logo_DocumentationDockWidget.png +graphic_logo_FileEditor.png +graphic_logo_FilesDockWidget.png +graphic_logo_HistoryDockWidget.png +graphic_logo_NewsDockWidget.png +graphic_logo_ReleaseWidget.png +graphic_logo_TerminalDockWidget.png +graphic_logo_WorkspaceView.png +letter_logo_DocumentationDockWidget.png +letter_logo_FileEditor.png +letter_logo_FilesDockWidget.png +letter_logo_HistoryDockWidget.png +letter_logo_NewsDockWidget.png +letter_logo_ReleaseWidget.png +letter_logo_TerminalDockWidget.png +letter_logo_WorkspaceView.png +logo.png +widget-close.png +widget-dock.png +widget-undock.png +zoom-in.png +zoom-out.png + +======================================== +Icons taken from the Crystal Project: +======================================== -by http://www.everaldo.com/ on 17.07.2011: +artsbuilderexecute.png +configure.png +editcopy.png +editcut.png +editdelete.png +editpaste.png +fileclose.png +filenew.png +fileopen.png +fileprint.png +filesaveas.png +filesave.png +findf.png +find.png +folder_documents.png +folder_new.png +folder.png +gear.png +home.png +ok.png +redled.png +redo.png +reload.png +search.png +undo.png +up.png + derived icons from up.png: + arrow_down.png + arrow_left.png + arrow_right.png + arrow_up.png + bookmark.png +warning.png + + +License of the Crystal Project +======================================== + +by http://www.everaldo.com/ on 17.07.2011 (not more available) +by http://www.softicons.com/free-icons/system-icons/crystal-project-icons-by-everaldo-coelho on 12.01.2014 The Crystal Project are released under LGPL. GNU General Public License.
--- a/libgui/src/m-editor/file-editor.cc Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/m-editor/file-editor.cc Mon Jan 13 10:48:49 2014 -0800 @@ -471,7 +471,7 @@ // Create a NonModal message about error. QMessageBox *msgBox = new QMessageBox (QMessageBox::Critical, tr ("Octave Editor"), - tr ("The associated file editor tab has disappeared. It was likely closed by some means."), + tr ("The associated file editor tab has disappeared."), QMessageBox::Ok, 0); msgBox->setWindowModality (Qt::NonModal); @@ -881,17 +881,17 @@ QAction *new_action = new QAction (QIcon (":/actions/icons/filenew.png"), tr ("&New File"), _tool_bar); - QAction *open_action = new QAction (QIcon (":/actions/icons/fileopen.png"), - tr ("&Open File"), _tool_bar); + QAction *open_action = new QAction (QIcon (":/actions/icons/folder_documents.png"), + tr ("&Open File..."), _tool_bar); _save_action = new QAction (QIcon (":/actions/icons/filesave.png"), tr ("&Save File"), _tool_bar); _save_as_action = new QAction (QIcon (":/actions/icons/filesaveas.png"), - tr ("Save File &As"), _tool_bar); + tr ("Save File &As..."), _tool_bar); _print_action = new QAction ( QIcon (":/actions/icons/fileprint.png"), - tr ("Print"), _tool_bar); + tr ("Print..."), _tool_bar); _undo_action = new QAction (QIcon (":/actions/icons/undo.png"), tr ("&Undo"), _tool_bar); @@ -939,13 +939,13 @@ _uncomment_selection_action = new QAction (tr ("&Uncomment"), _tool_bar); - _find_action = new QAction (QIcon (":/actions/icons/search.png"), - tr ("&Find and Replace"), _tool_bar); + _find_action = new QAction (QIcon (":/actions/icons/find.png"), + tr ("&Find and Replace..."), _tool_bar); _run_action = new QAction (QIcon (":/actions/icons/artsbuilderexecute.png"), tr ("Save File and Run"), _tool_bar); - _goto_line_action = new QAction (tr ("Go&to Line"), _tool_bar); + _goto_line_action = new QAction (tr ("Go &to Line..."), _tool_bar); // the mru-list and an empty array of actions QSettings *settings = resource_manager::get_settings (); @@ -1005,7 +1005,7 @@ _mru_file_menu->addAction (_mru_file_actions[i]); fileMenu->addAction (new_action); - fileMenu->addAction (QIcon (), tr ("New &Function"), + fileMenu->addAction (QIcon (), tr ("New &Function..."), this, SLOT (request_new_function (bool))); fileMenu->addAction (open_action); fileMenu->addMenu (_mru_file_menu); @@ -1061,11 +1061,11 @@ editMenu->addSeparator (); _preferences_action = editMenu->addAction (QIcon (":/actions/icons/configure.png"), - tr ("&Preferences"), + tr ("&Preferences..."), this, SLOT (request_preferences (bool))); _styles_preferences_action = editMenu->addAction (QIcon (":/actions/icons/configure.png"), - tr ("&Styles Preferences"), + tr ("&Styles Preferences..."), this, SLOT (request_styles_preferences (bool))); _menu_bar->addMenu (editMenu);
--- a/libgui/src/m-editor/find-dialog.cc Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/m-editor/find-dialog.cc Mon Jan 13 10:48:49 2014 -0800 @@ -72,7 +72,7 @@ : QDialog (p) { setWindowTitle ("Find and Replace"); - setWindowIcon (QIcon(":/actions/icons/search.png")); + setWindowIcon (QIcon(":/actions/icons/find.png")); _search_label = new QLabel (tr ("Find &what:")); _search_line_edit = new QLineEdit; @@ -90,7 +90,7 @@ _replace_button = new QPushButton (tr ("&Replace")); _replace_all_button = new QPushButton (tr ("Replace &All")); - _more_button = new QPushButton (tr ("&More")); + _more_button = new QPushButton (tr ("&More...")); _more_button->setCheckable (true); _more_button->setAutoDefault (false);
--- a/libgui/src/main-window.cc Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/main-window.cc Mon Jan 13 10:48:49 2014 -0800 @@ -1363,7 +1363,7 @@ construct_new_menu (file_menu); _open_action - = file_menu->addAction (QIcon (":/actions/icons/fileopen.png"), + = file_menu->addAction (QIcon (":/actions/icons/folder_documents.png"), tr ("Open...")); _open_action->setShortcutContext (Qt::ApplicationShortcut); @@ -1375,10 +1375,10 @@ file_menu->addSeparator (); QAction *load_workspace_action - = file_menu->addAction (tr ("Load Workspace")); + = file_menu->addAction (tr ("Load Workspace...")); QAction *save_workspace_action - = file_menu->addAction (tr ("Save Workspace As")); + = file_menu->addAction (tr ("Save Workspace As...")); file_menu->addSeparator (); @@ -1419,7 +1419,7 @@ tr ("Script")); _new_script_action->setShortcutContext (Qt::ApplicationShortcut); - _new_function_action = new_menu->addAction (tr ("Function")); + _new_function_action = new_menu->addAction (tr ("Function...")); _new_function_action->setEnabled (true); _new_function_action->setShortcutContext (Qt::ApplicationShortcut); @@ -1983,7 +1983,7 @@ QIcon (":/actions/icons/up.png"), tr ("One directory up")); QAction *current_dir_search = _main_tool_bar->addAction ( - QIcon (":/actions/icons/search.png"), + QIcon (":/actions/icons/folder.png"), tr ("Browse directories")); connect (_current_directory_combo_box, SIGNAL (activated (QString)),
--- a/libgui/src/module.mk Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/module.mk Mon Jan 13 10:48:49 2014 -0800 @@ -15,7 +15,6 @@ src/icons/bp_prev.png \ src/icons/bp_rm_all.png \ src/icons/bp_toggle.png \ - src/icons/chat.png \ src/icons/configure.png \ src/icons/db_cont.png \ src/icons/db_step_in.png \ @@ -33,8 +32,11 @@ src/icons/filesaveas.png \ src/icons/filesave.png \ src/icons/find.png \ + src/icons/findf.png \ src/icons/gear.png \ + src/icons/folder_documents.png \ src/icons/folder_new.png \ + src/icons/folder.png \ src/icons/graphic_logo_DocumentationDockWidget.png \ src/icons/graphic_logo_FileEditor.png \ src/icons/graphic_logo_FilesDockWidget.png \ @@ -43,10 +45,8 @@ src/icons/graphic_logo_TerminalDockWidget.png \ src/icons/graphic_logo_WorkspaceView.png \ src/icons/graphic_logo_ReleaseWidget.png \ - src/icons/help_index.png \ src/icons/home.png \ src/icons/icons_license \ - src/icons/jabber_protocol.png \ src/icons/letter_logo_DocumentationDockWidget.png \ src/icons/letter_logo_FileEditor.png \ src/icons/letter_logo_FilesDockWidget.png \ @@ -57,14 +57,10 @@ src/icons/letter_logo_ReleaseWidget.png \ src/icons/logo.png \ src/icons/ok.png \ - src/icons/question.png \ src/icons/redled.png \ src/icons/redo.png \ src/icons/reload.png \ src/icons/search.png \ - src/icons/star.png \ - src/icons/stop.png \ - src/icons/terminal.png \ src/icons/undo.png \ src/icons/up.png \ src/icons/warning.png \
--- a/libgui/src/resource.qrc Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/resource.qrc Mon Jan 13 10:48:49 2014 -0800 @@ -10,6 +10,8 @@ <file>icons/fileopen.png</file> <file>icons/filesave.png</file> <file>icons/fileprint.png</file> + <file>icons/folder.png</file> + <file>icons/folder_documents.png</file> <file>icons/folder_new.png</file> <file>icons/home.png</file> <file>icons/ok.png</file> @@ -26,18 +28,12 @@ <file>icons/arrow_up.png</file> <file>icons/arrow_down.png</file> <file>icons/bookmark.png</file> - <file>icons/question.png</file> - <file>icons/star.png</file> - <file>icons/stop.png</file> <file>icons/zoom-in.png</file> <file>icons/zoom-out.png</file> <file>icons/find.png</file> + <file>icons/findf.png</file> <file>icons/gear.png</file> - <file>icons/chat.png</file> - <file>icons/help_index.png</file> - <file>icons/jabber_protocol.png</file> <file>icons/logo.png</file> - <file>icons/terminal.png</file> <file>icons/bp_toggle.png</file> <file>icons/bp_rm_all.png</file> <file>icons/bp_prev.png</file>
--- a/libgui/src/settings-dialog.ui Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/settings-dialog.ui Mon Jan 13 10:48:49 2014 -0800 @@ -911,7 +911,7 @@ <enum>QFrame::NoFrame</enum> </property> <property name="text"> - <string><html><head/><body><p>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</p></body></html></string> + <string><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></string> </property> <property name="scaledContents"> <bool>false</bool>
--- a/libgui/src/welcome-wizard.cc Mon Jan 13 10:48:05 2014 -0800 +++ b/libgui/src/welcome-wizard.cc Mon Jan 13 10:48:49 2014 -0800 @@ -60,7 +60,7 @@ (tr ("<html><body>\n" "<p>You seem to be using the Octave graphical interface for the first time on this computer.\n" "Click 'Next' to create a configuration file and launch Octave.</p>\n" - "<p>The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.</p>\n" + "<p>The configuration file is stored in<br>%1.</p>\n" "</body></html>"). arg (resource_manager::get_settings_file ())); message->setWordWrap (true); @@ -206,7 +206,7 @@ message->setText (tr ("<html><body>\n" "<p>We hope you find Octave to be a useful tool.</p>\n" - "<p>If you encounter problems, there are a number of ways to get help including commercial support options, a mailing list, a wiki, and other commnity-based support channels.\n" + "<p>If you encounter problems, there are a number of ways to get help, including commercial support options, a mailing list, a wiki, and other commnity-based support channels.\n" "You can find more information about each of these by visiting <a href=\"http://octave.org/support.html\">http://octave.org/support.html</a> (opens in external browser).</p>\n" "</body></html>")); message->setWordWrap (true);