Mercurial > octave-nkf
changeset 18254:79dc730b92ae
maint: periodic merge of gui-release to default
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Fri, 10 Jan 2014 19:25:58 -0500 |
| parents | 89e3601c33aa (current diff) 545a77c3206e (diff) |
| children | f58a6cd3f909 |
| files | libgui/languages/pt_BR.ts |
| diffstat | 15 files changed, 334 insertions(+), 226 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/languages/be_BY.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/be_BY.ts Fri Jan 10 19:25:58 2014 -0500 @@ -475,7 +475,7 @@ <translation>курсор</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Нататка пра новы GUI Octave</strong></p><p>Адна з найбольшых адметнасцяў Octave 3.8 - графічны інтэрфэйс. Карыстальнікі апошнімі гадамі прасілі яго найбольш часта, і нарэшце ён амаль гатовы. Але ён пакуль не такі дасканалы, як бы мы жадалі, таму мы вырашылі пачакаць выпуску з серыі 4.0.x перад тым, як рабіць яго стандартным.</p><p>Да таго ж, улічваючы час і колькасць выпраўленняў і паляпшэнняў у параўнанні з апошнім буйным выпускам Octave, мы вырашылі затрымліваць новы выпуск толькі дзеля ўдасканалення GUI, не зважаючы на новыя магчымасці. Таму прыемнага вам карстання выпускам 3.8 і першай версіяй новага інтэрфэйсу. Нам здаецца, ён працуе даволі добра, але мы ведаем, што ёсць некаторыя відавочныя грубыя недарэчнасці і шмат чаго, што можна палепшыць.</p><p><strong>Нам патрабуецца ваша дапамога</strong></p><p>Ёсць шмат спосабаў, якімі вы можаце дапамагчы нам выправіць праблемы, што яшчэ засталіся, скончыць GUI і палепшыць агульнае уражанне як для новых карыстальнікаў, так і для экспертаў (спасылкі адкрыюцца ў знешнім браўзэры):</p><p><ul><li>Калі вы спрактыкаваны распрацоўнік праграм, то можаце выдаткаваць час, каб дапамагчы ў <a href="http://octave.org/get-involved.html">распрацоўцы Octave</a>.</li><li>Калі Octave працуе з памылкамі, вы можаце <a href="http://octave.org/bugs.html">паведаміць пра праблемы</a>, з якімі сутыкнуліся.</li><li>Няхай вы хоць карыстальнік, хоць распрацоўнік, вы можаце <a href="http://octave.org/donate.html">прафундаваць праект</a>. Распрацоўка Octave патрабуе шмат часу і навыкаў. Ваш удзел дапаможа гарантаваць, што Octave і надалей будзе ўдасканальвацца.</li></ul></p><p>Спадзяемся, вы знойдзеце Octave карыснай. Калі ласка, дапамажыце нам зрабіць яго лепшым для будучыні!</p></translation> </message> @@ -963,7 +963,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>вылучэнне скапіявана ў буфер абмену</translation> </message> @@ -1919,7 +1919,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Перайсці да радка</translation> </message> @@ -1994,7 +1994,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Радок:</translation> </message> @@ -2004,7 +2004,7 @@ <translation>Слупок:</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Выглядае на тое, што '%1' быў зменены іншай праграмай. Перачытаць яго?</translation> </message> @@ -2198,7 +2198,9 @@ <location line="+1"/> <source>Create file in </source> - <translation>Стварыць файл у</translation> + <comment>String ends with \n!</comment> + <translation>Стварыць файл у +</translation> </message> <message> <location line="+17"/> @@ -2209,7 +2211,9 @@ <location line="+1"/> <source>Create folder in </source> - <translation>Стварыць каталог у</translation> + <comment>String ends with \n!</comment> + <translation>Стварыць каталог у +</translation> </message> </context> <context> @@ -3452,16 +3456,19 @@ <message> <location line="+2"/> <source>b</source> + <comment>short form for bold</comment> <translation>т</translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation>к</translation> </message> <message> <location line="+1"/> <source>u</source> + <comment>short form for underlined</comment> <translation>п</translation> </message> </context>
--- a/libgui/languages/de_DE.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/de_DE.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation>Cursor</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Einige Hinweise zur neuen Octave GUI</strong></p><p>Eine der größten Neuerungen von Octave 3.8 ist die grafische Benutzerschnittstelle (GUI). Sie ist das, worum die Nutzer in den letzten Jahren am häufigsten gebeten haben, und nun ist sie fast fertig. Aber weil noch der Feinschliff fehlt, haben wir beschlossen, mit der GUI als Standard-Benutzerschnittstelle auf die 4.0.x Veröffentlichungen zu warten.</p><p>In Anbetracht der vergangenen Zeit, der Anzahl der behobenen Fehler und den Verbesserungen seit der letzten Veröffentlichung haben wir uns dazu entschieden, die nächste Veröffentlichung nicht weiter zu verzögern, nur um die GUI zu perfektionieren. Daher wünschen wir viel Spaß mit der Version 3.8 von Octave und der Vorschau auf die neue GUI. Wir sind der Meinung, dass sie schon ziemlich gut funktioniert, obwohl uns bewusst ist, dass es noch einige Ecken und Kanten sowie viele Dinge zu verbessern gibt.</p><p><strong>Deshalb brauchen wir Deine Mithilfe!</strong></p><p>Es gibt viele Möglichkeiten uns zu helfen die verbleibenden Probleme zu beheben, die GUI weiter zu entwickeln und die Benutzererfahrung für Neulinge und Experten gleichermaßen zu verbessern (Links öffnen im externen Browser):</p><p><ul><li>Falls Du ein geschickter Software-Entwickler bist, kannst du helfen, indem du dich an der <a href="http://octave.org/get-involved.html">Weiterentwicklung von Octave</a> beteiligst.</li><li>Sollte Octave einmal nicht wie erwartet funktionieren, solltest Du das gefundene <a href="http://octave.org/bugs.html">Problem melden</a>.</li><li>Egal, ob Du Anwender oder Entwickler bist, kannst du <a href="http://octave.org/donate.html">helfen, das Projekt zu finanzieren</a>. Die Weiterentwicklung von Octave braucht viel Zeit und Sachverstand. Dein Beitrag hilft sicherzustellen, dass Octave weiter verbessert wird.</li></ul></p><p>Wir hoffen, dass du Octave nützlich findest. Bitte hilf uns Octave zukünftig noch besser zu machen!</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>Auswahl in die Zwischenablage kopiert</translation> </message> @@ -381,7 +381,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Gehe zu Zeile</translation> </message> @@ -454,7 +454,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Zeile:</translation> </message> @@ -464,7 +464,7 @@ <translation>Spalte:</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Die Datei %1 wurde von einer anderen Anwendung verändert. Soll der neue Inhalt geladen werden?</translation> </message> @@ -659,7 +659,9 @@ <location line="+1"/> <source>Create file in </source> - <translation>Neue Datei in</translation> + <comment>String ends with \n!</comment> + <translation>Neue Datei in +</translation> </message> <message> <location line="+17"/> @@ -670,7 +672,9 @@ <location line="+1"/> <source>Create folder in </source> - <translation>Neues Verzeichnis in</translation> + <comment>String ends with \n!</comment> + <translation>Neues Verzeichnis in +</translation> </message> </context> <context> @@ -1910,16 +1914,19 @@ <message> <location line="+2"/> <source>b</source> + <comment>short form for bold</comment> <translation>f</translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation>k</translation> </message> <message> <location line="+1"/> <source>u</source> + <comment>short form for underlined</comment> <translation>u</translation> </message> </context>
--- a/libgui/languages/en_US.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/en_US.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation type="unfinished"></translation> </message> @@ -370,7 +370,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation type="unfinished"></translation> </message> @@ -437,7 +437,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -447,7 +447,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -640,6 +640,7 @@ <location line="+1"/> <source>Create file in </source> + <comment>String ends with \n!</comment> <translation type="unfinished"></translation> </message> <message> @@ -651,6 +652,7 @@ <location line="+1"/> <source>Create folder in </source> + <comment>String ends with \n!</comment> <translation type="unfinished"></translation> </message> </context> @@ -1841,16 +1843,19 @@ <message> <location line="+2"/> <source>b</source> + <comment>short form for bold</comment> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> <source>u</source> + <comment>short form for underlined</comment> <translation type="unfinished"></translation> </message> </context>
--- a/libgui/languages/es_ES.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/es_ES.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation>cursor</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Nota acerca de la nueva GUI de Octave</strong></p><p>Una de las novedades más grandes de Octave 3.8 es la interfaz gráfica de usuario. Esto ha sido algo que los usuarios han solicitado frecuentemente durante los últimos años, y ahora está casi lista. Pero como esta interfaz aún no está tan pulida como a nosotros nos gustaría, hemos decidido esperar hasta la serie de versiones 4.0.x de Octave para hacer a la GUI la interfaz por defecto.</p><p>Dado el tiempo transcurrido, el número de correcciones de errores del software (bugs) y el número de mejoras desde la última versión mayor de Octave, también hemos decidido retrasar el lanzamiento de todas estas nuevas mejoras durante más tiempo con el fin de perfeccionar la GUI. Disfrute de la versión 3.8 de Octave y la versión previa de la nueva GUI. Creemos que está funcionando razonablemente bien, pero también somos conscientes de que existen muchas cosas que se pueden mejorar.</p><p><strong>Necesitamos su ayuda</strong></p><p>Hay varias maneras mediante las cuales usted nos puede ayudar a arreglar errores, completar la GUI y, en general, mejorar la experiencia del usuario, ya sean novatos o expertos (los enlaces se abrirán en un navegador externo):</p><p><ul><li>Si usted es un desarrollador de software experimentado, puede contribuir con su tiempo para ayudar <a href="http://octave.org/get-involved.html">Desarrollo de Octave</a>.</li><li>Si Octave no funciona adecuadamente, se le invita a <a href="http://octave.org/bugs.html">reportar problemas </a> que haya encontrado.</li><li>Si usted es usuario o desarrollador, puede <a href="http://octave.org/donate.html">ayudar a financiar el proyecto</a>. El desarrollo de Octave necesita tiempo y conocimientos. Su contribución ayudaría en gran medida a asegurar que Octave continúe mejorando.</li></ul></p><p>Esperamos que haya encontrado Octave muy útil. Por favor, ¡ayúdenos a hacerlo aún mejor en el futuro!</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>selección copiada al portapapeles</translation> </message> @@ -370,7 +370,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Ir a línea</translation> </message> @@ -437,7 +437,7 @@ <translation>No se ha podido abrir el archivo %1 para escritura:\n%2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Línea:</translation> </message> @@ -447,7 +447,7 @@ <translation>Col:</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que el archivo \'%1\' ha sido modificado por otra aplicación. ¿Desea recargarlo?</translation> </message> @@ -640,7 +640,9 @@ <location line="+1"/> <source>Create file in </source> - <translation>Crear archivo en</translation> + <comment>String ends with \n!</comment> + <translation>Crear archivo en +</translation> </message> <message> <location line="+17"/> @@ -651,7 +653,9 @@ <location line="+1"/> <source>Create folder in </source> - <translation>Crear carpeta en</translation> + <comment>String ends with \n!</comment> + <translation>Crear carpeta en +</translation> </message> </context> <context> @@ -1898,16 +1902,19 @@ <message> <location line="+2"/> <source>b</source> + <comment>short form for bold</comment> <translation>b</translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation>i</translation> </message> <message> <location line="+1"/> <source>u</source> + <comment>short form for underlined</comment> <translation>u</translation> </message> </context>
--- a/libgui/languages/fr_FR.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/fr_FR.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation>curseur</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Note à propos du nouveau GUI d'Octave</strong></p><p>Parmi les nouvelles fonctionnalités d'Ocatve 3.8, l'interface graphique est une grande évolution. C'est bien la fonctionnalité que les utilisateurs ont le plus réclamée durant les dernières années, et elle est maintenant presque prête. Elle n'est pas aussi parfaite que nous le souhaiterions et c'est pourquoi nous avons décidé d'attendre la version 4.0 pour en faire l'interface par défaut.</p><p>Au vu du nombre de bug résolus et des améliorations apportées depuis la dernière version majeure d'Octave, nous avons décidé de ne pas retarder plus la parution de ces améliorations pour perfectionner le GUI. Vous pouvez maintenant apprécier la version 3.8 et la version préliminaire de la nouvelle interface graphique. Nous pensons qu'elle fonctionne raisonnablement bien, mais nous savons aussi qu'il y a des points durs évidents et beaucoup d'améliorations possibles.</p><p><strong>Nous avons besoin de votre aide</strong></p><p>Il y a de multiples manières d'aider à résoudre les bogues restants, à terminer le GUI et à améliorer l'expérience utilisateur aussi bien pour les novices que pour les experts (liens ouverts dans un navigateur externe):</p><p><ul><li>Si vous êtes un développeur expérimenté, vous pouvez donner de votre temps et <a href="http://octave.org/get-involved.html">développer Octave</a>.</li><li>Si Octave ne fonctionne pas correctement, vous êtes encouragés à <a href="http://octave.org/bugs.html">signaler les problèmes </a> que vous trouvez.</li><li>Que vous soyez utilisateur ou développeur, vous pouvez <a href="http://octave.org/donate.html">aider à financer le projet</a>. Le développement d'Octave demande beaucoup de temps et d’expertise. Vos contributions permettent d'assurer qu'Octave continuera à s'améliorer.</li></ul></p><p>Nous espérons que vous trouverez Octave utile. S'il vous plaît, aidez nous à l'améliorer encore dans le futur !</p></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>sélection copiée vers le presse-papier</translation> </message> @@ -378,7 +378,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Aller à la ligne</translation> </message> @@ -453,7 +453,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Ligne :</translation> </message> @@ -463,7 +463,7 @@ <translation>Col :</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Il semblerait que '%1' a été modifié par une autre application. Voulez-vous le récharger ?</translation> </message> @@ -659,6 +659,7 @@ <location line="+1"/> <source>Create file in </source> + <comment>String ends with \n!</comment> <translation>Créer un fichier dans </translation> </message> @@ -671,6 +672,7 @@ <location line="+1"/> <source>Create folder in </source> + <comment>String ends with \n!</comment> <translation>Créer un répertoire dans </translation> </message> @@ -1912,17 +1914,20 @@ <message> <location line="+2"/> <source>b</source> - <translation></translation> + <comment>short form for bold</comment> + <translation>g</translation> </message> <message> <location line="+1"/> <source>i</source> - <translation></translation> + <comment>short form for italic</comment> + <translation>i</translation> </message> <message> <location line="+1"/> <source>u</source> - <translation></translation> + <comment>short form for underlined</comment> + <translation>s</translation> </message> </context> <context>
--- a/libgui/languages/nl_NL.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/nl_NL.ts Fri Jan 10 19:25:58 2014 -0500 @@ -474,7 +474,7 @@ <translation>Aanwijzer</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation><p><strong>Een opmerking over Octave's Nieuwe GUI</strong></p><p>Een van de belangrijkste nieuwe kenmerken van Octave 3.8 is een grafische user interface (GUI). Dat is waar de gebruikers de afgelopen jaren het meest om gevraagd hebben en hij is bijna af. Maar omdat hij nog niet zo gepolijst is als we zouden willen hebben we besloten te wachten tot de versie 4.0 serie voordat we hem de standaard interface maken.</p><p>Vanwege de lange tijd en het aantal bug fixes en verbeteringen sinds de laatste major release versie hebben we ook besloten om niet langer meer te wachten op de GUI om al die verbeteringen door te voeren. Dus geniet van Octave versie 3.8 en de preview van de nieuwe GUI. We denken dat hij redelijk goed werkt, maar natuurlijk weten we dat er nog ruwe kantjes aan zitten en ruimte voor verbeteringen.</p><p><strong>We hebben je hulp nodig</strong></p><p>Er zijn veel manieren waarop je ons kunt helpen de overgebleven problemen te verhelpen, de GUI te completeren, en de gebruikerservaring voor nieuwelingen en experts (de URLs openen een nieuwe browser):</p><p><ul><li>Als je een bekwame ontwikkelaar bent kun je ons helpen door bij te dragen <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>Als Octave niet goed wekt raden we je aan om <a href="http://octave.org/bugs.html">de problemen te rapporteren </a> die je tegen komt.</li><li>Of je nu gebruiker of ontwikkelaar bent, je kunt ook <a href="http://octave.org/donate.html">een bijdrage geven</a>. De ontwikkeling van Octave vraagt een hoop tijd en expertise. Je bijdrage helpt er aan mee dat Octave verbeterd blijft worden.</li></ul></p><p>We hopen dat je Octave nuttig vindt. Help alsjeblieft om het in de toekomst nog beter te maken!</p></translation> </message> @@ -962,7 +962,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>selectie is naar klembord gekopieerd</translation> </message> @@ -1918,7 +1918,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Ga naar regel</translation> </message> @@ -1992,7 +1992,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Regel:</translation> </message> @@ -2002,7 +2002,7 @@ <translation>Kolom:</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Het lijkt erop dat '%1' is gewijzigd door een ander programma. Wil je het opnieuw laden?</translation> </message> @@ -2198,6 +2198,7 @@ <location line="+1"/> <source>Create file in </source> + <comment>String ends with \n!</comment> <translation>Maak nieuw bestand in </translation> </message> @@ -2210,6 +2211,7 @@ <location line="+1"/> <source>Create folder in </source> + <comment>String ends with \n!</comment> <translation>Maak nieuwe map in </translation> </message> @@ -3452,17 +3454,20 @@ <message> <location line="+2"/> <source>b</source> - <translation>b</translation> + <comment>short form for bold</comment> + <translation>d</translation> </message> <message> <location line="+1"/> <source>i</source> - <translation>i</translation> + <comment>short form for italic</comment> + <translation>s</translation> </message> <message> <location line="+1"/> <source>u</source> - <translation>u</translation> + <comment>short form for underlined</comment> + <translation>o</translation> </message> </context> <context>
--- a/libgui/languages/pt_BR.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/pt_BR.ts Fri Jan 10 19:25:58 2014 -0500 @@ -34,7 +34,7 @@ <message> <location line="+1"/> <source>inherited</source> - <translation>herdada</translation> + <translation>herdado(a)</translation> </message> <message> <location line="+1"/> @@ -62,9 +62,9 @@ <translation>indicador</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> - <translation><p><strong>Um aviso sobre a nova interface gráfica do Octave</strong></p><p>Uma das funcionalidades novas mais importantes no Octave versão 3.8 é a interface gráfica (GUI). É uma coisa que os usuários solicitaram muito frequentemente durante os últimos anos, e agora ela está quase pronta. Mas como ela não está tão bem acabada quanto gostaríamos, decidimos esperar até a próxima versão 4.0 antes de tornar a GUI a interface padrão do Octave.</p><p>Dado o tempo transcorrido e o número de correções e melhorias desde a última versão do Octave, também decidimos não adiar mais o lançamento de todas essas novidades, ao invés ficar aperfeiçoando a GUI. Portanto, aproveite a versão 3.8 do Octave e a prévia da nova GUI! Acreditamos que ela está funcionando razoavelmente bem, apesar de alguns aspectos obviamente inacabados, além de muitas melhorias possíveis.</p><p><strong>Ajude-nos</strong></p><p>Há muitas formas de você nos ajudar a corrigir os problemas que persistirem, a finalizar a GUI e a melhorar a usabilidade do Octave em geral, tanto para usuários iniciantes quanto experientes (os links abaixo serão abertos no seu navegador do sistema; o conteúdo poderá estar em inglês):</p><p><ul><li>Se você for um desenvolvedor de software habilidoso, ajude-nos contribuindo com seu tempo, auxiliando no <a href="http://octave.org/get-involved.html">desenvolvimento do Octave</a>.</li><li>Se o Octave não estiver funcionando corretamente, convidamos-lhe a <a href="http://octave.org/bugs.html">relatar os problemas</a> que vier a encontrar.</li><li>Quer você seja um usuário ou um desenvolvedor, você poderia <a href="http://octave.org/donate.html">fazer uma doação</a> para auxiliar no financiamento do projeto. Afinal, o desenvolvimento do Octave demanda tempo e conhecimento consideráveis. A sua generosidade contribui para assegurar que o Octave continuará a ser melhorado.</li></ul></p><p>Esperamos que você goste do Octave. Ajude-nos a torná-lo ainda melhor no seu futuro!</p></translation> + <translation><p><strong>Um aviso sobre a nova interface gráfica do Octave</strong></p><p>Uma das funcionalidades novas mais importantes no Octave versão 3.8 é a interface gráfica (GUI). É uma coisa que os usuários solicitaram muito frequentemente nos últimos anos, e agora ela está quase pronta. Mas como ela não está tão bem acabada quanto gostaríamos, decidimos esperar até a próxima versão 4.0 antes de tornar a GUI a interface padrão.</p><p>Dado o tempo transcorrido e o número de correções e melhorias desde a última versão, também decidimos não adiar mais o lançamento de todas essas novidades, ao invés ficar aperfeiçoando a GUI. Portanto, aproveite a versão 3.8 do Octave e a prévia da nova GUI! Acreditamos que ela está funcionando razoavelmente bem, apesar de alguns aspectos obviamente inacabados, além de muitas melhorias possíveis.</p><p><strong>Ajude-nos</strong></p><p>Há muitas formas de você nos ajudar a corrigir os problemas que persistirem, a finalizar a GUI e a melhorar a usabilidade do Octave em geral, tanto para usuários iniciantes quanto para aqueles mais experientes (os links abaixo serão abertos no seu navegador padrão do sistema; o conteúdo poderá estar em inglês):</p><p><ul><li>Se você for um desenvolvedor de software talentoso, ajude-nos contribuindo com o seu tempo, auxiliando no <a href="http://octave.org/get-involved.html">desenvolvimento do Octave</a>.</li><li>Se o Octave não estiver funcionando corretamente, convidamos-lhe a <a href="http://octave.org/bugs.html">relatar os problemas</a> que você vier a encontrar.</li><li>Quer você seja um usuário ou um desenvolvedor, você poderia <a href="http://octave.org/donate.html">fazer uma doação</a> para auxiliar no financiamento do projeto. Afinal, o desenvolvimento do Octave demanda tempo e conhecimento consideráveis. A sua generosidade contribui para assegurar a melhoria contínua do Octave.</li></ul></p><p>Esperamos que você goste do Octave. Ajude-nos a torná-lo ainda melhor no futuro!</p></translation> </message> </context> <context> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>seleção copiada para a área de transferência</translation> </message> @@ -120,7 +120,7 @@ <message> <location line="-269"/> <source>Octave Files (*.m);;All Files (*)</source> - <translation>Scripts do Octave (*.m);;Todos os Arquivos (*)</translation> + <translation>Arquivos do Octave (*.m);;Todos os Arquivos (*)</translation> </message> <message> <location line="-40"/> @@ -131,19 +131,19 @@ <location line="+1"/> <source>New function name: </source> - <translation>Novo nome de função:</translation> + <translation>Nome da nova função:</translation> </message> <message> <location line="+281"/> <source>File not saved! A file with the selected name %1 is already open in the editor</source> - <translation>Arquivo não salvo! Um arquivo com o nome selecionado %1 já está aberto no editor</translation> + <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. Provavelmente foi fechada de alguma maneira.</translation> + <translation>A aba do editor associada ao arquivo desapareceu.</translation> </message> <message> <location line="+227"/> @@ -153,7 +153,7 @@ <message> <location line="+175"/> <source>&New File</source> - <translation>&Novo Arquivo</translation> + <translation>&Novo Script</translation> </message> <message> <location line="+3"/> @@ -168,12 +168,12 @@ <message> <location line="+3"/> <source>Save File &As</source> - <translation>Salvar Arquivo &Como</translation> + <translation>Salvar Arquivo &Como...</translation> </message> <message> <location line="+3"/> <source>Print</source> - <translation>Imprimir</translation> + <translation>Imprimir...</translation> </message> <message> <location line="+3"/> @@ -203,7 +203,7 @@ <message> <location line="+2"/> <source>&Next Bookmark</source> - <translation>&Próximo Marcador</translation> + <translation>Marcador &Seguinte</translation> </message> <message> <location line="+2"/> @@ -223,7 +223,7 @@ <message> <location line="+4"/> <source>&Next Breakpoint</source> - <translation>&Próximo ponto de parada</translation> + <translation>Ponto de Parada &Seguinte</translation> </message> <message> <location line="+3"/> @@ -238,7 +238,7 @@ <message> <location line="+3"/> <source>&Remove All Breakpoints</source> - <translation>&Remover todos Pontos de Parada</translation> + <translation>&Remover todos os Pontos de Parada</translation> </message> <message> <location line="+3"/> @@ -253,7 +253,7 @@ <message> <location line="+6"/> <source>Save File and Run</source> - <translation>Salvar Arquivo e Rodar</translation> + <translation>Salvar Arquivo e Executá-lo</translation> </message> <message> <location line="+57"/> @@ -283,7 +283,7 @@ <message> <location line="+5"/> <source>Close Other Files</source> - <translation>Fechar Outros Arquivos</translation> + <translation>Fechar Demais Arquivos</translation> </message> <message> <location line="+51"/> @@ -303,7 +303,7 @@ <message> <location line="+3"/> <source>&Documentation on Keyword</source> - <translation>&Documentação na Palavra-chave</translation> + <translation>&Documentação da Palavra-chave</translation> </message> <message> <location line="-151"/> @@ -376,9 +376,9 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> - <translation>Vá para linha</translation> + <translation>Vá para linha...</translation> </message> <message> <location line="+1"/> @@ -399,7 +399,7 @@ <message> <location line="+5"/> <source>Do you want to cancel closing, save or discard the changes?</source> - <translation>Você deseja cancelar fechamento, salvar ou descartar as alterações?</translation> + <translation>Você deseja cancelar o fechamento, salvar as alterações, ou descartá-las?</translation> </message> <message> <location line="+10"/> @@ -423,7 +423,7 @@ <message> <location line="+201"/> <source>Octave Files (*.m);;All Files (*)</source> - <translation>Scripts Octave (*.m);; Todos os Arquivos (*)</translation> + <translation>Arquivos do Octave (*.m);; Todos os Arquivos (*)</translation> </message> <message> <location line="+86"/> @@ -441,7 +441,7 @@ has been deleted or renamed. Do you want to save it now?%2</source> <translation>Parece que o arquivo %1 -foi removido ou renomeado. Pretende salvá-lo agora?%2</translation> +foi removido ou renomeado. Gostaria de salvá-lo agora?%2</translation> </message> <message> <location line="-172"/> @@ -451,7 +451,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Linha:</translation> </message> @@ -461,7 +461,7 @@ <translation>Coluna:</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o arquivo '%1' foi modificado por outra aplicação. Deseja recarregá-lo?</translation> </message> @@ -501,7 +501,7 @@ <message> <location line="+5"/> <source>Set octave directory</source> - <translation>Definir o diretório do Octave</translation> + <translation>Escolher o diretório do Octave</translation> </message> <message> <location line="+2"/> @@ -527,7 +527,7 @@ <location line="+3"/> <location line="+354"/> <source>Find Files ...</source> - <translation>Buscar arquivos...</translation> + <translation>Buscar Arquivos...</translation> </message> <message> <location line="-350"/> @@ -564,7 +564,7 @@ <message> <location line="+8"/> <source>Show hidden</source> - <translation>Mostrar escondidos</translation> + <translation>Exibir ocultos</translation> </message> <message> <location line="+24"/> @@ -644,7 +644,7 @@ <message> <location line="+144"/> <source>Set directory of file browser</source> - <translation>Definir diretório do navegador de arquivos</translation> + <translation>Definir diretório do Navegador de Arquivos</translation> </message> <message> <location line="+29"/> @@ -655,7 +655,9 @@ <location line="+1"/> <source>Create file in </source> - <translation>Criar arquivo em</translation> + <comment>String ends with \n!</comment> + <translation>Criar arquivo em +</translation> </message> <message> <location line="+17"/> @@ -666,7 +668,9 @@ <location line="+1"/> <source>Create folder in </source> - <translation>Criar diretório em</translation> + <comment>String ends with \n!</comment> + <translation>Criar diretório em +</translation> </message> </context> <context> @@ -699,9 +703,9 @@ 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 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> +<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> </body></html></translation> </message> <message> @@ -757,7 +761,7 @@ <message> <location line="+1"/> <source>&Wrap while searching</source> - <translation>Retornar ao começo se encontrar &final durante busca</translation> + <translation>Retornar ao começo se alcançar o &final durante a busca</translation> </message> <message> <location line="+2"/> @@ -782,7 +786,7 @@ <message> <location line="+2"/> <source>&More</source> - <translation>&Mais</translation> + <translation>&Mais opções...</translation> </message> <message> <location line="+13"/> @@ -797,22 +801,22 @@ <message> <location line="+1"/> <source>Search &backward</source> - <translation>Buscar para &trás</translation> + <translation>Buscar de trás para frente</translation> </message> <message> <location line="+1"/> <source>Search se&lection</source> - <translation>Buscar dentre &seleção</translation> + <translation>Buscar dentro do texto &selecionado</translation> </message> <message> <location line="+71"/> <source>Search from end</source> - <translation>Buscar desde o final</translation> + <translation>Buscar do final para o começo</translation> </message> <message> <location line="+2"/> <source>Search from start</source> - <translation>Buscar desde o início</translation> + <translation>Buscar do começo para o final</translation> </message> <message> <location line="+121"/> @@ -845,57 +849,57 @@ <message> <location line="+10"/> <source>Named:</source> - <translation>Nomeados:</translation> + <translation>Nome de arquivo:</translation> </message> <message> <location line="+2"/> <source>Enter the filename expression</source> - <translation>Digite expressão para os nomes de arquivo</translation> + <translation>Digite a expressão de busca para os nomes de arquivo</translation> </message> <message> <location line="+6"/> <source>Start in:</source> - <translation>Iniciar em:</translation> + <translation>Diretório inicial:</translation> </message> <message> <location line="+5"/> <source>Enter the start directory</source> - <translation>Digite diretório inicial</translation> + <translation>Digite o diretório inicial</translation> </message> <message> <location line="+3"/> <source>Browse...</source> - <translation>Explorar...</translation> + <translation>Escolher...</translation> </message> <message> <location line="+1"/> <source>Browse for start directory</source> - <translation>Explorar diretório inicial</translation> + <translation>Escolha o diretório inicial</translation> </message> <message> <location line="+3"/> <source>Recurse directories</source> - <translation>Entrar em sub-diretórios</translation> + <translation>Buscar em sub-diretórios</translation> </message> <message> <location line="+4"/> <source>Search recursively through directories for matching files</source> - <translation>Buscar recursivamente nos diretórios por arquivos que correspondam</translation> + <translation>Buscar recursivamente nos sub-diretórios</translation> </message> <message> <location line="+2"/> <source>Include directories</source> - <translation>Inclur diretórios</translation> + <translation>Inclur nomes de diretórios</translation> </message> <message> <location line="+4"/> <source>Include matching directories in search results</source> - <translation>Incluir diretórios encontrados no resultado da busca</translation> + <translation>Incluir diretórios no resultado da busca</translation> </message> <message> <location line="+2"/> <source>Name case insensitive</source> - <translation>Insensível a maiúsculas/minúsculas</translation> + <translation>Não diferenciar maiúsculas/minúsculas no nome</translation> </message> <message> <location line="+3"/> @@ -910,17 +914,17 @@ <message> <location line="+1"/> <source>Search must match text</source> - <translation>Busca deve encontrar texto</translation> + <translation>Digite a expressão de busca para conteúdo dos arquivos</translation> </message> <message> <location line="+5"/> <source>Text to match</source> - <translation>Texto para encontrar</translation> + <translation>Texto a buscar</translation> </message> <message> <location line="+4"/> <source>Text case insensitive</source> - <translation>Texto insensível a maiúscula/minúscula</translation> + <translation>Não diferenciar maiúsculas/minúsculas no texto</translation> </message> <message> <location line="+3"/> @@ -1006,7 +1010,7 @@ <message> <location line="+9"/> <source>Enter text to filter the command history.</source> - <translation>Digite para filtrar o hitórico de comandos.</translation> + <translation>Digite para filtrar o histórico de comandos.</translation> </message> <message> <location line="+4"/> @@ -1034,7 +1038,7 @@ <message> <location filename="../src/welcome-wizard.cc" line="-179"/> <source>Welcome to Octave!</source> - <translation>Bem-vindo ao Octave!</translation> + <translation>Bem-vindo(a) ao Octave!</translation> </message> <message> <location line="+3"/> @@ -1055,8 +1059,8 @@ </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 lançar 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 inicializar.</p> +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> </body></html></translation> </message> </context> @@ -1066,7 +1070,7 @@ <location filename="../src/main-window.cc" line="-1693"/> <location line="+1164"/> <source>Load Workspace</source> - <translation>Carregar ambiente de trabalho</translation> + <translation>Carregar Ambiente de Trabalho...</translation> </message> <message> <location line="-522"/> @@ -1138,7 +1142,7 @@ <location line="-1262"/> <location line="+1181"/> <source>Save Workspace As</source> - <translation>Salvar Ambiente de Trabalho Como</translation> + <translation>Salvar Ambiente de Trabalho Como...</translation> </message> <message> <location line="-1057"/> @@ -1198,12 +1202,12 @@ <message> <location line="+12"/> <source>Continue</source> - <translation>Continuar</translation> + <translation>Prosseguir</translation> </message> <message> <location line="+9"/> <source>Exit Debug Mode</source> - <translation>Sair de Modo de Depuração</translation> + <translation>Sair do Modo de Depuração</translation> </message> <message> <location line="+51"/> @@ -1223,12 +1227,12 @@ <message> <location line="-288"/> <source>Step In</source> - <translation>Passo a dentro</translation> + <translation>Passo adentro</translation> </message> <message> <location line="+4"/> <source>Step Out</source> - <translation>Passo a fora</translation> + <translation>Passo afora</translation> </message> <message> <location line="+108"/> @@ -1243,7 +1247,7 @@ <message> <location line="+3"/> <source>Share Code</source> - <translation>Compartilhar o Código</translation> + <translation>Compartilhar Código Fonte</translation> </message> <message> <location line="+3"/> @@ -1294,12 +1298,12 @@ <location line="+47"/> <location line="+66"/> <source>Experimental GUI Info</source> - <translation>Informação sobre a Interface Gráfica Experimental</translation> + <translation>Aviso sobre a Interface Gráfica Experimental</translation> </message> <message> <location line="+27"/> <source>Enter directory name</source> - <translation>Digite nome do diretório</translation> + <translation>Digite o nome do diretório</translation> </message> <message> <location line="+9"/> @@ -1309,13 +1313,13 @@ <message> <location line="+4"/> <source>One directory up</source> - <translation>Um nível de diretório acima</translation> + <translation>Diretório um nível acima</translation> </message> <message> <location line="-1283"/> <location line="+1286"/> <source>Browse directories</source> - <translation>Navegar por diretórios</translation> + <translation>Escolher diretório</translation> </message> <message> <location line="-405"/> @@ -1360,7 +1364,7 @@ <message> <location line="+8"/> <source>Workspace</source> - <translation>Ambiente de trabalho</translation> + <translation>Ambiente de Trabalho</translation> </message> <message> <location line="+4"/> @@ -1634,7 +1638,7 @@ <message> <location line="+17"/> <source>Backspace unindents line</source> - <translation>Tecla Apagar remove identação na linha</translation> + <translation>Tecla Backspace remove identação da linha</translation> </message> <message> <location line="+155"/> @@ -1644,7 +1648,7 @@ <message> <location line="+13"/> <source>Case sensitive</source> - <translation>Sensível a maiúscula/minúscula</translation> + <translation>Diferenciar maiúsculas/minúsculas</translation> </message> <message> <location line="+13"/> @@ -1669,7 +1673,7 @@ <message> <location line="+32"/> <source>Editor Styles</source> - <translation>Estilos do Editor</translation> + <translation>Apresentação</translation> </message> <message> <location line="+132"/> @@ -1684,17 +1688,17 @@ <message> <location line="-757"/> <source>Show line numbers</source> - <translation>Exibir número de linha</translation> + <translation>Exibir números de linha</translation> </message> <message> <location line="+27"/> <source>Highlight current line</source> - <translation>Enfatizar linha atual</translation> + <translation>Destacar linha atual</translation> </message> <message> <location line="+262"/> <source>Code completion</source> - <translation>Sguestões para copletar código</translation> + <translation>Oferecer sugestões de preenchimento</translation> </message> <message> <location line="-282"/> @@ -1704,22 +1708,22 @@ <message> <location line="-17"/> <source>Show whitespace</source> - <translation>Mostrar espaço em branco</translation> + <translation>Exibir espaços em branco</translation> </message> <message> <location line="+27"/> <source>Do not show whitespace used for indentation</source> - <translation>Não mostrar espaço em branco usado para identação</translation> + <translation>Não exibir espaços em branco usados para identação</translation> </message> <message> <location line="+290"/> <source># of characters typed before completion list displayed</source> - <translation>Número de caracteres digitados antes da lista de completação ser apresentada</translation> + <translation>Número de caracteres digitados antes da apresentar sugestões de preenchimento</translation> </message> <message> <location line="+194"/> <source>Create nonexistent files without prompting</source> - <translation>Criar arquivos não existentes sem perguntar</translation> + <translation>Criar arquivos não existentes sem confirmar</translation> </message> <message> <location line="+57"/> @@ -1734,7 +1738,7 @@ <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 (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)</p></body></html></translation> + <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"/> @@ -1754,7 +1758,7 @@ <message> <location line="+7"/> <source>Use foreground color</source> - <translation>Usar cor de frente</translation> + <translation>Usar cor de primeiro plano</translation> </message> <message> <location line="+94"/> @@ -1794,12 +1798,12 @@ <message> <location line="+21"/> <source>Workspace</source> - <translation>Ambiente de trabalho</translation> + <translation>Ambiente de Trabalho</translation> </message> <message> <location line="+30"/> <source>Storage Class Colors</source> - <translation>Cores das Classes de Armazenamento</translation> + <translation>Cores das Categorias</translation> </message> <message> <location line="+35"/> @@ -1809,7 +1813,7 @@ <message> <location line="+8"/> <source>Allow Octave to connect to the Octave web site to display current news and information</source> - <translation>Permitir Octave se conectar a web para mostrar notícias recentes e informação</translation> + <translation>Permitir Octave se conectar à Internet para mostrar notícias e informações recentes</translation> </message> <message> <location line="+46"/> @@ -1824,22 +1828,22 @@ <message> <location line="-1129"/> <source>Icon set for dock widgets</source> - <translation>Conjunto de ícones para paineis</translation> + <translation>Conjunto de ícones para painéis</translation> </message> <message> <location line="+7"/> <source>Language (requires restart)</source> - <translation>Idioma (reinicialização do Octave necessária)</translation> + <translation>Idioma (alteração exige reinicialização do Octave)</translation> </message> <message> <location line="+7"/> <source>Icon size</source> - <translation>Tamanho do Ícone</translation> + <translation>Tamanho dos ícones</translation> </message> <message> <location line="+991"/> <source>Synchronize Octave working directory with file browser</source> - <translation>Sincronizar diretório de trabalho com o navegador de arquivos</translation> + <translation>Sincronizar diretório atual do Octave com o Navegador de Arquivos</translation> </message> <message> <location line="+129"/> @@ -1901,22 +1905,25 @@ <message> <location line="+6"/> <source>Background color, pink (255,0,255) means default</source> - <translation>Cor de fundo, rosa (255,0,255) significa padrão</translation> + <translation>Cor de fundo rosa (255,0,255) significa padrão</translation> </message> <message> <location line="+2"/> <source>b</source> - <translation>b</translation> + <comment>short form for bold</comment> + <translation>n</translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation>i</translation> </message> <message> <location line="+1"/> <source>u</source> - <translation>u</translation> + <comment>short form for underlined</comment> + <translation>s</translation> </message> </context> <context> @@ -1950,9 +1957,9 @@ <a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a>.</p> </body></html></source> <translation><html><body> -<p>Quando o Octave GUI inicia, ele checa o site para conferir notícias recentes e da comunidade. -A checagem acontece pelo menos uma vez ao dia e as notícias só serão apresentadas se existir algo novo desde o último acesso.</p> -<p>Você também pode ver as notícias em "Notícias de Comunidade" no menu de ajuda na interface gráfica, ou visitar +<p>Quando a interface gráfica do Octave se inicia, ela busca no sítio do Octave por notícias e informações recentes sobre a comunidade. +A busca acontece no máximo uma vez por dia e as notícias só serão apresentadas se houver algo novo desde o último acesso.</p> +<p>Você também pode ver as notícias selecionando "Notícias da Comunidade" no menu "Novidades" na interface gráfica, ou visitando <a href="http://octave.org/community-news.html">http://octave.org/community-news.html</a>.</p> </body></html></translation> </message> @@ -1970,7 +1977,7 @@ a:link { text-decoration: underline; color: #0000ff; } </style> <head/><body> -<p>Permitir Octave se conectar ao web na inicialização para mostrar as notícias correntes e informações sobre a comunidade.</p> +<p>Permitir que o Octave se conecte à Internet durante a inicialização para buscar as notícias e informações atuais sobre a comunidade.</p> </body></html></translation> </message> </context> @@ -2028,7 +2035,7 @@ <message> <location line="+1"/> <source>Storage Class</source> - <translation>Classe de Armazenamento</translation> + <translation>Categoria</translation> </message> <message> <location line="+109"/> @@ -2047,12 +2054,12 @@ <message> <location filename="../src/workspace-view.cc" line="+47"/> <source>Workspace</source> - <translation>Ambiente de trabalho</translation> + <translation>Ambiente de Trabalho</translation> </message> <message> <location line="+1"/> <source>View the variables in the active workspace.</source> - <translation>Visualizar variáveis no ambiente de trabalho ativo.</translation> + <translation>Visualizar variáveis no Ambiente de Trabalho.</translation> </message> <message> <location line="+76"/> @@ -2072,12 +2079,12 @@ <message> <location line="+125"/> <source>View the variables in the active workspace.<br></source> - <translation>Visualizar as variáveis no ambiente de trabalho ativo.<br></translation> + <translation>Visualizar as variáveis no Ambiente de Trabalho.<br></translation> </message> <message> <location line="+1"/> <source>Colors for the storage class:</source> - <translation>Cores para classe de armazenamento:</translation> + <translation>Cores das categorias:</translation> </message> </context> </TS>
--- a/libgui/languages/pt_PT.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/pt_PT.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation>indicador</translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>selecçao copiada para a área de transferência</translation> </message> @@ -1045,7 +1045,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Ir para linha</translation> </message> @@ -1120,7 +1120,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation>Linha:</translation> </message> @@ -1130,7 +1130,7 @@ <translation>Col:</translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Parece que o ficheiro '%1' foi modificado por outro aplicativo. Deseja recarregá-lo?</translation> </message> @@ -1326,6 +1326,7 @@ <location line="+1"/> <source>Create file in </source> + <comment>String ends with \n!</comment> <translation>Criar ficheiro em </translation> </message> @@ -1338,6 +1339,7 @@ <location line="+1"/> <source>Create folder in </source> + <comment>String ends with \n!</comment> <translation>Criar directório em </translation> </message> @@ -2579,17 +2581,20 @@ <message> <location line="+2"/> <source>b</source> - <translation>b</translation> + <comment>short form for bold</comment> + <translation>n</translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation>i</translation> </message> <message> <location line="+1"/> <source>u</source> - <translation>u</translation> + <comment>short form for underlined</comment> + <translation>s</translation> </message> </context> <context>
--- a/libgui/languages/ru_RU.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/ru_RU.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation>выделенное скопировано в буфер обмена</translation> </message> @@ -378,7 +378,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation>Перейти к строчке</translation> </message> @@ -453,7 +453,7 @@ %2.</translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -463,7 +463,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation>Кажется, файл '%1' был изменен другим приложением. Вы хотите обновить его содержимое?</translation> </message> @@ -656,7 +656,9 @@ <location line="+1"/> <source>Create file in </source> - <translation>Создать файл в</translation> + <comment>String ends with \n!</comment> + <translation>Создать файл в +</translation> </message> <message> <location line="+17"/> @@ -667,7 +669,9 @@ <location line="+1"/> <source>Create folder in </source> - <translation>Создать папку в</translation> + <comment>String ends with \n!</comment> + <translation>Создать папку в +</translation> </message> </context> <context> @@ -1859,17 +1863,20 @@ <message> <location line="+2"/> <source>b</source> - <translation>b</translation> + <comment>short form for bold</comment> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> <source>i</source> - <translation>i</translation> + <comment>short form for italic</comment> + <translation type="unfinished"></translation> </message> <message> <location line="+1"/> <source>u</source> - <translation>u</translation> + <comment>short form for underlined</comment> + <translation type="unfinished"></translation> </message> </context> <context>
--- a/libgui/languages/uk_UA.ts Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/languages/uk_UA.ts Fri Jan 10 19:25:58 2014 -0500 @@ -62,7 +62,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/main-window.cc" line="+1894"/> + <location filename="../src/main-window.cc" line="+1897"/> <source><p><strong>A Note about Octave's New GUI</strong></p><p>One of the biggest new features for Octave 3.8 is a graphical user interface. It is the one thing that users have requested most often over the last few years and now it is almost ready. But because it is not quite as polished as we would like, we have decided to wait until the 4.0.x release series before making the GUI the default interface.</p><p>Given the length of time and the number of bug fixes and improvements since the last major release, we also decided against delaying the release of all these new improvements any longer just to perfect the GUI. So please enjoy the 3.8 release of Octave and the preview of the new GUI. We believe it is working reasonably well, but we also know that there are some obvious rough spots and many things that could be improved.</p><p><strong>We Need Your Help</strong></p><p>There are many ways that you can help us fix the remaining problems, complete the GUI, and improve the overall user experience for both novices and experts alike (links will open an external browser):</p><p><ul><li>If you are a skilled software developer, you can help by contributing your time to help <a href="http://octave.org/get-involved.html">develop Octave</a>.</li><li>If Octave does not work properly, you are encouraged to <a href="http://octave.org/bugs.html">report problems </a> that you find.</li><li>Whether you are a user or developer, you can <a href="http://octave.org/donate.html">help to fund the project</a>. Octave development takes a lot of time and expertise. Your contributions help to ensure that Octave will continue to improve.</li></ul></p><p>We hope you find Octave to be useful. Please help us make it even better for the future!</p></source> <translation type="unfinished"></translation> </message> @@ -88,7 +88,7 @@ <context> <name>QWinTerminalImpl</name> <message> - <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1528"/> + <location filename="../qterminal/libqterminal/win32/QWinTerminalImpl.cpp" line="+1536"/> <source>copied selection to clipboard</source> <translation type="unfinished"></translation> </message> @@ -1036,7 +1036,7 @@ <context> <name>file_editor_tab</name> <message> - <location filename="../src/m-editor/file-editor-tab.cc" line="+792"/> + <location filename="../src/m-editor/file-editor-tab.cc" line="+803"/> <source>Goto line</source> <translation type="unfinished"></translation> </message> @@ -1103,7 +1103,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="-966"/> + <location line="-975"/> <source>Line:</source> <translation type="unfinished"></translation> </message> @@ -1113,7 +1113,7 @@ <translation type="unfinished"></translation> </message> <message> - <location line="+1113"/> + <location line="+1122"/> <source>It seems that '%1' has been modified by another application. Do you want to reload it?</source> <translation type="unfinished"></translation> </message> @@ -1306,6 +1306,7 @@ <location line="+1"/> <source>Create file in </source> + <comment>String ends with \n!</comment> <translation type="unfinished"></translation> </message> <message> @@ -1317,6 +1318,7 @@ <location line="+1"/> <source>Create folder in </source> + <comment>String ends with \n!</comment> <translation type="unfinished"></translation> </message> </context> @@ -2507,16 +2509,19 @@ <message> <location line="+2"/> <source>b</source> + <comment>short form for bold</comment> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> <source>i</source> + <comment>short form for italic</comment> <translation type="unfinished"></translation> </message> <message> <location line="+1"/> <source>u</source> + <comment>short form for underlined</comment> <translation type="unfinished"></translation> </message> </context>
--- a/libgui/src/files-dock-widget.cc Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/src/files-dock-widget.cc Fri Jan 10 19:25:58 2014 -0500 @@ -814,8 +814,8 @@ bool ok; QString name = QInputDialog::getText (this, tr ("Create File"), - tr ("Create file in\n") + parent_dir, - QLineEdit::Normal, "New File.txt", &ok); + tr ("Create file in\n","String ends with \\n!") + parent_dir, + QLineEdit::Normal, "New File.txt", &ok); if (ok && name.length () > 0) { name = parent_dir + "/" + name; @@ -832,9 +832,8 @@ bool ok; QString name = QInputDialog::getText (this, tr ("Create Directory"), - tr ("Create folder in\n") + parent_dir, - QLineEdit::Normal, "New Directory", - &ok); + tr ("Create folder in\n","String ends with \\n!") + parent_dir, + QLineEdit::Normal, "New Directory", &ok); if (ok && name.length () > 0) { QDir dir (parent_dir);
--- a/libgui/src/main-window.cc Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/src/main-window.cc Fri Jan 10 19:25:58 2014 -0500 @@ -88,7 +88,10 @@ _clipboard (QApplication::clipboard ()), _cmd_queue (new QStringList ()), // no command pending _cmd_processing (1), - _cmd_queue_mutex () + _cmd_queue_mutex (), + _dbg_queue (new QStringList ()), // no debug pending + _dbg_processing (1), + _dbg_queue_mutex () { QSettings *settings = resource_manager::get_settings (); @@ -438,10 +441,10 @@ "when you have a connection to the web (link opens in an external browser).\n" "</p>\n" "<p>\n" - "<small><em>— The Octave Developers, " OCTAVE_RELEASE_DATE "</em></small>\n" + "<small><em>— The Octave Developers, ") + OCTAVE_RELEASE_DATE + "</em></small>\n" "</p>\n" "</body>\n" - "</html>\n")); + "</html>\n"); } else html_text = QString @@ -457,10 +460,10 @@ "or enable web connections for news in Octave's network settings dialog.\n" "</p>\n" "<p>\n" - "<small><em>— The Octave Developers, " OCTAVE_RELEASE_DATE "</em></small>\n" + "<small><em>— The Octave Developers, ") + OCTAVE_RELEASE_DATE + "</em></small>\n" "</p>\n" "</body>\n" - "</html>\n")); + "</html>\n"); emit display_news_signal (html_text); @@ -780,31 +783,31 @@ void main_window::debug_continue (void) { - octave_link::post_event (this, &main_window::debug_continue_callback); + queue_debug ("cont"); } void main_window::debug_step_into (void) { - octave_link::post_event (this, &main_window::debug_step_into_callback); + queue_debug ("in"); } void main_window::debug_step_over (void) { - octave_link::post_event (this, &main_window::debug_step_over_callback); + queue_debug ("step"); } void main_window::debug_step_out (void) { - octave_link::post_event (this, &main_window::debug_step_out_callback); + queue_debug ("out"); } void main_window::debug_quit (void) { - octave_link::post_event (this, &main_window::debug_quit_callback); + queue_debug ("quit"); } void @@ -2101,15 +2104,7 @@ Fcd (ovl (directory)); } -void -main_window::debug_continue_callback (void) -{ - Fdbcont (); - - command_editor::interrupt (true); -} - -// The next three callbacks are invoked by GUI buttons. Those buttons +// The next callbacks are invoked by GUI buttons. Those buttons // should only be active when we are doing debugging, which means that // Octave is waiting for input in get_debug_input. Calling // command_editor::interrupt will force readline to return even if it @@ -2117,35 +2112,46 @@ // allowing the evaluator to continue and execute the next statement. void -main_window::debug_step_into_callback (void) +main_window::queue_debug (QString debug_cmd) { - Fdbstep (ovl ("in")); - - command_editor::interrupt (true); + _dbg_queue_mutex.lock (); + _dbg_queue->append (debug_cmd); // queue command + _dbg_queue_mutex.unlock (); + + if (_dbg_processing.tryAcquire ()) // if callback not processing, post event + octave_link::post_event (this, &main_window::execute_debug_callback); } void -main_window::debug_step_over_callback (void) -{ - Fdbstep (); - - command_editor::interrupt (true); -} - -void -main_window::debug_step_out_callback (void) +main_window::execute_debug_callback () { - Fdbstep (ovl ("out")); - - command_editor::interrupt (true); -} - -void -main_window::debug_quit_callback (void) -{ - Fdbquit (); - - command_editor::interrupt (true); + bool repost = false; // flag for reposting event for this callback + + if (!_dbg_queue->isEmpty ()) // list can not be empty here, just to make sure + { + _dbg_queue_mutex.lock (); // critical path + QString debug = _dbg_queue->takeFirst (); + if (_dbg_queue->isEmpty ()) + _dbg_processing.release (); // cmd queue empty, processing will stop + else + repost = true; // not empty, repost at end + _dbg_queue_mutex.unlock (); + + if (debug == "step") + Fdbstep (); + else if (debug == "cont") + Fdbcont (); + else if (debug == "quit") + Fdbquit (); + else + Fdbstep (ovl (debug.toStdString ())); + + command_editor::interrupt (true); + } + + if (repost) // queue not empty, so repost event for further processing + octave_link::post_event (this, &main_window::execute_debug_callback); + } void
--- a/libgui/src/main-window.h Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/src/main-window.h Fri Jan 10 19:25:58 2014 -0500 @@ -256,19 +256,13 @@ void change_directory_callback (const std::string& directory); - void debug_continue_callback (void); - - void debug_step_into_callback (void); - - void debug_step_over_callback (void); - - void debug_step_out_callback (void); - - void debug_quit_callback (void); - void exit_callback (void); - void queue_command (QString command); // Data models. + void queue_command (QString command); + + void queue_debug (QString command); + + void execute_debug_callback (); workspace_model *_workspace_model; @@ -349,6 +343,11 @@ QStringList *_cmd_queue; QSemaphore _cmd_processing; QMutex _cmd_queue_mutex; + + // semaphore to synchronize debug signals and related callbacks + QStringList *_dbg_queue; + QSemaphore _dbg_processing; + QMutex _dbg_queue_mutex; }; class news_reader : public QObject
--- a/libgui/src/settings-dialog.cc Wed Jan 08 01:40:11 2014 -0500 +++ b/libgui/src/settings-dialog.cc Fri Jan 10 19:25:58 2014 -0500 @@ -354,9 +354,9 @@ bg_color[i]->setToolTip (tr ("Background color, pink (255,0,255) means default")); } - attrib_font[0+3*i] = new QCheckBox (tr ("b")); - attrib_font[1+3*i] = new QCheckBox (tr ("i")); - attrib_font[2+3*i] = new QCheckBox (tr ("u")); + attrib_font[0+3*i] = new QCheckBox (tr ("b", "short form for bold")); + attrib_font[1+3*i] = new QCheckBox (tr ("i", "short form for italic")); + attrib_font[2+3*i] = new QCheckBox (tr ("u", "short form for underlined")); attrib_font[0+3*i]->setChecked (Qt::Checked && actual_font.bold ()); attrib_font[0+3*i]->setObjectName (actual_name+"_bold"); attrib_font[1+3*i]->setChecked (Qt::Checked && actual_font.italic ());
--- a/liboctave/util/oct-inttypes.h Wed Jan 08 01:40:11 2014 -0500 +++ b/liboctave/util/oct-inttypes.h Fri Jan 10 19:25:58 2014 -0500 @@ -1030,6 +1030,50 @@ return is; } +// We need to specialise for char and unsigned char because +// std::operator<< and std::operator>> are overloaded to input and +// output the ASCII character values instead of a representation of +// their numerical value (e.g. os << char(10) outputs a space instead +// of outputting the characters '1' and '0') + +template <> +inline std::ostream& +operator << (std::ostream& os, const octave_int<int8_t>& ival) +{ + os << static_cast<int> (ival.value ()); + return os; +} + +template <> +inline std::ostream& +operator << (std::ostream& os, const octave_int<uint8_t>& ival) +{ + os << static_cast<unsigned int> (ival.value ()); + return os; +} + + +template <> +inline std::istream& +operator >> (std::istream& is, octave_int<int8_t>& ival) +{ + int tmp = 0; + is >> tmp; + ival = static_cast<int8_t> (tmp); + return is; +} + +template <> +inline std::istream& +operator >> (std::istream& is, octave_int<uint8_t>& ival) +{ + unsigned int tmp = 0; + is >> tmp; + ival = static_cast<uint8_t> (tmp); + return is; +} + + // Bitwise operations #define OCTAVE_INT_BITCMP_OP(OP) \