Gcodetools have been upgraded to v. 1.7.

(bzr r10417)

21 files changed, 2072 insertions, 2072 deletions

diff --git a/packaging/win32/AdvUninstLog.nsh b/packaging/win32/AdvUninstLog.nsh
index 2b5b5c77b..f48049164 100644
--- a/packaging/win32/AdvUninstLog.nsh
+++ b/packaging/win32/AdvUninstLog.nsh
@@ -1,437 +1,437 @@
-     ;_____________________________ HEADER FILE BEGIN ____________________________

-

-     # Advanced Uninstall Log NSIS header

-     # Version 1.0 2007-01-31

-     # By Red Wine (http://nsis.sf.net/User:Red_Wine)

-     

-     # Usage: See included examples Uninstall_Log_Default_UI.nsi - Uninstall_Log_Modern_UI.nsi

-

-!verbose push

-   !verbose 3

-

-!ifndef ADVANCED_UNINSTALL.LOG_NSH

-   !define ADVANCED_UNINSTALL.LOG_NSH

-

-!ifndef INSTDIR_REG_ROOT | INSTDIR_REG_KEY

-   !error "You must properly define both INSTDIR_REG_ROOT and INSTDIR_REG_KEY"

-!endif

-

-!ifndef UNINSTALL_LOG

-   !define UNINSTALL_LOG         "Uninstall"

-!endif

-

-!ifndef UNINST_LOG_VERBOSE

-   !define UNINST_LOG_VERBOSE    "3"

-!endif

-

-!verbose pop

-

-!echo "Advanced Uninstall Log NSIS header v1.0 2007-01-31 by Red Wine (http://nsis.sf.net/User:Red_Wine)"

-

-!verbose push

-   !verbose ${UNINST_LOG_VERBOSE}

-

-!define UNINST_EXE     "$INSTDIR\${UNINSTALL_LOG}.exe"

-!define UNINST_DAT     "$INSTDIR\${UNINSTALL_LOG}.dat"

-!define UNLOG_PART     "$PLUGINSDIR\part."

-!define UNLOG_TEMP     "$PLUGINSDIR\unlog.tmp"

-!define EXCLU_LIST     "$PLUGINSDIR\exclude.tmp"

-!define UNLOG_HEAD     "=========== Uninstaller Log please do not edit this file ==========="

-

- var unlog_tmp_0

- var unlog_tmp_1

- var unlog_tmp_2

- var unlog_tmp_3

- var unlog_error

-

-!include FileFunc.nsh

-!include TextFunc.nsh

-

-!insertmacro Locate

-!insertmacro un.Locate

-!insertmacro DirState

-!insertmacro un.DirState

-!insertmacro FileJoin

-!insertmacro TrimNewLines

-!insertmacro un.TrimNewLines

-

-;.............................. Uninstaller Macros ..............................

-

-!macro UNINSTALL.LOG_BEGIN_UNINSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-        IfFileExists "${UNINST_DAT}" +3

-        MessageBox MB_ICONSTOP|MB_OK "${UNINST_DAT} not found, unable to perform uninstall." /SD IDOK

-        Quit

-

-        StrCmp "$PLUGINSDIR" "" 0 +2

-           InitPluginsDir

-

-        CopyFiles "${UNINST_DAT}" "${UNLOG_TEMP}"

-        FileOpen $unlog_tmp_2 "${UNLOG_TEMP}" r

-

-  !verbose pop

-!macroend

-

-

-!macro UNINSTALL.LOG_END_UNINSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-        FileClose $unlog_tmp_2

-        DeleteRegValue ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}.dat"

-        DeleteRegValue ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory"

-

-  !verbose pop

-!macroend

-

-

-!macro UNINSTALL.LOG_UNINSTALL TargetDir

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-     !ifndef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL

-        !error "You must insert either Interactive or Unattended Uninstall neither both, neither none."

-     !endif

-

-     !ifdef INTERACTIVE_UNINSTALL

-        GetTempFileName $unlog_tmp_5 "$PLUGINSDIR"

-        FileOpen $unlog_tmp_4 "$unlog_tmp_5" a

-     !endif

-

-        ${PerfomUninstall} "${TargetDir}" "${UnLog_Uninstall_CallBackFunc}"

-

-     !ifdef INTERACTIVE_UNINSTALL

-        FileClose $unlog_tmp_4

-     !endif

-

-  !verbose pop

-!macroend

-

-

-!define PerfomUninstall "!insertmacro PERFORMUNINSTALL"

-

-!macro PERFORMUNINSTALL TargetDir UninstCallBackFunc

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-   !define ID ${__LINE__}

-

-	${un.Locate} "${TargetDir}" "/L=F" "${UninstCallBackFunc}"

-

-    loop_${ID}:

-

-	StrCpy $unlog_tmp_1 0

-

-	${un.Locate} "${TargetDir}" "/L=DE" "${UninstCallBackFunc}"

-	StrCmp $unlog_tmp_1 "0" 0 loop_${ID}

-

-        ${un.DirState} "${TargetDir}" $unlog_tmp_0

-        StrCmp "$unlog_tmp_0" "0" 0 +2

-        RmDir "${TargetDir}"

-

-	IfErrors 0 +2

-	MessageBox MB_ICONEXCLAMATION|MB_OK "${UNINSTALL_LOG} Log error" /SD IDOK

-

-   !undef ID

-

-  !verbose pop

-!macroend

-

-

-!macro INTERACTIVE_UNINSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-     

-     !ifdef INTERACTIVE_UNINSTALL

-        !error "INTERACTIVE_UNINSTALL is already defined"

-     !endif

-

-        var unlog_tmp_4

-        var unlog_tmp_5

-

-     !define INTERACTIVE_UNINSTALL

-

-     !ifdef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL

-        !error "You must insert either Interactive or Unattended Uninstall neither both, neither none."

-     !endif

-

-     !ifdef UnLog_Uninstall_CallBackFunc

-        !undef UnLog_Uninstall_CallBackFunc

-     !endif

-

-     !ifndef UnLog_Uninstall_CallBackFunc

-        !insertmacro UNINSTALL.LOG_UNINSTALL_INTERACTIVE

-        !define UnLog_Uninstall_CallBackFunc "un._LocateCallBack_Function_Interactive"

-     !endif

-

-  !verbose pop

-!macroend

-

-

-!macro UNATTENDED_UNINSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-     !ifdef UNATTENDED_UNINSTALL

-        !error "UNATTENDED_UNINSTALL is already defined"

-     !endif

-

-     !define UNATTENDED_UNINSTALL

-

-     !ifdef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL

-        !error "You must insert either Interactive or Unattended Uninstall neither both, neither none."

-     !endif

-

-     !ifdef UnLog_Uninstall_CallBackFunc

-        !undef UnLog_Uninstall_CallBackFunc

-     !endif

-

-     !ifndef UnLog_Uninstall_CallBackFunc

-        !insertmacro UNINSTALL.LOG_UNINSTALL_UNATTENDED

-        !define UnLog_Uninstall_CallBackFunc "un._LocateCallBack_Function_Unattended"

-     !endif

-

-  !verbose pop

-!macroend

-

-

-!macro UNINSTALL.LOG_UNINSTALL_UNATTENDED

-

-  Function un._LocateCallBack_Function_Unattended

-    start:

-        FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN}

-        ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"

-        StrCmp "$unlog_tmp_3" "$R9" islog

-        IfErrors nolog

-        goto start

-

-    islog:

-        IfFileExists "$R9\*.*" isdir

-

-    isfile:

-        Delete "$R9"

-        goto end

-

-    isdir:

-        RmDir "$R9"

-	IntOp $unlog_tmp_1 $unlog_tmp_1 + 1

-        goto end

-

-    nolog:

-        ClearErrors

-        StrCmp "$R9" "${UNINST_EXE}" isfile

-        StrCmp "$R9" "${UNINST_DAT}" isfile

-

-    end:

-        FileSeek $unlog_tmp_2 0 SET

-	Push $unlog_tmp_0

-  FunctionEnd

-

-!macroend

-

-

-!macro UNINSTALL.LOG_UNINSTALL_INTERACTIVE

-

-  Function un._LocateCallBack_Function_Interactive

-    start:

-        FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN}

-        ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"

-        StrCmp "$unlog_tmp_3" "$R9" islog

-        IfErrors nolog

-        goto start

-

-    islog:

-        IfFileExists "$R9\*.*" isdir

-

-    isfile:

-        Delete "$R9"

-        goto end

-

-    isdir:

-        RmDir "$R9"

-	IntOp $unlog_tmp_1 $unlog_tmp_1 + 1

-        goto end

-

-    nolog:

-        ClearErrors

-	FileSeek $unlog_tmp_4 0 SET

-    read:

-        FileRead $unlog_tmp_4 "$unlog_tmp_3"

-        ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"

-        StrCmp "$unlog_tmp_3" "$R9" end

-        IfErrors +2

-        goto read

-        ClearErrors 

-        StrCmp "$R9" "${UNINST_EXE}" isfile

-        StrCmp "$R9" "${UNINST_DAT}" isfile

-        IfFileExists "$R9\*.*" msgdir

-

-	MessageBox MB_ICONQUESTION|MB_YESNO \

-        'Delete File "$R9"?' /SD IDNO IDYES isfile IDNO nodel

-

-    msgdir:

-        MessageBox MB_ICONQUESTION|MB_YESNO \

-        'Delete Directory "$R9"?' /SD IDNO IDYES isdir IDNO nodel

-

-    nodel:

-	FileSeek $unlog_tmp_4 0 END

-	FileWrite $unlog_tmp_4 "$R9$\r$\n"

-

-    end:

-        FileSeek $unlog_tmp_2 0 SET

-	Push $unlog_tmp_0

-  FunctionEnd

-

-!macroend

-

-;................................. Installer Macros .................................

-

-!macro UNINSTALL.LOG_INSTALL_UNATTENDED

-

-  Function _LocateCallBack_Function_Install

-    loop:

-        FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN}

-        ${TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"

-        IfErrors 0 +4

-        ClearErrors

-        FileSeek $unlog_tmp_2 0 SET

-        goto next

-        StrCmp "$R9" "$unlog_tmp_3" end

-        goto loop

-    next:

-	FileWrite $unlog_tmp_1 "$R9$\r$\n"

-    end:

-	Push $unlog_tmp_0

-  FunctionEnd

-

-!macroend

-

-

-!ifdef UnLog_Install_Func_CallBack

-    !undef UnLog_Install_Func_CallBack

-!endif

-

-!ifndef UnLog_Install_Func_CallBack

-    !insertmacro UNINSTALL.LOG_INSTALL_UNATTENDED

-    !define UnLog_Install_Func_CallBack "_LocateCallBack_Function_Install"

-!endif

-

-

-!macro UNINSTALL.LOG_PREPARE_INSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-      Push $0

-      Push $1

-        ClearErrors

-        ReadRegStr "$0"  ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory"

-        IfErrors next

-        ${DirState} "$0" $1

-        StrCmp "$1" "-1" next

-        StrCmp "$1" "0" next

-        IfFileExists "$0\${UNINSTALL_LOG}.dat" next

-        MessageBox MB_ICONEXCLAMATION|MB_OK \

-        "Previous installation detected at $0.$\n\

-        Required file ${UNINSTALL_LOG}.dat is missing.$\n$\nIt is highly recommended \

-        to select an empty directory and perform a fresh installation." /SD IDOK

-        StrCpy $unlog_error "error"

-

-    next:

-        ClearErrors

-        StrCmp "$PLUGINSDIR" "" 0 +2

-           InitPluginsDir

-

-        GetTempFileName "$1"

-        FileOpen $0 "$1" w

-        FileWrite $0 "${UNLOG_HEAD}$\r$\n"

-        FileClose $0

-        Rename "$1" "${UNLOG_TEMP}"

-      Pop $1

-      Pop $0

-

-  !verbose pop

-!macroend

-

-

-!macro UNINSTALL.LOG_UPDATE_INSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-        Delete "${UNINST_DAT}"

-        Rename "${UNLOG_TEMP}" "${UNINST_DAT}"

-        WriteUninstaller "${UNINST_EXE}"

-        WriteRegStr ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}.dat" "${UNINST_DAT}"

-        WriteRegStr ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory" "$INSTDIR"

-

-  !verbose pop

-!macroend

-

-

-!define uninstall.log_install "!insertmacro UNINSTALL.LOG_INSTALL"

-

-!macro UNINSTALL.LOG_INSTALL FileOpenWrite FileOpenRead TargetDir

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-	FileOpen $unlog_tmp_1 "${FileOpenWrite}" w

-	FileOpen $unlog_tmp_2 "${FileOpenRead}" r

-

-	${Locate} "${TargetDir}" "/L=FD" "${UnLog_Install_Func_CallBack}"

-

-        StrCmp $unlog_error "error" 0 +2

-        ClearErrors

-

-	IfErrors 0 +2

-	MessageBox MB_ICONEXCLAMATION|MB_OK "Error creating ${UNINSTALL_LOG} Log." /SD IDOK

-

-	FileClose $unlog_tmp_1

-	FileClose $unlog_tmp_2

-

-  !verbose pop

-!macroend

-

-

-!define uninstall.log_mergeID "!insertmacro UNINSTALL.LOG_MERGE"

-

-!macro UNINSTALL.LOG_MERGE UnlogPart

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-        ${FileJoin} "${UNLOG_TEMP}" "${UnlogPart}" "${UNLOG_TEMP}"

-

-  !verbose pop

-!macroend

-

-

-!macro UNINSTALL.LOG_OPEN_INSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-        StrCmp $unlog_error "error" +2

-        ${uninstall.log_install} "${EXCLU_LIST}" "${UNINST_DAT}" "$OUTDIR"

-

-  !verbose pop

-!macroend

-

-

-!macro UNINSTALL.LOG_CLOSE_INSTALL

-  !verbose push

-     !verbose ${UNINST_LOG_VERBOSE}

-

-   !define ID ${__LINE__}

-

-        ${uninstall.log_install} "${UNLOG_PART}${ID}" "${EXCLU_LIST}" "$OUTDIR"

-        ${uninstall.log_mergeID} "${UNLOG_PART}${ID}"

-

-   !undef ID ${__LINE__}

-

-  !verbose pop

-!macroend

-

-!endif

-

-!verbose pop

-     ;_____________________________ HEADER FILE END ____________________________

-

+     ;_____________________________ HEADER FILE BEGIN ____________________________
+
+     # Advanced Uninstall Log NSIS header
+     # Version 1.0 2007-01-31
+     # By Red Wine (http://nsis.sf.net/User:Red_Wine)
+     
+     # Usage: See included examples Uninstall_Log_Default_UI.nsi - Uninstall_Log_Modern_UI.nsi
+
+!verbose push
+   !verbose 3
+
+!ifndef ADVANCED_UNINSTALL.LOG_NSH
+   !define ADVANCED_UNINSTALL.LOG_NSH
+
+!ifndef INSTDIR_REG_ROOT | INSTDIR_REG_KEY
+   !error "You must properly define both INSTDIR_REG_ROOT and INSTDIR_REG_KEY"
+!endif
+
+!ifndef UNINSTALL_LOG
+   !define UNINSTALL_LOG         "Uninstall"
+!endif
+
+!ifndef UNINST_LOG_VERBOSE
+   !define UNINST_LOG_VERBOSE    "3"
+!endif
+
+!verbose pop
+
+!echo "Advanced Uninstall Log NSIS header v1.0 2007-01-31 by Red Wine (http://nsis.sf.net/User:Red_Wine)"
+
+!verbose push
+   !verbose ${UNINST_LOG_VERBOSE}
+
+!define UNINST_EXE     "$INSTDIR\${UNINSTALL_LOG}.exe"
+!define UNINST_DAT     "$INSTDIR\${UNINSTALL_LOG}.dat"
+!define UNLOG_PART     "$PLUGINSDIR\part."
+!define UNLOG_TEMP     "$PLUGINSDIR\unlog.tmp"
+!define EXCLU_LIST     "$PLUGINSDIR\exclude.tmp"
+!define UNLOG_HEAD     "=========== Uninstaller Log please do not edit this file ==========="
+
+ var unlog_tmp_0
+ var unlog_tmp_1
+ var unlog_tmp_2
+ var unlog_tmp_3
+ var unlog_error
+
+!include FileFunc.nsh
+!include TextFunc.nsh
+
+!insertmacro Locate
+!insertmacro un.Locate
+!insertmacro DirState
+!insertmacro un.DirState
+!insertmacro FileJoin
+!insertmacro TrimNewLines
+!insertmacro un.TrimNewLines
+
+;.............................. Uninstaller Macros ..............................
+
+!macro UNINSTALL.LOG_BEGIN_UNINSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+        IfFileExists "${UNINST_DAT}" +3
+        MessageBox MB_ICONSTOP|MB_OK "${UNINST_DAT} not found, unable to perform uninstall." /SD IDOK
+        Quit
+
+        StrCmp "$PLUGINSDIR" "" 0 +2
+           InitPluginsDir
+
+        CopyFiles "${UNINST_DAT}" "${UNLOG_TEMP}"
+        FileOpen $unlog_tmp_2 "${UNLOG_TEMP}" r
+
+  !verbose pop
+!macroend
+
+
+!macro UNINSTALL.LOG_END_UNINSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+        FileClose $unlog_tmp_2
+        DeleteRegValue ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}.dat"
+        DeleteRegValue ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory"
+
+  !verbose pop
+!macroend
+
+
+!macro UNINSTALL.LOG_UNINSTALL TargetDir
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+     !ifndef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL
+        !error "You must insert either Interactive or Unattended Uninstall neither both, neither none."
+     !endif
+
+     !ifdef INTERACTIVE_UNINSTALL
+        GetTempFileName $unlog_tmp_5 "$PLUGINSDIR"
+        FileOpen $unlog_tmp_4 "$unlog_tmp_5" a
+     !endif
+
+        ${PerfomUninstall} "${TargetDir}" "${UnLog_Uninstall_CallBackFunc}"
+
+     !ifdef INTERACTIVE_UNINSTALL
+        FileClose $unlog_tmp_4
+     !endif
+
+  !verbose pop
+!macroend
+
+
+!define PerfomUninstall "!insertmacro PERFORMUNINSTALL"
+
+!macro PERFORMUNINSTALL TargetDir UninstCallBackFunc
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+   !define ID ${__LINE__}
+
+	${un.Locate} "${TargetDir}" "/L=F" "${UninstCallBackFunc}"
+
+    loop_${ID}:
+
+	StrCpy $unlog_tmp_1 0
+
+	${un.Locate} "${TargetDir}" "/L=DE" "${UninstCallBackFunc}"
+	StrCmp $unlog_tmp_1 "0" 0 loop_${ID}
+
+        ${un.DirState} "${TargetDir}" $unlog_tmp_0
+        StrCmp "$unlog_tmp_0" "0" 0 +2
+        RmDir "${TargetDir}"
+
+	IfErrors 0 +2
+	MessageBox MB_ICONEXCLAMATION|MB_OK "${UNINSTALL_LOG} Log error" /SD IDOK
+
+   !undef ID
+
+  !verbose pop
+!macroend
+
+
+!macro INTERACTIVE_UNINSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+     
+     !ifdef INTERACTIVE_UNINSTALL
+        !error "INTERACTIVE_UNINSTALL is already defined"
+     !endif
+
+        var unlog_tmp_4
+        var unlog_tmp_5
+
+     !define INTERACTIVE_UNINSTALL
+
+     !ifdef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL
+        !error "You must insert either Interactive or Unattended Uninstall neither both, neither none."
+     !endif
+
+     !ifdef UnLog_Uninstall_CallBackFunc
+        !undef UnLog_Uninstall_CallBackFunc
+     !endif
+
+     !ifndef UnLog_Uninstall_CallBackFunc
+        !insertmacro UNINSTALL.LOG_UNINSTALL_INTERACTIVE
+        !define UnLog_Uninstall_CallBackFunc "un._LocateCallBack_Function_Interactive"
+     !endif
+
+  !verbose pop
+!macroend
+
+
+!macro UNATTENDED_UNINSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+     !ifdef UNATTENDED_UNINSTALL
+        !error "UNATTENDED_UNINSTALL is already defined"
+     !endif
+
+     !define UNATTENDED_UNINSTALL
+
+     !ifdef INTERACTIVE_UNINSTALL & UNATTENDED_UNINSTALL
+        !error "You must insert either Interactive or Unattended Uninstall neither both, neither none."
+     !endif
+
+     !ifdef UnLog_Uninstall_CallBackFunc
+        !undef UnLog_Uninstall_CallBackFunc
+     !endif
+
+     !ifndef UnLog_Uninstall_CallBackFunc
+        !insertmacro UNINSTALL.LOG_UNINSTALL_UNATTENDED
+        !define UnLog_Uninstall_CallBackFunc "un._LocateCallBack_Function_Unattended"
+     !endif
+
+  !verbose pop
+!macroend
+
+
+!macro UNINSTALL.LOG_UNINSTALL_UNATTENDED
+
+  Function un._LocateCallBack_Function_Unattended
+    start:
+        FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN}
+        ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"
+        StrCmp "$unlog_tmp_3" "$R9" islog
+        IfErrors nolog
+        goto start
+
+    islog:
+        IfFileExists "$R9\*.*" isdir
+
+    isfile:
+        Delete "$R9"
+        goto end
+
+    isdir:
+        RmDir "$R9"
+	IntOp $unlog_tmp_1 $unlog_tmp_1 + 1
+        goto end
+
+    nolog:
+        ClearErrors
+        StrCmp "$R9" "${UNINST_EXE}" isfile
+        StrCmp "$R9" "${UNINST_DAT}" isfile
+
+    end:
+        FileSeek $unlog_tmp_2 0 SET
+	Push $unlog_tmp_0
+  FunctionEnd
+
+!macroend
+
+
+!macro UNINSTALL.LOG_UNINSTALL_INTERACTIVE
+
+  Function un._LocateCallBack_Function_Interactive
+    start:
+        FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN}
+        ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"
+        StrCmp "$unlog_tmp_3" "$R9" islog
+        IfErrors nolog
+        goto start
+
+    islog:
+        IfFileExists "$R9\*.*" isdir
+
+    isfile:
+        Delete "$R9"
+        goto end
+
+    isdir:
+        RmDir "$R9"
+	IntOp $unlog_tmp_1 $unlog_tmp_1 + 1
+        goto end
+
+    nolog:
+        ClearErrors
+	FileSeek $unlog_tmp_4 0 SET
+    read:
+        FileRead $unlog_tmp_4 "$unlog_tmp_3"
+        ${un.TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"
+        StrCmp "$unlog_tmp_3" "$R9" end
+        IfErrors +2
+        goto read
+        ClearErrors 
+        StrCmp "$R9" "${UNINST_EXE}" isfile
+        StrCmp "$R9" "${UNINST_DAT}" isfile
+        IfFileExists "$R9\*.*" msgdir
+
+	MessageBox MB_ICONQUESTION|MB_YESNO \
+        'Delete File "$R9"?' /SD IDNO IDYES isfile IDNO nodel
+
+    msgdir:
+        MessageBox MB_ICONQUESTION|MB_YESNO \
+        'Delete Directory "$R9"?' /SD IDNO IDYES isdir IDNO nodel
+
+    nodel:
+	FileSeek $unlog_tmp_4 0 END
+	FileWrite $unlog_tmp_4 "$R9$\r$\n"
+
+    end:
+        FileSeek $unlog_tmp_2 0 SET
+	Push $unlog_tmp_0
+  FunctionEnd
+
+!macroend
+
+;................................. Installer Macros .................................
+
+!macro UNINSTALL.LOG_INSTALL_UNATTENDED
+
+  Function _LocateCallBack_Function_Install
+    loop:
+        FileRead $unlog_tmp_2 "$unlog_tmp_3" ${NSIS_MAX_STRLEN}
+        ${TrimNewLines} "$unlog_tmp_3" "$unlog_tmp_3"
+        IfErrors 0 +4
+        ClearErrors
+        FileSeek $unlog_tmp_2 0 SET
+        goto next
+        StrCmp "$R9" "$unlog_tmp_3" end
+        goto loop
+    next:
+	FileWrite $unlog_tmp_1 "$R9$\r$\n"
+    end:
+	Push $unlog_tmp_0
+  FunctionEnd
+
+!macroend
+
+
+!ifdef UnLog_Install_Func_CallBack
+    !undef UnLog_Install_Func_CallBack
+!endif
+
+!ifndef UnLog_Install_Func_CallBack
+    !insertmacro UNINSTALL.LOG_INSTALL_UNATTENDED
+    !define UnLog_Install_Func_CallBack "_LocateCallBack_Function_Install"
+!endif
+
+
+!macro UNINSTALL.LOG_PREPARE_INSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+      Push $0
+      Push $1
+        ClearErrors
+        ReadRegStr "$0"  ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory"
+        IfErrors next
+        ${DirState} "$0" $1
+        StrCmp "$1" "-1" next
+        StrCmp "$1" "0" next
+        IfFileExists "$0\${UNINSTALL_LOG}.dat" next
+        MessageBox MB_ICONEXCLAMATION|MB_OK \
+        "Previous installation detected at $0.$\n\
+        Required file ${UNINSTALL_LOG}.dat is missing.$\n$\nIt is highly recommended \
+        to select an empty directory and perform a fresh installation." /SD IDOK
+        StrCpy $unlog_error "error"
+
+    next:
+        ClearErrors
+        StrCmp "$PLUGINSDIR" "" 0 +2
+           InitPluginsDir
+
+        GetTempFileName "$1"
+        FileOpen $0 "$1" w
+        FileWrite $0 "${UNLOG_HEAD}$\r$\n"
+        FileClose $0
+        Rename "$1" "${UNLOG_TEMP}"
+      Pop $1
+      Pop $0
+
+  !verbose pop
+!macroend
+
+
+!macro UNINSTALL.LOG_UPDATE_INSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+        Delete "${UNINST_DAT}"
+        Rename "${UNLOG_TEMP}" "${UNINST_DAT}"
+        WriteUninstaller "${UNINST_EXE}"
+        WriteRegStr ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}.dat" "${UNINST_DAT}"
+        WriteRegStr ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}" "${UNINSTALL_LOG}Directory" "$INSTDIR"
+
+  !verbose pop
+!macroend
+
+
+!define uninstall.log_install "!insertmacro UNINSTALL.LOG_INSTALL"
+
+!macro UNINSTALL.LOG_INSTALL FileOpenWrite FileOpenRead TargetDir
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+	FileOpen $unlog_tmp_1 "${FileOpenWrite}" w
+	FileOpen $unlog_tmp_2 "${FileOpenRead}" r
+
+	${Locate} "${TargetDir}" "/L=FD" "${UnLog_Install_Func_CallBack}"
+
+        StrCmp $unlog_error "error" 0 +2
+        ClearErrors
+
+	IfErrors 0 +2
+	MessageBox MB_ICONEXCLAMATION|MB_OK "Error creating ${UNINSTALL_LOG} Log." /SD IDOK
+
+	FileClose $unlog_tmp_1
+	FileClose $unlog_tmp_2
+
+  !verbose pop
+!macroend
+
+
+!define uninstall.log_mergeID "!insertmacro UNINSTALL.LOG_MERGE"
+
+!macro UNINSTALL.LOG_MERGE UnlogPart
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+        ${FileJoin} "${UNLOG_TEMP}" "${UnlogPart}" "${UNLOG_TEMP}"
+
+  !verbose pop
+!macroend
+
+
+!macro UNINSTALL.LOG_OPEN_INSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+        StrCmp $unlog_error "error" +2
+        ${uninstall.log_install} "${EXCLU_LIST}" "${UNINST_DAT}" "$OUTDIR"
+
+  !verbose pop
+!macroend
+
+
+!macro UNINSTALL.LOG_CLOSE_INSTALL
+  !verbose push
+     !verbose ${UNINST_LOG_VERBOSE}
+
+   !define ID ${__LINE__}
+
+        ${uninstall.log_install} "${UNLOG_PART}${ID}" "${EXCLU_LIST}" "$OUTDIR"
+        ${uninstall.log_mergeID} "${UNLOG_PART}${ID}"
+
+   !undef ID ${__LINE__}
+
+  !verbose pop
+!macroend
+
+!endif
+
+!verbose pop
+     ;_____________________________ HEADER FILE END ____________________________
+
diff --git a/packaging/win32/AdvUninstLog.txt b/packaging/win32/AdvUninstLog.txt
index b92c5cec7..c294c3df2 100644
--- a/packaging/win32/AdvUninstLog.txt
+++ b/packaging/win32/AdvUninstLog.txt
@@ -1,121 +1,121 @@
-Overview

