[RELEASE] 6.1.8 release

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@959 f5eea248-9336-0410-98b8-ebc06183d4e3
remotes/trunk v6.1.8
Don Ho 2012-09-16 23:58:45 +00:00
parent ba6315c7bd
commit 275a78228b
6 changed files with 264 additions and 162 deletions

View File

@ -1,3 +1,8 @@
Notepad++ v6.1.8 fixed bug (from v6.1.7):
1. Fix a regression of wrong behaviour while save an empty file.
Notepad++ v6.1.7 new features and fixed bugs:
1. Fix config.xml zero length bug after Windows' update (Notepad++ is forced to quit).

Binary file not shown.

View File

@ -1,88 +1,51 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<NotepadPlus>
<![CDATA[
Name: Douglas Pereira / Nickname: Deek
e-Mail: douglas_pereira@outlook.com
]]>
<!--HyperText Mark-up Language 5-->
<AutoComplete>
<KeyWord name="!doctype" />
<!--Elements-->
<KeyWord name="!DOCTYPE" />
<KeyWord name="a" />
<KeyWord name="abbr" />
<KeyWord name="accept" />
<KeyWord name="accept-charset" />
<KeyWord name="accesskey" />
<KeyWord name="acronym" />
<KeyWord name="action" />
<KeyWord name="address" />
<KeyWord name="align" />
<KeyWord name="alink" />
<KeyWord name="alt" />
<KeyWord name="applet" />
<KeyWord name="archive" />
<KeyWord name="area" />
<KeyWord name="axis" />
<KeyWord name="article" />
<KeyWord name="aside" />
<KeyWord name="audio" />
<KeyWord name="b" />
<KeyWord name="background" />
<KeyWord name="base" />
<KeyWord name="basefont" />
<KeyWord name="bdi" />
<KeyWord name="bdo" />
<KeyWord name="bgcolor" />
<KeyWord name="big" />
<KeyWord name="blockquote" />
<KeyWord name="body" />
<KeyWord name="border" />
<KeyWord name="br" />
<KeyWord name="button" />
<KeyWord name="caption" />
<KeyWord name="cellpadding" />
<KeyWord name="cellspacing" />
<KeyWord name="center" />
<KeyWord name="char" />
<KeyWord name="charoff" />
<KeyWord name="charset" />
<KeyWord name="checkbox" />
<KeyWord name="checked" />
<KeyWord name="canvas" />
<KeyWord name="caption" />" />
<KeyWord name="cite" />
<KeyWord name="class" />
<KeyWord name="classid" />
<KeyWord name="clear" />
<KeyWord name="code" />
<KeyWord name="codebase" />
<KeyWord name="codetype" />
<KeyWord name="col" />
<KeyWord name="colgroup" />
<KeyWord name="color" />
<KeyWord name="cols" />
<KeyWord name="colspan" />
<KeyWord name="comment" />
<KeyWord name="compact" />
<KeyWord name="content" />
<KeyWord name="coords" />
<KeyWord name="data" />
<KeyWord name="datafld" />
<KeyWord name="dataformatas" />
<KeyWord name="datapagesize" />
<KeyWord name="datasrc" />
<KeyWord name="datetime" />
<KeyWord name="command" />
<KeyWord name="datalist" />
<KeyWord name="dd" />
<KeyWord name="declare" />
<KeyWord name="defer" />
<KeyWord name="del" />
<KeyWord name="datails" />
<KeyWord name="dfn" />
<KeyWord name="dir" />
<KeyWord name="disabled" />
<KeyWord name="div" />
<KeyWord name="dl" />
<KeyWord name="dt" />
<KeyWord name="em" />
<KeyWord name="embed" />
<KeyWord name="enctype" />
<KeyWord name="event" />
<KeyWord name="face" />
<KeyWord name="fieldset" />
<KeyWord name="file" />
<KeyWord name="font" />
<KeyWord name="for" />
<KeyWord name="figcaption" />
<KeyWord name="figure" />
<KeyWord name="footer" />
<KeyWord name="form" />
<KeyWord name="frame" />
<KeyWord name="frameborder" />
<KeyWord name="frameset" />
<KeyWord name="h1" />
<KeyWord name="h2" />
<KeyWord name="h3" />
@ -90,135 +53,248 @@
<KeyWord name="h5" />
<KeyWord name="h6" />
<KeyWord name="head" />
<KeyWord name="headers" />
<KeyWord name="height" />
<KeyWord name="hidden" />
<KeyWord name="header" />
<KeyWord name="hgroup" />
<KeyWord name="hr" />
<KeyWord name="href" />
<KeyWord name="hreflang" />
<KeyWord name="hspace" />
<KeyWord name="html" />
<KeyWord name="http-equiv" />
<KeyWord name="i" />
<KeyWord name="id" />
<KeyWord name="iframe" />
<KeyWord name="image" />
<KeyWord name="img" />
<KeyWord name="input" />
<KeyWord name="ins" />
<KeyWord name="isindex" />
<KeyWord name="ismap" />
<KeyWord name="keygen" />
<KeyWord name="kbd" />
<KeyWord name="label" />
<KeyWord name="lang" />
<KeyWord name="language" />
<KeyWord name="leftmargin" />
<KeyWord name="legend" />
<KeyWord name="li" />
<KeyWord name="link" />
<KeyWord name="longdesc" />
<KeyWord name="map" />
<KeyWord name="marginheight" />
<KeyWord name="mark" />
<KeyWord name="marginwidth" />
<KeyWord name="maxlength" />
<KeyWord name="media" />
<KeyWord name="menu" />
<KeyWord name="meta" />
<KeyWord name="method" />
<KeyWord name="multiple" />
<KeyWord name="name" />
<KeyWord name="noframes" />
<KeyWord name="nohref" />
<KeyWord name="noresize" />
<KeyWord name="meter" />
<KeyWord name="nav" />
<KeyWord name="noscript" />
<KeyWord name="noshade" />
<KeyWord name="nowrap" />
<KeyWord name="object" />
<KeyWord name="ol" />
<KeyWord name="optgroup" />
<KeyWord name="option" />
<KeyWord name="output" />
<KeyWord name="p" />
<KeyWord name="param" />
<KeyWord name="pre" />
<KeyWord name="prpgress" />
<KeyWord name="q" />
<KeyWord name="rp" />
<KeyWord name="rt" />
<KeyWord name="ruby" />
<KeyWord name="s" />
<KeyWord name="samp" />
<KeyWord name="script" />
<KeyWord name="select" />
<KeyWord name="section" />
<KeyWord name="selected" />
<KeyWord name="small" />
<KeyWord name="source" />
<KeyWord name="span" />
<KeyWord name="strong" />
<KeyWord name="style" />
<KeyWord name="sub" />
<KeyWord name="summary" />
<KeyWord name="sup" />
<KeyWord name="table" />
<KeyWord name="tbody" />
<KeyWord name="td" />
<KeyWord name="textarea" />
<KeyWord name="tfoot" />
<KeyWord name="th" />
<KeyWord name="thead" />
<KeyWord name="time" />
<KeyWord name="title" />
<KeyWord name="tr" />
<KeyWord name="track" />
<KeyWord name="u" />
<KeyWord name="ul" />
<KeyWord name="var" />
<KeyWord name="video" />
<KeyWord name="wbr" />
<!--Attributes-->
<KeyWord name="accept" />
<KeyWord name="accept-charset" />
<KeyWord name="action" />
<KeyWord name="alt" />
<KeyWord name="async" />
<KeyWord name="autocomplete" />
<KeyWord name="autofocus" />
<KeyWord name="autoplay" />
<KeyWord name="challenge" />
<KeyWord name="charset" />
<KeyWord name="checked" />
<KeyWord name="cite" />
<KeyWord name="cols" />
<KeyWord name="colspan" />
<KeyWord name="content" />
<KeyWord name="controls" />
<KeyWord name="coords" />
<KeyWord name="data" />
<KeyWord name="datetime" />
<KeyWord name="default" />
<KeyWord name="defer" />
<KeyWord name="disabled" />
<KeyWord name="enctype" />
<KeyWord name="for" />
<KeyWord name="form" />
<KeyWord name="formaction" />
<KeyWord name="formenctype" />
<KeyWord name="formmethod" />
<KeyWord name="formnovalidate" />
<KeyWord name="formtarget" />
<KeyWord name="headers" />
<KeyWord name="height" />
<KeyWord name="high" />
<KeyWord name="href" />
<KeyWord name="hreflang" />
<KeyWord name="http-equiv" />
<KeyWord name="icon" />
<KeyWord name="ismap" />
<KeyWord name="keytype" />
<KeyWord name="kind" />
<KeyWord name="label" />
<KeyWord name="list" />
<KeyWord name="loop" />
<KeyWord name="low" />
<KeyWord name="manifest" />
<KeyWord name="max" />
<KeyWord name="maxlength" />
<KeyWord name="media" />
<KeyWord name="method" />
<KeyWord name="min" />
<KeyWord name="multiple" />
<KeyWord name="muted" />
<KeyWord name="name" />
<KeyWord name="novalidate" />
<KeyWord name="open" />
<KeyWord name="optimum" />
<KeyWord name="pattern" />
<KeyWord name="placeholder" />
<KeyWord name="poster" />
<KeyWord name="preload" />
<KeyWord name="pubdate" />
<KeyWord name="radiogroup" />
<KeyWord name="readonly" />
<KeyWord name="required" />
<KeyWord name="rel" />
<KeyWord name="reversed" />
<KeyWord name="rows" />
<KeyWord name="rowspan" />
<KeyWord name="sandbox" />
<KeyWord name="scope" />
<KeyWord name="scoped" />
<KeyWord name="seamless" />
<KeyWord name="selected" />
<KeyWord name="shape" />
<KeyWord name="size" />
<KeyWord name="sizes" />
<KeyWord name="span" />
<KeyWord name="src" />
<KeyWord name="srcdoc" />
<KeyWord name="srclang" />
<KeyWord name="start" />
<KeyWord name="step" />
<KeyWord name="target" />
<KeyWord name="type" />
<KeyWord name="usemap" />
<KeyWord name="value" />
<KeyWord name="width" />
<KeyWord name="wrap" />
<KeyWord name="xml:lang" />
<KeyWord name="xmlns" />
<!--Global Attributes-->
<KeyWord name="aceeskey" />
<KeyWord name="class" />
<KeyWord name="contenteditable" />
<KeyWord name="contextmenu" />
<KeyWord name="dir" />
<KeyWord name="draggable" />
<KeyWord name="dropzone" />
<KeyWord name="hidden" />
<KeyWord name="id" />
<KeyWord name="lang" />
<KeyWord name="spellcheck" />
<KeyWord name="title" />
<!--Window Events-->
<KeyWord name="onafterprint" />
<KeyWord name="onbeforeprint" />
<KeyWord name="onbeforeunload" />
<KeyWord name="onerror" />
<KeyWord name="onhaschange" />
<KeyWord name="onload" />
<KeyWord name="onmessage" />
<KeyWord name="onoffline" />
<KeyWord name="ononline" />
<KeyWord name="onpagehide" />
<KeyWord name="onpageshow" />
<KeyWord name="onpopstate" />
<KeyWord name="onredo" />
<KeyWord name="onresize" />
<KeyWord name="onstorage" />
<KeyWord name="onundo" />
<KeyWord name="onunload" />
<!--Form Events-->
<KeyWord name="onblur" />
<KeyWord name="onchange" />
<KeyWord name="onclick" />
<KeyWord name="ondblclick" />
<KeyWord name="oncontextmenu" />
<KeyWord name="onfocus" />
<KeyWord name="onformchange" />
<KeyWord name="onforminput" />
<KeyWord name="oninput" />
<KeyWord name="oninvalid" />
<KeyWord name="onselect" />
<KeyWord name="onsubmit" />
<!--Keyboard Events-->
<KeyWord name="onkeydown" />
<KeyWord name="onkeypress" />
<KeyWord name="onkeyup" />
<KeyWord name="onload" />
<!--Mouse Events-->
<KeyWord name="onclick" />
<KeyWord name="ondblclick" />
<KeyWord name="ondrag" />
<KeyWord name="ondragend" />
<KeyWord name="ondragenter" />
<KeyWord name="ondragleave" />
<KeyWord name="ondragover" />
<KeyWord name="ondragstart" />
<KeyWord name="ondrop" />
<KeyWord name="onmousedown" />
<KeyWord name="onmousemove" />
<KeyWord name="onmouseout" />
<KeyWord name="onmouseover" />
<KeyWord name="onmouseup" />
<KeyWord name="onreset" />
<KeyWord name="onselect" />
<KeyWord name="onsubmit" />
<KeyWord name="onunload" />
<KeyWord name="optgroup" />
<KeyWord name="option" />
<KeyWord name="p" />
<KeyWord name="param" />
<KeyWord name="password" />
<KeyWord name="pre" />
<KeyWord name="profile" />
<KeyWord name="prompt" />
<KeyWord name="public" />
<KeyWord name="q" />
<KeyWord name="radio" />
<KeyWord name="readonly" />
<KeyWord name="rel" />
<KeyWord name="reset" />
<KeyWord name="rev" />
<KeyWord name="rows" />
<KeyWord name="rowspan" />
<KeyWord name="rules" />
<KeyWord name="s" />
<KeyWord name="samp" />
<KeyWord name="scheme" />
<KeyWord name="scope" />
<KeyWord name="script" />
<KeyWord name="select" />
<KeyWord name="selected" />
<KeyWord name="shape" />
<KeyWord name="size" />
<KeyWord name="small" />
<KeyWord name="span" />
<KeyWord name="src" />
<KeyWord name="standby" />
<KeyWord name="start" />
<KeyWord name="strike" />
<KeyWord name="strong" />
<KeyWord name="style" />
<KeyWord name="sub" />
<KeyWord name="submit" />
<KeyWord name="summary" />
<KeyWord name="sup" />
<KeyWord name="tabindex" />
<KeyWord name="table" />
<KeyWord name="target" />
<KeyWord name="tbody" />
<KeyWord name="td" />
<KeyWord name="text" />
<KeyWord name="textarea" />
<KeyWord name="tfoot" />
<KeyWord name="th" />
<KeyWord name="thead" />
<KeyWord name="title" />
<KeyWord name="topmargin" />
<KeyWord name="tr" />
<KeyWord name="tt" />
<KeyWord name="type" />
<KeyWord name="u" />
<KeyWord name="ul" />
<KeyWord name="usemap" />
<KeyWord name="valign" />
<KeyWord name="value" />
<KeyWord name="valuetype" />
<KeyWord name="var" />
<KeyWord name="version" />
<KeyWord name="vlink" />
<KeyWord name="vspace" />
<KeyWord name="width" />
<KeyWord name="xml" />
<KeyWord name="xmlns" />
<KeyWord name="onmpusewheel" />
<KeyWord name="onscroll" />
<!--Media Events-->
<KeyWord name="onabort" />
<KeyWord name="oncanplay" />
<KeyWord name="oncanplaythrough" />
<KeyWord name="ondurationchange" />
<KeyWord name="onemptied" />
<KeyWord name="onended" />
<KeyWord name="onloadeddata" />
<KeyWord name="onloadedmetadata" />
<KeyWord name="onloadstart" />
<KeyWord name="onpause" />
<KeyWord name="onplay" />
<KeyWord name="onplaying" />
<KeyWord name="onprogress" />
<KeyWord name="onratechange" />
<KeyWord name="onreadystatechange" />
<KeyWord name="onseeked" />
<KeyWord name="onseeking" />
<KeyWord name="onstalled" />
<KeyWord name="onsuspend" />
<KeyWord name="ontimeupdate" />
<KeyWord name="onvolumechange" />
<KeyWord name="onwaiting" />
</AutoComplete>
</NotepadPlus>

