[prev in list] [next in list] [prev in thread] [next in thread]
List: nsis-commits
Subject: [NSIS-commits] SF.net SVN: nsis:[6870] NSIS/branches/nsis2
From: anders_k--- via NSIS-commits <nsis-commits () lists ! sourceforge ! net>
Date: 2017-06-06 2:03:55
Message-ID: 1496714635.432771.32369 () sfp-scm-4 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6870
http://sourceforge.net/p/nsis/code/6870
Author: anders_k
Date: 2017-06-06 02:03:53 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
Backported some bugfixes from NSIS 3
Modified Paths:
--------------
NSIS/branches/nsis2/Contrib/AdvSplash/advsplash.txt
NSIS/branches/nsis2/Contrib/ExDLL/exdll.c
NSIS/branches/nsis2/Contrib/InstallOptions/Readme.html
NSIS/branches/nsis2/Contrib/InstallOptions/test.ini
NSIS/branches/nsis2/Contrib/InstallOptions/testnotify.ini
NSIS/branches/nsis2/Contrib/Language files/Afrikaans.nlf
NSIS/branches/nsis2/Contrib/Language files/Albanian.nlf
NSIS/branches/nsis2/Contrib/Language files/Arabic.nlf
NSIS/branches/nsis2/Contrib/Language files/Arabic.nsh
NSIS/branches/nsis2/Contrib/Language files/Basque.nlf
NSIS/branches/nsis2/Contrib/Language files/Basque.nsh
NSIS/branches/nsis2/Contrib/Language files/Belarusian.nlf
NSIS/branches/nsis2/Contrib/Language files/Bosnian.nlf
NSIS/branches/nsis2/Contrib/Language files/Breton.nlf
NSIS/branches/nsis2/Contrib/Language files/Bulgarian.nlf
NSIS/branches/nsis2/Contrib/Language files/Catalan.nlf
NSIS/branches/nsis2/Contrib/Language files/Croatian.nlf
NSIS/branches/nsis2/Contrib/Language files/Czech.nlf
NSIS/branches/nsis2/Contrib/Language files/Danish.nlf
NSIS/branches/nsis2/Contrib/Language files/Danish.nsh
NSIS/branches/nsis2/Contrib/Language files/Dutch.nlf
NSIS/branches/nsis2/Contrib/Language files/English.nlf
NSIS/branches/nsis2/Contrib/Language files/Esperanto.nlf
NSIS/branches/nsis2/Contrib/Language files/Estonian.nlf
NSIS/branches/nsis2/Contrib/Language files/Farsi.nlf
NSIS/branches/nsis2/Contrib/Language files/Finnish.nlf
NSIS/branches/nsis2/Contrib/Language files/French.nlf
NSIS/branches/nsis2/Contrib/Language files/Galician.nlf
NSIS/branches/nsis2/Contrib/Language files/German.nlf
NSIS/branches/nsis2/Contrib/Language files/Greek.nlf
NSIS/branches/nsis2/Contrib/Language files/Hebrew.nlf
NSIS/branches/nsis2/Contrib/Language files/Hungarian.nlf
NSIS/branches/nsis2/Contrib/Language files/Icelandic.nlf
NSIS/branches/nsis2/Contrib/Language files/Indonesian.nlf
NSIS/branches/nsis2/Contrib/Language files/Irish.nlf
NSIS/branches/nsis2/Contrib/Language files/Italian.nlf
NSIS/branches/nsis2/Contrib/Language files/Japanese.nlf
NSIS/branches/nsis2/Contrib/Language files/Korean.nlf
NSIS/branches/nsis2/Contrib/Language files/Kurdish.nlf
NSIS/branches/nsis2/Contrib/Language files/Latvian.nlf
NSIS/branches/nsis2/Contrib/Language files/Lithuanian.nlf
NSIS/branches/nsis2/Contrib/Language files/Luxembourgish.nlf
NSIS/branches/nsis2/Contrib/Language files/Macedonian.nlf
NSIS/branches/nsis2/Contrib/Language files/Malay.nlf
NSIS/branches/nsis2/Contrib/Language files/Mongolian.nlf
NSIS/branches/nsis2/Contrib/Language files/Norwegian.nlf
NSIS/branches/nsis2/Contrib/Language files/Norwegian.nsh
NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nlf
NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nsh
NSIS/branches/nsis2/Contrib/Language files/Polish.nlf
NSIS/branches/nsis2/Contrib/Language files/Portuguese.nlf
NSIS/branches/nsis2/Contrib/Language files/Portuguese.nsh
NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nlf
NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nsh
NSIS/branches/nsis2/Contrib/Language files/Romanian.nlf
NSIS/branches/nsis2/Contrib/Language files/Russian.nlf
NSIS/branches/nsis2/Contrib/Language files/Serbian.nlf
NSIS/branches/nsis2/Contrib/Language files/SerbianLatin.nlf
NSIS/branches/nsis2/Contrib/Language files/SimpChinese.nlf
NSIS/branches/nsis2/Contrib/Language files/Slovak.nlf
NSIS/branches/nsis2/Contrib/Language files/Slovenian.nlf
NSIS/branches/nsis2/Contrib/Language files/Spanish.nlf
NSIS/branches/nsis2/Contrib/Language files/SpanishInternational.nlf
NSIS/branches/nsis2/Contrib/Language files/Swedish.nlf
NSIS/branches/nsis2/Contrib/Language files/Swedish.nsh
NSIS/branches/nsis2/Contrib/Language files/Thai.nlf
NSIS/branches/nsis2/Contrib/Language files/TradChinese.nlf
NSIS/branches/nsis2/Contrib/Language files/Turkish.nlf
NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nlf
NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nsh
NSIS/branches/nsis2/Contrib/Language files/Uzbek.nlf
NSIS/branches/nsis2/Contrib/Language files/Welsh.nlf
NSIS/branches/nsis2/Contrib/Math/Math.txt
NSIS/branches/nsis2/Contrib/Modern UI/System.nsh
NSIS/branches/nsis2/Contrib/Modern UI 2/Localization.nsh
NSIS/branches/nsis2/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh
NSIS/branches/nsis2/Contrib/MultiUser/MultiUser.nsh
NSIS/branches/nsis2/Contrib/MultiUser/Readme.html
NSIS/branches/nsis2/Contrib/NSIS Menu/SConscript
NSIS/branches/nsis2/Contrib/NSIS Menu/nsismenu/nslinks.cpp
NSIS/branches/nsis2/Contrib/NSISdl/ReadMe.txt
NSIS/branches/nsis2/Contrib/NSISdl/SConscript
NSIS/branches/nsis2/Contrib/Splash/splash.txt
NSIS/branches/nsis2/Contrib/StartMenu/Example.nsi
NSIS/branches/nsis2/Contrib/System/System.html
NSIS/branches/nsis2/Contrib/zip2exe/main.cpp
NSIS/branches/nsis2/Contrib/zip2exe/res.rc
NSIS/branches/nsis2/Docs/src/attributes.but
NSIS/branches/nsis2/Docs/src/basic.but
NSIS/branches/nsis2/Docs/src/callback.but
NSIS/branches/nsis2/Docs/src/compiler.but
NSIS/branches/nsis2/Docs/src/credits.but
NSIS/branches/nsis2/Docs/src/generalpurpose.but
NSIS/branches/nsis2/Docs/src/history.but
NSIS/branches/nsis2/Docs/src/langs.but
NSIS/branches/nsis2/Docs/src/misc.but
NSIS/branches/nsis2/Docs/src/script.but
NSIS/branches/nsis2/Docs/src/tutorial.but
NSIS/branches/nsis2/Docs/src/var.but
NSIS/branches/nsis2/Examples/Modern UI/StartMenu.nsi
NSIS/branches/nsis2/Examples/bigtest.nsi
NSIS/branches/nsis2/Examples/example2.nsi
NSIS/branches/nsis2/Examples/makensis.nsi
NSIS/branches/nsis2/Include/LogicLib.nsh
NSIS/branches/nsis2/Include/StrFunc.nsh
NSIS/branches/nsis2/Include/UpgradeDLL.nsh
NSIS/branches/nsis2/SCons/Config/gnu
NSIS/branches/nsis2/SCons/Tools/crossmingw.py
NSIS/branches/nsis2/SCons/config.py
NSIS/branches/nsis2/Scripts/release.py
NSIS/branches/nsis2/Source/7zip/7zip/Compress/LZ/BinTree/BinTree.h
NSIS/branches/nsis2/Source/7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
NSIS/branches/nsis2/Source/Tests/compression.cpp
NSIS/branches/nsis2/Source/exehead/Main.c
NSIS/branches/nsis2/Source/exehead/Ui.c
NSIS/branches/nsis2/Source/exehead/api.h
NSIS/branches/nsis2/Source/exehead/exec.c
NSIS/branches/nsis2/Source/exehead/fileform.c
NSIS/branches/nsis2/Source/exehead/fileform.h
NSIS/branches/nsis2/Source/exehead/util.c
NSIS/branches/nsis2/Source/lang.cpp
NSIS/branches/nsis2/Source/makenssi.cpp
NSIS/branches/nsis2/Source/script.cpp
NSIS/branches/nsis2/Source/tokens.cpp
NSIS/branches/nsis2/Source/tokens.h
NSIS/branches/nsis2/Source/util.cpp
NSIS/branches/nsis2/Source/util.h
NSIS/branches/nsis2/Source/zlib/ZUTIL.H
NSIS/branches/nsis2/TODO.txt
Modified: NSIS/branches/nsis2/Contrib/AdvSplash/advsplash.txt
===================================================================
--- NSIS/branches/nsis2/Contrib/AdvSplash/advsplash.txt 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/AdvSplash/advsplash.txt 2017-06-06 02:03:53 UTC (rev \
6870) @@ -14,7 +14,7 @@
File /oname=spltmp.bmp "my_splash.bmp"
; optional
-; File /oname=spltmp.wav "my_splashshit.wav"
+; File /oname=spltmp.wav "my_my_splashsound.wav"
advsplash::show 1000 600 400 -1 $TEMP\spltmp
Modified: NSIS/branches/nsis2/Contrib/ExDLL/exdll.c
===================================================================
--- NSIS/branches/nsis2/Contrib/ExDLL/exdll.c 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/ExDLL/exdll.c 2017-06-06 02:03:53 UTC (rev 6870)
@@ -15,9 +15,9 @@
// note if you want parameters from the stack, pop them off in order.
- // i.e. if you are called via exdll::myFunction file.dat poop.dat
+ // i.e. if you are called via exdll::myFunction file.dat read.txt
// calling popstring() the first time would give you file.dat,
- // and the second time would give you poop.dat.
+ // and the second time would give you read.txt.
// you should empty the stack of your parameters, and ONLY your
// parameters.
Modified: NSIS/branches/nsis2/Contrib/InstallOptions/Readme.html
===================================================================
--- NSIS/branches/nsis2/Contrib/InstallOptions/Readme.html 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/InstallOptions/Readme.html 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -883,7 +883,7 @@
<pre>
Original version Copyright © 2001 Michael Bishop
DLL version 1 Copyright © 2001-2002 Nullsoft, Inc., ORTIM
-DLL version 2 Copyright © 2003-2015 Amir Szekely, Joost Verburg, Dave Laundon
+DLL version 2 Copyright © 2003-2017 Amir Szekely, Joost Verburg, Dave Laundon
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
Modified: NSIS/branches/nsis2/Contrib/InstallOptions/test.ini
===================================================================
--- NSIS/branches/nsis2/Contrib/InstallOptions/test.ini 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/InstallOptions/test.ini 2017-06-06 02:03:53 UTC (rev \
6870) @@ -41,12 +41,12 @@
[Field 5]
Type=FileRequest
-State=C:\poop.poop
+State=C:\dummy.xyz
Left=10
Right=-10
Top=56
Bottom=68
-Filter=Poop Files|*.poop|All files|*.*
+Filter=XYZ Files|*.xyz|All files|*.*
Flags=GROUP|FILE_MUST_EXIST|FILE_EXPLORER|FILE_HIDEREADONLY
[Field 6]
Modified: NSIS/branches/nsis2/Contrib/InstallOptions/testnotify.ini
===================================================================
--- NSIS/branches/nsis2/Contrib/InstallOptions/testnotify.ini 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/InstallOptions/testnotify.ini 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -41,8 +41,8 @@
[Field 5]
Type=FileRequest
Flags=GROUP|FILE_MUST_EXIST|FILE_EXPLORER|FILE_HIDEREADONLY
-State=C:\poop.poop
-Filter=Poop Files|*.poop|All files|*.*
+State=C:\dummy.xyz
+Filter=XYZ Files|*.xyz|All files|*.*
Left=10
Right=-10
Top=56
Modified: NSIS/branches/nsis2/Contrib/Language files/Afrikaans.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Afrikaans.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Afrikaans.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Albanian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Albanian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Albanian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Arabic.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Arabic.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Arabic.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1256
# RTL - anything else than RTL means LTR
RTL
Modified: NSIS/branches/nsis2/Contrib/Language files/Arabic.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Arabic.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Arabic.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -120,3 +120,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "\xE5\xE1 \xC3\xE4\xCA \
\xE3\xCA\xC3\xDF\xCF \xE3\xE4 \xC3\xE4\xDF \xC7\xE1\xCE\xD1\xE6\xCC \xE3\xE4 \
\xE3\xD2\xED\xE1 $(^Name)\xBF"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "\xC7\xCE\xCA\xD1 \
\xC7\xE1\xE3\xD3\xCA\xCE\xCF\xE3\xED\xE4" + ${LangFileString} \
MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "\xCD\xCF\xCF \xE1\xE3\xE4 \xE3\xE4 \
\xC7\xE1\xE3\xD3\xCA\xCE\xCF\xE3\xED\xE4 \xCA\xD1\xED\xCF \xCA\xD1\xDF\xED\xC8 \
$(^NameDA)." + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "\xCD\xCF\xCF \
\xE1\xE3\xE4 \xCA\xD1\xED\xCF \xCA\xD1\xDF\xED\xC8 $(^NameDA) \xE1\xE4\xDD\xD3\xDF \
\xDD\xDE\xD8 \xC3\xE3 \xE1\xCC\xE3\xED\xDA \xE3\xD3\xCA\xCE\xCF\xE3\xED \
\xC7\xE1\xCD\xC7\xD3\xC8. $(^ClickNext)" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "\xCA\xD1\xDF\xED\xC8 \xE1\xCC\xE3\xED\xDA \
\xE3\xD3\xCA\xCE\xCF\xE3\xED \xE5\xD0\xC7 \xC7\xE1\xCD\xC7\xD3\xC8" + \
${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "\xCA\xD1\xDF\xED\xC8 \
\xE1\xED \xDD\xDE\xD8" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Basque.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Basque.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Basque.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Basque.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Basque.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Basque.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -119,3 +119,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "Ziur zaude $(^Name)-ren ezabaketa \
laguntzailetik irten nahi duzula?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Hautatu Erabiltzaileak"
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Hautatu zein \
erabiltzailerentzat ezartzea nahi duzun $(^NameDA)." + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Hautatu norentzat ezartzea nahi duzun $(^NameDA) \
zuretzat bakarrik edo ordenagailu honetako erabiltzaile guztientzat. $(^ClickNext)" + \
${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Ezarri ordenagailu hau \
erabiltzen duen edonorentzat" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Ezarri niretzat bakarrik" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Belarusian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Belarusian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Belarusian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Bosnian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Bosnian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Bosnian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Breton.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Breton.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Breton.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Bulgarian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Bulgarian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Bulgarian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Catalan.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Catalan.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Catalan.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Croatian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Croatian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Croatian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Czech.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Czech.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Czech.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Danish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Danish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Danish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Danish.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Danish.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Danish.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -119,3 +119,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker p\xE5 at du vil afbryde \
$(^Name) afinstallationen?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "V\xE6lg brugere"
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "V\xE6lg de brugere som skal \
have installeret $(^NameDA)." + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_TOP "V\xE6lg hvorvidt du vil installere $(^NameDA) \
kun for dig selv eller for alle brugere p\xE5 denne computer. $(^ClickNext)" + \
${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som \
bruger denne computer" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer kun for mig" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Dutch.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Dutch.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Dutch.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/English.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/English.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/English.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
-
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Esperanto.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Esperanto.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Esperanto.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
-
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Estonian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Estonian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Estonian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1257
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Farsi.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Farsi.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Farsi.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1256
# RTL - anything else than RTL means LTR
RTL
Modified: NSIS/branches/nsis2/Contrib/Language files/Finnish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Finnish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Finnish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/French.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/French.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/French.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Galician.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Galician.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Galician.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/German.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/German.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/German.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Greek.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Greek.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Greek.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1253
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Hebrew.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Hebrew.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Hebrew.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1255
# RTL - anything else than RTL means LTR
RTL
Modified: NSIS/branches/nsis2/Contrib/Language files/Hungarian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Hungarian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Hungarian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Icelandic.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Icelandic.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Icelandic.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Indonesian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Indonesian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Indonesian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
-
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Irish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Irish.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Irish.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Italian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Italian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Italian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Japanese.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Japanese.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Japanese.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
\x82l\x82r \x82o\x83S\x83V\x83b\x83N
9
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
932
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Korean.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Korean.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Korean.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
\xB1\xBC\xB8\xB2
9
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
949
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Kurdish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Kurdish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Kurdish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
-
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Latvian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Latvian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Latvian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1257
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Lithuanian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Lithuanian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Lithuanian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1257
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Luxembourgish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Luxembourgish.nlf 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Luxembourgish.nlf 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Macedonian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Macedonian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Macedonian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Malay.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Malay.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Malay.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
-
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Mongolian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Mongolian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Mongolian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Norwegian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Norwegian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Norwegian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Norwegian.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Norwegian.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Norwegian.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -119,3 +119,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du sikker p\xE5 at du vil avbryte \
avinstallasjonen av $(^Name)?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Velg brukere"
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Velg hvilke brukere du vil \
installere $(^NameDA) for." + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP \
"Velg om du vil installere $(^NameDA) bare for deg selv, eller for alle som bruker \
denne maskinen. $(^ClickNext)" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Installer for alle som bruker denne \
maskinen" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer \
bare for meg" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nlf 2017-06-05 \
21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nlf 2017-06-06 \
02:03:53 UTC (rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nsh 2017-06-05 \
21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/NorwegianNynorsk.nsh 2017-06-06 \
02:03:53 UTC (rev 6870) @@ -119,3 +119,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "Er du viss p\xE5 at du vil avbryta \
avinstalleringa av $(^Name)?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Vel brukarar"
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Vel kva brukarar du vil \
installere $(^NameDA) for." + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP \
"Vel om du vil installere $(^NameDA) berre for deg, eller for alle som nyttar denne \
maskina. $(^ClickNext)" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS \
"Installer for alle som nyttar maskina" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installer berre for me" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Polish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Polish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Polish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Portuguese.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Portuguese.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Portuguese.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Portuguese.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Portuguese.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Portuguese.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -119,3 +119,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "Deseja realmente cancelar a \
desinstala\xE7\xE3o do $(^Name)?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Escolha utilizadores"
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escolha para quais \
utilizadores deseja instalar o $(^NameDA)." + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Escolha se deseja instalar o $(^NameDA) apenas \
para si ou para todos os utilizadores. $(^ClickNext)" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalar para todos os utilizadores" + \
${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalar apenas para \
si" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nlf 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nlf 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -6,12 +6,11 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
-# Translation by Diego Marcos
-# Corrections by Felipe
+# Translation by Diego Pedroso and Felipe, reviewed by Georger Ara\xFAjo
# ^Branding
Sistema de Instala\xE7\xE3o Nullsoft %s
# ^SetupCaption
@@ -19,7 +18,7 @@
# ^UninstallCaption
Desinstala\xE7\xE3o do $(^Name)
# ^LicenseSubCaption
-: Acordo da Licen\xE7a
+: Acordo de licen\xE7a
# ^ComponentsSubCaption
: Op\xE7\xF5es da Instala\xE7\xE3o
# ^DirSubCaption
@@ -45,9 +44,9 @@
# ^AgreeBtn
Eu &Concordo
# ^AcceptBtn
-Eu &aceito os termos no Acordo da Licen\xE7a
+Eu &aceito os termos do Acordo de Licen\xE7a
# ^DontAcceptBtn
-Eu &n\xE3o aceito os termos no Acordo da Licen\xE7a
+Eu &n\xE3o aceito os termos do Acordo de Licen\xE7a
# ^InstallBtn
&Instalar
# ^UninstallBtn
@@ -71,17 +70,17 @@
# ^Completed
Completado
# ^LicenseText
-Por favor reveja o acordo da licen\xE7a antes de instalar o $(^NameDA). Se voc\xEA \
aceita todos os termos do acordo, clique em Eu Concordo. +Por favor, leia com \
aten\xE7\xE3o o acordo de licen\xE7a antes de instalar o $(^NameDA). Se voc\xEA \
aceita todos os termos do acordo, clique em Eu Concordo. # ^LicenseTextCB
-Por favor reveja o acordo da licen\xE7a antes de instalar o $(^NameDA). Se voc\xEA \
aceita todos os termos do acordo, clique na caixa de sele\xE7\xE3o abaixo. $_CLICK \
+Por favor, leia com aten\xE7\xE3o o acordo de licen\xE7a antes de instalar o \
$(^NameDA). Se voc\xEA aceita todos os termos do acordo, clique na caixa de \
sele\xE7\xE3o abaixo. $_CLICK # ^LicenseTextRB
-Por favor reveja o acordo da licen\xE7a antes de instalar o $(^NameDA). Se voc\xEA \
aceita todos os termos do acordo, selecione a primeira op\xE7\xE3o abaixo. $_CLICK \
+Por favor, leia com aten\xE7\xE3o o acordo de licen\xE7a antes de instalar o \
$(^NameDA). Se voc\xEA aceita todos os termos do acordo, selecione a primeira \
op\xE7\xE3o abaixo. $_CLICK # ^UnLicenseText
-Por favor reveja o acordo da licen\xE7a antes de desinstalar o $(^NameDA). Se \
voc\xEA aceita todos os termos do acordo, clique em Eu Concordo. +Por favor, leia com \
aten\xE7\xE3o o acordo de licen\xE7a antes de desinstalar o $(^NameDA). Se voc\xEA \
aceita todos os termos do acordo, clique em Eu Concordo. # ^UnLicenseTextCB
-Por favor reveja o acordo da licen\xE7a antes de desinstalar o $(^NameDA). Se \
voc\xEA aceita todos os termos do acordo, clique na caixa de sele\xE7\xE3o abaixo. \
$_CLICK +Por favor, leia com aten\xE7\xE3o o acordo de licen\xE7a antes de \
desinstalar o $(^NameDA). Se voc\xEA aceita todos os termos do acordo, clique na \
caixa de sele\xE7\xE3o abaixo. $_CLICK # ^UnLicenseTextRB
-Por favor reveja o acordo da licen\xE7a antes de desinstalar o $(^NameDA). Se \
voc\xEA aceita todos os termos do acordo, selecione a primeira op\xE7\xE3o abaixo. \
$_CLICK +Por favor, leia com aten\xE7\xE3o o acordo de licen\xE7a antes de \
desinstalar o $(^NameDA). Se voc\xEA aceita todos os termos do acordo, selecione a \
primeira op\xE7\xE3o abaixo. $_CLICK # ^Custom
Personalizado
# ^ComponentsText
@@ -101,13 +100,13 @@
# ^UnComponentsSubText2
Ou, selecione os componentes opcionais que voc\xEA deseja desinstalar:
# ^DirText
-O Instalador instalar\xE1 o $(^NameDA) na seguinte pasta. Para instalar em uma pasta \
diferente, clique em Procurar e selecione outra pasta. $_CLICK +O $(^NameDA) ser\xE1 \
instalado na pasta a seguir. Para instalar em uma pasta diferente, clique em Procurar \
e selecione outra pasta. $_CLICK # ^DirSubText
-Pasta Destino
+Pasta de Destino
# ^DirBrowseText
Selecione a pasta para instalar o $(^NameDA):
# ^UnDirText
-O Instalador desinstalar\xE1 o $(^NameDA) da seguinte pasta. Para desinstalar de uma \
pasta diferente, clique em Procurar e selecione outra pasta. $_CLICK +O $(^NameDA) \
ser\xE1 desinstalado da pasta a seguir. Para desinstalar de uma pasta diferente, \
clique em Procurar e selecione outra pasta. $_CLICK # ^UnDirSubText
""
# ^UnDirBrowseText
@@ -115,19 +114,19 @@
# ^SpaceAvailable
"Espa\xE7o dispon\xEDvel: "
# ^SpaceRequired
-"Espa\xE7o requerido: "
+"Espa\xE7o necess\xE1rio: "
# ^UninstallingText
-O $(^NameDA) ser\xE1 desinstalado da seguinte pasta. $_CLICK
+O $(^NameDA) ser\xE1 desinstalado da pasta a seguir. $_CLICK
# ^UninstallingSubText
Desinstalando de:
# ^FileError
-Erro ao abrir o arquivo para a grava\xE7\xE3o: \r\n\r\n$0\r\n\r\nClique em Abortar \
para parar a instala\xE7\xE3o,\r\nRepetir para tentar de novo, ou\r\nIgnorar para \
pular este arquivo. +Erro ao abrir o arquivo para grava\xE7\xE3o: \
\r\n\r\n$0\r\n\r\nClique em Abortar para parar a instala\xE7\xE3o,\r\nRepetir para \
tentar de novo, ou\r\nIgnorar para pular este arquivo. # ^FileError_NoIgnore
-Erro ao abrir o arquivo para a grava\xE7\xE3o: \r\n\r\n$0\r\n\r\nClique em Repetir \
para tentar de novo, ou\r\nCancelar para parar a instala\xE7\xE3o. +Erro ao abrir o \
arquivo para grava\xE7\xE3o: \r\n\r\n$0\r\n\r\nClique em Repetir para tentar de novo, \
ou\r\nCancelar para parar a instala\xE7\xE3o. # ^CantWrite
-"N\xE3o pode escrever: "
+"N\xE3o foi poss\xEDvel gravar: "
# ^CopyFailed
-Falhou em copiar
+Falha ao copiar
# ^CopyTo
"Copiar para "
# ^Registering
@@ -135,9 +134,9 @@
# ^Unregistering
"Desfazendo o registro: "
# ^SymbolNotFound
-"N\xE3o p\xF4de achar o s\xEDmbolo: "
+"N\xE3o foi poss\xEDvel localizar o s\xEDmbolo: "
# ^CouldNotLoad
-"N\xE3o p\xF4de carregar: "
+"N\xE3o foi poss\xEDvel carregar: "
# ^CreateFolder
"Criar pasta: "
# ^CreateShortcut
@@ -145,19 +144,19 @@
# ^CreatedUninstaller
"Desinstalador criado: "
# ^Delete
-"Apagar o arquivo: "
+"Excluir o arquivo: "
# ^DeleteOnReboot
-"Apagar ao reiniciar: "
+"Excluir ao reiniciar: "
# ^ErrorCreatingShortcut
-"Erro ao criar o atalho: "
+"Erro ao criar atalho: "
# ^ErrorCreating
"Erro ao criar: "
# ^ErrorDecompressing
-Erro ao descompactar os dados! Instalador corrompido?
+Erro ao descomprimir os dados! Instalador corrompido?
# ^ErrorRegistering
Erro ao registar a DLL
# ^ExecShell
-"Executar pelo Shell: "
+"ExecShell: "
# ^Exec
"Executar: "
# ^Extract
@@ -171,7 +170,7 @@
# ^OutputFolder
"Pasta de sa\xEDda: "
# ^RemoveFolder
-"Remover a pasta: "
+"Excluir a pasta: "
# ^RenameOnReboot
"Renomear ao reiniciar: "
# ^Rename
@@ -181,7 +180,7 @@
# ^CopyDetails
Copiar os Detalhes para a \xC1rea de Transfer\xEAncia
# ^LogInstall
-P\xF4r no Log o processo de instala\xE7\xE3o
+Registrar o processo de instala\xE7\xE3o
# ^Byte
B
# ^Kilo
@@ -189,4 +188,4 @@
# ^Mega
M
# ^Giga
-G
\ No newline at end of file
+G
Modified: NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nsh 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/PortugueseBR.nsh 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -1,21 +1,21 @@
;Language: Brazilian Portuguese (1046)
-;By Felipe
+;By Diego Pedroso and Felipe, reviewed by Georger Ara\xFAjo
!insertmacro LANGFILE "PortugueseBR" "Portugu\xEAs Brasileiro"
!ifdef MUI_WELCOMEPAGE
- ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE "Bem-vindo ao Assistente de \
Instala\xE7\xE3o do $(^NameDA)"
- ${LangFileString} MUI_TEXT_WELCOME_INFO_TEXT "Este assistente guiar\xE1 voc\xEA \
atrav\xE9s da instala\xE7\xE3o do $(^NameDA).$\r$\n$\r$\n\xC9 recomendado que voc\xEA \
feche todos os outros aplicativos antes de iniciar o Instalador. Isto tornar\xE1 \
poss\xEDvel atualizar os arquivos de sistema relevantes sem ter que reiniciar seu \
computador.$\r$\n$\r$\n$_CLICK" + ${LangFileString} MUI_TEXT_WELCOME_INFO_TITLE \
"Bem-vindo ao Instalador do $(^NameDA)" + ${LangFileString} \
MUI_TEXT_WELCOME_INFO_TEXT "O instalador guiar\xE1 voc\xEA durante a instala\xE7\xE3o \
do $(^NameDA).$\r$\n$\r$\nAntes de come\xE7ar a instala\xE7\xE3o, \xE9 recomendado \
que voc\xEA feche todos os outros aplicativos. Isto tornar\xE1 poss\xEDvel atualizar \
os arquivos de sistema relevantes sem ter que reiniciar seu \
computador.$\r$\n$\r$\n$_CLICK"
!endif
!ifdef MUI_UNWELCOMEPAGE
- ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TITLE "Bem-vindo ao Assistente de \
Desinstala\xE7\xE3o do $(^NameDA)"
- ${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este assistente guiar\xE1 voc\xEA \
atrav\xE9s da desinstala\xE7\xE3o do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a \
desinstala\xE7\xE3o, tenha certeza de que o $(^NameDA) n\xE3o est\xE1 em \
execu\xE7\xE3o.$\r$\n$\r$\n$_CLICK" + ${LangFileString} \
MUI_UNTEXT_WELCOME_INFO_TITLE "Bem-vindo ao Desinstalador do $(^NameDA)" + \
${LangFileString} MUI_UNTEXT_WELCOME_INFO_TEXT "Este assistente guiar\xE1 voc\xEA \
durante a desinstala\xE7\xE3o do $(^NameDA).$\r$\n$\r$\nAntes de iniciar a \
desinstala\xE7\xE3o, certifique-se que o $(^NameDA) n\xE3o est\xE1 em \
execu\xE7\xE3o.$\r$\n$\r$\n$_CLICK"
!endif
!ifdef MUI_LICENSEPAGE
- ${LangFileString} MUI_TEXT_LICENSE_TITLE "Acordo da licen\xE7a"
- ${LangFileString} MUI_TEXT_LICENSE_SUBTITLE "Por favor, reveja os termos da \
licen\xE7a antes de instalar o $(^NameDA)." + ${LangFileString} \
MUI_TEXT_LICENSE_TITLE "Acordo de Licen\xE7a" + ${LangFileString} \
MUI_TEXT_LICENSE_SUBTITLE "Por favor, leia com aten\xE7\xE3o os termos da licen\xE7a \
antes de instalar o $(^NameDA)." ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM "Se \
voc\xEA aceita os termos do acordo, clique em Eu Concordo para continuar. Voc\xEA \
deve aceitar o acordo para instalar o $(^NameDA)." ${LangFileString} \
MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se voc\xEA aceita os termos do acordo, clique \
na caixa de sele\xE7\xE3o abaixo. Voc\xEA deve aceitar o acordo para instalar o \
$(^NameDA). $_CLICK" ${LangFileString} MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se \
voc\xEA aceita os termos do acordo, selecione a primeira op\xE7\xE3o abaixo. Voc\xEA \
deve aceitar o acordo para instalar o $(^NameDA). $_CLICK" @@ -22,8 +22,8 @@
!endif
!ifdef MUI_UNLICENSEPAGE
- ${LangFileString} MUI_UNTEXT_LICENSE_TITLE "Acordo da licen\xE7a"
- ${LangFileString} MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, reveja os termos da \
licen\xE7a antes de desinstalar o $(^NameDA)." + ${LangFileString} \
MUI_UNTEXT_LICENSE_TITLE "Acordo de Licen\xE7a" + ${LangFileString} \
MUI_UNTEXT_LICENSE_SUBTITLE "Por favor, leia com aten\xE7\xE3o os termos da \
licen\xE7a antes de desinstalar o $(^NameDA)." ${LangFileString} \
MUI_UNINNERTEXT_LICENSE_BOTTOM "Se voc\xEA aceita os termos do acordo, clique em Eu \
Concordo para continuar. Voc\xEA deve aceitar o acordo para desinstalar o \
$(^NameDA)." ${LangFileString} MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Se voc\xEA \
aceita os termos do acordo, clique na caixa de sele\xE7\xE3o abaixo. Voc\xEA deve \
aceitar o acordo para desinstalar o $(^NameDA). $_CLICK" ${LangFileString} \
MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Se voc\xEA aceita os termos do acordo, \
selecione a primeira op\xE7\xE3o abaixo. Voc\xEA deve aceitar o acordo para \
desinstalar o $(^NameDA). $_CLICK" @@ -30,7 +30,7 @@
!endif
!ifdef MUI_LICENSEPAGE | MUI_UNLICENSEPAGE
- ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Pressione Page Down para ver o resto \
do acordo." + ${LangFileString} MUI_INNERTEXT_LICENSE_TOP "Pressione Page Down para \
ver o restante do acordo."
!endif
!ifdef MUI_COMPONENTSPAGE
@@ -46,19 +46,19 @@
!ifdef MUI_COMPONENTSPAGE | MUI_UNCOMPONENTSPAGE
${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descri\xE7\xE3o"
!ifndef NSIS_CONFIG_COMPONENTPAGE_ALTERNATIVE
- ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione seu mouse \
sobre um componente para ver sua descri\xE7\xE3o." + ${LangFileString} \
MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione o mouse sobre um componente para \
ver sua descri\xE7\xE3o."
!else
- ${LangFileString} MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Posicione seu mouse \
sobre um componente para ver sua descri\xE7\xE3o." + ${LangFileString} \
MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Selecione um componente para ver sua \
descri\xE7\xE3o."
!endif
!endif
!ifdef MUI_DIRECTORYPAGE
- ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolher o Local da Instala\xE7\xE3o"
+ ${LangFileString} MUI_TEXT_DIRECTORY_TITLE "Escolha o Local da Instala\xE7\xE3o"
${LangFileString} MUI_TEXT_DIRECTORY_SUBTITLE "Escolha a pasta na qual instalar o \
$(^NameDA)."
!endif
!ifdef MUI_UNDIRECTORYPAGE
- ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolher o Local da \
Desinstala\xE7\xE3o" + ${LangFileString} MUI_UNTEXT_DIRECTORY_TITLE "Escolha o Local \
da Desinstala\xE7\xE3o" ${LangFileString} MUI_UNTEXT_DIRECTORY_SUBTITLE "Escolha a \
pasta da qual desinstalar o $(^NameDA)."
!endif
@@ -66,9 +66,9 @@
${LangFileString} MUI_TEXT_INSTALLING_TITLE "Instalando"
${LangFileString} MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere enquanto o \
$(^NameDA) est\xE1 sendo instalado." ${LangFileString} MUI_TEXT_FINISH_TITLE \
"Instala\xE7\xE3o Completa"
- ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "O Instalador completou com sucesso."
+ ${LangFileString} MUI_TEXT_FINISH_SUBTITLE "A instala\xE7\xE3o foi completada com \
sucesso." ${LangFileString} MUI_TEXT_ABORT_TITLE "Instala\xE7\xE3o Abortada"
- ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "O Instalador n\xE3o completou com \
sucesso." + ${LangFileString} MUI_TEXT_ABORT_SUBTITLE "A instala\xE7\xE3o n\xE3o foi \
completada com sucesso."
!endif
!ifdef MUI_UNINSTFILESPAGE
@@ -81,29 +81,29 @@
!endif
!ifdef MUI_FINISHPAGE
- ${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando o Assistente de \
Instala\xE7\xE3o do $(^NameDA)"
- ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "O $(^NameDA) foi instalado no seu \
computador.$\r$\n$\r$\nClique em Terminar para fechar este assistente." + \
${LangFileString} MUI_TEXT_FINISH_INFO_TITLE "Completando a instala\xE7\xE3o do \
$(^NameDA)" + ${LangFileString} MUI_TEXT_FINISH_INFO_TEXT "O $(^NameDA) foi \
instalado no seu computador.$\r$\n$\r$\nClique em Concluir para fechar o instalador." \
${LangFileString} MUI_TEXT_FINISH_INFO_REBOOT "Seu computador deve ser reiniciado \
para completar a instala\xE7\xE3o do $(^NameDA). Voc\xEA quer \
reiniciar agora?"
!endif
!ifdef MUI_UNFINISHPAGE
- ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Completando o Assistente de \
Desinstala\xE7\xE3o do $(^NameDA)"
- ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT "$(^NameDA) foi desinstalado do seu \
computador.$\r$\n$\r$\nClique em Terminar para fechar este \
assistente."
- ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Seu computador tem que ser \
reiniciado para completar a desinstala\xE7\xE3o do $(^NameDA). Voc\xEA quer reiniciar \
agora?" + ${LangFileString} MUI_UNTEXT_FINISH_INFO_TITLE "Concluindo a \
desinstala\xE7\xE3o do $(^NameDA)" + ${LangFileString} MUI_UNTEXT_FINISH_INFO_TEXT \
"O $(^NameDA) foi desinstalado do seu computador.$\r$\n$\r$\nClique em Concluir para \
fechar o instalador." + ${LangFileString} MUI_UNTEXT_FINISH_INFO_REBOOT "Seu \
computador deve ser reiniciado para completar a desinstala\xE7\xE3o do $(^NameDA). \
Voc\xEA quer reiniciar agora?"
!endif
!ifdef MUI_FINISHPAGE | MUI_UNFINISHPAGE
${LangFileString} MUI_TEXT_FINISH_REBOOTNOW "Reiniciar agora"
${LangFileString} MUI_TEXT_FINISH_REBOOTLATER "Eu quero reiniciar manualmente \
depois"
- ${LangFileString} MUI_TEXT_FINISH_RUN "&Executar $(^NameDA)"
- ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostrar o Readme"
- ${LangFileString} MUI_BUTTONTEXT_FINISH "&Terminar"
+ ${LangFileString} MUI_TEXT_FINISH_RUN "&Executar o $(^NameDA)"
+ ${LangFileString} MUI_TEXT_FINISH_SHOWREADME "&Mostrar o Leia-me"
+ ${LangFileString} MUI_BUTTONTEXT_FINISH "&Concluir"
!endif
!ifdef MUI_STARTMENUPAGE
- ${LangFileString} MUI_TEXT_STARTMENU_TITLE "Escolher a Pasta do Menu Iniciar"
- ${LangFileString} MUI_TEXT_STARTMENU_SUBTITLE "Escolher uma pasta do Menu Iniciar \
para os atalhos do $(^NameDA)."
- ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selecione a pasta do Menu Iniciar \
na qual voc\xEA gostaria de criar os atalhos do programa. Voc\xEA pode tamb\xE9m \
inserir um nome para criar uma nova pasta." + ${LangFileString} \
MUI_TEXT_STARTMENU_TITLE "Escolha a Pasta do Menu Iniciar" + ${LangFileString} \
MUI_TEXT_STARTMENU_SUBTITLE "Escolha uma pasta do Menu Iniciar para os atalhos do \
$(^NameDA)." + ${LangFileString} MUI_INNERTEXT_STARTMENU_TOP "Selecione a pasta do \
Menu Iniciar na qual voc\xEA quer que os atalhos do programa sejam criados. Voc\xEA \
tamb\xE9m pode inserir um nome para criar uma nova pasta." ${LangFileString} \
MUI_INNERTEXT_STARTMENU_CHECKBOX "N\xE3o criar atalhos"
!endif
@@ -113,17 +113,17 @@
!endif
!ifdef MUI_ABORTWARNING
- ${LangFileString} MUI_TEXT_ABORTWARNING "Voc\xEA tem certeza de que quer sair do \
Instalador do $(^Name)?" + ${LangFileString} MUI_TEXT_ABORTWARNING "Voc\xEA tem \
certeza que quer sair da Instala\xE7\xE3o do $(^Name)?"
!endif
!ifdef MUI_UNABORTWARNING
- ${LangFileString} MUI_UNTEXT_ABORTWARNING "Voc\xEA tem certeza de que quer sair da \
Desinstala\xE7\xE3o do $(^Name)?" + ${LangFileString} MUI_UNTEXT_ABORTWARNING \
"Voc\xEA tem certeza que quer sair da Desinstala\xE7\xE3o do \
$(^Name)?"
!endif
!ifdef MULTIUSER_INSTALLMODEPAGE
${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "Escolher Usu\xE1rios"
- ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escolher para quais \
usu\xE1rios voc\xEA quer instalar o $(^NameDA)."
- ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Selecione se voc\xEA quer \
instalar o $(^NameDA) para si mesmo ou para todos os usu\xE1rios deste computador. \
$(^ClickNext)"
- ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalar para qualquer \
um usando este computador"
- ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalar apenas \
para mim" + ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "Escolha para \
quais usu\xE1rios voc\xEA quer instalar o $(^NameDA)." + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_TOP "Selecione se voc\xEA quer instalar o $(^NameDA) \
somente para voc\xEA ou para todos os usu\xE1rios deste computador. $(^ClickNext)" + \
${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS "Instalar para todos os \
usu\xE1rios deste computador" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Instalar somente para \
mim"
!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Romanian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Romanian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Romanian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Russian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Russian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Russian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Serbian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Serbian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Serbian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/SerbianLatin.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/SerbianLatin.nlf 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/SerbianLatin.nlf 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/SimpChinese.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/SimpChinese.nlf 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/SimpChinese.nlf 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default \
\xD7\xD6\xCC\xE5\xC3\xFB\xB3\xC6\xD3\xEB\xB4\xF3С \xCB\xCE\xCC\xE5
9
-# Codepage - dash (-) means ANSI code page ANSI \xD7\xD6\xC2\xEBҳ
+# Codepage - dash (-) means ASCII code page ASCII \xD7\xD6\xC2\xEBҳ
936
# RTL - anything else than RTL means LTR \xD3\xC9\xD3\xD2\xD6\xC1\xD7\xF3\xCA\xE9д
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Slovak.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Slovak.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Slovak.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Slovenian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Slovenian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Slovenian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1250
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Spanish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Spanish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Spanish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/SpanishInternational.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/SpanishInternational.nlf 2017-06-05 \
21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/SpanishInternational.nlf 2017-06-06 \
02:03:53 UTC (rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Swedish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Swedish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Swedish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Swedish.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Swedish.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Swedish.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -120,3 +120,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "\xC4r du s\xE4ker p\xE5 att du vill \
avbryta avinstallationen av $(^Name)?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE "V\xE4lj anv\xE4ndare"
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE "V\xE4lj f\xF6r vilka \
anv\xE4ndare du vill installera $(^NameDA)." + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_TOP "V\xE4lj huruvida du vill installera $(^NameDA) \
enbart f\xF6r dig sj\xE4lv eller f\xF6r alla anv\xE4ndare p\xE5 denna dator. \
$(^ClickNext)" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS \
"Installera f\xF6r alla som anv\xE4nder denna dator" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "Installera bara f\xF6r mig" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Thai.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Thai.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Thai.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
874
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/TradChinese.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/TradChinese.nlf 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/TradChinese.nlf 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default \xA6r\xAB\xAC\xA6W\xBAٻP\xA4j\xA4p
\xB7s\xB2ө\xFA\xC5\xE9
9
-# Codepage - dash (-) means ANSI code page ANSI \xA6r\xBDX\xAD\xB6
+# Codepage - dash (-) means ASCII code page ASCII \xA6r\xBDX\xAD\xB6
950
# RTL - anything else than RTL means LTR \xA5ѥk\xA6ܥ\xAA\xAEѼg
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Turkish.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Turkish.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Turkish.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1254
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nlf 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nlf 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1251
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Ukrainian.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -120,3 +120,11 @@
!ifdef MUI_UNABORTWARNING
${LangFileString} MUI_UNTEXT_ABORTWARNING "\xC2\xE8 \
\xE2\xEF\xE5\xE2\xED\xE5\xED\xED\xB3 \xF9\xEE \xE1\xE0\xE6\xE0\xBA\xF2\xE5 \
\xEF\xEE\xEA\xE8\xED\xF3\xF2\xE8 \xCC\xE0\xE9\xF1\xF2\xF0 \
\xC2\xE8\xE4\xE0\xEB\xE5\xED\xED\xFF $(^Name)?"
!endif
+
+!ifdef MULTIUSER_INSTALLMODEPAGE
+ ${LangFileString} MULTIUSER_TEXT_INSTALLMODE_TITLE \
"\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xB3\xE2" + \
${LangFileString} MULTIUSER_TEXT_INSTALLMODE_SUBTITLE \
"\xC2\xE8\xE1\xE5\xF0\xB3\xF2\xFC \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xB3\xE2, \
\xE4\xEB\xFF \xFF\xEA\xE8\xF5 \xF1\xEB\xB3\xE4 \
\xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 $(^NameDA)." + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_TOP "\xC2\xE8\xE7\xED\xE0\xF7\xF2\xE5\xF1\xFF, \
\xF1\xEB\xB3\xE4 \xE2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 $(^NameDA) \xEB\xE8\xF8\xE5 \
\xE4\xEB\xFF \xE2\xE0\xF8\xEE\xE3\xEE \xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xE0, \
\xF7\xE8 \xE4\xEB\xFF \xF3\xF1\xB3\xF5 \
\xEA\xEE\xF0\xE8\xF1\xF2\xF3\xE2\xE0\xF7\xB3\xE2 \x{1B3EBF} \
\xEE\xEF\xE5\xF0\xE0\xF6\xB3\xE9\xED\xEE\xBF \xF1\xE8\xF1\xF2\xE5\xEC\xE8. \
$(^ClickNext)" + ${LangFileString} MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS \
"\xC2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 \xE4\xEB\xFF \xF3\xF1\xB3\xF5 \xF3 \
\xF6\xB3\xE9 \xF1\xE8\xF1\xF2\xE5\xEC\xB3" + ${LangFileString} \
MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER "\xC2\xF1\xF2\xE0\xED\xEE\xE2\xE8\xF2\xE8 \
\xEB\xE8\xF8\xE5 \xE4\xEB\xFF \xE2\xE0\xF1" +!endif
Modified: NSIS/branches/nsis2/Contrib/Language files/Uzbek.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Uzbek.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Uzbek.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -5,7 +5,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
1252
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Language files/Welsh.nlf
===================================================================
--- NSIS/branches/nsis2/Contrib/Language files/Welsh.nlf 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Language files/Welsh.nlf 2017-06-06 02:03:53 UTC (rev \
6870) @@ -6,7 +6,7 @@
# Font and size - dash (-) means default
-
-
-# Codepage - dash (-) means ANSI code page
+# Codepage - dash (-) means ASCII code page
-
# RTL - anything else than RTL means LTR
-
Modified: NSIS/branches/nsis2/Contrib/Math/Math.txt
===================================================================
--- NSIS/branches/nsis2/Contrib/Math/Math.txt 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Math/Math.txt 2017-06-06 02:03:53 UTC (rev 6870)
@@ -16,7 +16,7 @@
Strcpy $0 "Brainsucker"
Math::Script "a = 'Math'; B = 'Script'; r0 += ' wants to use ' + a + '::' + \
b +'!'" DetailPrint "$0"
-That string will fill r0 with some shit.
+That string will fill r0 with some stuff.
Here are some other samples:
10! (factorial, r0 will contain '10! = 362880'):
@@ -103,7 +103,7 @@
and the result of the last one of these sub-exprs gives you the result of
expression.
-All the shit (like variables and functions) will be saved between calls.
+All the stuff (like variables and functions) will be saved between calls.
Functions:
type conversions:
Modified: NSIS/branches/nsis2/Contrib/Modern UI/System.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Modern UI/System.nsh 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/Modern UI/System.nsh 2017-06-06 02:03:53 UTC (rev \
6870) @@ -1,11 +1,11 @@
/*
NSIS Modern User Interface - Version 1.8
-Copyright 2002-2015 Joost Verburg
+Copyright 2002-2017 Joost Verburg
*/
-!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2015 Joost Verburg"
+!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2017 Joost Verburg"
;--------------------------------
@@ -1104,6 +1104,10 @@
UninstallText "${MUI_UNCONFIRMPAGE_TEXT_TOP}" \
"${MUI_UNCONFIRMPAGE_TEXT_LOCATION}"
+ !ifdef MUI_UNCONFIRMPAGE_VARIABLE
+ DirVar "${MUI_UNCONFIRMPAGE_VARIABLE}"
+ !endif
+
PageExEnd
!insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre_${MUI_UNIQUEID} \
un.mui.ConfirmShow_${MUI_UNIQUEID} un.mui.ConfirmLeave_${MUI_UNIQUEID} @@ -2172,7 \
+2176,8 @@
!macro MUI_UNGETLANGUAGE
- !verbose pop
+ !verbose push
+ !verbose ${MUI_VERBOSE}
!ifdef MUI_LANGDLL_REGISTRY_ROOT & MUI_LANGDLL_REGISTRY_KEY & \
MUI_LANGDLL_REGISTRY_VALUENAME
Modified: NSIS/branches/nsis2/Contrib/Modern UI 2/Localization.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Modern UI 2/Localization.nsh 2017-06-05 21:43:07 UTC \
(rev 6869)
+++ NSIS/branches/nsis2/Contrib/Modern UI 2/Localization.nsh 2017-06-06 02:03:53 UTC \
(rev 6870) @@ -26,19 +26,22 @@
;--------------------------------
;Include langauge files
-!macro MUI_LANGUAGE LANGUAGE
+!macro MUI_LANGUAGEEX LangDir LANGUAGE
- ;Include a language
-
!verbose push
!verbose ${MUI_VERBOSE}
+ !ifndef MUI_PAGE_UNINSTALLER_PREFIX
+ !warning "MUI_LANGUAGE[EX] should be inserted after the MUI_[UN]PAGE_* macros"
+ !endif
+
!insertmacro MUI_INSERT
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+ ;Include a language
+ LoadLanguageFile "${LangDir}\${LANGUAGE}.nlf"
;Include language file
- !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language \
files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh" + \
!insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${LangDir}\${LANGUAGE}.nsh" \
"${NSISDIR}\Contrib\Language files\English.nsh"
;Add language to list of languages for selection dialog
!ifndef MUI_LANGDLL_LANGUAGES
@@ -65,7 +68,17 @@
!macroend
+!macro MUI_LANGUAGE NLFID
+ !verbose push
+ !verbose ${MUI_VERBOSE}
+
+ !insertmacro MUI_LANGUAGEEX "${NSISDIR}\Contrib\Language files" "${NLFID}"
+
+ !verbose pop
+
+!macroend
+
;--------------------------------
;Language selection
Modified: NSIS/branches/nsis2/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh 2017-06-05 \
21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Modern UI 2/Pages/UninstallConfirm.nsh 2017-06-06 \
02:03:53 UTC (rev 6870) @@ -41,6 +41,10 @@
UninstallText "${MUI_UNCONFIRMPAGE_TEXT_TOP}" \
"${MUI_UNCONFIRMPAGE_TEXT_LOCATION}"
+ !ifdef MUI_UNCONFIRMPAGE_VARIABLE
+ DirVar "${MUI_UNCONFIRMPAGE_VARIABLE}"
+ !endif
+
PageExEnd
!insertmacro MUI_UNFUNCTION_CONFIRMPAGE un.mui.ConfirmPre_${MUI_UNIQUEID} \
un.mui.ConfirmShow_${MUI_UNIQUEID} un.mui.ConfirmLeave_${MUI_UNIQUEID}
Modified: NSIS/branches/nsis2/Contrib/MultiUser/MultiUser.nsh
===================================================================
--- NSIS/branches/nsis2/Contrib/MultiUser/MultiUser.nsh 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/MultiUser/MultiUser.nsh 2017-06-06 02:03:53 UTC (rev \
6870) @@ -4,7 +4,7 @@
Installer configuration for multi-user Windows environments
-Copyright 2008-2015 Joost Verburg
+Copyright 2008-2017 Joost Verburg
*/
@@ -91,7 +91,11 @@
!if "${UNINSTALLER_PREFIX}" != UN
;Set default installation location for installer
!ifdef MULTIUSER_INSTALLMODE_INSTDIR
- StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !ifdef MULTIUSER_USE_PROGRAMFILES64
+ StrCpy $INSTDIR "$PROGRAMFILES64\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !else
+ StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+ !endif
!endif
!endif
@@ -429,7 +433,7 @@
nsDialogs::Create 1018
Pop $MultiUser.InstallModePage
- ${NSD_CreateLabel} 0u 0u 300u 20u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
+ ${NSD_CreateLabel} 0u 0u 300u 40u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
Pop $MultiUser.InstallModePage.Text
${NSD_CreateRadioButton} 20u 50u 280u 10u \
"${MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS}"
Modified: NSIS/branches/nsis2/Contrib/MultiUser/Readme.html
===================================================================
--- NSIS/branches/nsis2/Contrib/MultiUser/Readme.html 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/MultiUser/Readme.html 2017-06-06 02:03:53 UTC (rev \
6870) @@ -181,6 +181,14 @@
</tr>
<tr>
<td>
+ MULTIUSER_USE_PROGRAMFILES64
+ </td>
+ <td>
+ Use $PROGRAMFILES64 instead of $PROGRAMFILES as the default all \
users directory. + </td>
+ </tr>
+ <tr>
+ <td>
MULTIUSER_INIT_FUNCTIONQUIT<br />
MULTIUSER_INIT_UNFUNCTIONQUIT
</td>
Modified: NSIS/branches/nsis2/Contrib/NSIS Menu/SConscript
===================================================================
--- NSIS/branches/nsis2/Contrib/NSIS Menu/SConscript 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/NSIS Menu/SConscript 2017-06-06 02:03:53 UTC (rev \
6870) @@ -24,6 +24,7 @@
html = Split("""
#Menu/index.html
+ #Menu/notinstalled.html
""")
images = Split("""
Modified: NSIS/branches/nsis2/Contrib/NSIS Menu/nsismenu/nslinks.cpp
===================================================================
--- NSIS/branches/nsis2/Contrib/NSIS Menu/nsismenu/nslinks.cpp 2017-06-05 21:43:07 \
UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/NSIS Menu/nsismenu/nslinks.cpp 2017-06-06 02:03:53 \
UTC (rev 6870) @@ -99,11 +99,19 @@
+#if wxCHECK_VERSION(3, 0, 0)
+TAGS_MODULE_BEGIN(Links)
+#else
TAGS_MODULE_BEGIN(CustomLinks)
+#endif
TAGS_MODULE_ADD(A)
+#if wxCHECK_VERSION(3, 0, 0)
+TAGS_MODULE_END(Links)
+#else
TAGS_MODULE_END(CustomLinks)
+#endif
#endif
Modified: NSIS/branches/nsis2/Contrib/NSISdl/ReadMe.txt
===================================================================
--- NSIS/branches/nsis2/Contrib/NSISdl/ReadMe.txt 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/NSISdl/ReadMe.txt 2017-06-06 02:03:53 UTC (rev 6870)
@@ -3,7 +3,8 @@
Copyright (C) 2001-2002 Yaroslav Faybishenko & Justin Frankel
-This plugin can be used from NSIS to download files via http.
+This plugin can be used from NSIS to download files via HTTP.
+Note: HTTPS is not supported, only plain HTTP!
To connect to the internet, use the Dialer plugin.
Modified: NSIS/branches/nsis2/Contrib/NSISdl/SConscript
===================================================================
--- NSIS/branches/nsis2/Contrib/NSISdl/SConscript 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/NSISdl/SConscript 2017-06-06 02:03:53 UTC (rev 6870)
@@ -12,7 +12,7 @@
kernel32
user32
advapi32
- ws2_32
+ wsock32
""")
docs = Split("""
Modified: NSIS/branches/nsis2/Contrib/Splash/splash.txt
===================================================================
--- NSIS/branches/nsis2/Contrib/Splash/splash.txt 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/Splash/splash.txt 2017-06-06 02:03:53 UTC (rev 6870)
@@ -15,7 +15,7 @@
File /oname=spltmp.bmp "my_splash.bmp"
; optional
-; File /oname=spltmp.wav "my_splashshit.wav"
+; File /oname=spltmp.wav "my_splashsound.wav"
splash::show 1000 $TEMP\spltmp
Modified: NSIS/branches/nsis2/Contrib/StartMenu/Example.nsi
===================================================================
--- NSIS/branches/nsis2/Contrib/StartMenu/Example.nsi 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Contrib/StartMenu/Example.nsi 2017-06-06 02:03:53 UTC (rev \
6870) @@ -40,11 +40,11 @@
StrCmp $R1 ">" skip
CreateDirectory $SMPROGRAMS\$R0
- CreateShortCut $SMPROGRAMS\$R0\MakeNSISw.lnk $INSTDIR\makensisw.exe
+ CreateShortcut $SMPROGRAMS\$R0\MakeNSISw.lnk $INSTDIR\makensisw.exe
SetShellVarContext All
CreateDirectory $SMPROGRAMS\$R0
- CreateShortCut "$SMPROGRAMS\$R0\All users MakeNSISw.lnk" $INSTDIR\makensisw.exe
+ CreateShortcut "$SMPROGRAMS\$R0\All users MakeNSISw.lnk" $INSTDIR\makensisw.exe
skip:
SectionEnd
\ No newline at end of file
Modified: NSIS/branches/nsis2/Contrib/System/System.html
===================================================================
--- NSIS/branches/nsis2/Contrib/System/System.html 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/System/System.html 2017-06-06 02:03:53 UTC (rev 6870)
@@ -25,14 +25,12 @@
<h2><a name="intro"></a>Introduction</h2>
-<p>The System plug-in gives developers the ability to call any exported function \
from any DLL. For example, you can use it to call <a \
href="http://msdn.microsoft.com/library/en-us/fileio/base/getlogicaldrivestrings.asp">GetLogicalDriveStrings</a> \
to get a list of available drives on the user's computer.</p>
-
+<p>The System plug-in gives developers the ability to call any exported function \
from any DLL. For example, you can use it to call <a \
href="https://msdn.microsoft.com/en-us/library/aa364975">GetLogicalDriveStrings</a> \
to get a list of available drives on the user's computer.</p> +
<p>The System plug-in also allows the developer to allocate, free and copy memory; \
interact with COM objects and perform mathematical operations on 64-bit integers.</p> \
<p>Programming knowledge is highly recommended for good understanding of the System \
plug-in.</p>
-<p>The most useful System plug-in functions (Call, Get and Debug) are not available \
when compiling with GCC. To work around this, either download a MSVC-compiled version \
or write your own plugin that calls the functions you need.</p>
-
<h4>Usage Examples From The Wiki</h4>
<ul>
@@ -360,7 +358,7 @@
<h4>Callbacks</h4>
<blockquote>
-<p>Callback functions are simply functions which are passed to a function and called \
back by it. They are frequently used to pass a possibly large set of data item by \
item. For example, <a \
href="http://msdn.microsoft.com/library/en-us/winui/WinUI/WindowsUserInterface/Windowi \
ng/Windows/WindowReference/WindowFunctions/EnumChildWindows.asp">EnumChildWindows</a> \
uses a <a href="http://msdn.microsoft.com/library/en-us/winui/WinUI/WindowsUserInterface/Windowing/Windows/WindowReference/WindowFunctions/EnumChildProc.asp">callback \
function</a>. As NSIS functions are not quite regular functions, the System plug-in \
provides its own mechanism to support callback functions. It allows you to create \
callback functions and notifies you each time a callback function was called.</p> \
+<p>Callback functions are simply functions which are passed to a function and called \
back by it. They are frequently used to pass a possibly large set of data item by \
item. For example, <a \
href="https://msdn.microsoft.com/en-us/library/ms633494">EnumChildWindows</a> uses a \
<a href="https://msdn.microsoft.com/en-us/library/ms633493p">callback function</a>. \
As NSIS functions are not quite regular functions, the System plug-in provides its \
own mechanism to support callback functions. It allows you to create callback \
functions and notifies you each time a callback function was called.</p>
<p>Creation of callback functions is done using <a href="#callfuncs">Get</a> and the \
callback creation syntax. As you will not call the callbacks yourself, the source of \
the parameters should be omitted using a dot. When the callback is called, the \
destination of the parameters will be filled with the values passed on to the \
callback. The value the callback will return is set by the source of the return \
"parameter". The destination of the return "parameter" should always be set as that's \
where System will notify you the callback was called.</p>
@@ -665,7 +663,7 @@
<blockquote><pre>
System::<b>Int64Op</b> 156545668489 ~
Pop $0
-DetailPrint "1 ~ = $0" # -156545668490
+DetailPrint "156545668489 ~ = $0" # -156545668490
</pre></blockquote>
<blockquote><pre>
System::<b>Int64Op</b> 1 !
Modified: NSIS/branches/nsis2/Contrib/zip2exe/main.cpp
===================================================================
--- NSIS/branches/nsis2/Contrib/zip2exe/main.cpp 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/zip2exe/main.cpp 2017-06-06 02:03:53 UTC (rev 6870)
@@ -5,6 +5,9 @@
/*
+version 0.35.1 (by Anders Kjersem)
+* Ported "Aborts if the zip file is encrypted" from NSIS 3
+
version 0.35
* drag & drop support
@@ -68,6 +71,14 @@
int made;
+static bool IsEncrypted(unz_file_info&zfi)
+{
+ const unsigned short gpf_encrypted = (1<< 0); // 2.0.0+
+ //nst unsigned short gpf_encstrong = (1<< 6); // 5.0.0+ APPNOTE says that bit 0 \
MUST be set if bit 6 is set + const unsigned short gpf_enccntdir = (1<<13); // \
6.2.0+ Central Directory Encryption + return (zfi.flag & \
(gpf_encrypted|gpf_enccntdir)) != 0; +}
+
static void doRMDir(char *buf)
{
HANDLE h;
@@ -182,6 +193,14 @@
unzGetCurrentFileInfo(f,&info,filename,sizeof(filename),NULL,0,NULL,0);
+ if (IsEncrypted(info))
+ {
+ if (f) unzClose(f);
+ g_extracting = 0;
+ MessageBox(hwndDlg,("Encrypted ZIP files are not \
supported!"),g_errcaption,MB_OK|MB_ICONSTOP); + return 1;
+ }
+
// was zip created on MS-DOS/Windows?
if ((info.version & 0xFF00) == 0)
{
Modified: NSIS/branches/nsis2/Contrib/zip2exe/res.rc
===================================================================
--- NSIS/branches/nsis2/Contrib/zip2exe/res.rc 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Contrib/zip2exe/res.rc 2017-06-06 02:03:53 UTC (rev 6870)
@@ -29,7 +29,7 @@
IDD_DIALOG1 DIALOGEX 0, 0, 360, 271
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU
-CAPTION "Zip2Exe 0.35"
+CAPTION "Zip2Exe 0.35.1"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
ICON IDI_ICON1,IDC_NSISICON,6,6,20,20
Modified: NSIS/branches/nsis2/Docs/src/attributes.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/attributes.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/attributes.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -10,7 +10,7 @@
\c (left|right|top|bottom) (width|height) [padding]
-Adds a branding image on the top, bottom, left, or right of the installer. Its size \
will be set according to the width/height specified, the installer width/height and \
the installer font. The final size will not always be what you requested; have a look \
at the output of the command for the actual size. Because this depends on the \
installers font, you should use SetFont before AddBrandingImage. The default padding \
value is 2. +Adds a branding image on the top, bottom, left, or right of the \
installer. Its size will be set according to the width/height specified, the \
installer width/height and the installers font. The final size will not always be \
what you requested; have a look at the output of the command for the actual size. \
Because this depends on the installers font, you should use SetFont before \
AddBrandingImage. The default padding value is 2.
AddBrandingImage only adds a placeholder for an image. To set the image itself at \
runtime, use \R{setbrandingimage}{SetBrandingImage}.
@@ -48,7 +48,7 @@
\c /TRIM(LEFT|RIGHT|CENTER) text
-Sets the text that is shown (by default it is 'Nullsoft Install System vX.XX') at \
the bottom of the install window. Setting this to an empty string ("") uses the \
default; to set the string to blank, use " " (a space). If it doesn't matter to you, \
leave it the default so that everybody can know why the installer didn't suck. heh. \
Use /TRIMLEFT, /TRIMRIGHT or /TRIMCENTER to trim down the size of the control to the \
size of the string. +Sets the text that is shown at the bottom of the install window \
(by default it is 'Nullsoft Install System vX.XX'). Setting this to an empty string \
("") uses the default; to set the string to blank, use " " (a space). If it doesn't \
matter to you, leave it the default so that everybody can know why the installer \
didn't suck :). Use /TRIMLEFT, /TRIMRIGHT or /TRIMCENTER to trim down the size of the \
control to the size of the string.
Accepts variables. If variables are used, they must be initialized on \
\R{oninit}{.onInit}.
@@ -56,7 +56,7 @@
\c caption
-When used outside a \R{pageex}{PageEx} block: Sets the text for the titlebar of the \
installer. By default it is 'Name Setup', where Name is specified with the \
\R{aname}{Name} instruction. You can however override it with 'MyApp Installer' or \
whatever. If you specify an empty string (""), the default will be used (you can \
specify " " to simulate a empty string). +When used outside a \R{pageex}{PageEx} \
block: Sets the text for the titlebar of the installer. By default it is '$(^Name) \
Setup', where Name is specified by the \R{aname}{Name} instruction. You can however \
override it with 'MyApp Installer' or whatever. If you specify an empty string (""), \
the default will be used (you can specify " " to simulate a empty string).
When used inside a \R{pageex}{PageEx} block: Sets the subcaption of the current \
page.
@@ -66,7 +66,7 @@
\c dialog ui_file.exe
-Replaces dialog (\e{IDD_LICENSE}, \e{IDD_DIR}, \e{IDD_SELCOM}, \e{IDD_INST}, \
\e{IDD_INSTFILES}, \e{IDD_UNINST} or \e{IDD_VERIFY}) by a dialog with the same \
resource ID in ui_file.exe. You can also specify 'all' as the dialog if you wish to \
replace all 7 of the dialogs at once from the same UI file. For some example UIs look \
at Contrib\\UIs under your NSIS directory. +Replaces dialog (\e{IDD_LICENSE}, \
\e{IDD_DIR}, \e{IDD_SELCOM}, \e{IDD_INST}, \e{IDD_INSTFILES}, \e{IDD_UNINST} or \
\e{IDD_VERIFY}) with a dialog from ui_file.exe with the same resource ID. You can \
also specify 'all' as the dialog if you wish to replace all 7 of the dialogs at once \
from the same UI file. For some example UIs look at Contrib\\UIs under your NSIS \
directory.
\b \e{IDD_LICENSE} must contain \e{IDC_EDIT1} (RICHEDIT control).
@@ -215,7 +215,7 @@
\c root_key subkey key_name
-This attribute tells the installer to check a string in the registry, and use it for \
the install dir if that string is valid. If this attribute is present, it will \
override the InstallDir attribute if the registry key is valid, otherwise it will \
fall back to the InstallDir value. When querying the registry, this command will \
automatically remove any quotes. If the string ends in ".exe", it will automatically \
remove the filename component of the string (i.e. if the string is "C:\\program \
files\\poop\\poop.exe", it will know to use "C:\\program files\\poop"). For more \
advanced install directory configuration, set $INSTDIR in .onInit. +This attribute \
tells the installer to check a string in the registry and use it as the install dir \
if that string is valid. If this attribute is present, it will override the \
\R{ainstalldir}{InstallDir} attribute if the registry key is valid, otherwise it will \
fall back to the \R{ainstalldir}{InstallDir} value. When querying the registry, this \
command will automatically remove any quotes. If the string ends in ".exe", it will \
automatically remove the filename component of the string (i.e. if the string is \
"C:\\Program Files\\Foo\\app.exe", it will know to use "C:\\Program Files\\Foo"). For \
more advanced install directory configuration, set $INSTDIR in .onInit.
Language strings and variables cannot be used with InstallDirRegKey.
Modified: NSIS/branches/nsis2/Docs/src/basic.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/basic.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/basic.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -12,6 +12,8 @@
\c Delete $INSTDIR\somefile.dat
+\\<b\\>Warning:\\</b\\> The /REBOOTOK switch requires administrator rights on \
Windows NT and later. +
\S2{exec} Exec
\c command
@@ -108,6 +110,8 @@
\c Rename $INSTDIR\file.ext $INSTDIR\file.dat
+\\<b\\>Warning:\\</b\\> The /REBOOTOK switch requires administrator rights on \
Windows NT and later. +
\S2{reservefile} ReserveFile
\c [/nonfatal] [/r] [/x file|wildcard [...]] file [file...]
@@ -138,13 +142,15 @@
\c SetOutPath $TEMP
\c RMDir $TEMP\dir
-\\<b\\>Warning:\\</b\\> using \e{RMDir /r $INSTDIR} in the uninstaller is not safe. \
Though it is unlikely, the user might select to install to the Program Files folder \
and so this command will wipe out the entire Program Files folder, including other \
programs that has nothing to do with the uninstaller. The user can also put other \
files but the program's files and would expect them to get deleted with the program. \
Solutions are \W{http://nsis.sourceforge.net/Uninstall_only_installed_files}{available} \
for easily uninstalling only files which were installed by the installer. \
+\\<b\\>Warning:\\</b\\> Using \e{RMDir /r $INSTDIR} in the uninstaller is not safe. \
Though it is unlikely, the user might select to install to the root of the Program \
Files folder and this command would wipe out the entire Program Files folder, \
including all other installed programs! The user can also put other files in the \
installation folder and wouldn't expect them to get deleted along with the program. \
Solutions are \W{http://nsis.sourceforge.net/Uninstall_only_installed_files}{available} \
for easily uninstalling only files which were installed by the installer.
+\\<b\\>Warning:\\</b\\> The /REBOOTOK switch requires administrator rights on \
Windows NT and later. +
\S2{setoutpath} SetOutPath
\c outpath
-Sets the output path ($OUTDIR) and creates it (recursively if necessary), if it does \
not exist. Must be a full pathname, usually is just $INSTDIR (you can specify \
$INSTDIR if you are lazy with a single "-"). +Sets the output path ($OUTDIR) and \
creates it (recursively if necessary), if it does not exist. Must be a full pathname, \
usually is just $INSTDIR (you can specify $INSTDIR with a single "-" if you are \
lazy).
\c SetOutPath $INSTDIR
\c File program.exe
Modified: NSIS/branches/nsis2/Docs/src/callback.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/callback.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/callback.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -1,6 +1,6 @@
\S1{callbacks} Callback Functions
-You can create callback functions which have special names, that will be called by \
the installer at certain points in the install. Below is a list of currently \
available callbacks: +You can create callback functions (which have special names), \
that will be called by the installer at certain points in the install. Below is a \
list of available callbacks:
\S2{instcallbacks} Install Callbacks
Modified: NSIS/branches/nsis2/Docs/src/compiler.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/compiler.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/compiler.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -20,7 +20,7 @@
\c directory
-Adds another include directory to the include directories list. This list is \
searched when !include is used. This list's initial value is $\{NSISDIR\}\\Include \
alone. +Adds another include directory to the include directories list. This list is \
searched when !include is used. This list's initial value is $\{NSISDIR\}\\Include.
\c !addincludedir ..\include
\c !include something.nsh
@@ -126,10 +126,10 @@
\c !tempfile FILE
\c !define /date DATE "%H:%M:%S %d %b, %Y"
\c !system 'echo built on ${DATE} > "${FILE}"'
+\c !undef DATE
\c File /oname=build.txt "${FILE}"
\c !delfile "${FILE}"
\c !undef FILE
-\c !undef DATE
\S1{warning} !warning
Modified: NSIS/branches/nsis2/Docs/src/credits.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/credits.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/credits.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -116,13 +116,13 @@
Arabic - \e{asdfuae, Rami Kattan}
-Basque - \e{I\u00F1aki San Vicente}
+Basque - \e{I\uF1{n}aki San Vicente}
Belarusian - \e{Sitnikov Vjacheslav}
Bosnian - \e{Salih CAVKIC}
-Breton - \e{Korvigello\uF9 An Drouizig}
+Breton - \e{Korvigello\uF9{u} An Drouizig}
Bulgarian - \e{Asparouh Kalyandjiev, Plamen Penkov}
@@ -158,7 +158,7 @@
Icelandic - \e{Gretar Orri Kristinsson}
-Indonesian - \e{ariel825010106}
+Indonesian - \e{\#{Ariel Silooy}ariel825010106}
Italian - \e{Orfanik, sanface, Alessandro Staltari, Lorenzo Bevilacqua}
@@ -180,9 +180,9 @@
Norwegian - \e{Jonas Christoffer Lindstrom, Jan Ivar Beddari}
-Norwegian Nynorsk - \e{Vebj\u00F8rn Sture}
+Norwegian Nynorsk - \e{Vebj\u00F8{o}rn Sture}
-Polish - \e{Piotr Murawski, Rafa\xB3 Lampe, cube, SYSTEMsoft Group}
+Polish - \e{Piotr Murawski, Rafa\u0142{l} Lampe, cube, SYSTEMsoft Group}
Portuguese - \e{DragonSoull, Dre', Ramon}
@@ -196,11 +196,11 @@
Serbian Latin - \e{Srdjan Obucina, Vladan Obradovic}
-Slovak - \e{trace, Kypec, Mari\u00e1n Hikan\u00edk}
+Slovak - \e{trace, Kypec, Mari\u00e1{a}n Hikan\u00ed{i}k}
Slovenian - \e{Janez Dolinar, Martin Sebotnjak}
-Spanish - \e{MoNKi, Lobo Lunar, Darwin Rodrigo Toledo C\u00e1ceres}
+Spanish - \e{MoNKi, Lobo Lunar, Darwin Rodrigo Toledo C\u00e1{a}ceres}
Swedish - \e{Peter Gustafsson, Magnus Bonnevier, Rickard Angbratt}
@@ -214,7 +214,7 @@
Uzbek - \e{Emil Garipov (emil.garipov@gmail.com)}
-Valencian - \e{Bernardo Arlandis Ma\uF1\uF3}
+Valencian - \e{Bernardo Arlandis Ma\uF1{n}\uF3{o}}
Welsh - \e{Rhoslyn Prys, Meddal.com}
Modified: NSIS/branches/nsis2/Docs/src/generalpurpose.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/generalpurpose.but 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Docs/src/generalpurpose.but 2017-06-06 02:03:53 UTC (rev \
6870) @@ -33,7 +33,7 @@
\c CreateDirectory $INSTDIR\some\directory
-\S2{createshortcut} CreateShortCut
+\S2{createshortcut} CreateShortcut
\c link.lnk target.file [parameters [icon.file [icon_index_number [start_options \
[keyboard_shortcut [description]]]]]]
@@ -45,7 +45,7 @@
The error flag is set if the shortcut cannot be created (i.e. either of the paths \
(link or target) does not exist, or some other error).
\c CreateDirectory "$SMPROGRAMS\My Company"
-\c CreateShortCut "$SMPROGRAMS\My Company\My Program.lnk" "$INSTDIR\My Program.exe" \
\ +\c CreateShortcut "$SMPROGRAMS\My Company\My Program.lnk" "$INSTDIR\My \
Program.exe" \ \c "some command line parameters" "$INSTDIR\My Program.exe" 2 \
SW_SHOWNORMAL \ \c ALT|CONTROL|SHIFT|F5 "a description"
Modified: NSIS/branches/nsis2/Docs/src/history.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/history.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/history.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -1,6 +1,15 @@
\A{history} Changelog and Release Notes
+\H{v2.52} 2.52
+Released on ???? ??, 20??
+
+\S1{v2.52-cl} Changelog
+
+\S2{} Minor Changes
+
+\b Backported some bugfixes from NSIS 3
+
\H{v2.51} 2.51
Released on April 1st, 2016
@@ -2814,7 +2823,7 @@
\b !ifdef and friends can now be used in macros
-\b SendMessage can send strings (put STR: before a param) and supports timeouts
+\b SendMessage can send strings (put \cw{STR:} before a param) and supports timeouts
\b Right mouse button "Copy to clipboard" context menu for the Details window
Modified: NSIS/branches/nsis2/Docs/src/langs.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/langs.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/langs.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -50,7 +50,7 @@
As of version 2 NSIS fully supports multiple languages. The interface of one \
installer can support multiple languages.
-Use \R{loadlanguagefile}{LoadLanguageFile} for every language to load the default \
interface texts and language properties. +Use \R{loadlanguagefile}{LoadLanguageFile} \
for every language to load the default interface texts and language properties. Visit \
the \W{http://forums.winamp.com/showthread.php?t=157119}{NSIS translations forum} for \
more information about creating new language files.
The default interface texts can easily be changed using instructions like \
\R{acomponenttext}{ComponentText} etc.
Modified: NSIS/branches/nsis2/Docs/src/misc.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/misc.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/misc.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -69,7 +69,7 @@
\c \\<b\\>32\\</b\\>|64|lastused
-Sets the registry view affected by \R{registry}{registry commands}. On Windows x64 \
there are two views. One for 32-bit applications and one for x64 applications. By \
default, 32-bit applications running on x64 systems under WOW64 have access only to \
the 32-bit view. Using \c{SetRegView 64} allows the installer to access keys in the \
x64 view of the registry. +Sets the registry view affected by \R{registry}{registry \
commands}. On 64-bit Windows there are two views. One for 32-bit applications and one \
for 64-bit applications. By default, 32-bit applications running on 64-bit systems \
under WOW64 have access only to the 32-bit view. Using \c{SetRegView 64} allows the \
installer to access keys in the 64-bit view of the registry.
Affects \R{deleteregkey}{DeleteRegKey}, \R{deleteregvalue}{DeleteRegValue}, \
\R{enumregkey}{EnumRegKey}, \R{enumregvalue}{EnumRegValue}, \
\R{readregdword}{ReadRegDWORD}, \R{readregstr}{ReadRegStr}, \
\R{writeregbin}{WriteRegBin}, \R{writeregdword}{WriteRegDWORD}, \
\R{writeregstr}{WriteRegStr} and \R{writeregexpandstr}{WriteRegExpandStr}.
Modified: NSIS/branches/nsis2/Docs/src/script.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/script.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/script.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -78,7 +78,7 @@
To extend a command over multiple lines, use a backslash (\\) at the end of the \
line. The next line will effectively be concatenated to the end of it. For example:
-\c CreateShortCut "$SMPROGRAMS\NSIS\ZIP2EXE project workspace.lnk" \
+\c CreateShortcut "$SMPROGRAMS\NSIS\ZIP2EXE project workspace.lnk" \
\c "$INSTDIR\source\zip2exe\zip2exe.dsw"
\c
\c MessageBox MB_YESNO|MB_ICONQUESTION \
Modified: NSIS/branches/nsis2/Docs/src/tutorial.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/tutorial.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/tutorial.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -248,7 +248,7 @@
NSIS supports different compression methods, as explained \R{asetcompressor}{here}. \
ZLIB is the default compression method, which is fast and uses only a little bit of \
memory. LZMA is a good method for the creation of small installers for internet \
distribution. BZIP2 usually compresses better than ZLIB but not as good as LZMA, it \
is useful if you need lower memory usage or fast script compilation.
-It it also possible to compile Windows installers on Linux, BSD or Mac OS X servers. \
See \R{build}{Building NSIS} for details. +It is also possible to compile Windows \
installers on Linux, BSD or Mac OS X servers. See \R{build}{Building NSIS} for \
details.
\H{tutmodernui} Modern UI
Modified: NSIS/branches/nsis2/Docs/src/var.but
===================================================================
--- NSIS/branches/nsis2/Docs/src/var.but 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Docs/src/var.but 2017-06-06 02:03:53 UTC (rev 6870)
@@ -103,7 +103,7 @@
\e{$STARTMENU}
-The start menu folder (useful for adding start menu items using \
\R{createshortcut}{CreateShortCut}). The context of this constant (All Users or \
Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} setting. The \
default is the current user. +The start menu folder (useful for adding start menu \
items using \R{createshortcut}{CreateShortcut}). The context of this constant (All \
Users or Current user) depends on the \R{setshellvarcontext}{SetShellVarContext} \
setting. The default is the current user.
\e{$SMPROGRAMS}
Modified: NSIS/branches/nsis2/Examples/Modern UI/StartMenu.nsi
===================================================================
--- NSIS/branches/nsis2/Examples/Modern UI/StartMenu.nsi 2017-06-05 21:43:07 UTC (rev \
6869)
+++ NSIS/branches/nsis2/Examples/Modern UI/StartMenu.nsi 2017-06-06 02:03:53 UTC (rev \
6870) @@ -76,7 +76,7 @@
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" \
"$INSTDIR\Uninstall.exe" + CreateShortcut \
"$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END
Modified: NSIS/branches/nsis2/Examples/bigtest.nsi
===================================================================
--- NSIS/branches/nsis2/Examples/bigtest.nsi 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Examples/bigtest.nsi 2017-06-06 02:03:53 UTC (rev 6870)
@@ -138,7 +138,7 @@
SectionEnd
-Section "Test CreateShortCut"
+Section "Test CreateShortcut"
SectionIn 1 2 3
@@ -238,10 +238,10 @@
CreateDirectory "$SMPROGRAMS\Big NSIS Test"
SetOutPath $INSTDIR ; for working directory
- CreateShortCut "$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" \
"$INSTDIR\bt-uninst.exe" ; use defaults for parameters, icon, etc. + CreateShortcut \
"$SMPROGRAMS\Big NSIS Test\Uninstall BIG NSIS Test.lnk" "$INSTDIR\bt-uninst.exe" ; \
use defaults for parameters, icon, etc. ; this one will use notepad's icon, start it \
minimized, and give it a hotkey (of Ctrl+Shift+Q)
- CreateShortCut "$SMPROGRAMS\Big NSIS Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" \
"$WINDIR\notepad.exe" 0 SW_SHOWMINIMIZED CONTROL|SHIFT|Q
- CreateShortCut "$SMPROGRAMS\Big NSIS Test\TheDir.lnk" "$INSTDIR\" "" "" 0 \
SW_SHOWMAXIMIZED CONTROL|SHIFT|Z + CreateShortcut "$SMPROGRAMS\Big NSIS \
Test\silent.nsi.lnk" "$INSTDIR\silent.nsi" "" "$WINDIR\notepad.exe" 0 \
SW_SHOWMINIMIZED CONTROL|SHIFT|Q + CreateShortcut "$SMPROGRAMS\Big NSIS \
Test\TheDir.lnk" "$INSTDIR\" "" "" 0 SW_SHOWMAXIMIZED CONTROL|SHIFT|Z
FunctionEnd
Modified: NSIS/branches/nsis2/Examples/example2.nsi
===================================================================
--- NSIS/branches/nsis2/Examples/example2.nsi 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Examples/example2.nsi 2017-06-06 02:03:53 UTC (rev 6870)
@@ -63,8 +63,8 @@
Section "Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\Example2"
- CreateShortCut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" \
"$INSTDIR\uninstall.exe" 0
- CreateShortCut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" \
"$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0 + CreateShortcut \
"$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" \
"$INSTDIR\uninstall.exe" 0 + CreateShortcut "$SMPROGRAMS\Example2\Example2 \
(MakeNSISW).lnk" "$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0
SectionEnd
Modified: NSIS/branches/nsis2/Examples/makensis.nsi
===================================================================
--- NSIS/branches/nsis2/Examples/makensis.nsi 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Examples/makensis.nsi 2017-06-06 02:03:53 UTC (rev 6870)
@@ -299,10 +299,10 @@
SectionIn 1 2
SetOutPath $INSTDIR
!ifndef NO_STARTMENUSHORTCUTS
- CreateShortCut "$SMPROGRAMS\NSIS.lnk" "$INSTDIR\NSIS.exe"
+ CreateShortcut "$SMPROGRAMS\NSIS.lnk" "$INSTDIR\NSIS.exe"
!endif
- CreateShortCut "$DESKTOP\NSIS.lnk" "$INSTDIR\NSIS.exe"
+ CreateShortcut "$DESKTOP\NSIS.lnk" "$INSTDIR\NSIS.exe"
${MementoSectionEnd}
Modified: NSIS/branches/nsis2/Include/LogicLib.nsh
===================================================================
--- NSIS/branches/nsis2/Include/LogicLib.nsh 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Include/LogicLib.nsh 2017-06-06 02:03:53 UTC (rev 6870)
@@ -47,7 +47,7 @@
; Case-sensitive string tests:
; a S== b; a S!= b
; Standard (built-in) signed integer tests:
-; a = b; a <> b; a < b; a >= b; a > b; a <= b
+; a = b; a <> b; a < b; a >= b; a > b; a <= b; a & b
; Standard (built-in) unsigned integer tests:
; a U< b; a U>= b; a U> b; a U<= b
; 64-bit integer tests (using System.dll):
@@ -205,6 +205,12 @@
!insertmacro _> `${_a}` `${_b}` `${_f}` `${_t}`
!macroend
+ !macro _& _a _b _t _f
+ !insertmacro _LOGICLIB_TEMP
+ IntOp $_LOGICLIB_TEMP `${_a}` & `${_b}`
+ !insertmacro _<> $_LOGICLIB_TEMP 0 `${_t}` `${_f}`
+ !macroend
+
; Unsigned integer tests (NB: no need for extra equality tests)
!macro _U< _a _b _t _f
IntCmpU `${_a}` `${_b}` `${_f}` `${_t}` `${_f}`
Modified: NSIS/branches/nsis2/Include/StrFunc.nsh
===================================================================
--- NSIS/branches/nsis2/Include/StrFunc.nsh 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Include/StrFunc.nsh 2017-06-06 02:03:53 UTC (rev 6870)
@@ -14,7 +14,9 @@
!ifndef STRFUNC_VERBOSITY
!define STRFUNC_VERBOSITY 3
!endif
-!define _STRFUNC_VERBOSITY ${STRFUNC_VERBOSITY}
+!ifndef _STRFUNC_VERBOSITY
+ !define _STRFUNC_VERBOSITY ${STRFUNC_VERBOSITY}
+!endif
!undef STRFUNC_VERBOSITY
!verbose ${_STRFUNC_VERBOSITY}
Modified: NSIS/branches/nsis2/Include/UpgradeDLL.nsh
===================================================================
--- NSIS/branches/nsis2/Include/UpgradeDLL.nsh 2017-06-05 21:43:07 UTC (rev 6869)
+++ NSIS/branches/nsis2/Include/UpgradeDLL.nsh 2017-06-06 02:03:53 UTC (rev 6870)
@@ -60,26 +60,26 @@
;Advance counter
StrCpy $R0 0
- ReadRegDWORD $R0 HKLM "Software\NSIS.Library.RegTool.v2\UpgradeDLLSession" "count"
+ ReadRegDWORD $R0 HKLM "Software\NSIS.Library.RegTool.v3\UpgradeDLLSession" "count"
IntOp $R0 $R0 + 1
- WriteRegDWORD HKLM "Software\NSIS.Library.RegTool.v2\UpgradeDLLSession" "count" \
"$R0"
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
NSIS-commits mailing list
NSIS-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nsis-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic