Skip to content

Commit

Permalink
Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
Browse files Browse the repository at this point in the history 
[RELEASE] Notepad++ v5.6.7 release.

Conflicts:
	PowerEditor/src/Notepad_plus.cpp
	PowerEditor/src/NppNotification.cpp

[#45]

Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>
  • Loading branch information
@joce
joce committed Sep 30, 2010
2 parents a4e07b9 + 509168f commit 92e1692
Show file tree
Hide file tree
Showing 11 changed files with 266 additions and 218 deletions.
9 changes: 9 additions & 0 deletions PowerEditor/bin/change.log
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
Notepad++ v5.6.7 new features and fixed bugs (from v5.6.6) :

1. Fix "Find in files" crash bug.
2. Focus (switch to) the dirty document while asking to save unsaved document when user close Notepad++.
3. Fix the bug while giving command C:\NppDir>notepad++ (w/o quote), npp try to open file "notepad++".
4. Enlarge regconition of clickable link from "http://" to any URI.
5. Fix the bug while changing the language list in Style Configurator, the "Save and close" button is enabled.


Notepad++ v5.6.6 new features and fixed bugs (from v5.6.5) :

1. Fixed Search bug with Chinese/Japanese/Korean characters.
Expand Down
48 changes: 42 additions & 6 deletions PowerEditor/installer/nativeLang/brazilian_portuguese.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,33 @@
<Item posX = "1" posY = "12" name = "Operações com linhas"/>
<Item posX = "1" posY = "13" name = "Inserir/Remover comentário"/>
<Item posX = "1" posY = "14" name = "Auto completar"/>
<Item posX = "2" posY = "11" name = "Marcar todos"/>
<Item posX = "2" posY = "12" name = "Desmarcar todos"/>
<Item posX = "1" posY = "15" name = "Conversão final de linha"/>
<Item posX = "2" posY = "16" name = "Marcar todos"/>
<Item posX = "2" posY = "17" name = "Desmarcar todos"/>
<Item posX = "2" posY = "18" name = "Saltar acima"/>
<Item posX = "2" posY = "19" name = "Saltar abaixo"/>
<Item posX = "3" posY = "4" name = "Mostrar símbolo"/>
<Item posX = "3" posY = "5" name = "Zoom"/>
<Item posX = "3" posY = "6" name = "Mover/Clonar documento atual"/>

<Item posX = "3" posY = "16" name = "Recolher os níveis"/>
<Item posX = "3" posY = "17" name = "Expandir os níveis"/>
<Item posX = "4" posY = "5" name="Conjunto de caracteres"/>
<Item posX = "4" posY = "5" posZ = "0" name = "Árabe"/>
<Item posX = "4" posY = "5" posZ = "1" name = "Báltico"/>
<Item posX = "4" posY = "5" posZ = "2" name = "Celta"/>
<Item posX = "4" posY = "5" posZ = "3" name = "Cirílico"/>
<Item posX = "4" posY = "5" posZ = "4" name = "Europa Central"/>
<Item posX = "4" posY = "5" posZ = "5" name = "Chinês"/>
<Item posX = "4" posY = "5" posZ = "6" name = "Europa Oriental"/>
<Item posX = "4" posY = "5" posZ = "7" name = "Grego"/>
<Item posX = "4" posY = "5" posZ = "8" name = "Hebraico"/>
<Item posX = "4" posY = "5" posZ = "9" name = "Japonês"/>
<Item posX = "4" posY = "5" posZ = "10" name = "Coreano"/>
<Item posX = "4" posY = "5" posZ = "11" name = "Norte Europeu"/>
<Item posX = "4" posY = "5" posZ = "12" name = "Tailandês"/>
<Item posX = "4" posY = "5" posZ = "13" name = "Turco"/>
<Item posX = "4" posY = "5" posZ = "14" name = "Europa Ocidental"/>
<Item posX = "4" posY = "5" posZ = "15" name = "Vietnamita"/>
<Item posX = "6" posY = "4" name = "Importar" />
</SubEntries>

Expand Down Expand Up @@ -122,6 +141,23 @@
<Item id = "43030" name = "Usando 5° estilo"/>
<Item id = "43031" name = "Limpar 5° estilo"/>
<Item id = "43032" name = "Limpar todos estilos"/>
<Item id = "43033" name = "1° estilo"/>
<Item id = "43034" name = "2° estilo"/>
<Item id = "43035" name = "3° estilo"/>
<Item id = "43036" name = "4° estilo"/>
<Item id = "43037" name = "5° estilo"/>
<Item id = "43038" name = "Localizar estilo"/>
<Item id = "43039" name = "1° estilo"/>
<Item id = "43040" name = "2° estilo"/>
<Item id = "43041" name = "3° estilo"/>
<Item id = "43042" name = "4° estilo"/>
<Item id = "43043" name = "5° estilo"/>
<Item id = "43044" name = "Localizar estilo"/>
<Item id = "43045" name = "Janela do resultado de pesquisa"/>
<Item id = "43046" name = "Próximo resultado da pesquisa"/>
<Item id = "43047" name = "Resultado anterior da pesquisa"/>
<Item id = "43048" name = "Selecionar e localizar próximo"/>
<Item id = "43049" name = "Selecionar e localizar anterior"/>
<Item id = "44009" name = "Exibir somente o código"/>
<Item id = "44010" name = "Recolher todos níveis"/>
<Item id = "44011" name = "Definições do usuário..."/>
Expand Down Expand Up @@ -392,6 +428,8 @@
<Item id = "6219" name = "Veloc. piscada :"/>
<Item id = "6221" name = "R"/>
<Item id = "6222" name = "L"/>
<Item id = "6224" name = "Multiedição" />
<Item id = "6225" name = "Habilitar (Ctrl+Mouse)" />

<Item id = "6201" name = "Marcador de margem"/>
<Item id = "6202" name = "Simples"/>
Expand All @@ -408,9 +446,6 @@
<Item id = "6212" name = "Modo linha"/>
<Item id = "6213" name = "Modo plano de fundo"/>
<Item id = "6214" name = "Realçar linha atual"/>

<Item id = "6224" name = "Multiedição" />
<Item id = "6225" name = "Habilitar (Ctrl+Mouse)" />
</Scintillas>

<NewDoc title = "Novo Documento / Diretório Padrão">
Expand Down Expand Up @@ -522,6 +557,7 @@
<Item id = "6814" name = "Valor válido : 1 - 9"/>
<Item id = "6815" name = "Mostrar dica de parâmetro a cada entrada"/>
</Backup>

</Preference>

<MultiMacro title = "Executar macro múltiplas vezes">
Expand Down
14 changes: 8 additions & 6 deletions PowerEditor/installer/nativeLang/italian.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<!--
Italian translation for Notepad++ 5.6.1
Last modified Mon, December 8th, 2009 09:30 GMT by Luca Leonardi.
Italian translation for Notepad++ 5.6.6
Last modified Mon, January 26th, 2010 08:30 GMT by Luca Leonardi.
Please e-mail errors, suggestions etc. to ices_eyes(at)users.sourceforge.net.
For updates, see https://sourceforge.net/forum/message.php?msg_id=4588171
-->
Expand Down Expand Up @@ -32,10 +32,10 @@
<Item posX = "1" posY = "13" name = "Commenta/Decommenta"/>
<Item posX = "1" posY = "14" name = "Auto-completamento"/>
<Item posX = "1" posY = "15" name = "Converti carattere di fine linea"/>
<Item posX = "2" posY = "14" name = "Segna tutti"/>
<Item posX = "2" posY = "15" name = "Rimuovi marcatura"/>
<Item posX = "2" posY = "16" name = "Salta su"/>
<Item posX = "2" posY = "17" name = "Salta giù"/>
<Item posX = "2" posY = "16" name = "Segna tutti"/>
<Item posX = "2" posY = "17" name = "Rimuovi marcatura"/>
<Item posX = "2" posY = "18" name = "Salta su"/>
<Item posX = "2" posY = "19" name = "Salta giù"/>
<Item posX = "3" posY = "4" name = "Mostra simboli"/>
<Item posX = "3" posY = "5" name = "Zoom"/>
<Item posX = "3" posY = "6" name = "Sposta/Clona documento corrente"/>
Expand Down Expand Up @@ -161,6 +161,8 @@
<Item id = "43045" name = "Finestra risultati di ricerca"/>
<Item id = "43046" name = "Risultato di ricerca successivo"/>
<Item id = "43047" name = "Risultato di ricerca precedente"/>
<Item id = "43048" name = "Seleziona e trova successivo"/>
<Item id = "43049" name = "Seleziona e trova precedente"/>
<Item id = "44009" name = "Post-it"/>
<Item id = "44010" name = "Comprimi tutte le strutture"/>
<Item id = "44011" name = "Finestra impostazioni personalizzate"/>
Expand Down

0 comments on commit 92e1692

Please sign in to comment.