View File

@ -10,7 +10,7 @@
<Item menuId="search" name = "&amp;Szukaj"/>
<Item menuId="view" name = "&amp;Widok"/>
<Item menuId="encoding" name = "&amp;Format"/>
<Item menuId="language" name = "&amp;Jêzyk"/>
<Item menuId="language" name = "S&amp;kładnia"/>
<Item menuId="settings" name = "&amp;Ustawienia"/>
<Item menuId="macro" name = "&amp;Makra"/>
<Item menuId="run" name = "U&amp;ruchom"/>
@ -219,6 +219,7 @@
<Item id = "44049" name = "&amp;Informacje o pliku ..."/>
<Item id = "44072" name = "Przejdź do drugiego widoku"/>
<Item id="44080" name="Mapa dokumentu"/>
<Item id="44081" name="Panel projektu &amp;1"/>
<Item id="44082" name="Panel projektu &amp;2"/>
<Item id="44083" name="Panel projektu &amp;3"/>
@ -333,6 +334,7 @@
<Item id = "1686" name = "Przezroczystość"/>
<Item id = "1687" name = "Gdy nieaktywne"/>
<Item id = "1688" name = "Zawsze"/>
<Item id="1703" name="&amp;. wskazuje nowš linię"/>
</Find>
<GoToLine title = "Idź do linii #">
<Item id = "2007" name = "Linia"/>
@ -362,6 +364,9 @@
<Item id = "2910" name = "Szukaj"/>
</FindCharsInRange>
<DocSwitcher title = "Przełšcz dokument...">
</DocSwitcher>
<StyleConfig title = "Konfigurator stylów">
<Item id = "1" name = "Sprawdź!"/>
<Item id = "2" name = "Anuluj"/>
@ -474,6 +479,10 @@
<Item id = "6111" name = "Pokaż pasek stanu"/>
<Item id = "6112" name = "Przycisk zamykania na każdej zakładce"/>
<Item id = "6113" name = "Podwójne kliknięcie zamyka dokument"/>
<Item id="6114" name="Pozwól na przełšczanie między dokumentami"/>
<Item id="6115" name="Automatyczne wcięcia"/>
<Item id="6116" name="Pamiętaj ostatnio używany katalog"/>
<Item id="6117" name="Skorzystaj z historii dokumentu"/>
<Item id = "6118" name = "Ukryj"/>
<Item id = "6119" name = "Wiele linii"/>
<Item id = "6120" name = "Pionowo"/>
@ -584,6 +593,7 @@
<Item id = "6722" name = "Prawa sekcja"/>
<Item id = "6723" name = "Dodaj"/>
<Item id = "6725" name = "Parametr:"/>
<Item id="6727" name="Wybierz miejsce:"/>
<Item id = "6728" name = "Nagłówek i Stopka"/>
</Print>
<MISC title = "Inne">
@ -684,10 +694,13 @@ Kontynuowa
<ColumnModeTip title="Podpowiedź kolumnowego trybu zaznaczania" message="Użyj 'Alt+zaznaczenie myszką' lub 'Alt+Shift+strzałki'
by przejść do blokowego trybu zaznaczania"/>
<NbFileToOpenImportantWarning title="Otwarcie wielu plików" message="Majš być otwarte pliki: $INT_REPLACE$.\rKontynuować?"/>
</MessageBox>
<ProjectManager>
<PanelTitle name="Projekt"/>
<WorkspaceRootName name="Obszar roboczy"/>
<NewProjectName name="Nazwa projektu"/>
<NewFolderName name="Nazwa folderu"/>
<Menus>
<Entries>
<Item id="0" name="Obszar roboczy"/>
@ -707,17 +720,25 @@ by przej
<Item id="3112" name="Dodaj folder"/>
<Item id="3113" name="Dodaj pliki..."/>
<Item id="3114" name="Usuń"/>
<Item id="3117" name="Dodaj pliki z folderu..." />
<Item id="3118" name="Przesuń w górę"/>
<Item id="3119" name="Przesuń na dół"/>
</ProjectMenu>
<FolderMenu>
<Item id="3111" name="Zmień nazwę"/>
<Item id="3112" name="Dodaj folder"/>
<Item id="3113" name="Dodaj pliki..."/>
<Item id="3114" name="Usuń"/>
<Item id="3117" name="Dodaj pliki z folderu..." />
<Item id="3118" name="Przesuń w górę"/>
<Item id="3119" name="Przesuń na dół"/>
</FolderMenu>
<FileMenu>
<Item id="3111" name="Zmień nazwę"/>
<Item id="3115" name="Usuń"/>
<Item id="3116" name="Zmień ścieżkę pliku"/>
<Item id="3118" name="Przesuń w górę"/>
<Item id="3119" name="Przesuń na dół"/>
</FileMenu>
</Menus>
</ProjectManager>

View File

@ -28,10 +28,10 @@
; Define the application name
!define APPNAME "Notepad++"
!define APPVERSION "6.1.7"
!define APPVERSION "6.1.8"
!define APPNAMEANDVERSION "${APPNAME} v${APPVERSION}"
!define VERSION_MAJOR 6
!define VERSION_MINOR 17
!define VERSION_MINOR 18
!define APPWEBSITE "http://notepad-plus-plus.org/"

View File

@ -29,12 +29,12 @@
#ifndef RESOURCE_H
#define RESOURCE_H
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.7")
#define NOTEPAD_PLUS_VERSION TEXT("Notepad++ v6.1.8")
// should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
// ex : #define VERSION_VALUE TEXT("5.63\0")
#define VERSION_VALUE TEXT("6.17\0")
#define VERSION_DIGITALVALUE 6, 1, 7, 0
#define VERSION_VALUE TEXT("6.18\0")
#define VERSION_DIGITALVALUE 6, 1, 8, 0
#ifdef UNICODE
#define UNICODE_ANSI_MODE TEXT("(UNICODE)")