-

-Advanced Uninstall Log for NSIS was born in the need to cover a specific gap.

-It's been discussed fairly enough that the File /r command is very useful

-in cases when developers want to add a huge amount of sub directories and

-files, nevertheless it has the disadvantage that such an installation should

-be uninstalled with RmDir /r which is risky and removes also data that has

-been added/created later within the installation folder.

-

-

-

-

-About Advanced Uninstall Log.

-

-Advanced Uninstall Log is a macro system provided in a NSIS header that

-is able to monitor an installation and build an uninstall log file which

-is used by the uninstaller to uninstall files/directories that have been

-added within specific installation blocks.

-

-This means that files which have been installed outside these blocks,

-or added later either by the user or application's activities, ignored

-by the uninstaller.

-

-Moreover files that might exist into the target directory prior the current

-installation, ignored as well.

-

-Advanced Uninstall Log creates an uninstall log that removes only files that

-have been installed and optionally interacts with users for every other file

-and/or directory has found in installation folder and requires permission to

-remove these files/directories.

-

-It is enhanced as well to support updates, e.g. if the installer later would

-update the installation by adding new data, the uninstaller would remove the

-new data that has been added by the installer, without bothering users about.

-

-

-

-

-Features

-

-If target installation folder exists and contains files and/or directories

-they all preserved from being uninstalled.

-

-Uninstaller removes data that has been added within specific installation

-blocks, preserving all other data that has been created/added outside of

-these installation blocks. See included examples for details.

-

-Supports unlimited updates/reinstallations.

-

-Supports two uninstaller modes. Interactive mode requires confirmation

-to remove every other file exept those files that have been installed.

-Unattended mode leaves intact every other file without bothering users.

-

-In case when uninstall log (uninstall.dat) has been removed manually instead

-of execute uninstaller, if users attempt to run the installer later, a warning

-issued that they should select a new output folder.

-

-Implements only the included with NSIS release headers FileFunc and TextFunc.

-There is no need for external plugins and headers, adds a very small overhead.

-

-

-

-

-Restrictions

-

-If uninstall log (uninstall.dat) is missing uninstaller won't execute at all.

-

-Due to file create - write procedure that is required in order to add/update

-the uninstall log (uninstall.dat), restricted users on NT based systems won't 

-be able to execute the installer.

-

-

-

-

-Disadvantage

-

-Since the header does not implement anything else than the common NSIS release,

-a delay occurs while builds and reads the uninstall log because it needs to

-throw the list several times. Talking for common cases, most likely the delay

-won't be noticeable, however, in cases where the target directory isn't empty

-and contains a large amount of data which will be excluded from uninstall log,

-or added large amount of data after the installation which will be excluded also,

-the delay should be noticeable.

-

-

-

-

-Credits

-

-A very big thanks goes to kichik.

-When my idea of the Advanced Uninstall Log became an NSIS header, it was 

-indeed an amateur's attempt to write a flexible and errors free NSIS header.

-Kichik dropped me a dozen of suggestions helping me to achieve my plan.

-However, his main suggestion to eliminate the mentioned above disadvantage,

-still remains untouched by me.

-

-

-

-

-License

-

-This header file is provided 'as-is', without any express or implied warranty.

-In no event will the author be held liable for any damages arising from the use

-of this header file.

-

-Permission is granted to anyone to use this header file for any purpose,

-including commercial applications, and to alter it and redistribute it freely,

-subject to the following restrictions:

-

-   1. The origin of this header file must not be misrepresented; 

-      you must not claim that you wrote the original header file.

-      If you use this header file in a product, an acknowledgment in 

-      the product documentation would be appreciated but is not required.

-

-   2. Altered versions must be plainly marked as such, and must not be 

-      misrepresented as being the original header file.

-

-   3. This notice may not be removed or altered from any distribution. 

-

-

+Overview
+
+Advanced Uninstall Log for NSIS was born in the need to cover a specific gap.
+It's been discussed fairly enough that the File /r command is very useful
+in cases when developers want to add a huge amount of sub directories and
+files, nevertheless it has the disadvantage that such an installation should
+be uninstalled with RmDir /r which is risky and removes also data that has
+been added/created later within the installation folder.
+
+
+
+
+About Advanced Uninstall Log.
+
+Advanced Uninstall Log is a macro system provided in a NSIS header that
+is able to monitor an installation and build an uninstall log file which
+is used by the uninstaller to uninstall files/directories that have been
+added within specific installation blocks.
+
+This means that files which have been installed outside these blocks,
+or added later either by the user or application's activities, ignored
+by the uninstaller.
+
+Moreover files that might exist into the target directory prior the current
+installation, ignored as well.
+
+Advanced Uninstall Log creates an uninstall log that removes only files that
+have been installed and optionally interacts with users for every other file
+and/or directory has found in installation folder and requires permission to
+remove these files/directories.
+
+It is enhanced as well to support updates, e.g. if the installer later would
+update the installation by adding new data, the uninstaller would remove the
+new data that has been added by the installer, without bothering users about.
+
+
+
+
+Features
+
+If target installation folder exists and contains files and/or directories
+they all preserved from being uninstalled.
+
+Uninstaller removes data that has been added within specific installation
+blocks, preserving all other data that has been created/added outside of
+these installation blocks. See included examples for details.
+
+Supports unlimited updates/reinstallations.
+
+Supports two uninstaller modes. Interactive mode requires confirmation
+to remove every other file exept those files that have been installed.
+Unattended mode leaves intact every other file without bothering users.
+
+In case when uninstall log (uninstall.dat) has been removed manually instead
+of execute uninstaller, if users attempt to run the installer later, a warning
+issued that they should select a new output folder.
+
+Implements only the included with NSIS release headers FileFunc and TextFunc.
+There is no need for external plugins and headers, adds a very small overhead.
+
+
+
+
+Restrictions
+
+If uninstall log (uninstall.dat) is missing uninstaller won't execute at all.
+
+Due to file create - write procedure that is required in order to add/update
+the uninstall log (uninstall.dat), restricted users on NT based systems won't 
+be able to execute the installer.
+
+
+
+
+Disadvantage
+
+Since the header does not implement anything else than the common NSIS release,
+a delay occurs while builds and reads the uninstall log because it needs to
+throw the list several times. Talking for common cases, most likely the delay
+won't be noticeable, however, in cases where the target directory isn't empty
+and contains a large amount of data which will be excluded from uninstall log,
+or added large amount of data after the installation which will be excluded also,
+the delay should be noticeable.
+
+
+
+
+Credits
+
+A very big thanks goes to kichik.
+When my idea of the Advanced Uninstall Log became an NSIS header, it was 
+indeed an amateur's attempt to write a flexible and errors free NSIS header.
+Kichik dropped me a dozen of suggestions helping me to achieve my plan.
+However, his main suggestion to eliminate the mentioned above disadvantage,
+still remains untouched by me.
+
+
+
+
+License
+
+This header file is provided 'as-is', without any express or implied warranty.
+In no event will the author be held liable for any damages arising from the use
+of this header file.
+
+Permission is granted to anyone to use this header file for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+   1. The origin of this header file must not be misrepresented; 
+      you must not claim that you wrote the original header file.
+      If you use this header file in a product, an acknowledgment in 
+      the product documentation would be appreciated but is not required.
+
+   2. Altered versions must be plainly marked as such, and must not be 
+      misrepresented as being the original header file.
+
+   3. This notice may not be removed or altered from any distribution. 
+
+
 eof
\ No newline at end of file
diff --git a/packaging/win32/MessageBox.txt b/packaging/win32/MessageBox.txt
index dddab5553..c2aa963d6 100644
--- a/packaging/win32/MessageBox.txt
+++ b/packaging/win32/MessageBox.txt
@@ -1,186 +1,186 @@
-Customisable MessageBox Plug-In (v0.98 beta 3)

-

-[  Archive Page: http://nsis.sourceforge.net/archive/???  ]

-

---------------

-

-The Customisable MessageBox plug-in allows you to use a MessageBox in your installer which can be altered to how you want it to be.  You can control:

-	*  the number of buttons shown

-	*  the text each button shows

-	*  a standard or customisable icon ( flexible so you can use the installer or other files )

-	*  a fully working 'forth' button!

-

-The plug-in uses a few tricks to allow for the messagebox functionality to be altered so that the button text can finally be altered making [ Yes | Yes to All | No | No to All ] ( and anything else you care for ) possible.

-

-Also with the changes made it is now possible to have a functional 'forth' button - yes you read correctly!  When using the function just pass in four button texts and you will see the forth button - simple really :o)

-

-There is only the one function to show the messagebox so enjoy.

-

-[ As of v0.98 beta the parameters of calling the function have changed, check out usage for the revised options - thanks to n0On3 for the suggestions. ]

-

-

-Usage

------

-

-messagebox::show  styles  caption  ( module_name, icon_id )  text   but1  [ but2  but3  but4 ]

-

-styles - messagebox styles ( supports most of the windows messagebox styles )

-

-caption - the text to be used for the dialog title ( or the installer title if not specified )

-

-module_name - sets the name of the file ( usually a dll or exe file ) that contains the custom icon to be used - if 0 is passed then the installer will be used

-

-icon_id - the id of the icon group to be used for the custom icon

-

-text - the text to be shown by the messagebox

-

-but1 - specified text or name id to use ie IDYES, IDNO, etc ( there must always be at least one button )

-

-but2, but3, but4 - optional buttons which follow the same way as for but1

-

-

-When passing in options, you should use a "" pair for options you pass in to ensure the strings are correctly read.  It is not necessary to do so for the predefined button texts

-e.g. "IDCANCEL" is the same as IDCANCEL.

-

-See Example.nsi for an example ;o)  ( bit hacked at the moment due to testing but shows most things )

-

-

-Return Values

------

-

-To get the return value use Pop $0 immediately after the function has been used incase other functions alter the value.

-

-If there were no problems then the function will return the number of the button pressed working from the left being 'button 1'.

-i.e.

-	if you have [ yes | no | abort ] and 'no' is selected then the return value will be '2'

-

-If an error happens then the messagebox will return 0.

-

-If there are no buttons passed then the function will return '-1'.

-

-

-Some More Info

-----------------

-

-If you pass an empty string for the caption ( "" ) then the installer title text will be used instead (stripping back the current section name as NSIS messageboxes do).

-If the installer is run silently then the title will be blank if setting the caption option to "" ( as NSIS messageboxes do ).  This is because when the installer is silent it does not have a visible window and so will not have a window title ( had not taken this into account initially, oops - fixed from v0.98 beta 3 ).

-

-When you want to use a custom icon, setting module to '0' will look for the icon in the installer otherwise it will search the file specified.

-e.g.

-	"0,103" will load the installer icon ( well in testing it does :o)  )

-	"shell32.dll,24" will load the help file icon from the shell32.dll ( as long as the file exists! )

-

-If the module passed is not valid then the usericon style will not be used ( you may receive a windows message informing of this ).

-

-If the icon is not valid then the messagebox will just show a blank area where the icon would be displayed assuming that the value of module is valid.

-

-If a usericon is specified then if there are any of the messagebox icon styles passed in, these will be ignored.  This allows an icon to appear otherwise internal style conflicts will prevent any icon being shown.

-

-If you want to display the standard button texts then pass the following strings in for the necessary button:

-

-	IDOK		-	Ok

-	IDCANCEL	-	Cancel

-	IDABORT	-	Abort

-	IDRETRY	-	Retry

-	IDIGNORE	-	Ignore

-	IDYES		-	Yes

-	IDNO		-	No

-	IDHELP		-	Help / 4th button

-	IDTRYAGAIN	-	Try Again

-	IDCONTINUE	-	Continue

-

-When the function is processing the passed button texts to use, if a duplicate of the predefined texts (above) happen then the only the first instance will be allowed

-e.g.

-	IDYES "ah go on if you dare" IDYES	->	[  YES  |  ah go on if you dare  ]

-

-Each button will be resized if needed to allow the text to fit correctly in the button without being clipped.  If the text is still too long for the messagebox width ( limited to 80% of the screen width ) then buttons will be resized and clipping of the button text may happen again ( this will be fixed in v1.0 ).

-

-

-Final Notes

--------

-

-I have no idea how the code will work with international text (since i just use plain text in the code) so if you try it in a multilanguage setup then let me know how it reacts or if there are any issues with the function's display.

-

-The predefined button texts are hard coded and cannot be altered.  To alter the default texts involves passing in the language button text as a custom button text.

-

-The button resizing code is not complete at the moment ( as can be clearly seen from the first messagebox ) when it detects that the width of the messagebox is at the 80% screen width.  Issues are that the buttons are not correctly resized to ensure that they appear correctly ( as is the case with the second messagebox ).  This is more down to fiddling with the button widths after the initial processing but will be fixed soon :o)

-

-

-Credits

--------

-

-Coded by Darren Owen, aka DrO (Sept 2003)

-

-n0On3 - Idea request and helpful feedback ( the simplified function use over previous versions :o) )

-

-A plugin from me to you :o)

-

-

-Version History

--------

-

-v0.1

-* Initial release of the function

-* Basic support to show that the button text can be altered on the messagebox

-* Inital support for controlling the number of buttons shown

-

-v0.5

-* Setting of text of only the buttons wanted ( "/but? blah" )

-* Now if a string is not passed then the text will not be set (broken in the v0.1 release)

-* Altered a lot of internal workings to allow for more customising of the MessageBox

-* Better support for the number of buttons to show

-* The functional '4th' button - making use of the 'Help' button to act as a real button

-* Fixed a number of crash issues due to buffer sizes and a few other bugs, etc

-

-v0.8

-* A lot of changes made :o)

-* Improved internal handling so that now button text is set correctly either when the number of buttons is set or user styles are set so now "/but2 blah" will always set the second buttons text and not just a few cases as beforehand

-* Altered the order of the parameters from earlier versions to make some internals easier to do :o)

-* The 4th / Help button will now close the MessageBox in ALL cases - would not close correctly if there was not a 'cancel' button in earlier versions

-* Buffers are now allocated to the NSIS buffer sizes passed to the dll on use for better compatibility between dll and installer

-* When the button numbers are set, the function will map the returned value now to the button selected instead of the normal wndows defined return value

-* some other bits and bobs that i've forgotten on the way

-

-v0.9

-* Added in support for displaying custom icons on the messagebox ( along with standard icons which can be shown ) either in the installer or from other files

-* Altered the example script to show off some more bits of what it can do

-

-v0.95 beta

-* Added in support for resizing of buttons based on the text set into the button ( use the /trim before the text to be set )

-* Messagebox is now limited to approximately 80% of the screen size ( as the messagebox normally does )

-* The resizing of button texts will also update the width of the text width to ensure it keeps to the size of the messagebox

-* Support is not complete for /trim ( still need to update the graduating of the width increment )

-* When the 80% width is reached, currently buttons will disappear off the messagebox ( handling for a double height button will come to cope with this soon )

-* Altered the example script to show off some more bits of what it can do

-

-v0.98 beta

-* Removed the passing in of a hwnd parameter - is always owned by the installer

-* Altered the custom icon option to be a single parameter now in the form 'module,id' where module can be 0 to use the installer

-* All return values are now mapped to the button number pressed ie 1,2,etc

-* Now the number of buttons to show is based on the button string texts passed in to the function :o)

-* Altered the order of parameters to work in a top to bottom order with respect to the messagebox layout and to match closer to the NSIS setup

-[ a good suggestion from n0On3 - nice ]

-- now goes:	style  title  usericon  text  but1  [ but2  but3  but4 ]

-* Altered the button texts to be set in the order passed and will also convert the default ids too! eg IDYES -> "Yes", IDIGNORE -> "Ignore"

-* Fixed the graduating of the button trim feature to appear 'natural'

