Mercurial > octave
changeset 25262:e5cf943ba01b
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 15 Apr 2018 22:03:52 -0700 |
parents | 7e0be1b2ccf5 (current diff) 32323f5e61d2 (diff) |
children | 6f9d51536643 |
files | |
diffstat | 2 files changed, 31 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/languages/pt_BR.ts Sun Apr 15 17:52:59 2018 -0700 +++ b/libgui/languages/pt_BR.ts Sun Apr 15 22:03:52 2018 -0700 @@ -431,7 +431,9 @@ <source>Could not copy help collection to temporary file. Search capabilities may be affected. %1</source> - <translation type="unfinished"></translation> + <translation>Não foi possível copiar a coleção de ajuda para um arquivo +temporário. A funcionalidade de busca pode estar afetada. +%1</translation> </message> <message> <location line="+10"/> @@ -445,24 +447,24 @@ <message> <location line="+16"/> <source>Find:</source> - <translation type="unfinished"></translation> + <translation>Buscar:</translation> </message> <message> <location line="+7"/> <location line="+1"/> <source>Search forward</source> - <translation type="unfinished"></translation> + <translation>Buscar adiante</translation> </message> <message> <location line="+5"/> <location line="+1"/> <source>Search backward</source> - <translation type="unfinished"></translation> + <translation>Buscar para trás</translation> </message> <message> <location line="+25"/> <source>Escape</source> - <translation type="unfinished"></translation> + <translation>Esc</translation> </message> <message> <location line="+24"/> @@ -488,7 +490,7 @@ <message> <location line="+203"/> <source>Unable to register help file %1.</source> - <translation type="unfinished"></translation> + <translation>Não foi possível registrar o arquivo de ajuda %1.</translation> </message> </context> <context> @@ -766,7 +768,7 @@ <message> <location line="+7"/> <source>Convert Line Endings to &Windows (CRLF)</source> - <translation type="unfinished"></translation> + <translation>Converter Finais de Linha para &Windows (CRLF)</translation> </message> <message> <location line="+5"/> @@ -1113,7 +1115,10 @@ can not be applied. Please select another one or cancel saving!</source> - <translation type="unfinished"></translation> + <translation>A codificação atual %1 +não pode ser aplicada. + +Favor selecionar outra ou cancelar o salvar!</translation> </message> <message> <location line="+11"/> @@ -1122,7 +1127,11 @@ Using it will result in data loss! Do you want to choose another encoding?</source> - <translation type="unfinished"></translation> + <translation>O conteúdo atual do editor não podem ser codificados +com a forma de codificação selecionada %1. +Usá-la resultará na perda de dados! + +Deseja escolher outra codificação?</translation> </message> <message> <location line="+85"/> @@ -3069,12 +3078,12 @@ <message> <location line="+68"/> <source>Import shortcuts from file ...</source> - <translation type="unfinished"></translation> + <translation>Importar atalhos de arquivo...</translation> </message> <message> <location line="+5"/> <source>Export shortcuts into file ...</source> - <translation type="unfinished"></translation> + <translation>Exportar atalhos para arquivo...</translation> </message> <message> <location line="-4"/> @@ -3181,27 +3190,27 @@ <message> <location line="+259"/> <source>Foreground</source> - <translation type="unfinished"></translation> + <translation>Primeiro plano</translation> </message> <message> <location line="+1"/> <source>Background</source> - <translation type="unfinished">Fundo</translation> + <translation>Fundo</translation> </message> <message> <location line="+1"/> <source>Selected Foreground</source> - <translation type="unfinished"></translation> + <translation>Primeiro Plano Selecionado</translation> </message> <message> <location line="+1"/> <source>Selected Background</source> - <translation type="unfinished"></translation> + <translation>Fundo Selecionado</translation> </message> <message> <location line="+1"/> <source>Alternate Background</source> - <translation type="unfinished"></translation> + <translation>Fundo Alternativo</translation> </message> <message> <location line="+255"/> @@ -3576,7 +3585,7 @@ <message> <location line="+309"/> <source>Wrap long lines at current window border</source> - <translation type="unfinished"></translation> + <translation>Quebrar linhas longas na borda da janela atual</translation> </message> <message> <location line="+475"/> @@ -3968,7 +3977,7 @@ <message> <location line="+80"/> <source>Text encoding used for loading and saving</source> - <translation>Codificação de texto utilizada para abrir e salvar</translation> + <translation>Codificação de texto utilizada para carregar e salvar</translation> </message> <message> <location line="+25"/>
--- a/libinterp/corefcn/gl-render.cc Sun Apr 15 17:52:59 2018 -0700 +++ b/libinterp/corefcn/gl-render.cc Sun Apr 15 22:03:52 2018 -0700 @@ -1339,6 +1339,8 @@ glEnd (); + set_linestyle ("-"); // Disable LineStipple + #else octave_unused_parameter (props); @@ -2131,8 +2133,6 @@ draw_axes_boxes (props); } - set_linestyle ("-"); // Disable LineStipple - set_clipbox (x_min, x_max, y_min, y_max, z_min, z_max); draw_axes_children (props); @@ -3583,6 +3583,8 @@ glVertex2d (x0, y1); glVertex2d (x0, y0); glEnd (); + + set_linestyle ("-"); } // Restore previous coordinate system