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
[BUG_FIXED] Fix premature deallocation bug for import UDL.

Conflicts:
	PowerEditor/src/Parameters.cpp
	PowerEditor/src/Parameters.h
	PowerEditor/src/localizationString.h

[#45]

Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>
  • Loading branch information
joce committed Oct 4, 2010
2 parents b01d5b1 + 4c8fce1 commit f76d366
Show file tree
Hide file tree
Showing 9 changed files with 1,054 additions and 1,012 deletions.
19 changes: 10 additions & 9 deletions PowerEditor/installer/nativeLang/dutch.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<NotepadPlus>
<Native-Langue name = "Nederlands" filename="dutch.xml" >
<Native-Langue name = "Nederlands" filename = "dutch.xml">
<Menu>
<Main>
<!-- Main Menu Entries -->
Expand All @@ -27,10 +27,10 @@
<Item posX = "1" posY = "14" name = "Automatisch aanvullen"/>
<Item posX = "1" posY = "15" name = "Formaat"/>

<Item posX = "2" posY = "14" name = "Alles markeren"/>
<Item posX = "2" posY = "15" name = "Markering wissen"/>
<Item posX = "2" posY = "16" name = "Ga naar begin markering"/>
<Item posX = "2" posY = "17" name = "Ga naar einde markering"/>
<Item posX = "2" posY = "16" name = "Alles markeren"/>
<Item posX = "2" posY = "17" name = "Markering wissen"/>
<Item posX = "2" posY = "18" name = "Ga naar begin markering"/>
<Item posX = "2" posY = "19" name = "Ga naar einde markering"/>

<Item posX = "3" posY = "4" name = "Niet-afdrukbare tekens"/>
<Item posX = "3" posY = "5" name = "In- en uitzoomen"/>
Expand Down Expand Up @@ -158,16 +158,18 @@
<Item id = "43035" name = "3e markering"/>
<Item id = "43036" name = "4e markering"/>
<Item id = "43037" name = "5e markering"/>
<Item id = "43038" name = "Markering zoeken"/>
<Item id = "43038" name = "Zoekterm"/>
<Item id = "43039" name = "1e markering"/>
<Item id = "43041" name = "3e markering"/>
<Item id = "43040" name = "2e markering"/>
<Item id = "43041" name = "3e markering"/>
<Item id = "43042" name = "4e markering"/>
<Item id = "43043" name = "5e markering"/>
<Item id = "43044" name = "Markering zoeken"/>
<Item id = "43044" name = "Zoekterm"/>
<Item id = "43045" name = "Gevonden resultaten"/>
<Item id = "43046" name = "Volgende zoekterm"/>
<Item id = "43047" name = "Vorige zoekterm"/>
<Item id = "43048" name = "Selecteren en volgende zoeken"/>
<Item id = "43049" name = "Selecteren en vorige zoeken"/>
<Item id = "44009" name = "Interface verbergen"/>
<Item id = "44010" name = "Gegevensstructuur samenvouwen"/>
<Item id = "44011" name = "Syntaxismarkering ontwerpen..."/>
Expand Down Expand Up @@ -568,4 +570,3 @@
</Dialog>
</Native-Langue>
</NotepadPlus>

0 comments on commit f76d366

Please sign in to comment.