-[ adds approxiamately 3 character widths either side when the text won't fit fully in the button ]

-* Fixed a few bugs in the code introduced in the changes made

-* Support for MB_DEFBUTTON? is broken when a button has to be resized ( will fix this soon - already worked out how to but not why this happens )

-

-v0.98 beta 2

-* Fixed the MB_DEFBUTTON? issue ( needed to prevent the wm_active message being handled )

-* Verified the installer will show icons correctly if the installer is run silently ( no code changes were made )

-* Added in checking of the defined buttons to ensure that duplicates are not allowed (only the first occurrance is allowed)

-* Checked that all strings are verified for having data before being used

-* A few code tidy-ups introduced to the code

-* Typo fix in the example

-* Added in stripping out of the icon definitions if a user icon is specified (otherwise no icon will appear!)

-* Updated the readme file to reflect the changes made to the plug-in's functionality since v0.98 beta and to clarify things in better detail now ( i hope )

-* Added in a reference to the archive page for the plugin ( will upload majority of this file to the archive )

-* All internal buffers are now set to the buffer size passed into the plugin when it is called and altered how they are referenced

-* Fixed how the module string is cleared, should fix a potential crash issue i hope

-* Partially fixed the resizing of the text area when using long button strings to correctly limit out when the 80% limit is reached ( fine when now icon is used at the moment )

-* Added a silent installer option to the example script, just !define SILENT to get the silent version (should show that the function works fine either in a normal or silent installer)

-

-v0.98 beta 3

+Customisable MessageBox Plug-In (v0.98 beta 3)
+
+[  Archive Page: http://nsis.sourceforge.net/archive/???  ]
+
+--------------
+
+The Customisable MessageBox plug-in allows you to use a MessageBox in your installer which can be altered to how you want it to be.  You can control:
+	*  the number of buttons shown
+	*  the text each button shows
+	*  a standard or customisable icon ( flexible so you can use the installer or other files )
+	*  a fully working 'forth' button!
+
+The plug-in uses a few tricks to allow for the messagebox functionality to be altered so that the button text can finally be altered making [ Yes | Yes to All | No | No to All ] ( and anything else you care for ) possible.
+
+Also with the changes made it is now possible to have a functional 'forth' button - yes you read correctly!  When using the function just pass in four button texts and you will see the forth button - simple really :o)
+
+There is only the one function to show the messagebox so enjoy.
+
+[ As of v0.98 beta the parameters of calling the function have changed, check out usage for the revised options - thanks to n0On3 for the suggestions. ]
+
+
+Usage
+-----
+
+messagebox::show  styles  caption  ( module_name, icon_id )  text   but1  [ but2  but3  but4 ]
+
+styles - messagebox styles ( supports most of the windows messagebox styles )
+
+caption - the text to be used for the dialog title ( or the installer title if not specified )
+
+module_name - sets the name of the file ( usually a dll or exe file ) that contains the custom icon to be used - if 0 is passed then the installer will be used
+
+icon_id - the id of the icon group to be used for the custom icon
+
+text - the text to be shown by the messagebox
+
+but1 - specified text or name id to use ie IDYES, IDNO, etc ( there must always be at least one button )
+
+but2, but3, but4 - optional buttons which follow the same way as for but1
+
+
+When passing in options, you should use a "" pair for options you pass in to ensure the strings are correctly read.  It is not necessary to do so for the predefined button texts
+e.g. "IDCANCEL" is the same as IDCANCEL.
+
+See Example.nsi for an example ;o)  ( bit hacked at the moment due to testing but shows most things )
+
+
+Return Values
+-----
+
+To get the return value use Pop $0 immediately after the function has been used incase other functions alter the value.
+
+If there were no problems then the function will return the number of the button pressed working from the left being 'button 1'.
+i.e.
+	if you have [ yes | no | abort ] and 'no' is selected then the return value will be '2'
+
+If an error happens then the messagebox will return 0.
+
+If there are no buttons passed then the function will return '-1'.
+
+
+Some More Info
+----------------
+
+If you pass an empty string for the caption ( "" ) then the installer title text will be used instead (stripping back the current section name as NSIS messageboxes do).
+If the installer is run silently then the title will be blank if setting the caption option to "" ( as NSIS messageboxes do ).  This is because when the installer is silent it does not have a visible window and so will not have a window title ( had not taken this into account initially, oops - fixed from v0.98 beta 3 ).
+
+When you want to use a custom icon, setting module to '0' will look for the icon in the installer otherwise it will search the file specified.
+e.g.
+	"0,103" will load the installer icon ( well in testing it does :o)  )
+	"shell32.dll,24" will load the help file icon from the shell32.dll ( as long as the file exists! )
+
+If the module passed is not valid then the usericon style will not be used ( you may receive a windows message informing of this ).
+
+If the icon is not valid then the messagebox will just show a blank area where the icon would be displayed assuming that the value of module is valid.
+
+If a usericon is specified then if there are any of the messagebox icon styles passed in, these will be ignored.  This allows an icon to appear otherwise internal style conflicts will prevent any icon being shown.
+
+If you want to display the standard button texts then pass the following strings in for the necessary button:
+
+	IDOK		-	Ok
+	IDCANCEL	-	Cancel
+	IDABORT	-	Abort
+	IDRETRY	-	Retry
+	IDIGNORE	-	Ignore
+	IDYES		-	Yes
+	IDNO		-	No
+	IDHELP		-	Help / 4th button
+	IDTRYAGAIN	-	Try Again
+	IDCONTINUE	-	Continue
+
+When the function is processing the passed button texts to use, if a duplicate of the predefined texts (above) happen then the only the first instance will be allowed
+e.g.
+	IDYES "ah go on if you dare" IDYES	->	[  YES  |  ah go on if you dare  ]
+
+Each button will be resized if needed to allow the text to fit correctly in the button without being clipped.  If the text is still too long for the messagebox width ( limited to 80% of the screen width ) then buttons will be resized and clipping of the button text may happen again ( this will be fixed in v1.0 ).
+
+
+Final Notes
+-------
+
+I have no idea how the code will work with international text (since i just use plain text in the code) so if you try it in a multilanguage setup then let me know how it reacts or if there are any issues with the function's display.
+
+The predefined button texts are hard coded and cannot be altered.  To alter the default texts involves passing in the language button text as a custom button text.
+
+The button resizing code is not complete at the moment ( as can be clearly seen from the first messagebox ) when it detects that the width of the messagebox is at the 80% screen width.  Issues are that the buttons are not correctly resized to ensure that they appear correctly ( as is the case with the second messagebox ).  This is more down to fiddling with the button widths after the initial processing but will be fixed soon :o)
+
+
+Credits
+-------
+
+Coded by Darren Owen, aka DrO (Sept 2003)
+
+n0On3 - Idea request and helpful feedback ( the simplified function use over previous versions :o) )
+
+A plugin from me to you :o)
+
+
+Version History
+-------
+
+v0.1
+* Initial release of the function
+* Basic support to show that the button text can be altered on the messagebox
+* Inital support for controlling the number of buttons shown
+
+v0.5
+* Setting of text of only the buttons wanted ( "/but? blah" )
+* Now if a string is not passed then the text will not be set (broken in the v0.1 release)
+* Altered a lot of internal workings to allow for more customising of the MessageBox
+* Better support for the number of buttons to show
+* The functional '4th' button - making use of the 'Help' button to act as a real button
+* Fixed a number of crash issues due to buffer sizes and a few other bugs, etc
+
+v0.8
+* A lot of changes made :o)
+* Improved internal handling so that now button text is set correctly either when the number of buttons is set or user styles are set so now "/but2 blah" will always set the second buttons text and not just a few cases as beforehand
+* Altered the order of the parameters from earlier versions to make some internals easier to do :o)
+* The 4th / Help button will now close the MessageBox in ALL cases - would not close correctly if there was not a 'cancel' button in earlier versions
+* Buffers are now allocated to the NSIS buffer sizes passed to the dll on use for better compatibility between dll and installer
+* When the button numbers are set, the function will map the returned value now to the button selected instead of the normal wndows defined return value
+* some other bits and bobs that i've forgotten on the way
+
+v0.9
+* Added in support for displaying custom icons on the messagebox ( along with standard icons which can be shown ) either in the installer or from other files
+* Altered the example script to show off some more bits of what it can do
+
+v0.95 beta
+* Added in support for resizing of buttons based on the text set into the button ( use the /trim before the text to be set )
+* Messagebox is now limited to approximately 80% of the screen size ( as the messagebox normally does )
+* The resizing of button texts will also update the width of the text width to ensure it keeps to the size of the messagebox
+* Support is not complete for /trim ( still need to update the graduating of the width increment )
+* When the 80% width is reached, currently buttons will disappear off the messagebox ( handling for a double height button will come to cope with this soon )
+* Altered the example script to show off some more bits of what it can do
+
+v0.98 beta
+* Removed the passing in of a hwnd parameter - is always owned by the installer
+* Altered the custom icon option to be a single parameter now in the form 'module,id' where module can be 0 to use the installer
+* All return values are now mapped to the button number pressed ie 1,2,etc
+* Now the number of buttons to show is based on the button string texts passed in to the function :o)
+* Altered the order of parameters to work in a top to bottom order with respect to the messagebox layout and to match closer to the NSIS setup
+[ a good suggestion from n0On3 - nice ]
+- now goes:	style  title  usericon  text  but1  [ but2  but3  but4 ]
+* Altered the button texts to be set in the order passed and will also convert the default ids too! eg IDYES -> "Yes", IDIGNORE -> "Ignore"
+* Fixed the graduating of the button trim feature to appear 'natural'
+[ adds approxiamately 3 character widths either side when the text won't fit fully in the button ]
+* Fixed a few bugs in the code introduced in the changes made
+* Support for MB_DEFBUTTON? is broken when a button has to be resized ( will fix this soon - already worked out how to but not why this happens )
+
+v0.98 beta 2
+* Fixed the MB_DEFBUTTON? issue ( needed to prevent the wm_active message being handled )
+* Verified the installer will show icons correctly if the installer is run silently ( no code changes were made )
+* Added in checking of the defined buttons to ensure that duplicates are not allowed (only the first occurrance is allowed)
+* Checked that all strings are verified for having data before being used
+* A few code tidy-ups introduced to the code
+* Typo fix in the example
+* Added in stripping out of the icon definitions if a user icon is specified (otherwise no icon will appear!)
+* Updated the readme file to reflect the changes made to the plug-in's functionality since v0.98 beta and to clarify things in better detail now ( i hope )
+* Added in a reference to the archive page for the plugin ( will upload majority of this file to the archive )
+* All internal buffers are now set to the buffer size passed into the plugin when it is called and altered how they are referenced
+* Fixed how the module string is cleared, should fix a potential crash issue i hope
+* Partially fixed the resizing of the text area when using long button strings to correctly limit out when the 80% limit is reached ( fine when now icon is used at the moment )
+* Added a silent installer option to the example script, just !define SILENT to get the silent version (should show that the function works fine either in a normal or silent installer)
+
+v0.98 beta 3
 * Fixed a crash when a silent installer is run ( pointed out by n0On3 ) - not checking the string length when getting the installer title if ""is the pased caption value, doh!
\ No newline at end of file
diff --git a/packaging/win32/RequireLatestNSIS.nsh b/packaging/win32/RequireLatestNSIS.nsh
index 29552ac02..f859ec7ad 100644
--- a/packaging/win32/RequireLatestNSIS.nsh
+++ b/packaging/win32/RequireLatestNSIS.nsh
@@ -1,9 +1,9 @@
-!if ${NSIS_VERSION} = v2.45

-	!error "There is a bug in !searchparse which makes this script not compile in NSIS 2.45. Please upgrade to NSIS 2.46 or later and try again."

-!else

-	!echo "(If you get a compile error with !searchparse, please upgrade to NSIS 2.46 or later and try again.)"

-!endif

-!searchparse ${NSIS_VERSION} "v" V

-!if ${V} < 2.46

-	!error "You only have NSIS ${V}, but NSIS 2.46 or later is required for proper Windows 7 support. Please upgrade to NSIS 2.46 or later and try again."

-!endif

+!if ${NSIS_VERSION} = v2.45
+	!error "There is a bug in !searchparse which makes this script not compile in NSIS 2.45. Please upgrade to NSIS 2.46 or later and try again."
+!else
+	!echo "(If you get a compile error with !searchparse, please upgrade to NSIS 2.46 or later and try again.)"
+!endif
+!searchparse ${NSIS_VERSION} "v" V
+!if ${V} < 2.46
+	!error "You only have NSIS ${V}, but NSIS 2.46 or later is required for proper Windows 7 support. Please upgrade to NSIS 2.46 or later and try again."
+!endif
diff --git a/packaging/win32/VersionCompleteXXXX.nsh b/packaging/win32/VersionCompleteXXXX.nsh
index e2ff740e4..e4c6961cd 100644
--- a/packaging/win32/VersionCompleteXXXX.nsh
+++ b/packaging/win32/VersionCompleteXXXX.nsh
@@ -1,47 +1,47 @@
-; See http://nsis.sourceforge.net/VersionCompleteXXXX for documentation

-!macro VersionCompleteXXXN _INPUT_VALUE _OUTPUT_SYMBOL _REVISION

-	!searchparse /noerrors ${_INPUT_VALUE} "" _VERSION_1 "." _VERSION_2 "." _VERSION_3 "." _VERSION_4

-	!if `${_VERSION_1}` == ``

-		!undef _VERSION_1

-		!define _VERSION_1 0

-	!endif

-	!if `${_VERSION_2}` == ``

-		!undef _VERSION_2

-		!define _VERSION_2 0

-	!endif

-	!if `${_VERSION_3}` == ``

-		!undef _VERSION_3

-		!define _VERSION_3 0

-	!endif

-	!define ${_OUTPUT_SYMBOL} ${_VERSION_1}.${_VERSION_2}.${_VERSION_3}.${_REVISION}

-	!undef _VERSION_1

-	!undef _VERSION_2

-	!undef _VERSION_3

-	!undef _VERSION_4

-!macroend

-!define VersionCompleteXXXN `!insertmacro VersionCompleteXXXN`

-!macro VersionCompleteXXXX _INPUT_VALUE _OUTPUT_SYMBOL

-	!searchparse /noerrors ${_INPUT_VALUE} "" _VERSION_1 "." _VERSION_2 "." _VERSION_3 "." _VERSION_4

-	!if `${_VERSION_1}` == ``

-		!undef _VERSION_1

-		!define _VERSION_1 0

-	!endif

-	!if `${_VERSION_2}` == ``

-		!undef _VERSION_2

-		!define _VERSION_2 0

-	!endif

-	!if `${_VERSION_3}` == ``

-		!undef _VERSION_3

-		!define _VERSION_3 0

-	!endif

-	!if `${_VERSION_4}` == ``

-		!undef _VERSION_4

-		!define _VERSION_4 0

-	!endif

-	!define ${_OUTPUT_SYMBOL} ${_VERSION_1}.${_VERSION_2}.${_VERSION_3}.${_VERSION_4}

-	!undef _VERSION_1

-	!undef _VERSION_2

-	!undef _VERSION_3

-	!undef _VERSION_4

-!macroend

-!define VersionCompleteXXXX `!insertmacro VersionCompleteXXXX`

+; See http://nsis.sourceforge.net/VersionCompleteXXXX for documentation
+!macro VersionCompleteXXXN _INPUT_VALUE _OUTPUT_SYMBOL _REVISION
+	!searchparse /noerrors ${_INPUT_VALUE} "" _VERSION_1 "." _VERSION_2 "." _VERSION_3 "." _VERSION_4
+	!if `${_VERSION_1}` == ``
+		!undef _VERSION_1
+		!define _VERSION_1 0
+	!endif
+	!if `${_VERSION_2}` == ``
+		!undef _VERSION_2
+		!define _VERSION_2 0
+	!endif
+	!if `${_VERSION_3}` == ``
+		!undef _VERSION_3
+		!define _VERSION_3 0
+	!endif
+	!define ${_OUTPUT_SYMBOL} ${_VERSION_1}.${_VERSION_2}.${_VERSION_3}.${_REVISION}
+	!undef _VERSION_1
+	!undef _VERSION_2
+	!undef _VERSION_3
+	!undef _VERSION_4
+!macroend
+!define VersionCompleteXXXN `!insertmacro VersionCompleteXXXN`
+!macro VersionCompleteXXXX _INPUT_VALUE _OUTPUT_SYMBOL
+	!searchparse /noerrors ${_INPUT_VALUE} "" _VERSION_1 "." _VERSION_2 "." _VERSION_3 "." _VERSION_4
+	!if `${_VERSION_1}` == ``
+		!undef _VERSION_1
+		!define _VERSION_1 0
+	!endif
+	!if `${_VERSION_2}` == ``
+		!undef _VERSION_2
+		!define _VERSION_2 0
+	!endif
+	!if `${_VERSION_3}` == ``
+		!undef _VERSION_3
+		!define _VERSION_3 0
+	!endif
+	!if `${_VERSION_4}` == ``
+		!undef _VERSION_4
+		!define _VERSION_4 0
+	!endif
+	!define ${_OUTPUT_SYMBOL} ${_VERSION_1}.${_VERSION_2}.${_VERSION_3}.${_VERSION_4}
+	!undef _VERSION_1
+	!undef _VERSION_2
+	!undef _VERSION_3
+	!undef _VERSION_4
+!macroend
+!define VersionCompleteXXXX `!insertmacro VersionCompleteXXXX`
diff --git a/packaging/win32/ifexist.nsh b/packaging/win32/ifexist.nsh
index 80fd40aaa..f14236c2e 100644
--- a/packaging/win32/ifexist.nsh
+++ b/packaging/win32/ifexist.nsh
@@ -1,21 +1,21 @@
-; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation

-!macro !ifexist _FILE_NAME

-	!tempfile _TEMPFILE

-	!system `if exist "${_FILE_NAME}" echo !define _FILE_EXISTS > "${_TEMPFILE}"`

-	!include `${_TEMPFILE}`

-	!delfile `${_TEMPFILE}`

-	!undef _TEMPFILE

-	!ifdef _FILE_EXISTS

-		!undef _FILE_EXISTS

-!macroend

-!define !ifexist "!insertmacro !ifexist"

-!macro !ifnexist _FILE_NAME

-	!tempfile _TEMPFILE

-	!system `if not exist "${_FILE_NAME}" echo !define _FILE_EXISTS > "${_TEMPFILE}"`

-	!include `${_TEMPFILE}`

-	!delfile `${_TEMPFILE}`

-	!undef _TEMPFILE

-	!ifdef _FILE_EXISTS

-		!undef _FILE_EXISTS

-!macroend

-!define !ifnexist "!insertmacro !ifnexist"

+; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
+!macro !ifexist _FILE_NAME
+	!tempfile _TEMPFILE
+	!system `if exist "${_FILE_NAME}" echo !define _FILE_EXISTS > "${_TEMPFILE}"`
+	!include `${_TEMPFILE}`
+	!delfile `${_TEMPFILE}`
+	!undef _TEMPFILE
+	!ifdef _FILE_EXISTS
+		!undef _FILE_EXISTS
+!macroend
+!define !ifexist "!insertmacro !ifexist"
+!macro !ifnexist _FILE_NAME
+	!tempfile _TEMPFILE
+	!system `if not exist "${_FILE_NAME}" echo !define _FILE_EXISTS > "${_TEMPFILE}"`
+	!include `${_TEMPFILE}`
+	!delfile `${_TEMPFILE}`
+	!undef _TEMPFILE
+	!ifdef _FILE_EXISTS
+		!undef _FILE_EXISTS
+!macroend
+!define !ifnexist "!insertmacro !ifnexist"
diff --git a/packaging/win32/languages/Japanese.nsh b/packaging/win32/languages/Japanese.nsh
index b8c61f22a..c8e949aa0 100644
--- a/packaging/win32/languages/Japanese.nsh
+++ b/packaging/win32/languages/Japanese.nsh
@@ -1,113 +1,113 @@
-;Language: Japanese (1041, CP932)

-;By Kenji Inoue <kenz@oct.zaq.ne.jp>, Masato Hashimoto <cabezon.hashimoto@gmail.com>

-${LangFileString} CaptionDescription "Open Source Scalable Vector Graphics Editor"

-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ‚Í GNU General Public License (GPL) ‚̉º‚ŃŠƒŠ�[ƒX‚³‚ê‚Ü‚·�BŽQ�l‚É“–ŠYƒ‰ƒCƒZƒ“ƒX‚ð‚±‚±‚É•\Ž¦‚µ‚Ü‚·�B$_CLICK"

-${LangFileString} DIFFERENT_USER "Inkscape ‚̓†�[ƒU $0 ‚É‚æ‚Á‚ăCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·�B$\r$\n‚±‚Ì‚Ü‚Ü‘±‚¯‚é‚Æ�³�í‚ÉŠ®—¹‚µ‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñ�B$\r$\n$0 ‚Ń�ƒOƒCƒ“‚µ‚Ä‚©‚ç�Ä“xŽŽ‚Ý‚Ä‚­‚¾‚³‚¢�B"

-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ‚ÍŠù‚ɃCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·�B$\n$(^Name) ‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚ɈȑO‚̃o�[ƒWƒ‡ƒ“‚ð�í�œ‚µ‚Ü‚·‚©?"

-${LangFileString} OK_CANCEL_DESC "$\n$\nOK ‚ð‰Ÿ‚µ‚ÄŒp‘±‚·‚é‚© CANCEL ‚ð‰Ÿ‚µ‚Ä’†Ž~‚µ‚Ä‚­‚¾‚³‚¢�B"

-${LangFileString} NO_ADMIN "ŠÇ—�ŽÒŒ ŒÀ‚ª‚ ‚è‚Ü‚¹‚ñ�B$\r$\n‚·‚ׂẴ†�[ƒU‚ɑ΂·‚é Inkscape ‚̃Cƒ“ƒXƒg�[ƒ‹‚Í�³�í‚ÉŠ®—¹‚µ‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñ�B$\r$\n'‚·‚ׂẴ†�[ƒU' ƒIƒvƒVƒ‡ƒ“‚̃`ƒFƒbƒNƒ}�[ƒN‚ðŠO‚µ‚Ä‚­‚¾‚³‚¢�B"

-${LangFileString} NOT_SUPPORTED "Inkscape ‚Í Windows 95/98/ME �ã‚Å‚Í“®�삵‚Ü‚¹‚ñ!$\r$\n�Ú‚µ‚­‚̓IƒtƒBƒVƒƒƒ‹ƒEƒFƒuƒTƒCƒg‚ð‚²——‚­‚¾‚³‚¢�B"

-${LangFileString} Full "Š®‘S"

-${LangFileString} Optimal "�œK"

-${LangFileString} Minimal "�Å�¬"

-${LangFileString} Core "Inkscape SVG Editor (•K�{)"

-${LangFileString} CoreDesc "Inkscape ‚̃RƒAƒtƒ@ƒCƒ‹‚ÆDLL"

-${LangFileString} GTKFiles "GTK+ ƒ‰ƒ“ƒ^ƒCƒ€ŠÂ‹« (•K�{)"

-${LangFileString} GTKFilesDesc "ƒ}ƒ‹ƒ`ƒvƒ‰ƒbƒgƒtƒH�[ƒ€‘Ήž GUI ƒc�[ƒ‹ƒLƒbƒg (Inkscape ‚ªŽg—p)"

-${LangFileString} Shortcuts "ƒVƒ‡�[ƒgƒJƒbƒg"

-${LangFileString} ShortcutsDesc "Inkscape ‚ðŠJŽn‚·‚邽‚߂̃Vƒ‡�[ƒgƒJƒbƒg"

-${LangFileString} Alluser "‚·‚ׂẴ†�[ƒU"

-${LangFileString} AlluserDesc "‚±‚̃Rƒ“ƒsƒ…�[ƒ^‚ðŽg‚¤‚·‚ׂĂÌ�l‚É‚±‚̃AƒvƒŠƒP�[ƒVƒ‡ƒ“‚ðƒCƒ“ƒXƒg�[ƒ‹ (‚·‚ׂẴ†�[ƒU)"

-${LangFileString} Desktop "ƒfƒXƒNƒgƒbƒv"

-${LangFileString} DesktopDesc "Inkscape ‚ւ̃Vƒ‡�[ƒgƒJƒbƒg‚ðƒfƒXƒNƒgƒbƒv‚É�ì�¬"

-${LangFileString} Startmenu "ƒXƒ^�[ƒgƒ�ƒjƒ…�["

-${LangFileString} StartmenuDesc "ƒXƒ^�[ƒgƒ�ƒjƒ…�[‚É Inkscape ‚Ì�€–Ú‚ð�ì�¬"

-${LangFileString} Quicklaunch "ƒNƒCƒbƒN‹N“®"

-${LangFileString} QuicklaunchDesc "Inkscape ‚ւ̃Vƒ‡�[ƒgƒJƒbƒg‚ðƒNƒCƒbƒN‹N“®ƒc�[ƒ‹ƒo�[‚É�ì�¬"

-${LangFileString} SVGWriter "SVG ƒtƒ@ƒCƒ‹‚ð Inkscape ‚ÅŠJ‚­"

-${LangFileString} SVGWriterDesc "SVG ƒtƒ@ƒCƒ‹‚Ì•W�€ƒGƒfƒBƒ^‚É Inkscape ‚ð�Ý’è"

-${LangFileString} ContextMenu "ƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�["

-${LangFileString} ContextMenuDesc "SVG ƒtƒ@ƒCƒ‹‚̃Rƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[‚É Inkscape ‚ð’ljÁ"

-${LangFileString} DeletePrefs "ŒÂ�l�Ý’è‚ð�í�œ"

-${LangFileString} DeletePrefsDesc "ˆÈ‘O‚̃Cƒ“ƒXƒg�[ƒ‹Žž‚©‚çˆø‚«Œp‚¢‚¾ŒÂ�l�Ý’è‚ð�í�œ"

-${LangFileString} Addfiles "’ljÁƒtƒ@ƒCƒ‹"

-${LangFileString} AddfilesDesc "’ljÁƒtƒ@ƒCƒ‹"

-${LangFileString} Examples "ƒTƒ“ƒvƒ‹ƒtƒ@ƒCƒ‹"

-${LangFileString} ExamplesDesc "Inkscape ‚̃Tƒ“ƒvƒ‹ƒtƒ@ƒCƒ‹"

-${LangFileString} Tutorials "ƒ`ƒ…�[ƒgƒŠƒAƒ‹"

-${LangFileString} TutorialsDesc "Inkscape ‚̃`ƒ…�[ƒgƒŠƒAƒ‹"

-${LangFileString} Languages "Œ¾Œê"

-${LangFileString} LanguagesDesc "Inkscape ‚Ì‚³‚Ü‚´‚Ü‚ÈŒ¾Œêƒtƒ@ƒCƒ‹‚ðƒCƒ“ƒXƒg�[ƒ‹"

-${LangFileString} lng_am "ƒAƒ€ƒnƒ‰Œê"

-${LangFileString} lng_ar "ƒAƒ‰ƒrƒAŒê"

-${LangFileString} lng_az "ƒAƒ[ƒ‹ƒoƒCƒWƒƒƒ“Œê"

-${LangFileString} lng_be "ƒxƒ‰ƒ‹�[ƒVŒê"

-${LangFileString} lng_bg "ƒuƒ‹ƒKƒŠƒAŒê"

-${LangFileString} lng_bn "ƒxƒ“ƒKƒ‹Œê"

-${LangFileString} lng_br "ƒuƒ‹ƒgƒ“Œê"

-${LangFileString} lng_ca "ƒJƒ^ƒ�ƒjƒAŒê"

-${LangFileString} lng_ca@valencia "ƒoƒŒƒ“ƒVƒAŒê"

-${LangFileString} lng_cs "ƒ`ƒFƒRŒê"

-${LangFileString} lng_da "ƒfƒ“ƒ}�[ƒNŒê"

-${LangFileString} lng_de "ƒhƒCƒcŒê"

-${LangFileString} lng_dz "ƒ]ƒ“ƒJŒê"

-${LangFileString} lng_el "ƒMƒŠƒVƒƒŒê"

-${LangFileString} lng_en "‰pŒê"

-${LangFileString} lng_en_AU "‰pŒê (ƒI�[ƒXƒgƒ‰ƒŠƒA)"

-${LangFileString} lng_en_CA "‰pŒê (ƒJƒiƒ_)"

-${LangFileString} lng_en_GB "‰pŒê (‰p�‘)"

-${LangFileString} lng_en_US@piglatin "ƒsƒbƒO�Eƒ‰ƒeƒ“Œê"

-${LangFileString} lng_eo "ƒGƒXƒyƒ‰ƒ“ƒgŒê"

-${LangFileString} lng_es "ƒXƒyƒCƒ“Œê"

-${LangFileString} lng_es_MX "ƒXƒyƒCƒ“Œê (ƒ�ƒLƒVƒR)"

-${LangFileString} lng_et "ƒGƒXƒgƒjƒAŒê"

-${LangFileString} lng_eu "ƒoƒXƒNŒê"

-${LangFileString} lng_fa "ƒtƒ@ƒ‹ƒVŒê"

-${LangFileString} lng_fi "ƒtƒBƒ“ƒ‰ƒ“ƒhŒê"

-${LangFileString} lng_fr "ƒtƒ‰ƒ“ƒXŒê"

-${LangFileString} lng_ga "ƒAƒCƒ‹ƒ‰ƒ“ƒhŒê"

-${LangFileString} lng_gl "ƒKƒŠƒVƒAŒê"

-${LangFileString} lng_he "ƒwƒuƒ‰ƒCŒê"

-${LangFileString} lng_hr "ƒNƒ�ƒAƒ`ƒAŒê"

-${LangFileString} lng_hu "ƒnƒ“ƒKƒŠ�[Œê"

-${LangFileString} lng_id "ƒCƒ“ƒhƒlƒVƒAŒê"

-${LangFileString} lng_it "ƒCƒ^ƒŠƒAŒê"

-${LangFileString} lng_ja "“ú–{Œê"

-${LangFileString} lng_km "ƒNƒ��[ƒ‹Œê"

-${LangFileString} lng_ko "ŠØ�‘Œê"

-${LangFileString} lng_lt "ƒŠƒgƒAƒjƒAŒê"

-${LangFileString} lng_mk "ƒ}ƒPƒhƒjƒAŒê"

-${LangFileString} lng_mn "ƒ‚ƒ“ƒSƒ‹Œê"

-${LangFileString} lng_ne "ƒlƒp�[ƒ‹Œê"

-${LangFileString} lng_nb "ƒmƒ‹ƒEƒF�[Œêƒu�[ƒNƒ‚�[ƒ‹"

-${LangFileString} lng_nl "ƒIƒ‰ƒ“ƒ_Œê"

-${LangFileString} lng_nn "ƒmƒ‹ƒEƒF�[Œêƒj�[ƒmƒVƒ…ƒN"

-${LangFileString} lng_pa "ƒpƒ“ƒWƒƒƒuŒê"

-${LangFileString} lng_pl "ƒ|�[ƒ‰ƒ“ƒhŒê"

-${LangFileString} lng_pt "ƒ|ƒ‹ƒgƒKƒ‹Œê"

-${LangFileString} lng_pt_BR "ƒ|ƒ‹ƒgƒKƒ‹Œê (ƒuƒ‰ƒWƒ‹)"

-${LangFileString} lng_ro "ƒ‹�[ƒ}ƒjƒAŒê"

-${LangFileString} lng_ru "ƒ�ƒVƒAŒê"

-${LangFileString} lng_rw "ƒLƒjƒ„ƒ‹ƒ�ƒ“ƒ_Œê"

-${LangFileString} lng_sk "ƒXƒ�ƒoƒLƒAŒê"

-${LangFileString} lng_sl "ƒXƒ�ƒxƒjƒAŒê"

-${LangFileString} lng_sq "ƒAƒ‹ƒoƒjƒAŒê"

-${LangFileString} lng_sr "ƒZƒ‹ƒrƒAŒê"

-${LangFileString} lng_sr@latin "ƒZƒ‹ƒrƒAŒêƒ‰ƒeƒ“•¶Žš"

-${LangFileString} lng_sv "ƒXƒEƒF�[ƒfƒ“Œê"

-${LangFileString} lng_te_IN "ƒeƒ‹ƒOŒê"

-${LangFileString} lng_th "ƒ^ƒCŒê"

-${LangFileString} lng_tr "ƒgƒ‹ƒRŒê"

-${LangFileString} lng_uk "ƒEƒNƒ‰ƒCƒiŒê"

-${LangFileString} lng_vi "ƒxƒgƒiƒ€Œê"

-${LangFileString} lng_zh_CN "’†�‘Œê (ŠÈ‘ÌŽš)"

-${LangFileString} lng_zh_TW "’†�‘Œê (”É‘ÌŽš)"

-${LangFileString} UInstOpt "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ƒIƒvƒVƒ‡ƒ“"

-${LangFileString} UInstOpt1 "•K—v‚Å‚ ‚ê‚Έȉº‚̃IƒvƒVƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢"

-${LangFileString} PurgePrefs "ŒÂ�l�Ý’è‚ðŽc‚·"

-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ!$\r$\nƒfƒBƒŒƒNƒgƒŠ $INSTDIR ‚ðŽè“®‚Å�í�œ‚µ‚ăAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢!"

-${LangFileString} FileChanged "ƒtƒ@ƒCƒ‹ $filename ‚̓Cƒ“ƒXƒg�[ƒ‹Œã‚É•Ï�X‚³‚ê‚Ä‚¢‚Ü‚·�B$\r$\n‚±‚̃tƒ@ƒCƒ‹‚ð�í�œ‚µ‚Ü‚·‚©?"

-${LangFileString} Yes "‚Í‚¢"

-${LangFileString} AlwaysYes "‘S‚Ä‚Í‚¢"

-${LangFileString} No "‚¢‚¢‚¦"

-${LangFileString} AlwaysNo "‘S‚Ä‚¢‚¢‚¦"

+;Language: Japanese (1041, CP932)
+;By Kenji Inoue <kenz@oct.zaq.ne.jp>, Masato Hashimoto <cabezon.hashimoto@gmail.com>
+${LangFileString} CaptionDescription "Open Source Scalable Vector Graphics Editor"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ‚Í GNU General Public License (GPL) ‚̉º‚ŃŠƒŠ�[ƒX‚³‚ê‚Ü‚·�BŽQ�l‚É“–ŠYƒ‰ƒCƒZƒ“ƒX‚ð‚±‚±‚É•\Ž¦‚µ‚Ü‚·�B$_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape ‚̓†�[ƒU $0 ‚É‚æ‚Á‚ăCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·�B$\r$\n‚±‚Ì‚Ü‚Ü‘±‚¯‚é‚Æ�³�í‚ÉŠ®—¹‚µ‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñ�B$\r$\n$0 ‚Ń�ƒOƒCƒ“‚µ‚Ä‚©‚ç�Ä“xŽŽ‚Ý‚Ä‚­‚¾‚³‚¢�B"
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ‚ÍŠù‚ɃCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ä‚¢‚Ü‚·�B$\n$(^Name) ‚ðƒCƒ“ƒXƒg�[ƒ‹‚·‚é‘O‚ɈȑO‚̃o�[ƒWƒ‡ƒ“‚ð�í�œ‚µ‚Ü‚·‚©?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nOK ‚ð‰Ÿ‚µ‚ÄŒp‘±‚·‚é‚© CANCEL ‚ð‰Ÿ‚µ‚Ä’†Ž~‚µ‚Ä‚­‚¾‚³‚¢�B"
+${LangFileString} NO_ADMIN "ŠÇ—�ŽÒŒ ŒÀ‚ª‚ ‚è‚Ü‚¹‚ñ�B$\r$\n‚·‚ׂẴ†�[ƒU‚ɑ΂·‚é Inkscape ‚̃Cƒ“ƒXƒg�[ƒ‹‚Í�³�í‚ÉŠ®—¹‚µ‚È‚¢‚©‚à‚µ‚ê‚Ü‚¹‚ñ�B$\r$\n'‚·‚ׂẴ†�[ƒU' ƒIƒvƒVƒ‡ƒ“‚̃`ƒFƒbƒNƒ}�[ƒN‚ðŠO‚µ‚Ä‚­‚¾‚³‚¢�B"
+${LangFileString} NOT_SUPPORTED "Inkscape ‚Í Windows 95/98/ME �ã‚Å‚Í“®�삵‚Ü‚¹‚ñ!$\r$\n�Ú‚µ‚­‚̓IƒtƒBƒVƒƒƒ‹ƒEƒFƒuƒTƒCƒg‚ð‚²——‚­‚¾‚³‚¢�B"
+${LangFileString} Full "Š®‘S"
+${LangFileString} Optimal "�œK"
+${LangFileString} Minimal "�Å�¬"
+${LangFileString} Core "Inkscape SVG Editor (•K�{)"
+${LangFileString} CoreDesc "Inkscape ‚̃RƒAƒtƒ@ƒCƒ‹‚ÆDLL"
+${LangFileString} GTKFiles "GTK+ ƒ‰ƒ“ƒ^ƒCƒ€ŠÂ‹« (•K�{)"
+${LangFileString} GTKFilesDesc "ƒ}ƒ‹ƒ`ƒvƒ‰ƒbƒgƒtƒH�[ƒ€‘Ήž GUI ƒc�[ƒ‹ƒLƒbƒg (Inkscape ‚ªŽg—p)"
+${LangFileString} Shortcuts "ƒVƒ‡�[ƒgƒJƒbƒg"
+${LangFileString} ShortcutsDesc "Inkscape ‚ðŠJŽn‚·‚邽‚߂̃Vƒ‡�[ƒgƒJƒbƒg"
+${LangFileString} Alluser "‚·‚ׂẴ†�[ƒU"
+${LangFileString} AlluserDesc "‚±‚̃Rƒ“ƒsƒ…�[ƒ^‚ðŽg‚¤‚·‚ׂĂÌ�l‚É‚±‚̃AƒvƒŠƒP�[ƒVƒ‡ƒ“‚ðƒCƒ“ƒXƒg�[ƒ‹ (‚·‚ׂẴ†�[ƒU)"
+${LangFileString} Desktop "ƒfƒXƒNƒgƒbƒv"
+${LangFileString} DesktopDesc "Inkscape ‚ւ̃Vƒ‡�[ƒgƒJƒbƒg‚ðƒfƒXƒNƒgƒbƒv‚É�ì�¬"
+${LangFileString} Startmenu "ƒXƒ^�[ƒgƒ�ƒjƒ…�["
+${LangFileString} StartmenuDesc "ƒXƒ^�[ƒgƒ�ƒjƒ…�[‚É Inkscape ‚Ì�€–Ú‚ð�ì�¬"
+${LangFileString} Quicklaunch "ƒNƒCƒbƒN‹N“®"
+${LangFileString} QuicklaunchDesc "Inkscape ‚ւ̃Vƒ‡�[ƒgƒJƒbƒg‚ðƒNƒCƒbƒN‹N“®ƒc�[ƒ‹ƒo�[‚É�ì�¬"
+${LangFileString} SVGWriter "SVG ƒtƒ@ƒCƒ‹‚ð Inkscape ‚ÅŠJ‚­"
+${LangFileString} SVGWriterDesc "SVG ƒtƒ@ƒCƒ‹‚Ì•W�€ƒGƒfƒBƒ^‚É Inkscape ‚ð�Ý’è"
+${LangFileString} ContextMenu "ƒRƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�["
+${LangFileString} ContextMenuDesc "SVG ƒtƒ@ƒCƒ‹‚̃Rƒ“ƒeƒLƒXƒgƒ�ƒjƒ…�[‚É Inkscape ‚ð’ljÁ"
+${LangFileString} DeletePrefs "ŒÂ�l�Ý’è‚ð�í�œ"
+${LangFileString} DeletePrefsDesc "ˆÈ‘O‚̃Cƒ“ƒXƒg�[ƒ‹Žž‚©‚çˆø‚«Œp‚¢‚¾ŒÂ�l�Ý’è‚ð�í�œ"
+${LangFileString} Addfiles "’ljÁƒtƒ@ƒCƒ‹"
+${LangFileString} AddfilesDesc "’ljÁƒtƒ@ƒCƒ‹"
+${LangFileString} Examples "ƒTƒ“ƒvƒ‹ƒtƒ@ƒCƒ‹"
+${LangFileString} ExamplesDesc "Inkscape ‚̃Tƒ“ƒvƒ‹ƒtƒ@ƒCƒ‹"
+${LangFileString} Tutorials "ƒ`ƒ…�[ƒgƒŠƒAƒ‹"
+${LangFileString} TutorialsDesc "Inkscape ‚̃`ƒ…�[ƒgƒŠƒAƒ‹"
+${LangFileString} Languages "Œ¾Œê"
+${LangFileString} LanguagesDesc "Inkscape ‚Ì‚³‚Ü‚´‚Ü‚ÈŒ¾Œêƒtƒ@ƒCƒ‹‚ðƒCƒ“ƒXƒg�[ƒ‹"
+${LangFileString} lng_am "ƒAƒ€ƒnƒ‰Œê"
+${LangFileString} lng_ar "ƒAƒ‰ƒrƒAŒê"
+${LangFileString} lng_az "ƒAƒ[ƒ‹ƒoƒCƒWƒƒƒ“Œê"
+${LangFileString} lng_be "ƒxƒ‰ƒ‹�[ƒVŒê"
+${LangFileString} lng_bg "ƒuƒ‹ƒKƒŠƒAŒê"
+${LangFileString} lng_bn "ƒxƒ“ƒKƒ‹Œê"
+${LangFileString} lng_br "ƒuƒ‹ƒgƒ“Œê"
+${LangFileString} lng_ca "ƒJƒ^ƒ�ƒjƒAŒê"
+${LangFileString} lng_ca@valencia "ƒoƒŒƒ“ƒVƒAŒê"
+${LangFileString} lng_cs "ƒ`ƒFƒRŒê"
+${LangFileString} lng_da "ƒfƒ“ƒ}�[ƒNŒê"
+${LangFileString} lng_de "ƒhƒCƒcŒê"
+${LangFileString} lng_dz "ƒ]ƒ“ƒJŒê"
+${LangFileString} lng_el "ƒMƒŠƒVƒƒŒê"
+${LangFileString} lng_en "‰pŒê"
+${LangFileString} lng_en_AU "‰pŒê (ƒI�[ƒXƒgƒ‰ƒŠƒA)"
+${LangFileString} lng_en_CA "‰pŒê (ƒJƒiƒ_)"
+${LangFileString} lng_en_GB "‰pŒê (‰p�‘)"
+${LangFileString} lng_en_US@piglatin "ƒsƒbƒO�Eƒ‰ƒeƒ“Œê"
+${LangFileString} lng_eo "ƒGƒXƒyƒ‰ƒ“ƒgŒê"
+${LangFileString} lng_es "ƒXƒyƒCƒ“Œê"
+${LangFileString} lng_es_MX "ƒXƒyƒCƒ“Œê (ƒ�ƒLƒVƒR)"
+${LangFileString} lng_et "ƒGƒXƒgƒjƒAŒê"
+${LangFileString} lng_eu "ƒoƒXƒNŒê"
+${LangFileString} lng_fa "ƒtƒ@ƒ‹ƒVŒê"
+${LangFileString} lng_fi "ƒtƒBƒ“ƒ‰ƒ“ƒhŒê"
+${LangFileString} lng_fr "ƒtƒ‰ƒ“ƒXŒê"
+${LangFileString} lng_ga "ƒAƒCƒ‹ƒ‰ƒ“ƒhŒê"
+${LangFileString} lng_gl "ƒKƒŠƒVƒAŒê"
+${LangFileString} lng_he "ƒwƒuƒ‰ƒCŒê"
+${LangFileString} lng_hr "ƒNƒ�ƒAƒ`ƒAŒê"
+${LangFileString} lng_hu "ƒnƒ“ƒKƒŠ�[Œê"
+${LangFileString} lng_id "ƒCƒ“ƒhƒlƒVƒAŒê"
+${LangFileString} lng_it "ƒCƒ^ƒŠƒAŒê"
+${LangFileString} lng_ja "“ú–{Œê"
+${LangFileString} lng_km "ƒNƒ��[ƒ‹Œê"
+${LangFileString} lng_ko "ŠØ�‘Œê"
+${LangFileString} lng_lt "ƒŠƒgƒAƒjƒAŒê"
+${LangFileString} lng_mk "ƒ}ƒPƒhƒjƒAŒê"
+${LangFileString} lng_mn "ƒ‚ƒ“ƒSƒ‹Œê"
+${LangFileString} lng_ne "ƒlƒp�[ƒ‹Œê"
+${LangFileString} lng_nb "ƒmƒ‹ƒEƒF�[Œêƒu�[ƒNƒ‚�[ƒ‹"
+${LangFileString} lng_nl "ƒIƒ‰ƒ“ƒ_Œê"
+${LangFileString} lng_nn "ƒmƒ‹ƒEƒF�[Œêƒj�[ƒmƒVƒ…ƒN"
+${LangFileString} lng_pa "ƒpƒ“ƒWƒƒƒuŒê"
+${LangFileString} lng_pl "ƒ|�[ƒ‰ƒ“ƒhŒê"
+${LangFileString} lng_pt "ƒ|ƒ‹ƒgƒKƒ‹Œê"
+${LangFileString} lng_pt_BR "ƒ|ƒ‹ƒgƒKƒ‹Œê (ƒuƒ‰ƒWƒ‹)"
+${LangFileString} lng_ro "ƒ‹�[ƒ}ƒjƒAŒê"
+${LangFileString} lng_ru "ƒ�ƒVƒAŒê"
+${LangFileString} lng_rw "ƒLƒjƒ„ƒ‹ƒ�ƒ“ƒ_Œê"
+${LangFileString} lng_sk "ƒXƒ�ƒoƒLƒAŒê"
+${LangFileString} lng_sl "ƒXƒ�ƒxƒjƒAŒê"
+${LangFileString} lng_sq "ƒAƒ‹ƒoƒjƒAŒê"
+${LangFileString} lng_sr "ƒZƒ‹ƒrƒAŒê"
+${LangFileString} lng_sr@latin "ƒZƒ‹ƒrƒAŒêƒ‰ƒeƒ“•¶Žš"
+${LangFileString} lng_sv "ƒXƒEƒF�[ƒfƒ“Œê"
+${LangFileString} lng_te_IN "ƒeƒ‹ƒOŒê"
+${LangFileString} lng_th "ƒ^ƒCŒê"
+${LangFileString} lng_tr "ƒgƒ‹ƒRŒê"
+${LangFileString} lng_uk "ƒEƒNƒ‰ƒCƒiŒê"
+${LangFileString} lng_vi "ƒxƒgƒiƒ€Œê"
+${LangFileString} lng_zh_CN "’†�‘Œê (ŠÈ‘ÌŽš)"
+${LangFileString} lng_zh_TW "’†�‘Œê (”É‘ÌŽš)"
+${LangFileString} UInstOpt "ƒAƒ“ƒCƒ“ƒXƒg�[ƒ‹ƒIƒvƒVƒ‡ƒ“"
+${LangFileString} UInstOpt1 "•K—v‚Å‚ ‚ê‚Έȉº‚̃IƒvƒVƒ‡ƒ“‚ð‘I‘ð‚µ‚Ä‚­‚¾‚³‚¢"
+${LangFileString} PurgePrefs "ŒÂ�l�Ý’è‚ðŽc‚·"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñ!$\r$\nƒfƒBƒŒƒNƒgƒŠ $INSTDIR ‚ðŽè“®‚Å�í�œ‚µ‚ăAƒ“ƒCƒ“ƒXƒg�[ƒ‹‚µ‚Ä‚­‚¾‚³‚¢!"
+${LangFileString} FileChanged "ƒtƒ@ƒCƒ‹ $filename ‚̓Cƒ“ƒXƒg�[ƒ‹Œã‚É•Ï�X‚³‚ê‚Ä‚¢‚Ü‚·�B$\r$\n‚±‚̃tƒ@ƒCƒ‹‚ð�í�œ‚µ‚Ü‚·‚©?"
+${LangFileString} Yes "‚Í‚¢"
+${LangFileString} AlwaysYes "‘S‚Ä‚Í‚¢"
+${LangFileString} No "‚¢‚¢‚¦"
+${LangFileString} AlwaysNo "‘S‚Ä‚¢‚¢‚¦"
diff --git a/packaging/win32/languages/SimpChinese.nsh b/packaging/win32/languages/SimpChinese.nsh
index 8beb75db7..85fce0208 100644
--- a/packaging/win32/languages/SimpChinese.nsh
+++ b/packaging/win32/languages/SimpChinese.nsh
@@ -1,113 +1,113 @@
-;Language: Simplified Chinese (2052, CP936)

-;By Liang Wang <fabienow@gmail.com>

-${LangFileString} CaptionDescription "??Ô´??Á¿??ͼ????"

-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ??GNUͨ?ù???????֤???С? ??Щ?ṩ????֤?????Թ??ο??? $_CLICK"

-${LangFileString} DIFFERENT_USER "ʹ???? $0 ?Ѿ???װ Inkscape??$\r$\n???????????????޷??ɹ????ɣ?$\r$\n???? $0 ???ݵ?????????һ?Ρ?"

-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ?Ѿ???װ?? $\n??Ҫ?ڰ?װ $(^Name) ֮ǰ?Ƴ???һ???汾??"

-${LangFileString} OK_CANCEL_DESC "$\n$\n????È·???????????ß°???È¡??????Ö¹??"

-${LangFileString} NO_ADMIN "??û??ϵͳ????ԱȨ?ޡ?$\r$\n??װ Inkscape ??????ʹ???߿????޷??ɹ????ɡ?$\r$\nȡ????ѡ????װ??????ʹ???ߡ?ѡ??."

-${LangFileString} NOT_SUPPORTED "Inkscape ?޷??? Windows 95/98/ME ??????!$\r$\n???鿴?ٷ???վ????ϸ??Ϣ??"

-${LangFileString} Full "????"

-${LangFileString} Optimal "????"

-${LangFileString} Minimal "??С"

-${LangFileString} Core "Inkscape SVG ?༭????(????)"

-${LangFileString} CoreDesc "Inkscape ???Ä¿??? DLL "

-${LangFileString} GTKFiles "GTK+ ִ?л???(????)"

-${LangFileString} GTKFilesDesc "Inkscape ʹ?õĿ?ƽ̨ GUI ??????"

-${LangFileString} Shortcuts "???ݷ?ʽ"

-${LangFileString} ShortcutsDesc "???? Inkscape ?Ŀ??ݷ?ʽ"

-${LangFileString} Alluser "??װ??????ʹ????"

-${LangFileString} AlluserDesc "??װ????Ӧ?ó??????κ?ʹ????̨???Ե???(????ʹ????)"

-${LangFileString} Desktop "????"

-${LangFileString} DesktopDesc "???????Ͻ?Á¢ Inkscape ???Ý·?ʽ"

-${LangFileString} Startmenu "??ʼ?˵?"

-${LangFileString} StartmenuDesc "?Ú¿?ʼ?˵???Á¢ Inkscape ??Ä¿"

-${LangFileString} Quicklaunch "????????À¸"

-${LangFileString} QuicklaunchDesc "?Ú¿???????À¸??Á¢ Inkscape ???Ý·?ʽ"

-${LangFileString} SVGWriter "?? Inkscape ???? SVG ?ĵ?"

-${LangFileString} SVGWriterDesc "ѡ?? Inkscape ??Ϊ SVG ?ļ????͵???ѡ?༭????"

-${LangFileString} ContextMenu "?Ҽ??˵?"

-${LangFileString} ContextMenuDesc "???? Inkscape ?? SVG ?ļ????͵??Ҽ??˵?"

-${LangFileString} DeletePrefs "ɾ??????ƫ???趨"

-${LangFileString} DeletePrefsDesc "ɾ????һ?ΰ?װ?????ĸ???ƫ???趨"

-${LangFileString} Addfiles "?????ļ?????"

-${LangFileString} AddfilesDesc "?????ļ?????"

-${LangFileString} Examples "????"

-${LangFileString} ExamplesDesc "Inkscape ʹ?÷???"

-${LangFileString} Tutorials "Ö¸???Ö²?"

-${LangFileString} TutorialsDesc "Inkscape ʹ??˵??"

-${LangFileString} Languages "????"

-${LangFileString} LanguagesDesc "??×° Inkscape ???????Ô·???"

-${LangFileString} lng_am "????????????"

-${LangFileString} lng_ar "??À­????"

-${LangFileString} lng_az "??????È»??"

-${LangFileString} lng_be "?׶???˹??"

-${LangFileString} lng_bg "??????????"

-${LangFileString} lng_bn "?ϼ?À­??"

-${LangFileString} lng_br "??????????"

-${LangFileString} lng_ca "??̩¡??"

-${LangFileString} lng_ca@valencia "?????????? ??Ì©????????"

-${LangFileString} lng_cs "?Ý¿???"

-${LangFileString} lng_da "??????"

-${LangFileString} lng_de "????"

-${LangFileString} lng_dz "?Ú¿???"

-${LangFileString} lng_el "Ï£À°??"

-${LangFileString} lng_en "Ó¢??"

-${LangFileString} lng_en_AU "Ó¢??(?Ä´?????)"

-${LangFileString} lng_en_CA "Ӣ??(???ô?)"

-${LangFileString} lng_en_GB "Ó¢??(Ó¢??)"

-${LangFileString} lng_en_US@piglatin "??À­????"

-${LangFileString} lng_eo "?À½???"

-${LangFileString} lng_es "????????"

-${LangFileString} lng_es_MX "????????(Ä«????)"

-${LangFileString} lng_et "??ɳ??????"

-${LangFileString} lng_eu "??˹????"

-${LangFileString} lng_fa "Farsi"

-${LangFileString} lng_fi "??À¼??"

-${LangFileString} lng_fr "????"

-${LangFileString} lng_ga "????À¼??"

-${LangFileString} lng_gl "??????????"

-${LangFileString} lng_he "Ï£??????"

-${LangFileString} lng_hr "???Þ°???????"

-${LangFileString} lng_hu "????????"

-${LangFileString} lng_id "Ó¡????"

-${LangFileString} lng_it "????????"

-${LangFileString} lng_ja "????"

-${LangFileString} lng_km "??????"

-${LangFileString} lng_ko "????"

-${LangFileString} lng_lt "Á¢??????"

-${LangFileString} lng_mk "????????"

-${LangFileString} lng_mn "?ɹ???"

-${LangFileString} lng_ne "?á²´????"

-${LangFileString} lng_nb "Ų?? Bokmal ??"

-${LangFileString} lng_nl "??À¼??"

-${LangFileString} lng_nn "Ų?? Nynorsk ??"

-${LangFileString} lng_pa "????????"

-${LangFileString} lng_pl "??À¼??"

-${LangFileString} lng_pt "????????"

-${LangFileString} lng_pt_BR "????????(????)"

-${LangFileString} lng_ro "??????????"

-${LangFileString} lng_ru "????"

-${LangFileString} lng_rw "????¬??????"

-${LangFileString} lng_sk "˹?巨????"

-${LangFileString} lng_sl "˹?已??????"

-${LangFileString} lng_sq "????????????"

-${LangFileString} lng_sr "????ά????"

-${LangFileString} lng_sr@latin "????ά????-À­??"

-${LangFileString} lng_sv "??????"

-${LangFileString} lng_te_IN "Telugu"

-${LangFileString} lng_th "Ì©??"

-${LangFileString} lng_tr "?Á¶?????"

-${LangFileString} lng_uk "?Ú¿?À¼??"

-${LangFileString} lng_vi "Ô½??Ô’"

-${LangFileString} lng_zh_CN "????????"

-${LangFileString} lng_zh_TW "????????"

-${LangFileString} UInstOpt "????×°Ñ¡??"

-${LangFileString} UInstOpt1 "??Ñ¡??????Ñ¡??"

-${LangFileString} PurgePrefs "????????ƫ???趨"

-${LangFileString} UninstallLogNotFound "û???Òµ? $INSTDIR\uninstall.log ??$\r$\n?????????? $INSTDIR ?ļ??Ð�í·´??×°??"

-${LangFileString} FileChanged "??װ?? $filename ?ļ??????ѱ?????$\r$\n???Ƿ???ȻҪɾ???Ǹ??ļ????ͣ?"

-${LangFileString} Yes "??"

-${LangFileString} AlwaysYes "È«??????"

-${LangFileString} No "??"

-${LangFileString} AlwaysNo "È«???Ô·?"

+;Language: Simplified Chinese (2052, CP936)
+;By Liang Wang <fabienow@gmail.com>
+${LangFileString} CaptionDescription "??Ô´??Á¿??ͼ????"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ??GNUͨ?ù???????֤???С? ??Щ?ṩ????֤?????Թ??ο??? $_CLICK"
+${LangFileString} DIFFERENT_USER "ʹ???? $0 ?Ѿ???װ Inkscape??$\r$\n???????????????޷??ɹ????ɣ?$\r$\n???? $0 ???ݵ?????????һ?Ρ?"
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ?Ѿ???װ?? $\n??Ҫ?ڰ?װ $(^Name) ֮ǰ?Ƴ???һ???汾??"
+${LangFileString} OK_CANCEL_DESC "$\n$\n????È·???????????ß°???È¡??????Ö¹??"
+${LangFileString} NO_ADMIN "??û??ϵͳ????ԱȨ?ޡ?$\r$\n??װ Inkscape ??????ʹ???߿????޷??ɹ????ɡ?$\r$\nȡ????ѡ????װ??????ʹ???ߡ?ѡ??."
+${LangFileString} NOT_SUPPORTED "Inkscape ?޷??? Windows 95/98/ME ??????!$\r$\n???鿴?ٷ???վ????ϸ??Ϣ??"
+${LangFileString} Full "????"
+${LangFileString} Optimal "????"
+${LangFileString} Minimal "??С"
+${LangFileString} Core "Inkscape SVG ?༭????(????)"
+${LangFileString} CoreDesc "Inkscape ???Ä¿??? DLL "
+${LangFileString} GTKFiles "GTK+ ִ?л???(????)"
+${LangFileString} GTKFilesDesc "Inkscape ʹ?õĿ?ƽ̨ GUI ??????"
+${LangFileString} Shortcuts "???ݷ?ʽ"
+${LangFileString} ShortcutsDesc "???? Inkscape ?Ŀ??ݷ?ʽ"
+${LangFileString} Alluser "??װ??????ʹ????"
+${LangFileString} AlluserDesc "??װ????Ӧ?ó??????κ?ʹ????̨???Ե???(????ʹ????)"
+${LangFileString} Desktop "????"
+${LangFileString} DesktopDesc "???????Ͻ?Á¢ Inkscape ???Ý·?ʽ"
+${LangFileString} Startmenu "??ʼ?˵?"
+${LangFileString} StartmenuDesc "?Ú¿?ʼ?˵???Á¢ Inkscape ??Ä¿"
+${LangFileString} Quicklaunch "????????À¸"
+${LangFileString} QuicklaunchDesc "?Ú¿???????À¸??Á¢ Inkscape ???Ý·?ʽ"
+${LangFileString} SVGWriter "?? Inkscape ???? SVG ?ĵ?"
+${LangFileString} SVGWriterDesc "ѡ?? Inkscape ??Ϊ SVG ?ļ????͵???ѡ?༭????"
+${LangFileString} ContextMenu "?Ҽ??˵?"
+${LangFileString} ContextMenuDesc "???? Inkscape ?? SVG ?ļ????͵??Ҽ??˵?"
+${LangFileString} DeletePrefs "ɾ??????ƫ???趨"
+${LangFileString} DeletePrefsDesc "ɾ????һ?ΰ?װ?????ĸ???ƫ???趨"
+${LangFileString} Addfiles "?????ļ?????"
+${LangFileString} AddfilesDesc "?????ļ?????"
+${LangFileString} Examples "????"
+${LangFileString} ExamplesDesc "Inkscape ʹ?÷???"
+${LangFileString} Tutorials "Ö¸???Ö²?"
+${LangFileString} TutorialsDesc "Inkscape ʹ??˵??"
+${LangFileString} Languages "????"
+${LangFileString} LanguagesDesc "??×° Inkscape ???????Ô·???"
+${LangFileString} lng_am "????????????"
+${LangFileString} lng_ar "??À­????"
+${LangFileString} lng_az "??????È»??"
+${LangFileString} lng_be "?׶???˹??"
+${LangFileString} lng_bg "??????????"
+${LangFileString} lng_bn "?ϼ?À­??"
+${LangFileString} lng_br "??????????"
+${LangFileString} lng_ca "??̩¡??"
+${LangFileString} lng_ca@valencia "?????????? ??Ì©????????"
+${LangFileString} lng_cs "?Ý¿???"
+${LangFileString} lng_da "??????"
+${LangFileString} lng_de "????"
+${LangFileString} lng_dz "?Ú¿???"
+${LangFileString} lng_el "Ï£À°??"
+${LangFileString} lng_en "Ó¢??"
+${LangFileString} lng_en_AU "Ó¢??(?Ä´?????)"
+${LangFileString} lng_en_CA "Ӣ??(???ô?)"
+${LangFileString} lng_en_GB "Ó¢??(Ó¢??)"
+${LangFileString} lng_en_US@piglatin "??À­????"
+${LangFileString} lng_eo "?À½???"
+${LangFileString} lng_es "????????"
+${LangFileString} lng_es_MX "????????(Ä«????)"
+${LangFileString} lng_et "??ɳ??????"
+${LangFileString} lng_eu "??˹????"
+${LangFileString} lng_fa "Farsi"
+${LangFileString} lng_fi "??À¼??"
+${LangFileString} lng_fr "????"
+${LangFileString} lng_ga "????À¼??"
+${LangFileString} lng_gl "??????????"
+${LangFileString} lng_he "Ï£??????"
+${LangFileString} lng_hr "???Þ°???????"
+${LangFileString} lng_hu "????????"
+${LangFileString} lng_id "Ó¡????"
+${LangFileString} lng_it "????????"
+${LangFileString} lng_ja "????"
+${LangFileString} lng_km "??????"
+${LangFileString} lng_ko "????"
+${LangFileString} lng_lt "Á¢??????"
+${LangFileString} lng_mk "????????"
+${LangFileString} lng_mn "?ɹ???"
+${LangFileString} lng_ne "?á²´????"
+${LangFileString} lng_nb "Ų?? Bokmal ??"
+${LangFileString} lng_nl "??À¼??"
+${LangFileString} lng_nn "Ų?? Nynorsk ??"
+${LangFileString} lng_pa "????????"
+${LangFileString} lng_pl "??À¼??"
+${LangFileString} lng_pt "????????"
+${LangFileString} lng_pt_BR "????????(????)"
+${LangFileString} lng_ro "??????????"
+${LangFileString} lng_ru "????"
+${LangFileString} lng_rw "????¬??????"
+${LangFileString} lng_sk "˹?巨????"
+${LangFileString} lng_sl "˹?已??????"
+${LangFileString} lng_sq "????????????"
+${LangFileString} lng_sr "????ά????"
+${LangFileString} lng_sr@latin "????ά????-À­??"
+${LangFileString} lng_sv "??????"
+${LangFileString} lng_te_IN "Telugu"
+${LangFileString} lng_th "Ì©??"
+${LangFileString} lng_tr "?Á¶?????"
+${LangFileString} lng_uk "?Ú¿?À¼??"
+${LangFileString} lng_vi "Ô½??Ô’"
+${LangFileString} lng_zh_CN "????????"
+${LangFileString} lng_zh_TW "????????"
+${LangFileString} UInstOpt "????×°Ñ¡??"
+${LangFileString} UInstOpt1 "??Ñ¡??????Ñ¡??"
+${LangFileString} PurgePrefs "????????ƫ???趨"
+${LangFileString} UninstallLogNotFound "û???Òµ? $INSTDIR\uninstall.log ??$\r$\n?????????? $INSTDIR ?ļ??Ð�í·´??×°??"
+${LangFileString} FileChanged "??װ?? $filename ?ļ??????ѱ?????$\r$\n???Ƿ???ȻҪɾ???Ǹ??ļ????ͣ?"
+${LangFileString} Yes "??"
+${LangFileString} AlwaysYes "È«??????"
+${LangFileString} No "??"
+${LangFileString} AlwaysNo "È«???Ô·?"
diff --git a/packaging/win32/languages/TradChinese.nsh b/packaging/win32/languages/TradChinese.nsh
index 2db61420c..e8f1a260f 100644
--- a/packaging/win32/languages/TradChinese.nsh
+++ b/packaging/win32/languages/TradChinese.nsh
@@ -1,113 +1,113 @@
-;Language: Traditional Chinese (1028, CP950)

-;By Dong-Jun Wu <ziyawu@gmail.com>

-${LangFileString} CaptionDescription "¶}©ñ­ì©l½X¦V¶qø¹Ï³nÅé"

-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ¬O¥H GNU ³q¥Î¤½¦@³\¥iÃÒ (GPL) µo¦æ¡C ³o¸Ì´£¨Ñªº³\¥iÃҶȬ°°Ñ¦Ò°T®§¡C $_CLICK"

-${LangFileString} DIFFERENT_USER "¨Ï¥ÎªÌ $0 ¤w¸g¦w¸Ë Inkscape¡C$\r$\n¦pªGÄ~Äò§A¥i¯àµLªk¦¨¥\§¹¦¨¡I$\r$\n½Ð¥H $0 ¨­¥÷µn¤J«á¦A¸Õ¤@¦¸¡C"

-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ¤w¸g¦w¸Ë¡C $\n§A­n¦b¦w¸Ë $(^Name) ¤§«e²¾°£¤W¤@­Óª©¥»¡H"

-${LangFileString} OK_CANCEL_DESC "$\n$\n«ö¡u½T©w¡vÄ~Äò©ÎªÌ«ö¡u¨ú®ø¡v¤¤¤î¡C"

-${LangFileString} NO_ADMIN "§A¨S¦³¨t²ÎºÞ²z­ûÅv­­¡C$\r$\n¦w¸Ë Inkscape ¨ì©Ò¦³¨Ï¥ÎªÌ¥i¯àµLªk¦¨¥\§¹¦¨¡C$\r$\n¨ú®ø¤Ä¿ï¡u¦w¸Ëµ¹©Ò¦³¨Ï¥ÎªÌ¡v¿ï¶µ."

-${LangFileString} NOT_SUPPORTED "Inkscape µLªk©ó Windows 95/98/ME ¤U¹B¦æ!$\r$\n½Ð¬d¬Ý©x¤èºô¯¸ªº¸Ô²Ó«H®§¡C"

-${LangFileString} Full "§¹¾ã"

-${LangFileString} Optimal "²z·Q"

-${LangFileString} Minimal "³Ì¤p"

-${LangFileString} Core "Inkscape SVG ½s¿èµ{¦¡(¥²¶·)"

-${LangFileString} CoreDesc "Inkscape ®Ö¤ßÀɮשM DLL ÀÉ"

-${LangFileString} GTKFiles "GTK+ °õ¦æÀô¹Ò(¥²¶·)"

-${LangFileString} GTKFilesDesc "Inkscape ¨Ï¥Îªº¸ó¥­¥x GUI ¤u¨ã²Õ"

-${LangFileString} Shortcuts "±¶®|"

-${LangFileString} ShortcutsDesc "±Ò°Ê Inkscape ªº±¶®|"

-${LangFileString} Alluser "¦w¸Ëµ¹©Ò¦³¨Ï¥ÎªÌ"

-${LangFileString} AlluserDesc "¦w¸Ë³o­ÓÀ³¥Îµ{¦¡µ¹¥ô¦ó¨Ï¥Î³o¥x¹q¸£ªº¤H(©Ò¦³¨Ï¥ÎªÌ)"

-${LangFileString} Desktop "®à­±"

-${LangFileString} DesktopDesc "©ó®à­±¤W«Ø¥ß Inkscape ±¶®|"

-${LangFileString} Startmenu "¶}©l¥\¯àªí"

-${LangFileString} StartmenuDesc "©ó¶}©l¥\¯àªí«Ø¥ß Inkscape ¶µ¥Ø"

-${LangFileString} Quicklaunch "§Ö³t±Ò°Ê"

-${LangFileString} QuicklaunchDesc "©ó§Ö³t±Ò°Ê¦C«Ø¥ß Inkscape ±¶®|"

-${LangFileString} SVGWriter "¥Î Inkscape ¶}±Ò SVG ÀÉ"

-${LangFileString} SVGWriterDesc "¿ï¾Ü Inkscape §@¬° SVG Àɪº¹w³]½s¿èµ{¦¡"

-${LangFileString} ContextMenu "¥kÁä¥\¯àªí"

-${LangFileString} ContextMenuDesc "·s¼W Inkscape ¨ì SVG Àɪº¥kÁä¥\¯àªí"

-${LangFileString} DeletePrefs "§R°£­Ó¤H°¾¦n³]©w"

-${LangFileString} DeletePrefsDesc "§R°£¤W¤@¦¸¦w¸Ë¿ò¯dªº­Ó¤H°¾¦n³]©w"

-${LangFileString} Addfiles "¨ä¥LÀÉ®×"

-${LangFileString} AddfilesDesc "¨ä¥LÀÉ®×"

-${LangFileString} Examples "½d¨Ò"

-${LangFileString} ExamplesDesc "Inkscape ¨Ï¥Î½d¨Ò"

-${LangFileString} Tutorials "«ü¾É¤â¥U"

-${LangFileString} TutorialsDesc "Inkscape ¨Ï¥Î±Ð¾Ç"

-${LangFileString} Languages "»y¨¥"

-${LangFileString} LanguagesDesc "¦w¸Ë Inkscape ¦UºØ»y¨¥Â½Ä¶"

-${LangFileString} lng_am "ªü¤ñ¦è¥§¨È»y"

-${LangFileString} lng_ar "ªü©Ô§B»y"

-${LangFileString} lng_az "¨È¶ë«ôµM»y"

-${LangFileString} lng_be "¥Õ«Xù´µ»y"

-${LangFileString} lng_bg "«O¥[§Q¨È»y"

-${LangFileString} lng_bn "©s¥[©Ô»y"

-${LangFileString} lng_br "¤£¦C¶ð¥§»y"

-${LangFileString} lng_ca "¥[®õ¶©»y"

-${LangFileString} lng_ca@valencia "¥Ë­Û¦è¨È»y ¥[®õù¥§¨È»y"

-${LangFileString} lng_cs "±¶§J»y"

-${LangFileString} lng_da "¤¦³Á»y"

-${LangFileString} lng_de "¼w»y"

-${LangFileString} lng_dz "©v¥d»y"

-${LangFileString} lng_el "§Æþ»y"

-${LangFileString} lng_en "­^»y"

-${LangFileString} lng_en_AU "­^»y(¿D¤j§Q¨È)"

-${LangFileString} lng_en_CA "­^»y(¥[®³¤j)"

-${LangFileString} lng_en_GB "­^»y(¤£¦CÄA)"

-${LangFileString} lng_en_US@piglatin "½Þ©Ô¤B»y"

-${LangFileString} lng_eo "¥@¬É»y"

-${LangFileString} lng_es "¦è¯Z¤ú¤å"

-${LangFileString} lng_es_MX "¦è¯Z¤ú»y(¾¥¦è­ô)"

-${LangFileString} lng_et "·R¨F¥§¨È»y"

-${LangFileString} lng_eu "¤Ú´µ§J»y"

-${LangFileString} lng_fa "Farsi"

-${LangFileString} lng_fi "ªâÄõ»y"

-${LangFileString} lng_fr "ªk¤å"

-${LangFileString} lng_ga "·Rº¸Äõ»y"

-${LangFileString} lng_gl "¥[¨½¦è¨È»y"

-${LangFileString} lng_he "§Æ§B¨Ó»y"

-${LangFileString} lng_hr "§Jù®J¦è¨È»y"

-${LangFileString} lng_hu "¦I¤ú§Q»y"

-${LangFileString} lng_id "¦L¥§»y"

-${LangFileString} lng_it "¸q¤j§Q¤å"

-${LangFileString} lng_ja "¤é¤å"

-${LangFileString} lng_km "°ª´Ö»y"

-${LangFileString} lng_ko "Áú¤å"

-${LangFileString} lng_lt "¥ß³³©{»y"

-${LangFileString} lng_mk "°¨¨ä¹y»y"

-${LangFileString} lng_mn "»X¥j»y"

-${LangFileString} lng_ne "¥§ªyº¸»y"

-${LangFileString} lng_nb "®¿«Â Bokmal »y"

-${LangFileString} lng_nl "²üÄõ»y"

-${LangFileString} lng_nn "®¿«Â Nynorsk »y"

-${LangFileString} lng_pa "®Ç¾B´¶»y"

-${LangFileString} lng_pl "ªiÄõ»y"

-${LangFileString} lng_pt "¸²µå¤ú¤å"

-${LangFileString} lng_pt_BR "¸²µå¤ú¤å(¤Ú¦è)"

-${LangFileString} lng_ro "ù°¨¥§¨È»y"

-${LangFileString} lng_ru "«X¤å"

-${LangFileString} lng_rw "ª÷¨È¿c¦w¹F»y"

-${LangFileString} lng_sk "´µ¬¥ªk§J»y"

-${LangFileString} lng_sl "´µ¬¥¤Z¥§¨È»y"

-${LangFileString} lng_sq "ªüº¸¤Ú¥§¨È»y"

-${LangFileString} lng_sr "Áɺ¸ºû¨È»y"

-${LangFileString} lng_sr@latin "¶ëº¸ºû¨È¤å-©Ô¤B"

-${LangFileString} lng_sv "·ç¨å»y"

-${LangFileString} lng_te_IN "Telugu"

-${LangFileString} lng_th "®õ»y"

-${LangFileString} lng_tr "¤g¦Õ¨ä»y"

-${LangFileString} lng_uk "¯Q§JÄõ»y"

-${LangFileString} lng_vi "¶V«n¸Ü"

-${LangFileString} lng_zh_CN "²Å餤¤å"

-${LangFileString} lng_zh_TW "ÁcÅ餤¤å"

-${LangFileString} UInstOpt "¤Ï¦w¸Ë¿ï¶µ"

-${LangFileString} UInstOpt1 "½Ð¿ï¾Ü¨ä¥L¿ï¶µ"

-${LangFileString} PurgePrefs "«O¯d­Ó¤H°¾¦n³]©w"

-${LangFileString} UninstallLogNotFound "¨S¦³§ä¨ì $INSTDIR\uninstall.log ¡I$\r$\n½Ð¦Û¦æ²M°£ $INSTDIR ¸ê®Æ§¨¨Ó¤Ï¦w¸Ë¡I"

-${LangFileString} FileChanged "¦w¸Ë«á $filename ÀɮפwÅܧó¡C$\r$\n§A¬O§_¤´µM­n§R°£¨º­ÓÀɮסH"

-${LangFileString} Yes "¬O"

-${LangFileString} AlwaysYes "¥þ³¡¬Ò¬O"

-${LangFileString} No "§_"

-${LangFileString} AlwaysNo "¥þ³¡¬Ò§_"

+;Language: Traditional Chinese (1028, CP950)
+;By Dong-Jun Wu <ziyawu@gmail.com>
+${LangFileString} CaptionDescription "¶}©ñ­ì©l½X¦V¶qø¹Ï³nÅé"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ¬O¥H GNU ³q¥Î¤½¦@³\¥iÃÒ (GPL) µo¦æ¡C ³o¸Ì´£¨Ñªº³\¥iÃҶȬ°°Ñ¦Ò°T®§¡C $_CLICK"
+${LangFileString} DIFFERENT_USER "¨Ï¥ÎªÌ $0 ¤w¸g¦w¸Ë Inkscape¡C$\r$\n¦pªGÄ~Äò§A¥i¯àµLªk¦¨¥\§¹¦¨¡I$\r$\n½Ð¥H $0 ¨­¥÷µn¤J«á¦A¸Õ¤@¦¸¡C"
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ¤w¸g¦w¸Ë¡C $\n§A­n¦b¦w¸Ë $(^Name) ¤§«e²¾°£¤W¤@­Óª©¥»¡H"
+${LangFileString} OK_CANCEL_DESC "$\n$\n«ö¡u½T©w¡vÄ~Äò©ÎªÌ«ö¡u¨ú®ø¡v¤¤¤î¡C"
+${LangFileString} NO_ADMIN "§A¨S¦³¨t²ÎºÞ²z­ûÅv­­¡C$\r$\n¦w¸Ë Inkscape ¨ì©Ò¦³¨Ï¥ÎªÌ¥i¯àµLªk¦¨¥\§¹¦¨¡C$\r$\n¨ú®ø¤Ä¿ï¡u¦w¸Ëµ¹©Ò¦³¨Ï¥ÎªÌ¡v¿ï¶µ."
+${LangFileString} NOT_SUPPORTED "Inkscape µLªk©ó Windows 95/98/ME ¤U¹B¦æ!$\r$\n½Ð¬d¬Ý©x¤èºô¯¸ªº¸Ô²Ó«H®§¡C"
+${LangFileString} Full "§¹¾ã"
+${LangFileString} Optimal "²z·Q"
+${LangFileString} Minimal "³Ì¤p"
+${LangFileString} Core "Inkscape SVG ½s¿èµ{¦¡(¥²¶·)"
+${LangFileString} CoreDesc "Inkscape ®Ö¤ßÀɮשM DLL ÀÉ"
+${LangFileString} GTKFiles "GTK+ °õ¦æÀô¹Ò(¥²¶·)"
+${LangFileString} GTKFilesDesc "Inkscape ¨Ï¥Îªº¸ó¥­¥x GUI ¤u¨ã²Õ"
+${LangFileString} Shortcuts "±¶®|"
+${LangFileString} ShortcutsDesc "±Ò°Ê Inkscape ªº±¶®|"
+${LangFileString} Alluser "¦w¸Ëµ¹©Ò¦³¨Ï¥ÎªÌ"
+${LangFileString} AlluserDesc "¦w¸Ë³o­ÓÀ³¥Îµ{¦¡µ¹¥ô¦ó¨Ï¥Î³o¥x¹q¸£ªº¤H(©Ò¦³¨Ï¥ÎªÌ)"
+${LangFileString} Desktop "®à­±"
+${LangFileString} DesktopDesc "©ó®à­±¤W«Ø¥ß Inkscape ±¶®|"
+${LangFileString} Startmenu "¶}©l¥\¯àªí"
+${LangFileString} StartmenuDesc "©ó¶}©l¥\¯àªí«Ø¥ß Inkscape ¶µ¥Ø"
+${LangFileString} Quicklaunch "§Ö³t±Ò°Ê"
+${LangFileString} QuicklaunchDesc "©ó§Ö³t±Ò°Ê¦C«Ø¥ß Inkscape ±¶®|"
+${LangFileString} SVGWriter "¥Î Inkscape ¶}±Ò SVG ÀÉ"
+${LangFileString} SVGWriterDesc "¿ï¾Ü Inkscape §@¬° SVG Àɪº¹w³]½s¿èµ{¦¡"
+${LangFileString} ContextMenu "¥kÁä¥\¯àªí"
+${LangFileString} ContextMenuDesc "·s¼W Inkscape ¨ì SVG Àɪº¥kÁä¥\¯àªí"
+${LangFileString} DeletePrefs "§R°£­Ó¤H°¾¦n³]©w"
+${LangFileString} DeletePrefsDesc "§R°£¤W¤@¦¸¦w¸Ë¿ò¯dªº­Ó¤H°¾¦n³]©w"
+${LangFileString} Addfiles "¨ä¥LÀÉ®×"
+${LangFileString} AddfilesDesc "¨ä¥LÀÉ®×"
+${LangFileString} Examples "½d¨Ò"
+${LangFileString} ExamplesDesc "Inkscape ¨Ï¥Î½d¨Ò"
+${LangFileString} Tutorials "«ü¾É¤â¥U"
+${LangFileString} TutorialsDesc "Inkscape ¨Ï¥Î±Ð¾Ç"
+${LangFileString} Languages "»y¨¥"
+${LangFileString} LanguagesDesc "¦w¸Ë Inkscape ¦UºØ»y¨¥Â½Ä¶"
+${LangFileString} lng_am "ªü¤ñ¦è¥§¨È»y"
+${LangFileString} lng_ar "ªü©Ô§B»y"
+${LangFileString} lng_az "¨È¶ë«ôµM»y"
+${LangFileString} lng_be "¥Õ«Xù´µ»y"
+${LangFileString} lng_bg "«O¥[§Q¨È»y"
+${LangFileString} lng_bn "©s¥[©Ô»y"
+${LangFileString} lng_br "¤£¦C¶ð¥§»y"
+${LangFileString} lng_ca "¥[®õ¶©»y"
+${LangFileString} lng_ca@valencia "¥Ë­Û¦è¨È»y ¥[®õù¥§¨È»y"
+${LangFileString} lng_cs "±¶§J»y"
+${LangFileString} lng_da "¤¦³Á»y"
+${LangFileString} lng_de "¼w»y"
+${LangFileString} lng_dz "©v¥d»y"
+${LangFileString} lng_el "§Æþ»y"
+${LangFileString} lng_en "­^»y"
+${LangFileString} lng_en_AU "­^»y(¿D¤j§Q¨È)"
+${LangFileString} lng_en_CA "­^»y(¥[®³¤j)"
+${LangFileString} lng_en_GB "­^»y(¤£¦CÄA)"
+${LangFileString} lng_en_US@piglatin "½Þ©Ô¤B»y"
+${LangFileString} lng_eo "¥@¬É»y"
+${LangFileString} lng_es "¦è¯Z¤ú¤å"
+${LangFileString} lng_es_MX "¦è¯Z¤ú»y(¾¥¦è­ô)"
+${LangFileString} lng_et "·R¨F¥§¨È»y"
+${LangFileString} lng_eu "¤Ú´µ§J»y"
+${LangFileString} lng_fa "Farsi"
+${LangFileString} lng_fi "ªâÄõ»y"
+${LangFileString} lng_fr "ªk¤å"
+${LangFileString} lng_ga "·Rº¸Äõ»y"
+${LangFileString} lng_gl "¥[¨½¦è¨È»y"
+${LangFileString} lng_he "§Æ§B¨Ó»y"
+${LangFileString} lng_hr "§Jù®J¦è¨È»y"
+${LangFileString} lng_hu "¦I¤ú§Q»y"
+${LangFileString} lng_id "¦L¥§»y"
+${LangFileString} lng_it "¸q¤j§Q¤å"
+${LangFileString} lng_ja "¤é¤å"
+${LangFileString} lng_km "°ª´Ö»y"
+${LangFileString} lng_ko "Áú¤å"
+${LangFileString} lng_lt "¥ß³³©{»y"
+${LangFileString} lng_mk "°¨¨ä¹y»y"
+${LangFileString} lng_mn "»X¥j»y"
+${LangFileString} lng_ne "¥§ªyº¸»y"
+${LangFileString} lng_nb "®¿«Â Bokmal »y"
+${LangFileString} lng_nl "²üÄõ»y"
+${LangFileString} lng_nn "®¿«Â Nynorsk »y"
+${LangFileString} lng_pa "®Ç¾B´¶»y"
+${LangFileString} lng_pl "ªiÄõ»y"
+${LangFileString} lng_pt "¸²µå¤ú¤å"
+${LangFileString} lng_pt_BR "¸²µå¤ú¤å(¤Ú¦è)"
+${LangFileString} lng_ro "ù°¨¥§¨È»y"
+${LangFileString} lng_ru "«X¤å"
+${LangFileString} lng_rw "ª÷¨È¿c¦w¹F»y"
+${LangFileString} lng_sk "´µ¬¥ªk§J»y"
+${LangFileString} lng_sl "´µ¬¥¤Z¥§¨È»y"
+${LangFileString} lng_sq "ªüº¸¤Ú¥§¨È»y"
+${LangFileString} lng_sr "Áɺ¸ºû¨È»y"
+${LangFileString} lng_sr@latin "¶ëº¸ºû¨È¤å-©Ô¤B"
+${LangFileString} lng_sv "·ç¨å»y"
+${LangFileString} lng_te_IN "Telugu"
+${LangFileString} lng_th "®õ»y"
+${LangFileString} lng_tr "¤g¦Õ¨ä»y"
+${LangFileString} lng_uk "¯Q§JÄõ»y"
+${LangFileString} lng_vi "¶V«n¸Ü"
+${LangFileString} lng_zh_CN "²Å餤¤å"
+${LangFileString} lng_zh_TW "ÁcÅ餤¤å"
+${LangFileString} UInstOpt "¤Ï¦w¸Ë¿ï¶µ"
+${LangFileString} UInstOpt1 "½Ð¿ï¾Ü¨ä¥L¿ï¶µ"
+${LangFileString} PurgePrefs "«O¯d­Ó¤H°¾¦n³]©w"
+${LangFileString} UninstallLogNotFound "¨S¦³§ä¨ì $INSTDIR\uninstall.log ¡I$\r$\n½Ð¦Û¦æ²M°£ $INSTDIR ¸ê®Æ§¨¨Ó¤Ï¦w¸Ë¡I"
+${LangFileString} FileChanged "¦w¸Ë«á $filename ÀɮפwÅܧó¡C$\r$\n§A¬O§_¤´µM­n§R°£¨º­ÓÀɮסH"
+${LangFileString} Yes "¬O"
+${LangFileString} AlwaysYes "¥þ³¡¬Ò¬O"
+${LangFileString} No "§_"
+${LangFileString} AlwaysNo "¥þ³¡¬Ò§_"
diff --git a/packaging/win32/md5dll.txt b/packaging/win32/md5dll.txt
index 7d6992186..a8d3572c7 100644
--- a/packaging/win32/md5dll.txt
+++ b/packaging/win32/md5dll.txt
@@ -1,68 +1,68 @@
-Calculates the md5sum of a file or string.

-Has been tested to work with NSIS 2.0+

-

-

-Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm

-

-[Md5Dll]

-Matthew "IGx89" Lieder

-  -Original plugin Author

-

-Sunjammer (12th May 2002)

-  -Original usage notes and example script 

-

-[Md5Dll.0.1]

-KJD (2004)

-  -Modified to reduce size and use exdll.h

-   (reduced to about 6KB uncompressed, by removing CRTL dependency)

-

-[Md5dll.0.2]

-Davy Durham (2004)

-  -MD5.cpp fix (correct for loop used to replace memset, exceeded bounds)

-

-[Md5dll.0.3]

-Shengalts Aleksander aka Instructor (2005)

-  -New command: "GetMD5Random"

-  -Changed names: "GetFileMD5" -> "GetMD5File", "GetMD5" -> "GetMD5String"

-  -Fixed: string length error

-

-[Md5dll.0.4]

-KJD (2005)

-  -Added dual name to exports for backwards compatibility

-

-

---------------------------------

-

-Usage:

-

-Push $1 ;string

-CallInstDll "md5dll" GetMD5String

-Pop $1 ;md5 of string

-

--or-

-

-Push $1 ;filename

-CallInstDll "md5dll" GetMD5File

-Pop $1 ;md5 of file

-

---------------------------------

-

-Example usage in recent NSIS versions

-

-OutFile "md5test.exe"

-Section ""

-  #generate MD5sum of a string

-  md5dll::GetMD5String "md5me"

-  Pop $0

-  DetailPrint "md5: [$0]"

-

-  # generate MD5sum of a file

-  md5dll::GetMD5File "${NSISDIR}\makensis.exe"

-  Pop $0

-  DetailPrint "md5: [$0]"

-

-  #generate random MD5sum

-  md5dll::GetMD5Random

-  Pop $0

-  DetailPrint "md5: [$0]"

-SectionEnd

+Calculates the md5sum of a file or string.
+Has been tested to work with NSIS 2.0+
+
+
+Derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm
+
+[Md5Dll]
+Matthew "IGx89" Lieder
+  -Original plugin Author
+
+Sunjammer (12th May 2002)
+  -Original usage notes and example script 
+
+[Md5Dll.0.1]
+KJD (2004)
+  -Modified to reduce size and use exdll.h
+   (reduced to about 6KB uncompressed, by removing CRTL dependency)
+
+[Md5dll.0.2]
+Davy Durham (2004)
+  -MD5.cpp fix (correct for loop used to replace memset, exceeded bounds)
+
+[Md5dll.0.3]
+Shengalts Aleksander aka Instructor (2005)
+  -New command: "GetMD5Random"
+  -Changed names: "GetFileMD5" -> "GetMD5File", "GetMD5" -> "GetMD5String"
+  -Fixed: string length error
+
+[Md5dll.0.4]
+KJD (2005)
+  -Added dual name to exports for backwards compatibility
+
+
+--------------------------------
+
+Usage:
+
+Push $1 ;string
+CallInstDll "md5dll" GetMD5String
+Pop $1 ;md5 of string
+
+-or-
+
+Push $1 ;filename
+CallInstDll "md5dll" GetMD5File
+Pop $1 ;md5 of file
+
+--------------------------------
+
+Example usage in recent NSIS versions
+
+OutFile "md5test.exe"
+Section ""
+  #generate MD5sum of a string
+  md5dll::GetMD5String "md5me"
+  Pop $0
+  DetailPrint "md5: [$0]"
+
+  # generate MD5sum of a file
+  md5dll::GetMD5File "${NSISDIR}\makensis.exe"
+  Pop $0
+  DetailPrint "md5: [$0]"
+
+  #generate random MD5sum
+  md5dll::GetMD5Random
+  Pop $0
+  DetailPrint "md5: [$0]"
+SectionEnd
diff --git a/packaging/win32/portable/App/AppInfo/appinfo.ini b/packaging/win32/portable/App/AppInfo/appinfo.ini
index 677489010..544a66584 100644
--- a/packaging/win32/portable/App/AppInfo/appinfo.ini
+++ b/packaging/win32/portable/App/AppInfo/appinfo.ini
@@ -1,26 +1,26 @@
-[Format]

-Type=PortableApps.comFormat

-Version=0.91

-

-[Details]

-Name=Inkscape Portable

-AppID=InkscapePortable

-Publisher=Inkscape.org & PortableApps.com

-Homepage=Inkscape.org

-Category=Graphics & Pictures

-Description=Inkscape is a powerful vector graphics editor.

-Language=Multilingual

-

-[License]

-Shareable=true

-OpenSource=true

-Freeware=true

-CommercialUse=true

-

-[Version]

-PackageVersion=0.47

-DisplayVersion=0.47

-

-[Control]

-Icons=1

-Start=InkscapePortable.exe

+[Format]
+Type=PortableApps.comFormat
+Version=0.91
+
+[Details]
+Name=Inkscape Portable
+AppID=InkscapePortable
+Publisher=Inkscape.org & PortableApps.com
+Homepage=Inkscape.org
+Category=Graphics & Pictures
+Description=Inkscape is a powerful vector graphics editor.
+Language=Multilingual
+
+[License]
+Shareable=true
+OpenSource=true
+Freeware=true
+CommercialUse=true
+
+[Version]
+PackageVersion=0.47
+DisplayVersion=0.47
+
+[Control]
+Icons=1
+Start=InkscapePortable.exe
diff --git a/packaging/win32/portable/App/AppInfo/installer.ini b/packaging/win32/portable/App/AppInfo/installer.ini
index ad1918ecf..ffa60d15a 100644
--- a/packaging/win32/portable/App/AppInfo/installer.ini
+++ b/packaging/win32/portable/App/AppInfo/installer.ini
@@ -1,15 +1,15 @@
-[OptionalComponents]

-OptionalComponents=true

-OptionalDirectory1=App\Inkscape\locale

-OptionalDirectory2=App\Inkscape\share\locale

-OptionalFile1=App\Inkscape\share\clipart\draw-freely.*.svg

-OptionalFile2=App\Inkscape\share\screens\*.*.svg

-OptionalFile3=App\Inkscape\share\templates\default.*.svg

-OptionalFile4=App\Inkscape\share\tutorials\potrace-*.svg

-OptionalFile5=App\Inkscape\share\tutorials\*.*.svg

-

-[DirectoriesToPreserve]

-PreserveDirectory1=App\Inkscape\data

-PreserveDirectory2=App\Inkscape\modules

-PreserveDirectory3=App\Inkscape\plugins

-PreserveDirectory4=App\Inkscape\share\extensions

+[OptionalComponents]
+OptionalComponents=true
+OptionalDirectory1=App\Inkscape\locale
+OptionalDirectory2=App\Inkscape\share\locale
+OptionalFile1=App\Inkscape\share\clipart\draw-freely.*.svg
+OptionalFile2=App\Inkscape\share\screens\*.*.svg
+OptionalFile3=App\Inkscape\share\templates\default.*.svg
+OptionalFile4=App\Inkscape\share\tutorials\potrace-*.svg
+OptionalFile5=App\Inkscape\share\tutorials\*.*.svg
+
+[DirectoriesToPreserve]
+PreserveDirectory1=App\Inkscape\data
+PreserveDirectory2=App\Inkscape\modules
+PreserveDirectory3=App\Inkscape\plugins
+PreserveDirectory4=App\Inkscape\share\extensions
diff --git a/packaging/win32/portable/App/readme.txt b/packaging/win32/portable/App/readme.txt
index fd42dacfb..b67db5038 100644
--- a/packaging/win32/portable/App/readme.txt
+++ b/packaging/win32/portable/App/readme.txt
@@ -1 +1 @@
-The files in this directory are necessary for Inkscape Portable to function.  There is normally no need to directly access or alter any of the files within these directories.

+The files in this directory are necessary for Inkscape Portable to function.  There is normally no need to directly access or alter any of the files within these directories.
diff --git a/packaging/win32/portable/Other/Source/InkscapePortable.ini b/packaging/win32/portable/Other/Source/InkscapePortable.ini
index b734190da..0ddd34b4a 100644
--- a/packaging/win32/portable/Other/Source/InkscapePortable.ini
+++ b/packaging/win32/portable/Other/Source/InkscapePortable.ini
@@ -1,6 +1,6 @@
-[InkscapePortable]

-AdditionalParameters=

-DisableSplashScreen=false

-

-# This INI is an example only and will not work until placed according to the directions in readme.txt

-# The above options are explained in the included readme.txt

+[InkscapePortable]
+AdditionalParameters=
+DisableSplashScreen=false
+
+# This INI is an example only and will not work until placed according to the directions in readme.txt
+# The above options are explained in the included readme.txt
diff --git a/packaging/win32/portable/Other/Source/InkscapePortable.nsi b/packaging/win32/portable/Other/Source/InkscapePortable.nsi
index c9081207d..673d49c51 100644
--- a/packaging/win32/portable/Other/Source/InkscapePortable.nsi
+++ b/packaging/win32/portable/Other/Source/InkscapePortable.nsi
@@ -1,130 +1,130 @@
-;Copyright (C) 2004-2008 John T. Haller of PortableApps.com

-;Copyright (C) 2008-2009 Chris Morgan of PortableApps.com and Inkscape.org

-

-;Website: http://PortableApps.com/InkscapePortable

-

-;This software is OSI Certified Open Source Software.

-;OSI Certified is a certification mark of the Open Source Initiative.

-

-;This program is free software; you can redistribute it and/or

-;modify it under the terms of the GNU General Public License

-;as published by the Free Software Foundation; either version 2

-;of the License, or (at your option) any later version.

-

-;This program is distributed in the hope that it will be useful,

-;but WITHOUT ANY WARRANTY; without even the implied warranty of

-;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-;GNU General Public License for more details.

-

-;You should have received a copy of the GNU General Public License

-;along with this program; if not, write to the Free Software

-;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-

-!define PORTABLEAPPNAME "Inkscape Portable"

-!define NAME InkscapePortable

-!define VER "1.6.6.0"

-!define LAUNCHERLANGUAGE English

-

-;=== Program Details

-Name "${PORTABLEAPPNAME}"

-OutFile "..\..\${NAME}.exe"

-VIProductVersion "${VER}"

-VIAddVersionKey ProductName "${PORTABLEAPPNAME}"

-VIAddVersionKey Comments "Allows Inkscape to be run from a removable drive.  For additional details, visit Inkscape.org"

-VIAddVersionKey CompanyName "PortableApps.com"

-VIAddVersionKey LegalCopyright "PortableApps.com & Inkscape.org"

-VIAddVersionKey FileDescription "${PORTABLEAPPNAME}"

-VIAddVersionKey FileVersion "${VER}"

-VIAddVersionKey ProductVersion "${VER}"

-VIAddVersionKey InternalName "${PORTABLEAPPNAME}"

-VIAddVersionKey LegalTrademarks "PortableApps.com is a Trademark of Rare Ideas, LLC."

-VIAddVersionKey OriginalFilename "${NAME}.exe"

-;VIAddVersionKey PrivateBuild ""

-;VIAddVersionKey SpecialBuild ""

-

-;=== Runtime Switches

-CRCCheck On

-WindowIcon Off

-SilentInstall Silent

-AutoCloseWindow True

-RequestExecutionLevel user

-

-; Best Compression

-SetCompress Auto

-SetCompressor /SOLID lzma

-SetCompressorDictSize 32

-SetDatablockOptimize On

-

-;=== Include

-;(Standard NSIS)

-!include FileFunc.nsh

-!insertmacro GetParameters

-!insertmacro GetRoot

-

-;(NSIS Plugins)

-!include TextReplace.nsh

-

-;(Custom)

-!include ReplaceInFileWithTextReplace.nsh

-

-;=== Program Icon

-Icon "..\..\App\AppInfo\appicon.ico"

-

-;=== Icon & Stye ===

-;!define MUI_ICON "..\..\App\AppInfo\appicon.ico"

-

-;=== Languages

-LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LAUNCHERLANGUAGE}.nlf"

-!include PortableApps.comLauncherLANG_${LAUNCHERLANGUAGE}.nsh

-

-Var MISSINGFILEORPATH

-

-Section Main

-	IfFileExists "$EXEDIR\App\Inkscape\inkscape.exe" DisplaySplash

-		StrCpy $MISSINGFILEORPATH "inkscape.exe"

-		MessageBox MB_OK|MB_ICONEXCLAMATION `$(LauncherFileNotFound)`

-		Abort

-

-	DisplaySplash:

-		ReadINIStr $0 "$EXEDIR\${NAME}.ini" "${NAME}" DisableSplashScreen

-		StrCmp $0 "true" SettingsDirectory

-			;=== Show the splash screen while processing registry entries

-			InitPluginsDir

-			File /oname=$PLUGINSDIR\splash.jpg "${NAME}.jpg"

-			newadvsplash::show /NOUNLOAD 1200 0 0 -1 /L $PLUGINSDIR\splash.jpg

-

-	SettingsDirectory:

-		CreateDirectory $EXEDIR\Data\settings

-		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("INKSCAPE_PORTABLE_PROFILE_DIR", "$EXEDIR\Data\settings").n'

-		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("HOME", "$EXEDIR\Data\settings").n' ; possibly some GTK stuff

-		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("APPDATA", "$EXEDIR\Data\settings").n' ; Just to be on the safe side

-

-	;InkscapeLanguage:

-		ReadEnvStr $0 "PortableApps.comLocaleglibc"

-		StrCmp $0 "" InkscapeLanguageSettingsFile

-		StrCmp $0 "en_US" SetInkscapeLanguageVariable

-		IfFileExists "$EXEDIR\App\Inkscape\locale\$0\*.*" SetInkscapeLanguageVariable

-

-	InkscapeLanguageSettingsFile:

-		ReadINIStr $0 "$EXEDIR\Data\settings\${NAME}Settings.ini" Language LANG

-		StrCmp $0 "" AdjustPaths

-		StrCmp $0 "en_US" SetInkscapeLanguageVariable

-		IfFileExists "$EXEDIR\App\Inkscape\locale\$0\*.*" SetInkscapeLanguageVariable AdjustPaths

-

-	SetInkscapeLanguageVariable:

-		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("LANG", r0).n'

-

-	AdjustPaths:

-		ReadINIStr $0 "$EXEDIR\Data\settings\${NAME}Settings.ini" "${NAME}Settings" LastDrive

-		${GetRoot} $EXEDIR $1

-		StrCmp $0 $1 Launch

-		WriteINIStr "$EXEDIR\Data\settings\${NAME}Settings.ini" "${NAME}Settings" LastDrive $1

-		${ReplaceInFile} "$EXEDIR\Data\settings\preferences.xml" "$0\" "$1\"

-		${ReplaceInFile} "$EXEDIR\Data\settings\.recently-used.xbel" "file:///$0/" "file:///$1/"

-

-	Launch:

-		${GetParameters} $0

-		ReadINIStr $1 "$EXEDIR\${NAME}.ini" "${NAME}" AdditionalParameters

-		Exec `"$EXEDIR\App\Inkscape\inkscape.exe" $0 $1`

-		newadvsplash::stop /WAIT

-SectionEnd

+;Copyright (C) 2004-2008 John T. Haller of PortableApps.com
+;Copyright (C) 2008-2009 Chris Morgan of PortableApps.com and Inkscape.org
+
+;Website: http://PortableApps.com/InkscapePortable
+
+;This software is OSI Certified Open Source Software.
+;OSI Certified is a certification mark of the Open Source Initiative.
+
+;This program is free software; you can redistribute it and/or
+;modify it under the terms of the GNU General Public License
+;as published by the Free Software Foundation; either version 2
+;of the License, or (at your option) any later version.
+
+;This program is distributed in the hope that it will be useful,
+;but WITHOUT ANY WARRANTY; without even the implied warranty of
+;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;GNU General Public License for more details.
+
+;You should have received a copy of the GNU General Public License
+;along with this program; if not, write to the Free Software
+;Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+!define PORTABLEAPPNAME "Inkscape Portable"
+!define NAME InkscapePortable
+!define VER "1.6.6.0"
+!define LAUNCHERLANGUAGE English
+
+;=== Program Details
+Name "${PORTABLEAPPNAME}"
+OutFile "..\..\${NAME}.exe"
+VIProductVersion "${VER}"
+VIAddVersionKey ProductName "${PORTABLEAPPNAME}"
+VIAddVersionKey Comments "Allows Inkscape to be run from a removable drive.  For additional details, visit Inkscape.org"
+VIAddVersionKey CompanyName "PortableApps.com"
+VIAddVersionKey LegalCopyright "PortableApps.com & Inkscape.org"
+VIAddVersionKey FileDescription "${PORTABLEAPPNAME}"
+VIAddVersionKey FileVersion "${VER}"
+VIAddVersionKey ProductVersion "${VER}"
+VIAddVersionKey InternalName "${PORTABLEAPPNAME}"
+VIAddVersionKey LegalTrademarks "PortableApps.com is a Trademark of Rare Ideas, LLC."
+VIAddVersionKey OriginalFilename "${NAME}.exe"
+;VIAddVersionKey PrivateBuild ""
+;VIAddVersionKey SpecialBuild ""
+
+;=== Runtime Switches
+CRCCheck On
+WindowIcon Off
+SilentInstall Silent
+AutoCloseWindow True
+RequestExecutionLevel user
+
+; Best Compression
+SetCompress Auto
+SetCompressor /SOLID lzma
+SetCompressorDictSize 32
+SetDatablockOptimize On
+
+;=== Include
+;(Standard NSIS)
+!include FileFunc.nsh
+!insertmacro GetParameters
+!insertmacro GetRoot
+
+;(NSIS Plugins)
+!include TextReplace.nsh
+
+;(Custom)
+!include ReplaceInFileWithTextReplace.nsh
+
+;=== Program Icon
+Icon "..\..\App\AppInfo\appicon.ico"
+
+;=== Icon & Stye ===
+;!define MUI_ICON "..\..\App\AppInfo\appicon.ico"
+
+;=== Languages
+LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LAUNCHERLANGUAGE}.nlf"
+!include PortableApps.comLauncherLANG_${LAUNCHERLANGUAGE}.nsh
+
+Var MISSINGFILEORPATH
+
+Section Main
+	IfFileExists "$EXEDIR\App\Inkscape\inkscape.exe" DisplaySplash
+		StrCpy $MISSINGFILEORPATH "inkscape.exe"
+		MessageBox MB_OK|MB_ICONEXCLAMATION `$(LauncherFileNotFound)`
+		Abort
+
+	DisplaySplash:
+		ReadINIStr $0 "$EXEDIR\${NAME}.ini" "${NAME}" DisableSplashScreen
+		StrCmp $0 "true" SettingsDirectory
+			;=== Show the splash screen while processing registry entries
+			InitPluginsDir
+			File /oname=$PLUGINSDIR\splash.jpg "${NAME}.jpg"
+			newadvsplash::show /NOUNLOAD 1200 0 0 -1 /L $PLUGINSDIR\splash.jpg
+
+	SettingsDirectory:
+		CreateDirectory $EXEDIR\Data\settings
+		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("INKSCAPE_PORTABLE_PROFILE_DIR", "$EXEDIR\Data\settings").n'
+		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("HOME", "$EXEDIR\Data\settings").n' ; possibly some GTK stuff
+		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("APPDATA", "$EXEDIR\Data\settings").n' ; Just to be on the safe side
+
+	;InkscapeLanguage:
+		ReadEnvStr $0 "PortableApps.comLocaleglibc"
+		StrCmp $0 "" InkscapeLanguageSettingsFile
+		StrCmp $0 "en_US" SetInkscapeLanguageVariable
+		IfFileExists "$EXEDIR\App\Inkscape\locale\$0\*.*" SetInkscapeLanguageVariable
+
+	InkscapeLanguageSettingsFile:
+		ReadINIStr $0 "$EXEDIR\Data\settings\${NAME}Settings.ini" Language LANG
+		StrCmp $0 "" AdjustPaths
+		StrCmp $0 "en_US" SetInkscapeLanguageVariable
+		IfFileExists "$EXEDIR\App\Inkscape\locale\$0\*.*" SetInkscapeLanguageVariable AdjustPaths
+
+	SetInkscapeLanguageVariable:
+		System::Call 'Kernel32::SetEnvironmentVariableA(t, t) i("LANG", r0).n'
+
+	AdjustPaths:
+		ReadINIStr $0 "$EXEDIR\Data\settings\${NAME}Settings.ini" "${NAME}Settings" LastDrive
+		${GetRoot} $EXEDIR $1
+		StrCmp $0 $1 Launch
+		WriteINIStr "$EXEDIR\Data\settings\${NAME}Settings.ini" "${NAME}Settings" LastDrive $1
+		${ReplaceInFile} "$EXEDIR\Data\settings\preferences.xml" "$0\" "$1\"
+		${ReplaceInFile} "$EXEDIR\Data\settings\.recently-used.xbel" "file:///$0/" "file:///$1/"
+
+	Launch:
+		${GetParameters} $0
+		ReadINIStr $1 "$EXEDIR\${NAME}.ini" "${NAME}" AdditionalParameters
+		Exec `"$EXEDIR\App\Inkscape\inkscape.exe" $0 $1`
+		newadvsplash::stop /WAIT
+SectionEnd
diff --git a/packaging/win32/portable/Other/Source/License.txt b/packaging/win32/portable/Other/Source/License.txt
index d6a3987f4..f119115a6 100644
--- a/packaging/win32/portable/Other/Source/License.txt
+++ b/packaging/win32/portable/Other/Source/License.txt
@@ -1,344 +1,344 @@
-		    GNU GENERAL PUBLIC LICENSE

-		       Version 2, June 1991

-

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.

-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- Everyone is permitted to copy and distribute verbatim copies

- of this license document, but changing it is not allowed.

-

-			    Preamble

-

-  The licenses for most software are designed to take away your

-freedom to share and change it.  By contrast, the GNU General Public

-License is intended to guarantee your freedom to share and change free

-software--to make sure the software is free for all its users.  This

-General Public License applies to most of the Free Software

-Foundation's software and to any other program whose authors commit to

-using it.  (Some other Free Software Foundation software is covered by

-the GNU Library General Public License instead.)  You can apply it to

-your programs, too.

-

-  When we speak of free software, we are referring to freedom, not

-price.  Our General Public Licenses are designed to make sure that you

-have the freedom to distribute copies of free software (and charge for

-this service if you wish), that you receive source code or can get it

-if you want it, that you can change the software or use pieces of it

-in new free programs; and that you know you can do these things.

-

-  To protect your rights, we need to make restrictions that forbid

-anyone to deny you these rights or to ask you to surrender the rights.

-These restrictions translate to certain responsibilities for you if you

-distribute copies of the software, or if you modify it.

-

-  For example, if you distribute copies of such a program, whether

-gratis or for a fee, you must give the recipients all the rights that

-you have.  You must make sure that they, too, receive or can get the

-source code.  And you must show them these terms so they know their

-rights.

-

-  We protect your rights with two steps: (1) copyright the software, and

-(2) offer you this license which gives you legal permission to copy,

-distribute and/or modify the software.

-

-  Also, for each author's protection and ours, we want to make certain

-that everyone understands that there is no warranty for this free

-software.  If the software is modified by someone else and passed on, we

-want its recipients to know that what they have is not the original, so

-that any problems introduced by others will not reflect on the original

-authors' reputations.

-

-  Finally, any free program is threatened constantly by software

-patents.  We wish to avoid the danger that redistributors of a free

-program will individually obtain patent licenses, in effect making the

-program proprietary.  To prevent this, we have made it clear that any

-patent must be licensed for everyone's free use or not licensed at all.

-

-  The precise terms and conditions for copying, distribution and

-modification follow.

-

-		    GNU GENERAL PUBLIC LICENSE

-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-

-  0. This License applies to any program or other work which contains

-a notice placed by the copyright holder saying it may be distributed

-under the terms of this General Public License.  The "Program", below,

-refers to any such program or work, and a "work based on the Program"

-means either the Program or any derivative work under copyright law:

-that is to say, a work containing the Program or a portion of it,

-either verbatim or with modifications and/or translated into another

-language.  (Hereinafter, translation is included without limitation in

-the term "modification".)  Each licensee is addressed as "you".

-

-Activities other than copying, distribution and modification are not

-covered by this License; they are outside its scope.  The act of

-running the Program is not restricted, and the output from the Program

-is covered only if its contents constitute a work based on the

-Program (independent of having been made by running the Program).

-Whether that is true depends on what the Program does.

-

-  1. You may copy and distribute verbatim copies of the Program's

-source code as you receive it, in any medium, provided that you

-conspicuously and appropriately publish on each copy an appropriate

-copyright notice and disclaimer of warranty; keep intact all the

-notices that refer to this License and to the absence of any warranty;

-and give any other recipients of the Program a copy of this License

-along with the Program.

-

-You may charge a fee for the physical act of transferring a copy, and

-you may at your option offer warranty protection in exchange for a fee.

-

-  2. You may modify your copy or copies of the Program or any portion

-of it, thus forming a work based on the Program, and copy and

-distribute such modifications or work under the terms of Section 1

-above, provided that you also meet all of these conditions:

-

-    a) You must cause the modified files to carry prominent notices

-    stating that you changed the files and the date of any change.

-

-    b) You must cause any work that you distribute or publish, that in

-    whole or in part contains or is derived from the Program or any

-    part thereof, to be licensed as a whole at no charge to all third

-    parties under the terms of this License.

-

-    c) If the modified program normally reads commands interactively

-    when run, you must cause it, when started running for such

-    interactive use in the most ordinary way, to print or display an

-    announcement including an appropriate copyright notice and a

-    notice that there is no warranty (or else, saying that you provide

-    a warranty) and that users may redistribute the program under

-    these conditions, and telling the user how to view a copy of this

-    License.  (Exception: if the Program itself is interactive but

-    does not normally print such an announcement, your work based on

-    the Program is not required to print an announcement.)

-

-These requirements apply to the modified work as a whole.  If

-identifiable sections of that work are not derived from the Program,

-and can be reasonably considered independent and separate works in

-themselves, then this License, and its terms, do not apply to those

-sections when you distribute them as separate works.  But when you

-distribute the same sections as part of a whole which is a work based

-on the Program, the distribution of the whole must be on the terms of

-this License, whose permissions for other licensees extend to the

-entire whole, and thus to each and every part regardless of who wrote it.

-

-Thus, it is not the intent of this section to claim rights or contest

-your rights to work written entirely by you; rather, the intent is to

-exercise the right to control the distribution of derivative or

-collective works based on the Program.

-

-In addition, mere aggregation of another work not based on the Program

-with the Program (or with a work based on the Program) on a volume of

-a storage or distribution medium does not bring the other work under

-the scope of this License.

-

-  3. You may copy and distribute the Program (or a work based on it,

-under Section 2) in object code or executable form under the terms of

-Sections 1 and 2 above provided that you also do one of the following:

-

-    a) Accompany it with the complete corresponding machine-readable

-    source code, which must be distributed under the terms of Sections

-    1 and 2 above on a medium customarily used for software interchange; or,

-

-    b) Accompany it with a written offer, valid for at least three

-    years, to give any third party, for a charge no more than your

-    cost of physically performing source distribution, a complete

-    machine-readable copy of the corresponding source code, to be

-    distributed under the terms of Sections 1 and 2 above on a medium

-    customarily used for software interchange; or,

-

-    c) Accompany it with the information you received as to the offer

