# HG changeset patch # User Rik # Date 1389638929 28800 # Node ID f227bb47314fb6fcd5428bd6ac6df3bea407450b # Parent 7e297c293e4c4afd8f267111b37791ade9cde51f# Parent 975480e1be4bbfa3eaf736aed702291e93c80ec6 maint: Merge stable -> gui-release. diff -r 7e297c293e4c -r f227bb47314f configure.ac --- 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]) diff -r 7e297c293e4c -r f227bb47314f libgui/languages/be_BY.ts --- 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 @@ ужо адкрыты ў рэдактары - - The associated file editor tab has disappeared. It was likely closed by some means. - Асацыяваная картка рэдактара знікла. Выглядае, што яе з нейкай прычыны закрылі. - - - + &%1 %2 &%1 %2 @@ -1699,24 +1694,24 @@ &Новы файл - - &Open File - &Адкрыць файл + + &Save File + &Захаваць файл + + + + &Open File... + &Адкрыць файл... + + + + Save File &As... + Захаваць файл &як... - &Save File - &Захаваць файл - - - - Save File &As - Захаваць файл &як - - - - Print - Друк + Print... + Друк... @@ -1794,22 +1789,27 @@ &Раскаментаваць - + + &Find and Replace... + &Знайсці і замяніць... + + + Save File and Run Захаваць і выканаць файл - + + Go &to Line... + П&ерайсці да радка... + + + &Recent Editor Files &Ранейшыя файлы - - New &Function - Новая &функцыя - - - + &Edit Function &Змяніць функцыю @@ -1829,7 +1829,17 @@ Закрыць іншыя файлы - + + &Preferences... + &Настаўленні... + + + + &Styles Preferences... + &Настаўленні выгляду... + + + Run &Selection Выканаць &вылучанае @@ -1849,12 +1859,7 @@ &Дакументацыя па ключавым слове - - &Find and Replace - &Знайсці і замяніць - - - + Could not open file %1 for read: %2. @@ -1881,32 +1886,27 @@ на запіс: %2. - - Go&to Line - П&ерайсці да радка - - - + + The associated file editor tab has disappeared. + Асацыяваная картка рэдактара знікла. + + + &File &Файл - + + New &Function... + Новая &функцыя... + + + &Edit &Змяніць - - &Preferences - &Настаўленні - - - - &Styles Preferences - &Настаўленні выгляду - - - + &Debug &Адладка @@ -2032,55 +2032,22 @@ Перайсці каталогам вышэй - - Show octave directory - Перайсці да каталогу Octave - - - - Goto current octave directory - Перайсці да дзейнага каталога Octave - - - - Set octave directory - Задаць каталог Octave - - - - Set octave directroy to current browser directory - Зрабіць каталогам Octave дзейны каталог аглядніка - - - + Actions on current directory Дзеянні з дзейным каталогам + + Find Files ... + Шукаць файлы... + + + + New File + Новы файл + + - Show Home directory - Перайсці да хатняга каталогу - - - - Search directory - Шукаць каталог - - - - - Find Files ... - Шукаць файлы... - - - - - New File - Новы файл - - - - New Directory Новы каталог @@ -2090,7 +2057,52 @@ Двойчы пстрыкніце па файле для адкрыцця - + + Show Octave directory + Перайсці да каталогу Octave + + + + Go to current Octave directory + Перайсці да дзейнага каталога Octave + + + + Set Octave directory + Задаць каталог Octave + + + + Set Octave directroy to current browser directory + Зрабіць каталогам Octave дзейны каталог аглядніка + + + + Show Home Directory + Перайсці да хатняга каталогу + + + + Search Directory... + Шукаць каталог... + + + + Find Files... + Шукаць файлы... + + + + New File... + Новы файл... + + + + New Directory... + Новы каталог... + + + File size Памер файла @@ -2242,7 +2254,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> @@ -2328,8 +2340,8 @@ - &More - &Больш параметраў + &More... + &Больш параметраў... @@ -2598,12 +2610,12 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> Выглядае, што на гэтым кампутары вы выкарыстоўваеце графічны інтэрфэйс Octave упершыню. Націсніце 'Далей', каб запісаць файл канфігурацыі і запусціць Octave. -Файл канфігурацыі запісаны ў %1. Калі файл існуе, вы больш не пабачыце гэтае акенца падчас запуску Octave. +Файл канфігурацыі запісаны ў %1. </body></html> @@ -2611,12 +2623,11 @@ main_window - Load Workspace Загрузіць прастору зменных - + About Octave Пра Octave @@ -2637,12 +2648,7 @@ Новы сцэнар - - Function - Функцыя - - - + Figure Графік @@ -2683,12 +2689,11 @@ - Save Workspace As Захаваць прастору зменных як - + The release notes file '%1' is empty. Файл заўваг да выпуску '%1' пусты. @@ -2773,7 +2778,22 @@ Крок наперад - + + Load Workspace... + Загрузіць прастору зменных... + + + + Save Workspace As... + Захаваць прастору зменных як... + + + + Function... + Функцыя... + + + Step Out Крок назад @@ -3217,7 +3237,12 @@ Выгляд рэдактара - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Пазначце шрыфт, ягоны памер (як розніцу ад стандартнага памеру), стыль шрыфту (тоўсты, курсіўны, падкрэслены), колер тэксту і колер фону (для фону ружовы (255,0,255) азначае стандартны колер фону).</body></html> + + + Terminal Colors Колеры тэрміналу @@ -3282,12 +3307,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Пазначце шрыфт, ягоны памер (як розніцу ад стандартнага памеру), стыль шрыфту (тоўсты, курсіўны, падкрэслены), колер тэксту і колер фону (для фону ружовы (255,0,255) азначае стандартны колер фону)</body></html> - - - + Terminal Тэрмінал diff -r 7e297c293e4c -r f227bb47314f libgui/languages/de_DE.ts --- 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 - - The associated file editor tab has disappeared. It was likely closed by some means. - Der zugehörige Editor-Reiter ist nicht mehr vorhanden und wurde wahrscheinlich geschlossen. - - - + &%1 %2 &%1 %2 @@ -159,24 +154,24 @@ &Neue Datei - - &Open File - Datei &Öffnen - - - + &Save File Datei &speichern - - Save File &As - Datei speichern &als + + &Open File... + Datei &Öffnen... + + + + Save File &As... + Datei speichern &als... - Print - Drucken + Print... + Drucken... @@ -254,22 +249,27 @@ Kommentar &entfernen - + + &Find and Replace... + &Suchen und Ersetzen... + + + Save File and Run Datei speichern und Ausführen - + + Go &to Line... + &Gehe zu Zeile... + + + &Recent Editor Files &Zuletzt bearbeitete Dateien - - New &Function - Neue &Funktion - - - + &Edit Function Funktion b&earbeiten @@ -289,7 +289,17 @@ Andere Dokumente schließen - + + &Preferences... + &Einstellungen... + + + + &Styles Preferences... + &Stil-Einstellungen... + + + Run &Selection Markierten Quellcode au&sführen @@ -309,12 +319,7 @@ &Dokumentation zum Schlüsselwort - - &Find and Replace - &Suchen und Ersetzen - - - + Could not open file %1 for read: %2. @@ -343,32 +348,27 @@ %2. - - Go&to Line - &Gehe zu Zeile + + The associated file editor tab has disappeared. + Der zugehörige Editor-Reiter ist nicht mehr vorhanden. - + &File &Datei - + + New &Function... + Neue &Funktion... + + + &Edit &Bearbeiten - - &Preferences - &Einstellungen - - - - &Styles Preferences - &Stil-Einstellungen - - - + &Debug &Debuggen @@ -492,55 +492,22 @@ Ordern darüber anwählen - - Show octave directory - Aktuelles Octave Verzeichnis anzeigen - - - - Goto current octave directory - Zu aktuellem Octave Verezichnis gehen - - - - Set octave directory - Octave Verzeichnis setzen - - - - Set octave directroy to current browser directory - Setze Octave Verzeichnis zu aktuellem Browser Verzeichnis - - - + Actions on current directory Aktionen mit aktuellem Verzeichnis - - Show Home directory - Wechsle zum Heimatverzeichnis - - - - Search directory - Verzeichnis suchen - - - - + Find Files ... Dateien suchen ... - - + New File Neue Datei - - + New Directory Neues Verzeichnis @@ -550,7 +517,53 @@ Doppelklick auf eine Datei um diese zu öffnen - + + Show Octave directory + Aktuelles Octave Verzeichnis anzeigen + + + + Go to current Octave directory + Zum aktuellen Octave Verezichnis gehen + + + + Set Octave directory + Octave Verzeichnis setzen + + + + Set Octave directroy to current browser directory + Setze Octave Verzeichnis zu aktuellem Browser Verzeichnis + + + + Show Home Directory + Wechsle zum Heimatverzeichnis + + + + Search Directory... + Verzeichnis suchen... + + + + Find Files... + Dateien suchen... + Suche Dateien... + + + + New File... + Neue Datei... + + + + New Directory... + Neues Verzeichnis... + + + File size Dateigröße @@ -703,7 +716,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> @@ -789,8 +802,8 @@ - &More - &Mehr + &More... + &Mehr... @@ -1059,12 +1072,12 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> 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. -Die Konfigurationsdatei wird in %1 gespeichert. Falls diese Datei existiert, wird dieser Dialog nicht mehr angezeigt. +Die Konfigurationsdatei wird in %1 gespeichert. </body></html> @@ -1072,12 +1085,11 @@ main_window - Load Workspace Lade Arbeitsumgebung - + About Octave Über Octave @@ -1098,12 +1110,7 @@ Skript - - Function - Funktion - - - + Figure Abbildung @@ -1144,12 +1151,11 @@ - Save Workspace As Arbeitsumgebung speichern als - + The release notes file '%1' is empty. Die Datei '%1' mit Versionshinweisen ist leer. @@ -1234,7 +1240,22 @@ Hineinspringen - + + Load Workspace... + Lade Arbeitsumgebung... + + + + Save Workspace As... + Arbeitsumgebung speichern als... + + + + Function... + Funktion... + + + Step Out Herausspringen @@ -1675,7 +1696,12 @@ Editor Stile - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Auswahl von Schrift, Schriftgröße (als Differenz von der Standardgröße), Schriftstil (fett, kursiv, unterstrichen), Text- und Hintergrundfarbe (für den Hintergrund ist die Farbe Pink (255,0,255) ein Platzhalter für die Standardfarbe)</body></html> + + + Terminal Colors Farben des Befehlsfensters @@ -1740,12 +1766,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Auswahl von Schrift, Schriftgröße (als Differenz von der Standardgröße), Schriftstil (fett, kursiv, unterstrichen), Text- und Hintergrundfarbe (für den Hintergrund ist die Farbe Pink (255,0,255) ein Platzhalter für die Standardfarbe)</body></html> - - - + Terminal Befehlsfenster diff -r 7e297c293e4c -r f227bb47314f libgui/languages/en_US.ts --- 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 @@ - - The associated file editor tab has disappeared. It was likely closed by some means. - - - - + &%1 %2 @@ -156,23 +151,23 @@ - - &Open File + + &Save File + + + + + &Open File... + + + + + Save File &As... - &Save File - - - - - Save File &As - - - - - Print + Print... @@ -251,22 +246,27 @@ - + + &Find and Replace... + + + + Save File and Run - + + Go &to Line... + + + + &Recent Editor Files - - New &Function - - - - + &Edit Function @@ -286,7 +286,17 @@ - + + &Preferences... + + + + + &Styles Preferences... + + + + Run &Selection @@ -306,12 +316,7 @@ - - &Find and Replace - - - - + Could not open file %1 for read: %2. @@ -332,32 +337,27 @@ - - Go&to Line + + The associated file editor tab has disappeared. - + &File - + + New &Function... + + + + &Edit - - &Preferences - - - - - &Styles Preferences - - - - + &Debug @@ -475,55 +475,22 @@ - - Show octave directory - - - - - Goto current octave directory - - - - - Set octave directory - - - - - Set octave directroy to current browser directory - - - - + Actions on current directory - - Show Home directory + + Find Files ... - - Search directory + + New File - - Find Files ... - - - - - - New File - - - - - New Directory @@ -533,7 +500,52 @@ - + + Show Octave directory + + + + + Go to current Octave directory + + + + + Set Octave directory + + + + + Set Octave directroy to current browser directory + + + + + Show Home Directory + + + + + Search Directory... + + + + + Find Files... + + + + + New File... + + + + + New Directory... + + + + File size @@ -682,7 +694,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> @@ -753,7 +765,7 @@ - &More + &More... @@ -1023,7 +1035,7 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> @@ -1032,12 +1044,11 @@ main_window - Load Workspace - + About Octave @@ -1058,12 +1069,7 @@ - - Function - - - - + Figure @@ -1104,12 +1110,11 @@ - Save Workspace As - + The release notes file '%1' is empty. @@ -1194,7 +1199,22 @@ - + + Load Workspace... + + + + + Save Workspace As... + + + + + Function... + + + + Step Out @@ -1604,7 +1624,12 @@ - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + + + + Terminal Colors @@ -1669,12 +1694,7 @@ - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - - - - + Terminal diff -r 7e297c293e4c -r f227bb47314f libgui/languages/es_ES.ts --- 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 @@ - - The associated file editor tab has disappeared. It was likely closed by some means. - La pestaña para la edición del archivo ha desaparecido. Es probable que se haya cerrado por algún medio. - - - + &%1 %2 &%1 %2 @@ -149,24 +144,24 @@ &Nuevo archivo - - &Open File - &Abrir archivo - - - + &Save File &Guardar archivo - - Save File &As - Guardar archivo &como + + &Open File... + &Abrir archivo... + + + + Save File &As... + Guardar archivo &como... - Print - Imprimir + Print... + Imprimir... @@ -244,22 +239,27 @@ &Eliminar comentario - + + &Find and Replace... + &Buscar y reemplazar... + + + Save File and Run Guardar archivo y ejecutar - + + Go &to Line... + &Ir a línea... + + + &Recent Editor Files Archivos &recientes - - New &Function - Nueva &función - - - + &Edit Function &Editar función @@ -279,7 +279,17 @@ Cerrar otros archivos - + + &Preferences... + &Preferencias... + + + + &Styles Preferences... + Preferencias de &estilos... + + + Run &Selection Ejecutar &selección @@ -299,12 +309,7 @@ &Documentación de palabras clave - - &Find and Replace - &Buscar y reemplazar - - - + Could not open file %1 for read: %2. @@ -332,32 +337,27 @@ ¡Archivo no guardado! Un archivo con el nombre seleccionado\n%1\nya se encuentra abierto en el editor - - Go&to Line - &Ir a línea + + The associated file editor tab has disappeared. + La pestaña para la edición del archivo ha desaparecido. - + &File &Archivo - + + New &Function... + Nueva &función... + + + &Edit &Editar - - &Preferences - &Preferencias - - - - &Styles Preferences - Preferencias de &estilos - - - + &Debug &Depurar @@ -475,55 +475,22 @@ Subir un directorio - - Show octave directory - Mostrar el directorio de Octave - - - - Goto current octave directory - Ir al directorio actual de Octave - - - - Set octave directory - Seleccionar el directorio de Octave - - - - Set octave directroy to current browser directory - Asignar el directorio de Octave como directorio actual del explorador - - - + Actions on current directory Acciones en el directorio actual - - Show Home directory - Mostrar el directorio de inicio - - - - Search directory - Buscar directorio - - - - + Find Files ... Buscar archivos ... - - + New File Nuevo archivo - - + New Directory Nuevo directorio @@ -533,7 +500,52 @@ Pulse dos veces en un archivo para abrirlo - + + Show Octave directory + Mostrar el directorio de Octave + + + + Go to current Octave directory + Ir al directorio actual de Octave + + + + Set Octave directory + Seleccionar el directorio de Octave + + + + Set Octave directroy to current browser directory + Asignar el directorio de Octave como directorio actual del explorador + + + + Show Home Directory + Mostrar el directorio de inicio + + + + Search Directory... + Buscar directorio... + + + + Find Files... + Buscar archivos... + + + + New File... + Nuevo archivo... + + + + New Directory... + Nuevo directorio... + + + File size Tamaño del archivo @@ -684,7 +696,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> @@ -773,8 +785,8 @@ - &More - &Más + &More... + &Más... @@ -1044,27 +1056,24 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> 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. -El archivo de configuración se guardará en %1. Si el archivo ya existe, no verá este diálogo cuando Octave se inicie. -</body></html> - - +El archivo de configuración se guardará en %1. +</body></html> main_window - Load Workspace Cargar espacio de trabajo - + About Octave Acerca de Octave @@ -1086,12 +1095,7 @@ Guión - - Function - Función - - - + Figure Figura @@ -1132,12 +1136,11 @@ - Save Workspace As Guardar espacio de trabajo como - + The release notes file '%1' is empty. El archivo de las notas de versión %1 está vacío. @@ -1222,7 +1225,22 @@ Iniciar - + + Load Workspace... + Cargar espacio de trabajo... + + + + Save Workspace As... + Guardar espacio de trabajo como... + + + + Function... + Función... + + + Step Out Terminar @@ -1667,7 +1685,12 @@ Estilos del editor - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Seleccione fuente, tamaño de fuente (como diferencia con el tamaño por defecto), estilo de fuente (negrita, cursiva, subrayada), color de texto y color de fondo(para este último, el color rosa (255,0,255) es un marcador de posición para el color de fondo por defecto).</body></html> + + + Terminal Colors En es_ES, terminal suele ser masculino, aunque en el español iberoamericano suele adoptarse el femenino Colores del terminal @@ -1728,12 +1751,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Seleccione fuente, tamaño de fuente (como diferencia con el tamaño por defecto), estilo de fuente (negrita, cursiva, subrayada), color de texto y color de fondo(para este último, el color rosa (255,0,255) es un marcador de posición para el color de fondo por defecto)</body></html> - - - + Terminal Terminal diff -r 7e297c293e4c -r f227bb47314f libgui/languages/fr_FR.ts --- 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 - - The associated file editor tab has disappeared. It was likely closed by some means. - L'onglet éditeur de fichier associé a disparu. Il a probablement été fermé par un moyen quelconque. - - - + &%1 %2 &%1 %2 @@ -158,24 +153,24 @@ &Nouveau - - &Open File - &Ouvrir - - - + &Save File &Enregistrer - - Save File &As - Enregistrer &sous + + &Open File... + &Ouvrir... + + + + Save File &As... + Enregistrer &sous... - Print - Imprimer + Print... + Imprimer... @@ -253,22 +248,27 @@ &Décommenter - + + &Find and Replace... + &Rechercher et remplacer... + + + Save File and Run Enregistrer et Exécuter - + + Go &to Line... + &Aller à la ligne... + + + &Recent Editor Files Fichiers &récents - - New &Function - Nouvelle &Fonction - - - + &Edit Function &Editer Fonction @@ -288,7 +288,17 @@ Fermer les autres fichiers - + + &Preferences... + &Préférences... + + + + &Styles Preferences... + Préférences de &Style... + + + Run &Selection Exécuter la &Selection @@ -308,12 +318,7 @@ &Documentation sur le mot de clés - - &Find and Replace - &Rechercher et remplacer - - - + Could not open file %1 for read: %2. @@ -340,32 +345,27 @@ pour écrire : %2. - - Go&to Line - &Aller à la ligne + + The associated file editor tab has disappeared. + L'onglet éditeur de fichier associé a disparu. - + &File &Fichier - + + New &Function... + Nouvelle &Fonction... + + + &Edit &Editer - - &Preferences - &Préférences - - - - &Styles Preferences - Préférences de &Style - - - + &Debug &Déboguer @@ -491,55 +491,22 @@ Remonter d'un répertoire - - Show octave directory - Revenir au répertoire d'Octave - - - - Goto current octave directory - Aller au répertoire courant d'Octave - - - - Set octave directory - Définir le répertoire d'Octave - - - - Set octave directroy to current browser directory - Définir le répertoire du navigateur comme répertoire d'Octave - - - + Actions on current directory Actions sur le répertoire courant - - Show Home directory - Aller au répertoire personnel - - - - Search directory - Rechercher dans le répertoire - - - - + Find Files ... Rechercher des fichiers... - - + New File Nouveau fichier - - + New Directory Nouveau répertoire @@ -549,7 +516,52 @@ Double-cliquer sur un fichier pour l'ouvrir - + + Show Octave directory + Revenir au répertoire d'Octave + + + + Go to current Octave directory + Aller au répertoire courant d'Octave + + + + Set Octave directory + Définir le répertoire d'Octave + + + + Set Octave directroy to current browser directory + Définir le répertoire du navigateur comme répertoire d'Octave + + + + Show Home Directory + Aller au répertoire personnel + + + + Search Directory... + Rechercher dans le répertoire... + + + + Find Files... + Rechercher des fichiers... + + + + New File... + Nouveau fichier... + + + + New Directory... + Nouveau répertoire... + + + File size Taille du fichier @@ -703,7 +715,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> @@ -789,8 +801,8 @@ - &More - &Plus d'options + &More... + &Plus d'options... @@ -1059,12 +1071,12 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> 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. -Le fichier de configuration est enregistré dans %1. Si ce fichier existe vous ne verrez plus ce dialogue au démarrage d'Octave. +Le fichier de configuration est enregistré dans %1. </body></html> @@ -1072,12 +1084,11 @@ main_window - Load Workspace Charger l'espace de travail - + About Octave À propos d'Octave @@ -1098,12 +1109,7 @@ Fichier de script - - Function - Fonction - - - + Figure Figure @@ -1144,12 +1150,11 @@ - Save Workspace As Enregistrer l'espace de travail sous - + The release notes file '%1' is empty. Le fichier de notes de version '%1' est vide. @@ -1234,7 +1239,22 @@ Avancer d'un pas avec entrée - + + Load Workspace... + Charger l'espace de travail... + + + + Save Workspace As... + Enregistrer l'espace de travail sous... + + + + Function... + Fonction... + + + Step Out Exécuter jusqu'à l'instruction de retour @@ -1680,7 +1700,12 @@ Affichage - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Sélectionnez la police, sa taille (différence par rapport à la taille par défaut), son style (gras, italique, souligné), la couleur du texte et de l'arrière plan (pour ce dernier, le rose (255,0,255) fait figure de défaut).</body></html> + + + Terminal Colors Couleurs de la fenetre de commandes @@ -1740,12 +1765,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Sélectionnez la police, sa taille (différence par rapport à la taille par défaut), son style (gras, italique, souligné), la couleur du texte et de l'arrière plan (pour ce dernier, le rose (255,0,255) fait figure de défaut)</body></html> - - - + Terminal Terminal diff -r 7e297c293e4c -r f227bb47314f libgui/languages/nl_NL.ts --- 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 - - The associated file editor tab has disappeared. It was likely closed by some means. - Het bijbehorende tabblad in de editor is verdwenen. Het is waarschijnlijk op een of andere manier gesloten. - - - + &%1 %2 @@ -1698,24 +1693,24 @@ &Nieuw Bestand - - &Open File - &Openen + + &Save File + Op&slaan + + + + &Open File... + &Openen... + + + + Save File &As... + Opslaan &als... - &Save File - Op&slaan - - - - Save File &As - Opslaan &als - - - - Print - Afdrukken + Print... + Afdrukken... @@ -1793,22 +1788,27 @@ Zet om naar code - + + &Find and Replace... + Zoek en Vervang... + + + Save File and Run Sla Bestand op en Voer uit - + + Go &to Line... + Ga naar regel... + + + &Recent Editor Files &Recent geopend - - New &Function - Nieuwe &Functie - - - + &Edit Function Pas Functie Aan @@ -1828,7 +1828,17 @@ Andere bestanden sluiten - + + &Preferences... + Voorkeuren... + + + + &Styles Preferences... + &Stijlvoorkeuren... + + + Run &Selection Geselecteerde tekst uitvoeren @@ -1848,12 +1858,7 @@ &Documentatie bij sleutelwoord - - &Find and Replace - Zoek en Vervang - - - + Could not open file %1 for read: %2. @@ -1880,32 +1885,27 @@ niet openen om te schrijven: %2. - - Go&to Line - Ga naar regel - - - + + The associated file editor tab has disappeared. + Het bijbehorende tabblad in de editor is verdwenen. + + + &File Bestand - + + New &Function... + Nieuwe &Functie... + + + &Edit B&ewerken - - &Preferences - Voorkeuren - - - - &Styles Preferences - &Stijlvoorkeuren - - - + &Debug &Debuggen @@ -2030,55 +2030,22 @@ Eén mapniveau omhoog - - Show octave directory - Laat octave map zien - - - - Goto current octave directory - Ga naar huidige octave map - - - - Set octave directory - Stel octave map in - - - - Set octave directroy to current browser directory - Maak huidige browser map de Octave map - - - + Actions on current directory Bewerkingen op huidige map + + Find Files ... + Zoek bestanden ... + + + + New File + Nieuw bestand + + - Show Home directory - Laat home map zien - - - - Search directory - Zoek in map - - - - - Find Files ... - Zoek bestanden ... - - - - - New File - Nieuw bestand - - - - New Directory Nieuwe map @@ -2088,7 +2055,52 @@ Dubbelklik een bestand om te openen - + + Show Octave directory + Laat Octave map zien + + + + Go to current Octave directory + Ga naar huidige Octave map + + + + Set Octave directory + Stel Octave map in + + + + Set Octave directroy to current browser directory + Maak huidige browser map de Octave map + + + + Show Home Directory + Laat home map zien + + + + Search Directory... + Zoek in map... + + + + Find Files... + Zoek bestanden... + + + + New File... + Nieuw bestand... + + + + New Directory... + Nieuwe map... + + + File size Bestandsgrootte @@ -2242,7 +2254,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> @@ -2329,7 +2341,7 @@ - &More + &More... &Meer @@ -2599,12 +2611,12 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> 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. -Het configuratiebestand is opgeslagen in %1. Als dat bestand bestaat, zal je dit dialoogscherm niet zien wanneer Octave start. +Het configuratiebestand is opgeslagen in %1. </body></html> @@ -2612,12 +2624,11 @@ main_window - Load Workspace Werkruimte laden - + About Octave Over Octave @@ -2638,12 +2649,7 @@ Script - - Function - Functie - - - + Figure Figuur @@ -2684,12 +2690,11 @@ - Save Workspace As Sla Werkruimte Op Als - + The release notes file '%1' is empty. Bestand met Release Notes '%1' is leeg. @@ -2774,7 +2779,22 @@ Stap In - + + Load Workspace... + Werkruimte laden... + + + + Save Workspace As... + Sla Werkruimte Op Als... + + + + Function... + Functie... + + + Step Out Stap Uit @@ -3220,7 +3240,12 @@ Editorstijlen - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Selecteer font, font grootte (als een verschil van de standaard grootte), font stijl (dik, schuin, onderstreept), tekstkleur en achtergrondkleur (wat betreft de laatste, de kleur roze (255,0,255) is een plaatsvervanger voor de standaard achtergrondkleur).</body></html> + + + Terminal Colors Terminalkleuren @@ -3280,12 +3305,7 @@ - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Selecteer font, font grootte (als een verschil van de standaard grootte), font stijl (dik, schuin, onderstreept), tekstkleur en achtergrondkleur (wat betreft de laatste, de kleur roze (255,0,255) is een plaatsvervanger voor de standaard achtergrondkleur)</body></html> - - - + Terminal Opdrachtvenster diff -r 7e297c293e4c -r f227bb47314f libgui/languages/pt_BR.ts --- 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 @@ Arquivo não foi salvo! Um arquivo com o nome selecionado %1 já está aberto no editor - - The associated file editor tab has disappeared. It was likely closed by some means. - A aba do editor associada ao arquivo desapareceu. - - - + &%1 %2 &%1 %2 @@ -156,23 +151,23 @@ &Novo Script - - &Open File - &Abrir Arquivo - - - + &Save File &Salvar Arquivo - - Save File &As + + &Open File... + &Abrir Arquivo... + + + + Save File &As... Salvar Arquivo &Como... - Print + Print... Imprimir... @@ -251,22 +246,27 @@ &Descomentar - + + &Find and Replace... + &Buscar e Substituir... + + + Save File and Run Salvar Arquivo e Executá-lo - + + Go &to Line... + Vá para &Linha... + + + &Recent Editor Files Arquivos &Recentes - - New &Function - Nova &Função - - - + &Edit Function &Editar Função @@ -286,7 +286,17 @@ Fechar Demais Arquivos - + + &Preferences... + &Preferências... + + + + &Styles Preferences... + Preferências de &Estilo... + + + Run &Selection Executar &Seleção @@ -306,12 +316,7 @@ &Documentação da Palavra-chave - - &Find and Replace - &Buscar e Substituir - - - + Could not open file %1 for read: %2. @@ -338,32 +343,27 @@ para escrita: %2. - - Go&to Line - Vá para &Linha + + The associated file editor tab has disappeared. + A aba do editor associada ao arquivo desapareceu. - + &File &Arquivo - + + New &Function... + Nova &Função... + + + &Edit &Editar - - &Preferences - &Preferências - - - - &Styles Preferences - Preferências de &Estilo - - - + &Debug &Depurar @@ -489,55 +489,22 @@ Subir um nível de diretório - - Show octave directory - Exibir o diretório do Octave - - - - Goto current octave directory - Vá para o diretório atual do Octave - - - - Set octave directory - Escolher o diretório do Octave - - - - Set octave directroy to current browser directory - Definir diretório do Octave igual ao diretório atual no navegador - - - + Actions on current directory Ações no diretório atual - - Show Home directory - Exibir diretório pessoal - - - - Search directory - Buscar no diretório - - - - + Find Files ... Buscar Arquivos... - - + New File Novo Arquivo - - + New Directory Novo Diretório @@ -547,7 +514,52 @@ Clique duas vezes em um arquivo para abrí-lo - + + Show Octave directory + Exibir o diretório do Octave + + + + Go to current Octave directory + Vá para o diretório atual do Octave + + + + Set Octave directory + Definir o diretório do Octave + + + + Set Octave directroy to current browser directory + Definir diretório do Octave igual ao diretório atual no navegador + + + + Show Home Directory + Exibir diretório pessoal + + + + Search Directory... + Buscar no diretório... + + + + Find Files... + Buscar Arquivos... + + + + New File... + Novo Arquivo... + + + + New Directory... + Novo Diretório... + + + File size Tamanho do arquivo @@ -699,13 +711,13 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> -Esperamos que você ache o Octave uma ferramenta útil. -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). +Esperamos que o Octave seja uma ferramenta últil. +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). </body></html> @@ -785,8 +797,8 @@ - &More - &Mais opções... + &More... + &Mais... @@ -1055,12 +1067,12 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> 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. -O arquivo de configuração é armazenado em %1. Se o arquivo existir, você não verá esta mensagem quando o Octave iniciar novamente. +Clique em próximo para criar um arquivo de configuração e lançar o Octave. +O arquivo de configuração é armazenado em %1. </body></html> @@ -1068,12 +1080,11 @@ main_window - Load Workspace Carregar Ambiente de Trabalho... - + About Octave Sobre o Octave @@ -1094,12 +1105,7 @@ Script - - Function - Função - - - + Figure Figura @@ -1140,12 +1146,11 @@ - Save Workspace As Salvar Ambiente de Trabalho Como... - + The release notes file '%1' is empty. O arquivo de notas da versão '%1' está vazio. @@ -1230,7 +1235,22 @@ Passo adentro - + + Load Workspace... + Carregar ambiente de trabalho... + + + + Save Workspace As... + Salvar Ambiente de Trabalho Como... + + + + Function... + Função... + + + Step Out Passo afora @@ -1676,7 +1696,12 @@ Apresentação - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Selecionar fonte, tamanho da fonte (como uma diferença do tamanho padrão), estilo da fonte (negrito, itálico, sublinhado), cor de texto e cor de fundo (a cor rosa (255,0,255) é a cor de fundo padrão).</body></html> + + + Terminal Colors Cores do Terminal @@ -1736,12 +1761,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Selecionar fonte, tamanho da fonte (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).</body></html> - - - + Terminal Terminal diff -r 7e297c293e4c -r f227bb47314f libgui/languages/pt_PT.ts --- 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 - - The associated file editor tab has disappeared. It was likely closed by some means. - A aba do editor associada ao ficheiro desapareceu. Foi provavelmente fechada de alguma maneira. - - - + &%1 %2 &%1 %2 @@ -825,24 +820,24 @@ &Novo Ficheiro - - &Open File - &Abrir Ficheiro + + &Save File + &Guardar Ficheiro + + + + &Open File... + &Abrir Ficheiro... + + + + Save File &As... + Guardar Ficheiro &Como... - &Save File - &Guardar Ficheiro - - - - Save File &As - Guardar Ficheiro &Como - - - - Print - Imprimir + Print... + Imprimir... @@ -920,22 +915,27 @@ &Descomentar - + + &Find and Replace... + &Buscar e Substituir... + + + Save File and Run Gravar ficheiro e executar - + + Go &to Line... + Ir para &Linha... + + + &Recent Editor Files Ficheiros &recentes - - New &Function - Nova função - - - + &Edit Function &Editar Função @@ -955,7 +955,17 @@ Fechar os Outros Ficheiros - + + &Preferences... + &Preferências... + + + + &Styles Preferences... + Preferências de &Estilo... + + + Run &Selection Executar &Selecção @@ -975,12 +985,7 @@ &Documentação da Palavra-chave - - &Find and Replace - &Buscar e Substituir - - - + Could not open file %1 for read: %2. @@ -1007,32 +1012,27 @@ para escrita: %2. - - Go&to Line - Ir para &Linha - - - + + The associated file editor tab has disappeared. + A aba do editor associada ao ficheiro desapareceu. + + + &File &Ficheiro - + + New &Function... + Nova &função + + + &Edit &Editar - - &Preferences - &Preferências - - - - &Styles Preferences - Preferências de &Estilo - - - + &Debug &Depurar @@ -1158,55 +1158,22 @@ Subir um nível de directório - - Show octave directory - Mostrar o directório actual do Octave - - - - Goto current octave directory - Ir para o directório actual do Octave - - - - Set octave directory - Definir o directório actual do Octave - - - - Set octave directroy to current browser directory - Definir o directório actual do Octave para o directório actual do navegador - - - + Actions on current directory Acções no directório actual + + Find Files ... + Procurar Ficheiros... + + + + New File + Novo Ficheiro + + - Show Home directory - Mostrar directório pessoal - - - - Search directory - Procurar no directório - - - - - Find Files ... - Procurar Ficheiros... - - - - - New File - Novo Ficheiro - - - - New Directory Novo Directório @@ -1216,7 +1183,52 @@ Clicar duas vezes num ficheiro para o abrir - + + Show Octave directory + Mostrar o directório actual do Octave + + + + Go to current Octave directory + Ir para o directório actual do Octave + + + + Set Octave directory + Definir o directório actual do Octave + + + + Set Octave directroy to current browser directory + Definir o directório actual do Octave para o directório actual do navegador + + + + Show Home Directory + Mostrar directório pessoal + + + + Search Directory... + Procurar no directório... + + + + Find Files... + Encontrar Ficheiros... + + + + New File... + Novo Ficheiro... + + + + New Directory... + Novo Directório... + + + File size Tamanho de ficheiro @@ -1370,7 +1382,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> <html><body> @@ -1456,8 +1468,8 @@ - &More - &Mais + &More... + &Mais... @@ -1726,12 +1738,12 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> <html><body> 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. -O ficheiro de configuração é gravado em in %1. Se esse ficheiro existir, este diálogo não volta a aparecer ao iniciar Octave.. +O ficheiro de configuração é gravado em in %1. </body></html> @@ -1739,12 +1751,11 @@ main_window - Load Workspace Carregar ambiente de trabalho - + About Octave Sobre o Octave @@ -1765,12 +1776,7 @@ Script - - Function - Função - - - + Figure Figura @@ -1811,12 +1817,11 @@ - Save Workspace As Guardar Ambiente de Trabalho como - + The release notes file '%1' is empty. O ficheiro de notas da versão '%1' está vazio. @@ -1898,12 +1903,27 @@ Step In - - - - + + + + + Load Workspace... + Carregar ambiente de trabalho... + + + + Save Workspace As... + Guardar Ambiente de Trabalho como... + + + + Function... + Função... + + + Step Out - + @@ -2347,7 +2367,12 @@ Estilos do Editor - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + <html><head/><body>Seleccionar tipo de letra, tamanho (como diferença para o tamanho padrão), decoração (negrito, itálico, sublinhado), cor do texto e cor do fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão).</body></html> + + + Terminal Colors Cores do Terminal @@ -2407,12 +2432,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - <html><head/><body>Seleccionar tipo de letra, tamanho (como diferença para o tamanho padrão), decoração (negrito, itálico, sublinhado), cor do texto e cor do fundo de tela (para o último, a cor rosa (255,0,255) é sinônimo da cor de fundo padrão)</body></html> - - - + Terminal Terminal diff -r 7e297c293e4c -r f227bb47314f libgui/languages/ru_RU.ts --- 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 @@ уже открыт в редакторе - - The associated file editor tab has disappeared. It was likely closed by some means. - - - - + &%1 %2 &%1 %2 @@ -158,24 +153,24 @@ Созд&ать - - &Open File - &Открыть - - - + &Save File &Сохранить - - Save File &As - Сохранить &как + + &Open File... + &Открыть... + + + + Save File &As... + Сохранить &как... - Print - Печать + Print... + Печать... @@ -225,22 +220,22 @@ &Next Breakpoint - + Pre&vious Breakpoint - + Toggle &Breakpoint - + &Remove All Breakpoints - + @@ -253,22 +248,27 @@ &Раскомментировать - - Save File and Run - + + &Find and Replace... + &Найти и заменить... - + + Save File and Run + + + + + Go &to Line... + &Перейти к строчке... + + + &Recent Editor Files &Недавние файлы редактора - - New &Function - - - - + &Edit Function &Редактировать функцию @@ -288,9 +288,19 @@ Закрыть другие файлы - + + &Preferences... + &Настройки... + + + + &Styles Preferences... + Настройки &стиля... + + + Run &Selection - + @@ -308,12 +318,7 @@ &Документация по зарезервированному слову - - &Find and Replace - &Найти и заменить - - - + Could not open file %1 for read: %2. @@ -340,32 +345,27 @@ для записи: %2. - - Go&to Line - &Перейти к строчке + + The associated file editor tab has disappeared. + - + &File &Файл - + + New &Function... + + + + &Edit &Правка - - &Preferences - &Настройки - - - - &Styles Preferences - Настройки &стиля - - - + &Debug &Отладка @@ -385,7 +385,7 @@ Line number - + @@ -455,12 +455,12 @@ Line: - + Col: - + @@ -488,85 +488,97 @@ Move up one directory - - - - - Show octave directory - Показывать директорию Octave - - - - Goto current octave directory - Перейти к текущей директории Octave - - - - Set octave directory - Установить директорию Octave + - - Set octave directroy to current browser directory - - - - + Actions on current directory - + - - Show Home directory - Показывать домашнюю директорию - - - - Search directory - - - - - + Find Files ... Найти файлы... - - + New File Новый файл - - + New Directory Новая директория Double-click a file to open it - + + + + + Show Octave directory + Перейти к текущей директории Octave + + + + Go to current Octave directory + Перейти к текущей директории Octave + + + + Set Octave directory + Установить директорию Octave + + + + Set Octave directroy to current browser directory + - + + Show Home Directory + Показывать домашнюю директорию + + + + Search Directory... + + + + + Find Files... + Найти файлы... + + + + New File... + Новый файл... + + + + New Directory... + Новая директория... + + + File size - + File type - + Date modified - + Show hidden - + @@ -645,7 +657,7 @@ Set directory of file browser - + @@ -679,31 +691,31 @@ Enjoy! - + Previous - + Finish - Завершить + Завершить Cancel - Отмена + Отмена <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> - + @@ -719,7 +731,7 @@ <li>Open the documentation browser of the Octave GUI with the help menu</li> </ul> </body></html> - + @@ -747,7 +759,7 @@ &Wrap while searching - + @@ -771,8 +783,8 @@ - &More - &Больше + &More... + &Больше... @@ -1041,7 +1053,7 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> @@ -1050,12 +1062,11 @@ main_window - Load Workspace Загрузить область переменных - + About Octave Об Octave @@ -1076,14 +1087,9 @@ Скрипт - - Function - Функция - - - + Figure - + @@ -1122,12 +1128,11 @@ - Save Workspace As - + The release notes file '%1' is empty. @@ -1212,7 +1217,22 @@ - + + Load Workspace... + Загрузить область переменных... + + + + Save Workspace As... + + + + + Function... + Функция... + + + Step Out @@ -1624,7 +1644,12 @@ - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + + + + Terminal Colors @@ -1689,12 +1714,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - - - - + Terminal Командная строка diff -r 7e297c293e4c -r f227bb47314f libgui/languages/uk_UA.ts --- 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 @@ - - The associated file editor tab has disappeared. It was likely closed by some means. - - - - + &%1 %2 @@ -822,23 +817,23 @@ &Створити - - &Open File - &Відкрити + + &Save File + &Зберегти + + + + &Open File... + &Відкрити... + + + + Save File &As... + Зберегти &як... - &Save File - &Зберегти - - - - Save File &As - Зберегти &як - - - - Print + Print... @@ -917,22 +912,27 @@ - + + &Find and Replace... + + + + Save File and Run - + + Go &to Line... + + + + &Recent Editor Files - - New &Function - - - - + &Edit Function @@ -952,7 +952,17 @@ - + + &Preferences... + + + + + &Styles Preferences... + + + + Run &Selection @@ -972,12 +982,7 @@ - - &Find and Replace - - - - + Could not open file %1 for read: %2. @@ -998,32 +1003,27 @@ - - Go&to Line - - - - + + The associated file editor tab has disappeared. + + + + &File &Файл - + + New &Function... + + + + &Edit &Правка - - &Preferences - - - - - &Styles Preferences - - - - + &Debug @@ -1141,55 +1141,22 @@ - - Show octave directory - - - - - Goto current octave directory - - - - - Set octave directory - - - - - Set octave directroy to current browser directory - - - - + Actions on current directory + + Find Files ... + + + + + New File + + + - Show Home directory - - - - - Search directory - - - - - - Find Files ... - - - - - - New File - - - - - New Directory @@ -1199,7 +1166,52 @@ - + + Show Octave directory + + + + + Go to current Octave directory + + + + + Set Octave directory + + + + + Set Octave directroy to current browser directory + + + + + Show Home Directory + + + + + Search Directory... + + + + + Find Files... + + + + + New File... + + + + + New Directory... + + + + File size @@ -1348,7 +1360,7 @@ <html><body> We hope you find Octave to be a useful tool. -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. +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). </body></html> @@ -1419,7 +1431,7 @@ - &More + &More... @@ -1689,7 +1701,7 @@ <html><body> 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. -The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts. +The configuration file is stored in %1. </body></html> @@ -1698,12 +1710,11 @@ main_window - Load Workspace Завантажити область змінних - + About Octave Про Octave @@ -1724,12 +1735,7 @@ - - Function - - - - + Figure @@ -1770,12 +1776,11 @@ - Save Workspace As - + The release notes file '%1' is empty. @@ -1860,7 +1865,22 @@ - + + Load Workspace... + + + + + Save Workspace As... + + + + + Function... + + + + Step Out @@ -2270,7 +2290,12 @@ - + + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> + + + + Terminal Colors @@ -2335,12 +2360,7 @@ emacs - - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> - - - - + Terminal Командний рядок diff -r 7e297c293e4c -r f227bb47314f libgui/qterminal/libqterminal/unix/kpty.cpp --- 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 @@ -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 // /////////////////////// diff -r 7e297c293e4c -r f227bb47314f libgui/src/files-dock-widget.cc --- 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); diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/chat.png Binary file libgui/src/icons/chat.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/findf.png Binary file libgui/src/icons/findf.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/folder.png Binary file libgui/src/icons/folder.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/folder_documents.png Binary file libgui/src/icons/folder_documents.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/folder_new.png diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/gear.png Binary file libgui/src/icons/gear.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/help_index.png Binary file libgui/src/icons/help_index.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/icons_license --- 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. diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/jabber_protocol.png Binary file libgui/src/icons/jabber_protocol.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/question.png Binary file libgui/src/icons/question.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/star.png Binary file libgui/src/icons/star.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/stop.png Binary file libgui/src/icons/stop.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/icons/terminal.png Binary file libgui/src/icons/terminal.png has changed diff -r 7e297c293e4c -r f227bb47314f libgui/src/m-editor/file-editor.cc --- 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); diff -r 7e297c293e4c -r f227bb47314f libgui/src/m-editor/find-dialog.cc --- 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); diff -r 7e297c293e4c -r f227bb47314f libgui/src/main-window.cc --- 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)), diff -r 7e297c293e4c -r f227bb47314f libgui/src/module.mk --- 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 \ diff -r 7e297c293e4c -r f227bb47314f libgui/src/resource.qrc --- 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 @@ icons/fileopen.png icons/filesave.png icons/fileprint.png + icons/folder.png + icons/folder_documents.png icons/folder_new.png icons/home.png icons/ok.png @@ -26,18 +28,12 @@ icons/arrow_up.png icons/arrow_down.png icons/bookmark.png - icons/question.png - icons/star.png - icons/stop.png icons/zoom-in.png icons/zoom-out.png icons/find.png + icons/findf.png icons/gear.png - icons/chat.png - icons/help_index.png - icons/jabber_protocol.png icons/logo.png - icons/terminal.png icons/bp_toggle.png icons/bp_rm_all.png icons/bp_prev.png diff -r 7e297c293e4c -r f227bb47314f libgui/src/settings-dialog.ui --- 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 @@ QFrame::NoFrame - <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color)</body></html> + <html><head/><body>Select font, font size (as a difference from the default size), font style (bold, italic, underline), text color and background color (for the latter, the color pink (255,0,255) is a placeholder for the default background color).</body></html> false diff -r 7e297c293e4c -r f227bb47314f libgui/src/welcome-wizard.cc --- 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 ("\n" "

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.

\n" - "

The configuration file is stored in %1. If that file exists, you will not see this dialog when Octave starts.

\n" + "

The configuration file is stored in
%1.

\n" ""). arg (resource_manager::get_settings_file ())); message->setWordWrap (true); @@ -206,7 +206,7 @@ message->setText (tr ("\n" "

We hope you find Octave to be a useful tool.

\n" - "

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" + "

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 http://octave.org/support.html (opens in external browser).

\n" "")); message->setWordWrap (true);