-    to distribute corresponding source code.  (This alternative is

-    allowed only for noncommercial distribution and only if you

-    received the program in object code or executable form with such

-    an offer, in accord with Subsection b above.)

-

-The source code for a work means the preferred form of the work for

-making modifications to it.  For an executable work, complete source

-code means all the source code for all modules it contains, plus any

-associated interface definition files, plus the scripts used to

-control compilation and installation of the executable.  However, as a

-special exception, the source code distributed need not include

-anything that is normally distributed (in either source or binary

-form) with the major components (compiler, kernel, and so on) of the

-operating system on which the executable runs, unless that component

-itself accompanies the executable.

-

-If distribution of executable or object code is made by offering

-access to copy from a designated place, then offering equivalent

-access to copy the source code from the same place counts as

-distribution of the source code, even though third parties are not

-compelled to copy the source along with the object code.

-

-  4. You may not copy, modify, sublicense, or distribute the Program

-except as expressly provided under this License.  Any attempt

-otherwise to copy, modify, sublicense or distribute the Program is

-void, and will automatically terminate your rights under this License.

-However, parties who have received copies, or rights, from you under

-this License will not have their licenses terminated so long as such

-parties remain in full compliance.

-

-  5. You are not required to accept this License, since you have not

-signed it.  However, nothing else grants you permission to modify or

-distribute the Program or its derivative works.  These actions are

-prohibited by law if you do not accept this License.  Therefore, by

-modifying or distributing the Program (or any work based on the

-Program), you indicate your acceptance of this License to do so, and

-all its terms and conditions for copying, distributing or modifying

-the Program or works based on it.

-

-  6. Each time you redistribute the Program (or any work based on the

-Program), the recipient automatically receives a license from the

-original licensor to copy, distribute or modify the Program subject to

-these terms and conditions.  You may not impose any further

-restrictions on the recipients' exercise of the rights granted herein.

-You are not responsible for enforcing compliance by third parties to

-this License.

-

-  7. If, as a consequence of a court judgment or allegation of patent

-infringement or for any other reason (not limited to patent issues),

-conditions are imposed on you (whether by court order, agreement or

-otherwise) that contradict the conditions of this License, they do not

-excuse you from the conditions of this License.  If you cannot

-distribute so as to satisfy simultaneously your obligations under this

-License and any other pertinent obligations, then as a consequence you

-may not distribute the Program at all.  For example, if a patent

-license would not permit royalty-free redistribution of the Program by

-all those who receive copies directly or indirectly through you, then

-the only way you could satisfy both it and this License would be to

-refrain entirely from distribution of the Program.

-

-If any portion of this section is held invalid or unenforceable under

-any particular circumstance, the balance of the section is intended to

-apply and the section as a whole is intended to apply in other

-circumstances.

-

-It is not the purpose of this section to induce you to infringe any

-patents or other property right claims or to contest validity of any

-such claims; this section has the sole purpose of protecting the

-integrity of the free software distribution system, which is

-implemented by public license practices.  Many people have made

-generous contributions to the wide range of software distributed

-through that system in reliance on consistent application of that

-system; it is up to the author/donor to decide if he or she is willing

-to distribute software through any other system and a licensee cannot

-impose that choice.

-

-This section is intended to make thoroughly clear what is believed to

-be a consequence of the rest of this License.

-

-  8. If the distribution and/or use of the Program is restricted in

-certain countries either by patents or by copyrighted interfaces, the

-original copyright holder who places the Program under this License

-may add an explicit geographical distribution limitation excluding

-those countries, so that distribution is permitted only in or among

-countries not thus excluded.  In such case, this License incorporates

-the limitation as if written in the body of this License.

-

-  9. The Free Software Foundation may publish revised and/or new versions

-of the General Public License from time to time.  Such new versions will

-be similar in spirit to the present version, but may differ in detail to

-address new problems or concerns.

-

-Each version is given a distinguishing version number.  If the Program

-specifies a version number of this License which applies to it and "any

-later version", you have the option of following the terms and conditions

-either of that version or of any later version published by the Free

-Software Foundation.  If the Program does not specify a version number of

-this License, you may choose any version ever published by the Free Software

-Foundation.

-

-  10. If you wish to incorporate parts of the Program into other free

-programs whose distribution conditions are different, write to the author

-to ask for permission.  For software which is copyrighted by the Free

-Software Foundation, write to the Free Software Foundation; we sometimes

-make exceptions for this.  Our decision will be guided by the two goals

-of preserving the free status of all derivatives of our free software and

-of promoting the sharing and reuse of software generally.

-

-		  NO WARRANTY

-

-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,

-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT

-PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED

-IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES

-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,

-EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,

-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY

-AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE

-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL

-NECESSARY SERVICING, REPAIR OR CORRECTION.

-

-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR

-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY

-OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM

-AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING

-ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES

-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM

-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING

-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD

-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY

-OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS

-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-	     END OF TERMS AND CONDITIONS

-

-	    How to Apply These Terms to Your New Programs

-

-  If you develop a new program, and you want it to be of the greatest

-possible use to the public, the best way to achieve this is to make it

-free software which everyone can redistribute and change under these terms.

-

-  To do so, attach the following notices to the program.  It is safest

-to attach them to the start of each source file to most effectively

-convey the exclusion of warranty; and each file should have at least

-the "copyright" line and a pointer to where the full notice is found.

-

-    <one line to give the program's name and a brief idea of what it does.>

-    Copyright (C) 19yy  <name of author>

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program; if not, write to the Free Software

-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-

-

-Also add information on how to contact you by electronic and paper mail.

-

-If the program is interactive, make it output a short notice like this

-when it starts in an interactive mode:

-

-    Gnomovision version 69, Copyright (C) 19yy name of author

-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.

-    This is free software, and you are welcome to redistribute it

-    under certain conditions; type `show c' for details.

-

-The hypothetical commands `show w' and `show c' should show the appropriate

-parts of the General Public License.  Of course, the commands you use may

-be called something other than `show w' and `show c'; they could even be

-mouse-clicks or menu items--whatever suits your program.

-

-You should also get your employer (if you work as a programmer) or your

-school, if any, to sign a "copyright disclaimer" for the program, if

-necessary.  Here is a sample; alter the names:

-

-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program

-  `Gnomovision' (which makes passes at compilers) written by James Hacker.

-

-  <signature of Ty Coon>, 1 April 1989

-  Ty Coon, President of Vice

-

-This General Public License does not permit incorporating your program into

-proprietary programs.  If your program is a subroutine library, you may

-consider it more useful to permit linking proprietary applications with the

-library.  If this is what you want to do, use the GNU Library General

+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+		  NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED
+IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY
+AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY
+OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM
+AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
+OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+	     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
\ No newline at end of file
diff --git a/packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh b/packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh
index 1cce3522c..456f6c600 100644
--- a/packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh
+++ b/packaging/win32/portable/Other/Source/PortableApps.comInstallerCustom.nsh
@@ -1,12 +1,12 @@
-!macro CustomCodePostInstall

-	${If} ${FileExists} "$INSTDIR\Data\settings\AppData" ; 0.46 Development Tests

-		Rename "$INSTDIR\Data\settings\AppData" "$INSTDIR\Data\_settings"

-	${ElseIf} ${FileExists} "$INSTDIR\Data\settings\InkscapePortableAppData" ; 0.46 Pre-Release 1

-		Rename "$INSTDIR\Data\settings\InkscapePortableAppData" "$INSTDIR\Data\_settings"

-	${EndIf}

-	${If} ${FileExists} "$INSTDIR\Data\_settings"

-		Rename "$INSTDIR\Data\settings\InkscapePortableSettings.ini" "$INSTDIR\Data\_settings\InkscapePortableSettings.ini"

-		RMDir /r "$INSTDIR\Data\settings"

-		Rename "$INSTDIR\Data\settings" "$INSTDIR\Data\_settings"

-	${EndIf}

-!macroend

+!macro CustomCodePostInstall
+	${If} ${FileExists} "$INSTDIR\Data\settings\AppData" ; 0.46 Development Tests
+		Rename "$INSTDIR\Data\settings\AppData" "$INSTDIR\Data\_settings"
+	${ElseIf} ${FileExists} "$INSTDIR\Data\settings\InkscapePortableAppData" ; 0.46 Pre-Release 1
+		Rename "$INSTDIR\Data\settings\InkscapePortableAppData" "$INSTDIR\Data\_settings"
+	${EndIf}
+	${If} ${FileExists} "$INSTDIR\Data\_settings"
+		Rename "$INSTDIR\Data\settings\InkscapePortableSettings.ini" "$INSTDIR\Data\_settings\InkscapePortableSettings.ini"
+		RMDir /r "$INSTDIR\Data\settings"
+		Rename "$INSTDIR\Data\settings" "$INSTDIR\Data\_settings"
+	${EndIf}
+!macroend
diff --git a/packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh b/packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh
index 79679e26d..71bdbbaa4 100644
--- a/packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh
+++ b/packaging/win32/portable/Other/Source/PortableApps.comLauncherLANG_ENGLISH.nsh
@@ -1,6 +1,6 @@
-LangString LauncherFileNotFound ${LANG_ENGLISH} "${PORTABLEAPPNAME} cannot be started. You may wish to re-install to fix this issue. (ERROR: $MISSINGFILEORPATH could not be found)"

-LangString LauncherAlreadyRunning ${LANG_ENGLISH} "Another instance of ${APPNAME} is already running. Please close other instances of ${APPNAME} before launching ${PORTABLEAPPNAME}."

-LangString LauncherAskCopyLocal ${LANG_ENGLISH} "${PORTABLEAPPNAME} appears to be running from a location that is read-only. Would you like to temporarily copy it to the local hard drive and run it from there?$\n$\nPrivacy Note: If you say Yes, your personal data within ${PORTABLEAPPNAME} will be temporarily copied to a local drive. Although this copy of your data will be deleted when you close ${PORTABLEAPPNAME}, it may be possible for someone else to access your data later."

-LangString LauncherNoReadOnly ${LANG_ENGLISH} "${PORTABLEAPPNAME} can not run directly from a read-only location and will now close."

-LangString LauncherPathTooLong ${LANG_ENGLISH} "The path to ${PORTABLEAPPNAME} is too long.  Please shorten the path by eliminating some parent directories or shortening directory names."

-LangString LauncherNextButton ${LANG_ENGLISH} "&Next >"

+LangString LauncherFileNotFound ${LANG_ENGLISH} "${PORTABLEAPPNAME} cannot be started. You may wish to re-install to fix this issue. (ERROR: $MISSINGFILEORPATH could not be found)"
+LangString LauncherAlreadyRunning ${LANG_ENGLISH} "Another instance of ${APPNAME} is already running. Please close other instances of ${APPNAME} before launching ${PORTABLEAPPNAME}."
+LangString LauncherAskCopyLocal ${LANG_ENGLISH} "${PORTABLEAPPNAME} appears to be running from a location that is read-only. Would you like to temporarily copy it to the local hard drive and run it from there?$\n$\nPrivacy Note: If you say Yes, your personal data within ${PORTABLEAPPNAME} will be temporarily copied to a local drive. Although this copy of your data will be deleted when you close ${PORTABLEAPPNAME}, it may be possible for someone else to access your data later."
+LangString LauncherNoReadOnly ${LANG_ENGLISH} "${PORTABLEAPPNAME} can not run directly from a read-only location and will now close."
+LangString LauncherPathTooLong ${LANG_ENGLISH} "The path to ${PORTABLEAPPNAME} is too long.  Please shorten the path by eliminating some parent directories or shortening directory names."
+LangString LauncherNextButton ${LANG_ENGLISH} "&Next >"
diff --git a/packaging/win32/portable/Other/Source/Readme.txt b/packaging/win32/portable/Other/Source/Readme.txt
index 201ffd1b0..67d4500f4 100644
--- a/packaging/win32/portable/Other/Source/Readme.txt
+++ b/packaging/win32/portable/Other/Source/Readme.txt
@@ -1,67 +1,67 @@
-Inkscape Portable

-=================

-Copyright 2004-2008 John T. Haller

-Copyright 2008-2009 Chris Morgan

-

-Website: http://Inkscape.org/

-

-This software is OSI Certified Open Source Software.

-OSI Certified is a certification mark of the Open Source Initiative.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-

-

-ABOUT INKSCAPE PORTABLE

-=======================

-The Inkscape Portable launcher allows you to run Inkscape from a

-removable drive whose letter changes as you move it to another

-computer.  The program can be entirely self-contained on the drive

-and then used on any Windows computer.

-

-

-LICENSE

-=======

-This code is released under the GPL.

-The full code is included with this package as InkscapePortable.nsi.

-

-

-INSTALLATION / DIRECTORY STRUCTURE

-==================================

-The program expects the following directory structure:

-

--\ <--- Directory with InkscapePortable.exe

-	+\App\

-		+\Inkscape\

-	+\Data\

-		+\settings\

-

-

-INKSCAPEPORTABLE.INI CONFIGURATION

-==================================

-The Inkscape Portable launcher will look for an ini file called

-InkscapePortable.ini in the directory which contains InkscapePortable.exe.

-If you are happy with the default options, it is not necessary, though.

-The INI file is formatted as follows:

-

-[InkscapePortable]

-AdditionalParameters=

-DisableSplashScreen=false

-

-The AdditionalParameters entry allows you to pass additional command-line

-parameter entries to inkscape.exe.  Whatever you enter here will be

-appended to the call to inkscape.exe.

-

-The DisableSplashScreen entry allows you to run the Inkscape Portable

-launcher without the splash screen showing up.  The default is false.

+Inkscape Portable
+=================
+Copyright 2004-2008 John T. Haller
+Copyright 2008-2009 Chris Morgan
+
+Website: http://Inkscape.org/
+
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+
+ABOUT INKSCAPE PORTABLE
+=======================
+The Inkscape Portable launcher allows you to run Inkscape from a
+removable drive whose letter changes as you move it to another
+computer.  The program can be entirely self-contained on the drive
+and then used on any Windows computer.
+
+
+LICENSE
+=======
+This code is released under the GPL.
+The full code is included with this package as InkscapePortable.nsi.
+
+
+INSTALLATION / DIRECTORY STRUCTURE
+==================================
+The program expects the following directory structure:
+
+-\ <--- Directory with InkscapePortable.exe
+	+\App\
+		+\Inkscape\
+	+\Data\
+		+\settings\
+
+
+INKSCAPEPORTABLE.INI CONFIGURATION
+==================================
+The Inkscape Portable launcher will look for an ini file called
+InkscapePortable.ini in the directory which contains InkscapePortable.exe.
+If you are happy with the default options, it is not necessary, though.
+The INI file is formatted as follows:
+
+[InkscapePortable]
+AdditionalParameters=
+DisableSplashScreen=false
+
+The AdditionalParameters entry allows you to pass additional command-line
+parameter entries to inkscape.exe.  Whatever you enter here will be
+appended to the call to inkscape.exe.
+
+The DisableSplashScreen entry allows you to run the Inkscape Portable
+launcher without the splash screen showing up.  The default is false.
diff --git a/packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh b/packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh
index ab81f62fc..3157f3eae 100644
--- a/packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh
+++ b/packaging/win32/portable/Other/Source/ReplaceInFileWithTextReplace.nsh
@@ -1,64 +1,64 @@
-; ReplaceInFile wrapper for testreplace function

-; John T. Haller of PortableApps.com

-; BSD License

-; Requires TextReplace plugin installed in NSIS and !include "TextReplace.nsh" in main nsi

-;

-; Usage: ${ReplaceInFile} SOURCE_FILE SEARCH_TEXT REPLACEMENT

-; or use ReplaceInFileCS for case-sensitive (use when possible, it's faster)

-; No return variable.  Error will be set if unable to do the replacement (invalid file, locked file, etc)

-

-Function ReplaceInFile

-	Exch $0 ;REPLACEMENT

-	Exch

-	Exch $1 ;SEARCH_TEXT

-	Exch 2

-	Exch $2 ;SOURCE_FILE

-	Exch 3

-	Exch $3 ;CASE_INSENSITIVE

-	Push $4 ;NEW_FILE

-	Push $5 ;RETURN_VALUE

-	

-	StrCpy $4 `$2.OldReplaceInFile`

-	

-	${textreplace::ReplaceInFile} "$2" "$4" "$1" "$0" "$3 /C=0" $5

-	

-	IntCmp $5 0 StackCleanup ReturnError RenameToOriginal

-	

-	ReturnError:

-		SetErrors

-		Goto StackCleanup

-	

-	RenameToOriginal:

-		Delete $2

-		Rename $4 $2

-	

-	StackCleanup:

-		Pop $5

-		Pop $4

-		Pop $3

-		Pop $0

-		Pop $1

-		Pop $2

-

-		${textreplace::Unload}

-FunctionEnd

-

-!macro ReplaceInFileCS SOURCE_FILE SEARCH_TEXT REPLACEMENT

-	Push `/S=1`

-	Push `${SOURCE_FILE}`

-	Push `${SEARCH_TEXT}`

-	Push `${REPLACEMENT}`

-	Call ReplaceInFile

-!macroend

-

-!macro ReplaceInFile SOURCE_FILE SEARCH_TEXT REPLACEMENT

-	Push `/S=0`

-	Push `${SOURCE_FILE}`

-	Push `${SEARCH_TEXT}`

-	Push `${REPLACEMENT}`

-	Call ReplaceInFile

-!macroend

-

-!define ReplaceInFileCS '!insertmacro "ReplaceInFileCS"'

-

+; ReplaceInFile wrapper for testreplace function
+; John T. Haller of PortableApps.com
+; BSD License
+; Requires TextReplace plugin installed in NSIS and !include "TextReplace.nsh" in main nsi
+;
+; Usage: ${ReplaceInFile} SOURCE_FILE SEARCH_TEXT REPLACEMENT
+; or use ReplaceInFileCS for case-sensitive (use when possible, it's faster)
+; No return variable.  Error will be set if unable to do the replacement (invalid file, locked file, etc)
+
+Function ReplaceInFile
+	Exch $0 ;REPLACEMENT
+	Exch
+	Exch $1 ;SEARCH_TEXT
+	Exch 2
+	Exch $2 ;SOURCE_FILE
+	Exch 3
+	Exch $3 ;CASE_INSENSITIVE
+	Push $4 ;NEW_FILE
+	Push $5 ;RETURN_VALUE
+	
+	StrCpy $4 `$2.OldReplaceInFile`
+	
+	${textreplace::ReplaceInFile} "$2" "$4" "$1" "$0" "$3 /C=0" $5
+	
+	IntCmp $5 0 StackCleanup ReturnError RenameToOriginal
+	
+	ReturnError:
+		SetErrors
+		Goto StackCleanup
+	
+	RenameToOriginal:
+		Delete $2
+		Rename $4 $2
+	
+	StackCleanup:
+		Pop $5
+		Pop $4
+		Pop $3
+		Pop $0
+		Pop $1
+		Pop $2
+
+		${textreplace::Unload}
+FunctionEnd
+
+!macro ReplaceInFileCS SOURCE_FILE SEARCH_TEXT REPLACEMENT
+	Push `/S=1`
+	Push `${SOURCE_FILE}`
+	Push `${SEARCH_TEXT}`
+	Push `${REPLACEMENT}`
+	Call ReplaceInFile
+!macroend
+
+!macro ReplaceInFile SOURCE_FILE SEARCH_TEXT REPLACEMENT
+	Push `/S=0`
+	Push `${SOURCE_FILE}`
+	Push `${SEARCH_TEXT}`
+	Push `${REPLACEMENT}`
+	Call ReplaceInFile
+!macroend
+
+!define ReplaceInFileCS '!insertmacro "ReplaceInFileCS"'
+
 !define ReplaceInFile '!insertmacro "ReplaceInFile"'
\ No newline at end of file
diff --git a/packaging/win32/portable/help.html b/packaging/win32/portable/help.html
index eec89c5bb..7e7ee0fbf 100644
--- a/packaging/win32/portable/help.html
+++ b/packaging/win32/portable/help.html
@@ -1,178 +1,178 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="en-US"><head><title>Inkscape Portable Help</title>

-	<link rel="alternate" type="application/rss+xml" title="PortableApps.com" href="http://portableapps.com/feeds/general">

-	<link rel="SHORTCUT ICON" href="Other/Help/images/favicon.ico">

-<style>body {

-	font-family: Verdana,Arial,Helvetica,sans-serif;

-	font-size: 76%;

-	color: #000;

-	margin: 20px;

-	background: #E6E8EA;

-	text-align: center;

-}

-a

-{

-	color: #B31616;

-	font-weight: bold;

-}

-a:link {

-	}

-a:visited {

-	}

-a:active {

-	}

-a:hover {

-	color: red;

-	}

-h1, h2, h3, h4, h5, h6 {

-	font-family: Arial, sans-serif;

-	font-weight: normal;

-}

-h1 {

-	color: #B31616;

-	font-weight: bold;

-	letter-spacing: -2px;

-	font-size: 2.2em;

-	border-bottom: 1px solid silver;

-	padding-bottom: 5px;

-	}

-h2 {

-	font-size: 1.5em;

-	border-bottom: 1px solid silver;

-	padding-bottom: 3px;

-	clear: both;

-	}

-h3 {

-	font-size: 1.2em;

-	}

-h4 {

-	font-size: 1.1em;

-	}

-h5 {

-	font-size: 1.0em;

-	}

-h6 {

-	font-size: 0.8em;

-	}

-img {

-	border: 0;

-	}

-ol, ul, li {

-	font-size: 1.0em;

-	}

-p, table, tr, td, th {

-	font-size: 1.0em;

-	}

-pre {

-	font-family: Courier New,Courier,monospace;

-	font-size: 1.0em;

-	}

-strong, b {

-	font-weight: bold;

-	}

-table, tr, td {

-	font-size: 1.0em;

-	border-collapse: collapse;

-}

-td, th {

-	border: 1px solid #aaaaaa;

-	border-collapse: collapse;

-	padding: 3px;

-}

-th {

-	background: #3667A8;

-	color: white;

-}

-ol ol {

-	list-style-type: lower-alpha;

-}

-.content {

-	text-align: left;

-	margin-left: auto;

-	margin-right: auto;

-	width: 780px;

-	background-color: #FFFFFF;

-	border-left: 1px solid Black;

-	border-right: 1px solid Black;

-	padding: 12px 30px;

-	line-height: 150%;

-}

-.logo {

-	background: #ffffff url("Other/Help/images/help_background_header.png") repeat-x;

-	width: 840px;

-	margin-top: 20px;

-	margin-left: auto;

-	margin-right: auto;

-	text-align: left;

-	border-right: 1px solid black;

-	border-left: 1px solid black;

-}

-.footer {

-	background: #ffffff url("Other/Help/images/help_background_footer.png") repeat-x;

-	width: 840px;

-	height: 16px;

-	margin-left: auto;

-	margin-right: auto;

-	text-align: left;

-	border-right: 1px solid black;

-	border-left: 1px solid black;

-}

-.logo img {

-	padding-left: 0px;

-	border: none;

-	position: relative;

-	top: -4px;

-}

-* html .content {

-	width: 760px;

-}

-* html .logo, * html .footer {

-	width: 820px;

-}

-.content h1 {

-	margin: 0px;

-}

-h1.hastagline {

-	border: 0;

-}

-h2.tagline {

-	color: #747673;

-	clear: none;

-	margin-top: 0em;

-}

-/*printer styles*/ 

-@media print{ 

-body, .content {margin: 0; padding: 0;}

-.navigation, .locator, .footer a, .message, .footer-links {display:none;} 

-.footer, .content, .header {border: none;}

-a {text-decoration: none; font-weight: normal; color: black;}

-}</style>

-</head>

-<body>

-<div class="logo"><a href="http://portableapps.com/"><img src="Other/Help/images/help_logo_top.png" width="229" height="47" alt="PortableApps.com - Your Digital Life, Anywhere"></a></div>

-<div class="content">

-<h1 class="hastagline">Inkscape Portable Help</h1>

-<h2 class="tagline">amazing vector graphics - everywhere!</h2>

-<p>Inkscape Portable is the popular Inkscape vector graphics editor packaged with a PortableApps.com launcher as a <a href="http://portableapps.com/about/what_is_a_portable_app">portable app</a>, to help you design on your iPod, USB flash drive, portable hard drive, etc.  It has all the same great features as Inkscape including editing vector graphics, designing things and more. Plus, it leaves no personal information behind on the machine you run it on, so you can take it with you wherever you go.  <a href="http://inkscape.org/">Learn more about Inkscape...</a></p>

+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en-US"><head><title>Inkscape Portable Help</title>
+	<link rel="alternate" type="application/rss+xml" title="PortableApps.com" href="http://portableapps.com/feeds/general">
+	<link rel="SHORTCUT ICON" href="Other/Help/images/favicon.ico">
+<style>body {
+	font-family: Verdana,Arial,Helvetica,sans-serif;
+	font-size: 76%;
+	color: #000;
+	margin: 20px;
+	background: #E6E8EA;
+	text-align: center;
+}
+a
+{
+	color: #B31616;
+	font-weight: bold;
+}
+a:link {
+	}
+a:visited {
+	}
+a:active {
+	}
+a:hover {
+	color: red;
+	}
+h1, h2, h3, h4, h5, h6 {
+	font-family: Arial, sans-serif;
+	font-weight: normal;
+}
+h1 {
+	color: #B31616;
+	font-weight: bold;
+	letter-spacing: -2px;
+	font-size: 2.2em;
+	border-bottom: 1px solid silver;
+	padding-bottom: 5px;
+	}
+h2 {
+	font-size: 1.5em;
+	border-bottom: 1px solid silver;
+	padding-bottom: 3px;
+	clear: both;
+	}
+h3 {
+	font-size: 1.2em;
+	}
+h4 {
+	font-size: 1.1em;
+	}
+h5 {
+	font-size: 1.0em;
+	}
+h6 {
+	font-size: 0.8em;
+	}
+img {
+	border: 0;
+	}
+ol, ul, li {
+	font-size: 1.0em;
+	}
+p, table, tr, td, th {
+	font-size: 1.0em;
+	}
+pre {
+	font-family: Courier New,Courier,monospace;
+	font-size: 1.0em;
+	}
+strong, b {
+	font-weight: bold;
+	}
+table, tr, td {
+	font-size: 1.0em;
+	border-collapse: collapse;
+}
+td, th {
+	border: 1px solid #aaaaaa;
+	border-collapse: collapse;
+	padding: 3px;
+}
+th {
+	background: #3667A8;
+	color: white;
+}
+ol ol {
+	list-style-type: lower-alpha;
+}
+.content {
+	text-align: left;
+	margin-left: auto;
+	margin-right: auto;
+	width: 780px;
+	background-color: #FFFFFF;
+	border-left: 1px solid Black;
+	border-right: 1px solid Black;
+	padding: 12px 30px;
+	line-height: 150%;
+}
+.logo {
+	background: #ffffff url("Other/Help/images/help_background_header.png") repeat-x;
+	width: 840px;
+	margin-top: 20px;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+	border-right: 1px solid black;
+	border-left: 1px solid black;
+}
+.footer {
+	background: #ffffff url("Other/Help/images/help_background_footer.png") repeat-x;
+	width: 840px;
+	height: 16px;
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+	border-right: 1px solid black;
+	border-left: 1px solid black;
+}
+.logo img {
+	padding-left: 0px;
+	border: none;
+	position: relative;
+	top: -4px;
+}
+* html .content {
+	width: 760px;
+}
+* html .logo, * html .footer {
+	width: 820px;
+}
+.content h1 {
+	margin: 0px;
+}
+h1.hastagline {
+	border: 0;
+}
+h2.tagline {
+	color: #747673;
+	clear: none;
+	margin-top: 0em;
+}
+/*printer styles*/ 
+@media print{ 
+body, .content {margin: 0; padding: 0;}
+.navigation, .locator, .footer a, .message, .footer-links {display:none;} 
+.footer, .content, .header {border: none;}
+a {text-decoration: none; font-weight: normal; color: black;}
+}</style>
+</head>
+<body>
+<div class="logo"><a href="http://portableapps.com/"><img src="Other/Help/images/help_logo_top.png" width="229" height="47" alt="PortableApps.com - Your Digital Life, Anywhere"></a></div>
+<div class="content">
+<h1 class="hastagline">Inkscape Portable Help</h1>
+<h2 class="tagline">amazing vector graphics - everywhere!</h2>
+<p>Inkscape Portable is the popular Inkscape vector graphics editor packaged with a PortableApps.com launcher as a <a href="http://portableapps.com/about/what_is_a_portable_app">portable app</a>, to help you design on your iPod, USB flash drive, portable hard drive, etc.  It has all the same great features as Inkscape including editing vector graphics, designing things and more. Plus, it leaves no personal information behind on the machine you run it on, so you can take it with you wherever you go.  <a href="http://inkscape.org/">Learn more about Inkscape...</a></p>
 
-<p><a href="http://inkscape.org/donate.php"><img src="Other/Help/images/donation_button.png" width="110" height="23" border="0" align="top" alt="Make a Donation"></a> - Support Inkscape Development</p>

-<p><a href="http://portableapps.com/donate"><img src="Other/Help/images/donation_button.png" width="110" height="23" border="0" align="top" alt="Make a Donation"></a> - Support PortableApps.com's Hosting and Development</p>

-

-<p><a href="http://inkscape.org/">Go to the Inkscape Portable Homepage &gt;&gt;</a></p>

-

-<p><a href="http://PortableApps.com/">Get more portable apps at PortableApps.com</a></p>

-

-<p>This software is OSI Certified Open Source Software. OSI Certified is a certification mark of the Open Source Initiative.</p>

-

-<h2>Portable App Issues</h2>

-<ul>

-	<li><a href="http://portableapps.com/support/portable_app#downloading">Downloading a Portable App</a></li>

-	<li><a href="http://portableapps.com/support/portable_app#installing">Installing a Portable App</a></li>

-	<li><a href="http://portableapps.com/support/portable_app#using">Using a Portable App</a></li>

-	<li><a href="http://portableapps.com/support/portable_app#upgrading">Upgrading a Portable App</a></li>

-</ul>

-<p>You can read about advanced configuration options for the Inkscape Portable launcher in its <a href="Other\Source\Readme.txt">readme file</a>.

-</div>

-<div class="footer"></div>

-</body>

-</html>

+<p><a href="http://inkscape.org/donate.php"><img src="Other/Help/images/donation_button.png" width="110" height="23" border="0" align="top" alt="Make a Donation"></a> - Support Inkscape Development</p>
+<p><a href="http://portableapps.com/donate"><img src="Other/Help/images/donation_button.png" width="110" height="23" border="0" align="top" alt="Make a Donation"></a> - Support PortableApps.com's Hosting and Development</p>
+
+<p><a href="http://inkscape.org/">Go to the Inkscape Portable Homepage &gt;&gt;</a></p>
+
+<p><a href="http://PortableApps.com/">Get more portable apps at PortableApps.com</a></p>
+
+<p>This software is OSI Certified Open Source Software. OSI Certified is a certification mark of the Open Source Initiative.</p>
+
+<h2>Portable App Issues</h2>
+<ul>
+	<li><a href="http://portableapps.com/support/portable_app#downloading">Downloading a Portable App</a></li>
+	<li><a href="http://portableapps.com/support/portable_app#installing">Installing a Portable App</a></li>
+	<li><a href="http://portableapps.com/support/portable_app#using">Using a Portable App</a></li>
+	<li><a href="http://portableapps.com/support/portable_app#upgrading">Upgrading a Portable App</a></li>
+</ul>
+<p>You can read about advanced configuration options for the Inkscape Portable launcher in its <a href="Other\Source\Readme.txt">readme file</a>.
+</div>
+<div class="footer"></div>
+</body>
+</html>