Packaging: Merge all fixes from 0.92.x branch for NSIS and WiX installers (Windows .exe and .msi)

(bzr r15245)

49 files changed, 3426 insertions, 2476 deletions

diff --git a/packaging/win32/MessageBox.txt b/packaging/win32/MessageBox.txt
deleted file mode 100644
index c2aa963d6..000000000
--- a/packaging/win32/MessageBox.txt
+++ /dev/null
@@ -1,186 +0,0 @@
-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
deleted file mode 100644
index f859ec7ad..000000000
--- a/packaging/win32/RequireLatestNSIS.nsh
+++ /dev/null
@@ -1,9 +0,0 @@
-!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
deleted file mode 100644
index e4c6961cd..000000000
--- a/packaging/win32/VersionCompleteXXXX.nsh
+++ /dev/null
@@ -1,47 +0,0 @@
-; 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/inkscape.nsi b/packaging/win32/inkscape.nsi
index 7948e4b85..9f2c00727 100755
--- a/packaging/win32/inkscape.nsi
+++ b/packaging/win32/inkscape.nsi
@@ -2,13 +2,13 @@
 ; ==========================
 ; This file generates the Inkscape installer, which is currently the
 ; preferred deployment method on Windows.
-; 1. Install NSIS 2.46 or later on Windows (2.45 has a !searchparse bug
-;    which breaks it and earlier doesn't support Windows 7 properly, and
-;    cross-compilation probably won't work due to some !system magic)
+; 1. Install NSIS 3.0 or later (http://nsis.sourceforge.net/)
 ; 2. Compile Inkscape (http://wiki.inkscape.org/wiki/index.php/Win32Port)
-; 3. Compile this file with NSIS. There should be no need to set version
-;    numbers in this file as it gets them from the Bazaar branch info and
-;    ..\..\src\inkscape-version.cpp. However, if the version number comes
+; 3. Compile this file with NSIS.
+;
+;    There should be no need to set version  numbers in this file as it
+;    gets them from the Bazaar branch info and inkscape.rc or
+;    inkscape-version.cpp respectively. However, if the version number comes
 ;    out wrong or this script didn't compile properly then you can define
 ;    INKSCAPE_VERSION by uncommenting the next line and setting the correct
 ;    value:
@@ -18,47 +18,48 @@
        !define RELEASE_REVISION 1
 
 ; There should never be any need for packagers to touch anything below
-; this line.  That's my job - Chris Morgan
+; this line. Otherwise file a bug or write to the mailing list.
+
+
+; Define this to make it build quickly, not including any of the files or code in the sections,
+; for quick testing of features of the installer and development thereof.
+;!define DUMMYINSTALL
+
 
 ; Installer code {{{1
-; Compression and admin requirement {{{2
+; Unicode, compression and admin requirement {{{2
+Unicode true
 SetCompressor /SOLID lzma
 SetCompressorDictSize 32
 RequestExecutionLevel admin
 
 ; Include required files {{{2
-!include RequireLatestNSIS.nsh
-!include ifexist.nsh
-!include VersionCompleteXXXX.nsh
 !include LogicLib.nsh
 !include Sections.nsh
-
-!macro !redef VAR VAL
-  !define _!redef_${VAR} `${VAL}`
-  !ifdef ${VAR}
-    !undef ${VAR}
-  !endif
-  !define ${VAR} `${VAL}`
-  !undef _!redef_${VAR}
-!macroend
-!define !redef `!insertmacro !redef`
+!include macros\ifexist.nsh
+!include macros\RequireLatestNSIS.nsh
+!include macros\SHMessageBoxCheck.nsh
+!include macros\VersionCompleteXXXX.nsh
+!include languages\_language_lists.nsh
 
 ; Advanced Uninstall Log {{{3
 ; We're abusing this script terribly and it's time to fix the broken uninstaller.
 ; However, for the moment, this is what we're using.
 !define INSTDIR_REG_ROOT HKLM
 !define INSTDIR_REG_KEY "${UNINST_KEY}"
-!include AdvUninstLog.nsh
-!insertmacro INTERACTIVE_UNINSTALL
+!include macros\AdvUninstLog.nsh
+;!insertmacro INTERACTIVE_UNINSTALL ; not needed anymore since we have our own uninstall logic; conflicts with other macros
 
 ; Initialise NSIS plug-ins {{{3
-; The plugins used are md5dll and messagebox
-!addplugindir .
+; The plugin used is md5dll
+!addplugindir plugins
 
 ; FileFunc bits and pieces {{{3
 !include FileFunc.nsh
 !insertmacro GetParameters
+!insertmacro GetSize
 !insertmacro GetOptions
+!insertmacro Locate
 !insertmacro un.GetParent
 
 ; User interface {{{3
@@ -70,6 +71,7 @@ RequestExecutionLevel admin
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP header.bmp
 !define MUI_WELCOMEFINISHPAGE_BITMAP welcomefinish.bmp
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP welcomefinish.bmp
 !define MUI_COMPONENTSPAGE_SMALLDESC
 
 ; Pages {{{4
@@ -84,10 +86,10 @@ LicenseForceSelection off
 !insertmacro MUI_PAGE_LICENSE ..\..\Copying
 ; Components page {{{6
 !insertmacro MUI_PAGE_COMPONENTS
-; InstType "$(Full)"
-; InstType "$(Optimal)"
-; InstType "$(Minimal)"
-; Directory page {{{6
+InstType "$(Full)"
+InstType "$(Optimal)"
+InstType "$(Minimal)"
+;Directory page {{{6
 !insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page {{{6
 !insertmacro MUI_PAGE_INSTFILES
@@ -103,6 +105,7 @@ ShowUninstDetails hide
 !insertmacro MUI_UNPAGE_FINISH
 
 ; Localization {{{3
+!define LANGFILE_LANGDLL_FMT "%ENGNAME% / %NATIVENAME%" ; include English name in language selection dialog
 ; See also the "Languages sections" SectionGroup lower down.
 !insertmacro MUI_RESERVEFILE_LANGDLL
 ;TODO: check if `!insertmacro LANGFILE "English" "English"`-style lines are needed (don't think it should be due to MUI_LANGUAGE)
@@ -111,46 +114,47 @@ ShowUninstDetails hide
 !verbose 3
 !insertmacro MUI_LANGUAGE "English"
 !insertmacro LANGFILE_INCLUDE "languages\English.nsh"
-!macro INKLANGFILE _LANG
-  !insertmacro MUI_LANGUAGE "${_LANG}"
-  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "languages\${_LANG}.nsh" "languages\English.nsh"
+!macro INKLANGFILE  LocaleName LocaleID
+  !insertmacro MUI_LANGUAGE "${LocaleName}"
+  !insertmacro LANGFILE_INCLUDE_WITHDEFAULT "languages\${LocaleName}.nsh" "languages\English.nsh"
 !macroend
-!insertmacro INKLANGFILE Breton
-!insertmacro INKLANGFILE Catalan
-!insertmacro INKLANGFILE Czech
-!insertmacro INKLANGFILE Danish
-!insertmacro INKLANGFILE Dutch
-!insertmacro INKLANGFILE Finnish
-!insertmacro INKLANGFILE French
-!insertmacro INKLANGFILE Galician
-!insertmacro INKLANGFILE German
-!insertmacro INKLANGFILE Greek
-!insertmacro INKLANGFILE Indonesian
-!insertmacro INKLANGFILE Icelandic
-!insertmacro INKLANGFILE Italian
-!insertmacro INKLANGFILE Japanese
-!insertmacro INKLANGFILE Polish
-!insertmacro INKLANGFILE Portuguese
-!insertmacro INKLANGFILE PortugueseBR
-!insertmacro INKLANGFILE Romanian
-!insertmacro INKLANGFILE Russian
-!insertmacro INKLANGFILE Slovak
-!insertmacro INKLANGFILE Slovenian
-!insertmacro INKLANGFILE Spanish
-!insertmacro INKLANGFILE SimpChinese
-!insertmacro INKLANGFILE TradChinese
-!insertmacro INKLANGFILE Ukrainian
+; include list of available installer translations from /languages/_language_lists.nsh
+!insertmacro INSTALLER_TRANSLATIONS INKLANGFILE
 !verbose pop
 
 ReserveFile inkscape.nsi.uninstall
-ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
+ReserveFile /plugin UserInfo.dll
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 
 ; #######################################
 ; SETTINGS
 ; #######################################
 
+; Find inkscape distribution directory (uncomment line below to manually define)
+;!define INKSCAPE_DIST_DIR ..\..\inkscape
+!ifdef INKSCAPE_DIST_DIR
+  ${!ifnexist} ${INKSCAPE_DIST_DIR}\inkscape.exe
+    !error "inkscape.exe not found in INKSCAPE_DIST_DIR ('${INKSCAPE_DIST_DIR}')"
+!endif
+!ifndef INKSCAPE_DIST_DIR
+  ${!defineifexist} ${INKSCAPE_DIST_DIR}\inkscape.exe INKSCAPE_DIST_DIR ..\..\inkscape ; btool default
+!endif
+!ifndef INKSCAPE_DIST_DIR
+  ${!defineifexist} ..\..\build\inkscape\inkscape.exe INKSCAPE_DIST_DIR ..\..\build\inkscape ; cmake default
+!endif
+!ifndef INKSCAPE_DIST_DIR
+  !error "Couldn't find inkscape distribution directory in neither ..\..\inkscape nor ..\..\build\inkscape"
+!endif
+!echo `Bundling compiled Inkscape files from ${INKSCAPE_DIST_DIR}`
+
 ; Product details (version, name, registry keys etc.) {{{2
+; Try to find version number in inkscape.rc first (e.g. 0.92pre1) {{{3
+!ifndef INKSCAPE_VERSION
+  !searchparse /noerrors /file ..\..\src\inkscape.rc `VALUE "ProductVersion", "` INKSCAPE_VERSION `"`
+  !ifdef INKSCAPE_VERSION
+    !echo `Got version number from ..\..\src\inkscape.rc: ${INKSCAPE_VERSION}`
+  !endif
+!endif
 ; Find the version number in inkscape-version.cpp (e.g. 0.47+devel) {{{3
 !ifndef INKSCAPE_VERSION
   ; Official release format (no newlines)
@@ -159,15 +163,29 @@ ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
     ; Other format; sorry, it has to be done in two steps.
     !searchparse /noerrors /file ..\..\src\inkscape-version.cpp `char const *version_string = "` INKSCAPE_VERSION `";`
     !searchparse /noerrors `${INKSCAPE_VERSION}` `` INKSCAPE_VERSION ` r` BZR_REVISION
-    !ifndef INKSCAPE_VERSION
-      !error "INKSCAPE_VERSION not defined and unable to get version number from ..\..\src\inkscape-version.cpp!"
-    !endif
   !endif
+  !ifdef INKSCAPE_VERSION
+    !echo `Got version number from ..\..\src\inkscape-version.cpp: ${INKSCAPE_VERSION}`
+  !endif
+!endif
+!ifndef INKSCAPE_VERSION
+  !error "INKSCAPE_VERSION not defined and unable to get version number from either ..\..\src\inkscape.rc or ..\..\src\inkscape-version.cpp!"
 !endif
-!echo `Got version number from ..\..\src\inkscape-version.cpp: ${INKSCAPE_VERSION}`
 !define FILENAME Inkscape-${INKSCAPE_VERSION}
 !define BrandingText `Inkscape ${INKSCAPE_VERSION}`
 
+; Detect architecture of the build
+${!ifexist} ${INKSCAPE_DIST_DIR}\gspawn-win32-helper.exe
+  !define BITNESS 32
+!endif
+${!ifexist} ${INKSCAPE_DIST_DIR}\gspawn-win64-helper.exe
+  !define BITNESS 64
+  !define /redef FILENAME `${FILENAME}-x64` ; add architecture to filename for 64-bit builds
+!endif
+!ifndef BITNESS
+  !error "Could not detect architecture (BITNESS) of the Inkscape build"
+!endif
+
 ; Check for the Bazaar revision number for lp:inkscape {{{3
 ${!ifexist} ..\..\.bzr\branch\last-revision
   !if `${BZR_REVISION}` == ``
@@ -196,31 +214,30 @@ ${!ifexist} ..\..\.bzr\branch\last-revision
 
 ; Handle display version number and complete X.X version numbers into X.X.X.X {{{3
 !ifdef DEVEL & BZR_REVISION
-  ${!redef} FILENAME `${FILENAME}-r${BZR_REVISION}`
-  ${!redef} BrandingText `${BrandingText} r${BZR_REVISION}`
+  !define /redef FILENAME `${FILENAME}-r${BZR_REVISION}`
+  !define /redef BrandingText `${BrandingText} r${BZR_REVISION}`
   !define VERSION_X.X.X.X_REVISION ${BZR_REVISION}
 ; Handle the installer revision number {{{4
 !else ifdef RELEASE_REVISION
-  ${!redef} FILENAME `${FILENAME}-${RELEASE_REVISION}`
+  !define /redef FILENAME `${FILENAME}-${RELEASE_REVISION}`
   ; If we wanted the branding text to be like "Inkscape 0.48pre1 r9505" this'd do it.
   ;!ifdef BZR_REVISION
-  ;  ${!redef} BrandingText `${BrandingText} r${BZR_REVISION}`
+  ;  !define /redef BrandingText `${BrandingText} r${BZR_REVISION}`
   ;!endif
   !if `${RELEASE_REVISION}` != `1`
-    ${!redef} BrandingText `${BrandingText}, revision ${RELEASE_REVISION}`
+    !define /redef BrandingText `${BrandingText}, revision ${RELEASE_REVISION}`
   !endif
   !define VERSION_X.X.X.X_REVISION ${RELEASE_REVISION}
 !else
   !define VERSION_X.X.X.X_REVISION 0
 !endif
 
-${VersionCompleteXXXN} ${INKSCAPE_VERSION_NUMBER} VERSION_X.X.X.X ${VERSION_X.X.X.X_REVISION}
+${VersionCompleteXXXRevision} ${INKSCAPE_VERSION_NUMBER} VERSION_X.X.X.X ${VERSION_X.X.X.X_REVISION}
 
 ; Product definitions {{{3
 !define PRODUCT_NAME "Inkscape" ; TODO: fix up the language files to not use this and kill this line
 !define INSTDIR_KEY "Software\Microsoft\Windows\CurrentVersion\App Paths\inkscape.exe"
 !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape"
-;!define DUMMYINSTALL ; Define this to make it build quickly, not including any of the files or code in the sections, for quick testing of features of the installer and development thereof.
 !define _FILENAME ${FILENAME}.exe
 !undef FILENAME
 !define FILENAME ${_FILENAME}
@@ -231,19 +248,22 @@ Name              `Inkscape`
 Caption           `Inkscape - $(CaptionDescription)`
 BrandingText      `${BrandingText}`
 OutFile           `${FILENAME}`
-InstallDir        "$PROGRAMFILES\Inkscape"
+!if ${BITNESS} = 32
+  InstallDir        "$PROGRAMFILES32\Inkscape"
+!else
+  InstallDir        "$PROGRAMFILES64\Inkscape"
+!endif
 InstallDirRegKey  HKLM "${INSTDIR_KEY}" ""
 
 ; Version information {{{3
 VIProductVersion ${VERSION_X.X.X.X}
-VIAddVersionKey ProductName Inkscape
-VIAddVersionKey Comments "Licensed under the GNU GPL"
-VIAddVersionKey CompanyName inkscape.org
-VIAddVersionKey LegalCopyright "© 2016 Inkscape"
-VIAddVersionKey FileDescription Inkscape
-VIAddVersionKey FileVersion ${VERSION_X.X.X.X}
-VIAddVersionKey ProductVersion ${VERSION_X.X.X.X}
-VIAddVersionKey InternalName Inkscape
+VIAddVersionKey /LANG=0 ProductName "Inkscape"
+VIAddVersionKey /LANG=0 Comments "Licensed under the GNU GPL"
+VIAddVersionKey /LANG=0 CompanyName "Inkscape Project"
+VIAddVersionKey /LANG=0 LegalCopyright "© 2016 Inkscape Project"
+VIAddVersionKey /LANG=0 FileDescription "Inkscape Vector Graphics Editor"
+VIAddVersionKey /LANG=0 FileVersion ${VERSION_X.X.X.X}
+VIAddVersionKey /LANG=0 ProductVersion ${VERSION_X.X.X.X}
 
 ; Variables {{{2
 Var askMultiUser
@@ -266,8 +286,15 @@ Var CMDARGS
     ReadRegStr $2 HKU "$1\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
     ${IfThen} $2 == "" ${|} ${Continue} ${|}
     DetailPrint "Removing $2\Inkscape"
+
     Delete $2\Inkscape\preferences.xml
     Delete $2\Inkscape\extension-errors.log
+
+    RMDir  $2\Inkscape\extensions
+    RMDir  $2\Inkscape\icons
+    RMDir  $2\Inkscape\keys
+    RMDir  $2\Inkscape\palettes
+    RMDir  $2\Inkscape\templates
     RMDir  $2\Inkscape
   ${Loop}
 !macroend
@@ -291,72 +318,77 @@ Section -removeInkscape ; Hidden, mandatory section to clean a previous installa
 !endif
 SectionEnd ; -removeInkscape }}}
 
-Section $(Core) SecCore ; Mandatory Inkscape core files section {{{
+Section "$(Core)" SecCore ; Mandatory Inkscape core files section {{{
   SectionIn 1 2 3 RO
 !ifndef DUMMYINSTALL
   DetailPrint "Installing Inkscape core files..."
+
   SetOutPath $INSTDIR
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  SetOverwrite on
-  SetAutoClose false
-
-  File           /a    ..\..\inkscape\ink*.exe
-  File           /a    ..\..\inkscape\inkscape.com
-  File           /a    ..\..\inkscape\AUTHORS
-  File           /a    ..\..\inkscape\COPYING
-  File           /a    ..\..\inkscape\COPYING.LIB
-  File           /a    ..\..\inkscape\NEWS
-  File           /a    ..\..\inkscape\gspawn-win32-helper.exe
-  File           /a    ..\..\inkscape\gspawn-win32-helper-console.exe
-  File /nonfatal /a    ..\..\inkscape\HACKING.txt
-  File           /a    ..\..\inkscape\README
-  File /nonfatal /a    ..\..\inkscape\README.txt
-  File           /a    ..\..\inkscape\TRANSLATORS
-  File /nonfatal /a /r ..\..\inkscape\data
-  File /nonfatal /a /r ..\..\inkscape\doc
-  File /nonfatal /a /r ..\..\inkscape\plugins
-  File /nonfatal /a /r /x *.??*.???* /x examples /x tutorials ..\..\inkscape\share
+  File           /a    ${INKSCAPE_DIST_DIR}\ink*.exe
+  File /nonfatal /a    ${INKSCAPE_DIST_DIR}\inkscape.com ; not created as of Inkscape 0.92pre1
+  File           /a    ${INKSCAPE_DIST_DIR}\AUTHORS
+  File           /a    ${INKSCAPE_DIST_DIR}\COPYING
+  File           /a    ${INKSCAPE_DIST_DIR}\GPL2.txt
+  File           /a    ${INKSCAPE_DIST_DIR}\GPL3.txt
+  File           /a    ${INKSCAPE_DIST_DIR}\LGPL2.1.txt
+  File           /a    ${INKSCAPE_DIST_DIR}\NEWS
+  File           /a    ${INKSCAPE_DIST_DIR}\gspawn-win${BITNESS}-helper.exe
+  File           /a    ${INKSCAPE_DIST_DIR}\gspawn-win${BITNESS}-helper-console.exe
+  File           /a    ${INKSCAPE_DIST_DIR}\README
+  File           /a    ${INKSCAPE_DIST_DIR}\TRANSLATORS
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-  ; this files are added because it slips through the filter
-  SetOutPath $INSTDIR\share\branding
+
+  SetOutPath $INSTDIR\data
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /a ..\..\inkscape\share\branding\draw-freely.ru.svg
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\data\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-  SetOutPath $INSTDIR\share\icons
+  SetOutPath $INSTDIR\doc
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /a ..\..\inkscape\share\icons\inkscape.file.png
-  File /a ..\..\inkscape\share\icons\inkscape.file.svg
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\doc\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-  SetOutPath $INSTDIR\share\extensions
+  SetOutPath $INSTDIR\plugins
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /a ..\..\inkscape\share\extensions\inkscape.extension.rng
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\plugins\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-  SetOutPath $INSTDIR\share\extensions\test
+  SetOutPath $INSTDIR\modules
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /a ..\..\inkscape\share\extensions\test\inkwebjs-move.test.svg
-  File /a ..\..\inkscape\share\extensions\test\test_template.py.txt
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\modules\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-  SetOutPath $INSTDIR\modules
+
+  ;exclude everything from /share for which we have separate sections below
+  SetOutPath $INSTDIR\share
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /nonfatal /a /r ..\..\inkscape\modules\*.*
+  File /nonfatal /a /r /x *.??*.???* /x examples /x extensions /x locale /x tutorials ${INKSCAPE_DIST_DIR}\share\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-  SetOutPath $INSTDIR\python
+  ; this files are added because it slips through the filter
+  SetOutPath $INSTDIR\share\icons
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /nonfatal /a /r ..\..\inkscape\python\*.*
+  File /a ${INKSCAPE_DIST_DIR}\share\icons\inkscape.file.png
+  File /a ${INKSCAPE_DIST_DIR}\share\icons\inkscape.file.svg
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  SetOutPath $INSTDIR\share\templates
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /a ${INKSCAPE_DIST_DIR}\share\templates\default.en_US.svg
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 !endif
 SectionEnd ; SecCore }}}
 
-Section $(GTKFiles) SecGTK ; Mandatory GTK files section {{{
+Section "$(GTKFiles)" SecGTK ; Mandatory GTK files section {{{
   SectionIn 1 2 3 RO
 !ifndef DUMMYINSTALL
   DetailPrint "Installing GTK files..."
   SetOutPath $INSTDIR
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  SetOverwrite on
-  File /a /r ..\..\inkscape\*.dll
-  File /a /r /x locale ..\..\inkscape\lib
-  File /a /r ..\..\inkscape\etc
+  File /a /r /x python ${INKSCAPE_DIST_DIR}\*.dll
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  SetOutPath $INSTDIR\lib
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /a /r /x locale /x aspell-0.60 ${INKSCAPE_DIST_DIR}\lib\*.*
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  SetOutPath $INSTDIR\etc
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /a /r ${INKSCAPE_DIST_DIR}\etc\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 !endif
 SectionEnd ; SecGTK }}}
@@ -368,7 +400,7 @@ Section -SetCurrentUserOnly ; Set the installation to "current user" only by def
 !endif
 SectionEnd ; -SetCurrentUserOnly }}}
 
-Section $(Alluser) SecAlluser ; Then offer the user the option to make it global (default) {{{
+Section "$(Alluser)" SecAlluser ; Then offer the user the option to make it global (default) {{{
   SectionIn 1 2 3
 !ifndef DUMMYINSTALL
   ; disable this option in Win95/Win98/WinME
@@ -378,21 +410,36 @@ Section $(Alluser) SecAlluser ; Then offer the user the option to make it global
 !endif
 SectionEnd ; SecAllUser }}}
 
+Section /o "$(DeletePrefs)" SecPrefs ; Delete user preferences before installation {{{
+!ifndef DUMMYINSTALL
+  !insertmacro delprefs
+!endif
+SectionEnd ; SecPrefs }}}
+
 SectionGroup "$(Shortcuts)" SecShortcuts ; Create shortcuts for the user {{{
 
-Section $(Desktop) SecDesktop ; Desktop shortcut {{{
+Section "$(Startmenu)" SecStartMenu ; Start menu shortcut {{{
+  SectionIn 1 2 3
+!ifndef DUMMYINSTALL
+  CreateShortcut $SMPROGRAMS\Inkscape.lnk $INSTDIR\inkscape.exe
+!endif
+SectionEnd ; SecStartMenu }}}
+
+Section "$(Desktop)" SecDesktop ; Desktop shortcut {{{
+  SectionIn 1 2 3
 !ifndef DUMMYINSTALL
   CreateShortCut $DESKTOP\Inkscape.lnk $INSTDIR\inkscape.exe
 !endif
 SectionEnd ; SecDesktop }}}
 
-Section $(Quicklaunch) SecQuickLaunch ; Quick Launch shortcut {{{
+Section "$(Quicklaunch)" SecQuickLaunch ; Quick Launch shortcut {{{
+  SectionIn 1 2 3
 !ifndef DUMMYINSTALL
   ${IfThen} $QUICKLAUNCH != $TEMP ${|} CreateShortCut $QUICKLAUNCH\Inkscape.lnk $INSTDIR\inkscape.exe ${|}
 !endif
 SectionEnd ; SecQuickLaunch }}}
 
-Section $(SVGWriter) SecSVGWriter ; Register Inkscape as the default application for .svg[z] {{{
+Section "$(SVGWriter)" SecSVGWriter ; Register Inkscape as the default application for .svg[z] {{{
   SectionIn 1 2 3
 !ifndef DUMMYINSTALL
   DetailPrint "Associating SVG files with Inkscape"
@@ -410,7 +457,7 @@ Section $(SVGWriter) SecSVGWriter ; Register Inkscape as the default application
 !endif
 SectionEnd ; SecSVGWriter }}}
 
-Section $(ContextMenu) SecContextMenu ; Put Inkscape in the .svg[z] context menus (but not as default) {{{
+Section "$(ContextMenu)" SecContextMenu ; Put Inkscape in the .svg[z] context menus (but not as default) {{{
   SectionIn 1 2 3
 !ifndef DUMMYINSTALL
   DetailPrint "Adding Inkscape to SVG file context menu"
@@ -434,152 +481,122 @@ SectionEnd ; SecContextMenu }}}
 
 SectionGroupEnd ; SecShortcuts }}}
 
-Section /o "$(DeletePrefs)" SecPrefs ; Delete user preferences before installation {{{
+Section "$(Python)" SecPython ; Python distribution {{{
+  SectionIn 1 2
 !ifndef DUMMYINSTALL
-  !insertmacro delprefs
+  DetailPrint "Installing Python..."
+  SetOutPath $INSTDIR\python
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\python\*.*
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 !endif
-SectionEnd ; SecPrefs }}}
+SectionEnd ; SecPython }}}
 
 SectionGroup "$(Addfiles)" SecAddfiles ; Additional files {{{
 
-Section $(Examples) SecExamples ; Install example SVG files {{{
+Section "$(Extensions)" SecExtensions ; Extensions {{{
   SectionIn 1 2
 !ifndef DUMMYINSTALL
-  SetOutPath $INSTDIR\share
+  DetailPrint "Installing extensions..."
+  SetOutPath $INSTDIR\share\extensions
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /nonfatal /a /r /x *.??*.???* ..\..\inkscape\share\examples
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\share\extensions\*.*
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+!endif
+SectionEnd ; SecExtensions }}}
+
+Section "$(Examples)" SecExamples ; Install example SVG files {{{
+  SectionIn 1 2
+!ifndef DUMMYINSTALL
+  DetailPrint "Installing examples..."
+  SetOutPath $INSTDIR\share\examples
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /nonfatal /a /r /x *.??*.???* ${INKSCAPE_DIST_DIR}\share\examples\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 !endif
 SectionEnd ; SecExamples }}}
 
-Section $(Tutorials) SecTutorials ; Install tutorials {{{
+Section "$(Tutorials)" SecTutorials ; Install tutorials {{{
   SectionIn 1 2
 !ifndef DUMMYINSTALL
-  SetOutPath $INSTDIR\share
+  DetailPrint "Installing tutorials..."
+  SetOutPath $INSTDIR\share\tutorials
   !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /nonfatal /a /r /x *.??*.???* ..\..\inkscape\share\tutorials
+  File /nonfatal /a /r /x *.??*.???* ${INKSCAPE_DIST_DIR}\share\tutorials\*.*
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 !endif
 SectionEnd ; SecTutorials }}}
 
+Section "$(Dictionaries)" SecDictionaries ; Aspell dictionaries {{{
+  SectionIn 1 2
+!ifndef DUMMYINSTALL
+  DetailPrint "Installing dictionaries..."
+  SetOutPath $INSTDIR\lib\aspell-0.60
+  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+  File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\lib\aspell-0.60\*.*
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+!endif
+SectionEnd ; SecDictionaries }}}
+
 SectionGroupEnd ; SecAddfiles }}}
 
 SectionGroup "$(Languages)" SecLanguages ; Languages sections {{{
   !macro Language SecName lng ; A macro to create each section {{{
     Section /o "$(lng_${lng}) (${lng})" Sec${SecName}
-      ;SectionIn 1 2 3
+      SectionIn 1 ; flags will be adjusted below, see LanguageAutoSelect in .onInit
     !ifndef DUMMYINSTALL
-      SetOutPath $INSTDIR
-      !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a ..\..\inkscape\*.${lng}.txt ; FIXME: remove this?  No such files.
-      !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-      SetOutPath $INSTDIR\locale
-      !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a /r ..\..\inkscape\locale\${lng}
-      !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-      SetOutPath $INSTDIR\lib\locale
-      !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a /r ..\..\inkscape\lib\locale\${lng}
-      !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-      SetOutPath $INSTDIR\share\clipart
-      !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a /r ..\..\inkscape\share\clipart\*.${lng}.svg
-      !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-      ; the keyboard tables
-      SetOutPath $INSTDIR\share\screens
+      DetailPrint "Installing translations and translated content for ${SecName} (${lng}) locale..."
+      ; locale folders (/locale, /share/locale /lib/locale)
+      ${!defineifexist} ${INKSCAPE_DIST_DIR}\locale EXISTS 1
+      !ifdef EXISTS
+        !undef EXISTS
+        SetOutPath $INSTDIR\locale\${lng}
+        !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+        File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\locale\${lng}\*.*
+        !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+      !endif
+      ${!defineifexist} ${INKSCAPE_DIST_DIR}\share\locale EXISTS 1
+      !ifdef EXISTS
+        !undef EXISTS
+        SetOutPath $INSTDIR\share\locale\${lng}
+        !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+        File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\share\locale\${lng}\*.*
+        !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+      !endif
+      ${!defineifexist} ${INKSCAPE_DIST_DIR}\lib\locale EXISTS 1
+      !ifdef EXISTS
+        !undef EXISTS
+        SetOutPath $INSTDIR\lib\locale\${lng}
+        !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+        File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\lib\locale\${lng}\*.*
+        !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+      !endif
+
+      ; localized documentation, templates and tutorials
+      SetOutPath $INSTDIR\doc
       !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a /r ..\..\inkscape\share\screens\*.${lng}.svg
+      File /nonfatal /a ${INKSCAPE_DIST_DIR}\doc\*.${lng}.html ; keys.${lng}.html
+      File /nonfatal /a ${INKSCAPE_DIST_DIR}\doc\*.${lng}.txt ; HACKING.${lng}.html
       !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
       SetOutPath $INSTDIR\share\templates
       !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a /r ..\..\inkscape\share\templates\*.${lng}.svg
-      !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-      SetOutPath $INSTDIR\doc
-      !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-      File /nonfatal /a /r ..\..\inkscape\doc\keys.${lng}.xml
-      File /nonfatal /a /r ..\..\inkscape\doc\keys.${lng}.html
+      File /nonfatal /a /r ${INKSCAPE_DIST_DIR}\share\templates\*.${lng}.svg
       !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
       SectionGetFlags ${SecTutorials} $R1
       IntOp $R1 $R1 & ${SF_SELECTED}
       ${If} $R1 >= ${SF_SELECTED}
         SetOutPath $INSTDIR\share\tutorials
         !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-        File /nonfatal /a ..\..\inkscape\share\tutorials\*.${lng}.*
+        File /nonfatal /a ${INKSCAPE_DIST_DIR}\share\tutorials\*.${lng}.*
         !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
       ${EndIf}
     !endif
     SectionEnd
   !macroend ; Language }}}
 
-  ; Now create each section with the Language macro {{{
-  !insertmacro Language Amharic           am
-  !insertmacro Language Arabic            ar
-  !insertmacro Language Azerbaijani       az
-  !insertmacro Language Byelorussian      be
-  !insertmacro Language Bulgarian         bg
-  !insertmacro Language Bengali           bn
-  !insertmacro Language BengaliBangladesh bn_BD
-  !insertmacro Language Breton            br
-  !insertmacro Language Catalan           ca
-  !insertmacro Language CatalanValencia   ca@valencia
-  !insertmacro Language Czech             cs
-  !insertmacro Language Danish            da
-  !insertmacro Language German            de
-  !insertmacro Language Dzongkha          dz
-  !insertmacro Language Greek             el
-  !insertmacro Language EnglishAustralian en_AU
-  !insertmacro Language EnglishCanadian   en_CA
-  !insertmacro Language EnglishBritain    en_GB
-  !insertmacro Language EnglishPiglatin   en_US@piglatin
-  !insertmacro Language Esperanto         eo
-  !insertmacro Language Spanish           es
-  !insertmacro Language SpanishMexico     es_MX
-  !insertmacro Language Estonian          et
-  !insertmacro Language Basque            eu
-  !insertmacro Language Farsi             fa
-  !insertmacro Language French            fr
-  !insertmacro Language Finnish           fi
-  !insertmacro Language Irish             ga
-  !insertmacro Language Galician          gl
-  !insertmacro Language Hebrew            he
-  !insertmacro Language Croatian          hr
-  !insertmacro Language Hungarian         hu
-  !insertmacro Language Armenian          hy
-  !insertmacro Language Indonesian        id
-  !insertmacro Language Icelandic         is
-  !insertmacro Language Italian           it
-  !insertmacro Language Japanese          ja
-  !insertmacro Language Khmer             km
-  !insertmacro Language Korean            ko
-  !insertmacro Language Lithuanian        lt
-  !insertmacro Language Latvian           lv
-  !insertmacro Language Mongolian         mn
-  !insertmacro Language Macedonian        mk
-  !insertmacro Language NorwegianBokmal   nb
-  !insertmacro Language Nepali            ne
-  !insertmacro Language Dutch             nl
-  !insertmacro Language NorwegianNynorsk  nn
-  !insertmacro Language Panjabi           pa
-  !insertmacro Language Polish            pl
-  !insertmacro Language Portuguese        pt
-  !insertmacro Language PortugueseBrazil  pt_BR
-  !insertmacro Language Romanian          ro
-  !insertmacro Language Russian           ru
-  !insertmacro Language Kinyarwanda       rw
-  !insertmacro Language Slovak            sk
-  !insertmacro Language Slovenian         sl
-  !insertmacro Language Albanian          sq
-  !insertmacro Language Serbian           sr
-  !insertmacro Language SerbianLatin      sr@latin
-  !insertmacro Language Swedish           sv
-  !insertmacro Language Telugu            te
-  !insertmacro Language Thai              th
-  !insertmacro Language Turkish           tr
-  !insertmacro Language Ukrainian         uk
-  !insertmacro Language Vietnamese        vi
-  !insertmacro Language SimpChinese       zh_CN
-  !insertmacro Language TradChinese       zh_TW
-  ; }}}
+  ; Now create each section with the Language macro.
+  ; include list of available inkscape translations from /languages/_language_lists.nsh
+  !insertmacro INKSCAPE_TRANSLATIONS Language
 SectionGroupEnd ; SecLanguages }}}
 
 Section -FinalizeInstallation ; Hidden, mandatory section to finalize installation {{{
@@ -593,9 +610,6 @@ Section -FinalizeInstallation ; Hidden, mandatory section to finalize installati
   WriteRegStr SHCTX "${INSTDIR_KEY}" askMultiUser $askMultiUser
   WriteRegStr SHCTX "${INSTDIR_KEY}" User         $User
 
-  ; start menu entries
-  CreateShortcut $SMPROGRAMS\Inkscape.lnk $INSTDIR\inkscape.exe
-
   ; uninstall settings
   ; WriteUninstaller $INSTDIR\uninst.exe
   WriteRegExpandStr SHCTX "${UNINST_KEY}" UninstallString ${UNINST_EXE}
@@ -604,9 +618,16 @@ Section -FinalizeInstallation ; Hidden, mandatory section to finalize installati
   WriteRegStr       SHCTX "${UNINST_KEY}" DisplayName     "Inkscape ${INKSCAPE_VERSION}"
   WriteRegStr       SHCTX "${UNINST_KEY}" DisplayIcon     $INSTDIR\Inkscape.exe,0
   WriteRegStr       SHCTX "${UNINST_KEY}" DisplayVersion  ${INKSCAPE_VERSION}
+  WriteRegStr       SHCTX "${UNINST_KEY}" Publisher       "Inkscape Project"
+  WriteRegStr       SHCTX "${UNINST_KEY}" URLInfoAbout    "https://inkscape.org"
+
   WriteRegDWORD     SHCTX "${UNINST_KEY}" NoModify        1
   WriteRegDWORD     SHCTX "${UNINST_KEY}" NoRepair        1
 
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD     SHCTX "${UNINST_KEY}" EstimatedSize   "$0"
+
   ;create/update log always within .onInstSuccess function
   !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
 
@@ -614,12 +635,16 @@ Section -FinalizeInstallation ; Hidden, mandatory section to finalize installati
   ClearErrors
   FileOpen $0 $INSTDIR\Uninstall.dat r
   FileOpen $9 $INSTDIR\Uninstall.log w
+  FileRead $0 $1 ; read first line (which is the header)
   ${IfNot} ${Errors}
     ${Do}
       ClearErrors
       FileRead $0 $1
       ${IfThen} ${Errors} ${|} ${ExitDo} ${|}
-      StrCpy $1 $1 -2
+      StrCpy $1 $1 -2 ; strip \r\n from path
+      ${If} ${FileExists} $1\*.* ; ignore directories
+        ${Continue}
+      ${EndIf}
       md5dll::GetMD5File /NOUNLOAD $1
       Pop $2
       ${IfThen} $2 != "" ${|} FileWrite $9 "$2  $1$\r$\n" ${|}
@@ -628,7 +653,7 @@ Section -FinalizeInstallation ; Hidden, mandatory section to finalize installati
   FileClose $0
   FileClose $9
   ; Not needed any more
-  Delete $INSTDIR\Uninstall.dat
+  ; Delete $INSTDIR\Uninstall.dat ; actually this is checked for in UNINSTALL.LOG_PREPARE_INSTALL, so keep it for now...
 !endif
 SectionEnd ; -FinalizeInstallation }}}
 
@@ -637,14 +662,18 @@ SectionEnd ; -FinalizeInstallation }}}
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGTK} "$(GTKFilesDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} "$(ShortcutsDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecAlluser} "$(AlluserDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} "$(StartmenuDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktop} "$(DesktopDesc)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecQuicklaunch} "$(QuicklaunchDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecQuickLaunch} "$(QuicklaunchDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSVGWriter} "$(SVGWriterDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecContextMenu} "$(ContextMenuDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPrefs} "$(DeletePrefsDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecPython} "$(PythonDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecAddfiles} "$(AddfilesDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecExtensions} "$(ExtensionsDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecExamples} "$(ExamplesDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTutorials} "$(TutorialsDesc)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDictionaries} "$(DictionariesDesc)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecLanguages} "$(LanguagesDesc)"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END ; Section descriptions }}}
 
@@ -656,42 +685,21 @@ Function .onInit ; initialise the installer {{{2
   ; Language detection {{{
   !insertmacro MUI_LANGDLL_DISPLAY
 
-  !macro LanguageAutoSelect SecName LocaleID
+  !macro LanguageAutoSelect LocaleName LocaleID
     ${If} $LANGUAGE = ${LocaleID}
-      SectionGetFlags ${Sec${SecName}} $0
-      IntOp $0 $0 | ${SF_SELECTED}
-      SectionSetFlags ${Sec${SecName}} $0
+      SectionSetInstTypes ${Sec${LocaleName}} 3 ; this equals binary "011" (which flags the default for sections 1 and 2 but not 3)
+                                                ; and is equivalent to "SectionIn 1 2"
     ${EndIf}
   !macroend
 
+  ; include list for installer autoselection from /languages/_language_lists.nsh
   ; No need for English to be detected as it's the default
-  !insertmacro LanguageAutoSelect Breton        1150
-  !insertmacro LanguageAutoSelect Catalan       1027
-  !insertmacro LanguageAutoSelect Czech         1029
-  !insertmacro LanguageAutoSelect Danish        1030
-  !insertmacro LanguageAutoSelect Dutch         1043
-  !insertmacro LanguageAutoSelect Finnish       1035
-  !insertmacro LanguageAutoSelect French        1036
-  !insertmacro LanguageAutoSelect Galician      1110
-  !insertmacro LanguageAutoSelect German        1031
-  !insertmacro LanguageAutoSelect Greek         1032
-  !insertmacro LanguageAutoSelect Indonesian    1057
-  !insertmacro LanguageAutoSelect Icelandic     861
-  !insertmacro LanguageAutoSelect Italian       1040
-  !insertmacro LanguageAutoSelect Japanese      1041
-  !insertmacro LanguageAutoSelect Polish        1045
-  !insertmacro LanguageAutoSelect Portuguese    2070
-  !insertmacro LanguageAutoSelect PortugueseBrazil  1046
-  !insertmacro LanguageAutoSelect Romanian      1048
-  !insertmacro LanguageAutoSelect Russian       1049
-  !insertmacro LanguageAutoSelect Slovak        1051
-  !insertmacro LanguageAutoSelect Slovenian     1060
-  !insertmacro LanguageAutoSelect Spanish       1034
-  !insertmacro LanguageAutoSelect SimpChinese   2052
-  !insertmacro LanguageAutoSelect TradChinese   1028
-  !insertmacro LanguageAutoSelect Ukrainian     1058
+  !insertmacro INSTALLER_TRANSLATIONS LanguageAutoSelect
   ; End of language detection }}}
 
+  ; ser the second InstType ("Optimal") as default
+  SetCurInstType 1
+
   !insertmacro UNINSTALL.LOG_PREPARE_INSTALL ; prepare advanced uninstallation log script
 
   ;Extract InstallOptions INI files
@@ -740,7 +748,11 @@ Function .onInit ; initialise the installer {{{2
 
   ; Request uninstallation of an old Inkscape installation {{{
   ReadRegStr $R0 HKLM "${UNINST_KEY}" UninstallString
-  ${IfThen} $R0 == "" ${|} ReadRegStr $R0 HKCU "${UNINST_KEY}" UninstallString ${|}
+  ReadRegStr $R1 HKLM "${UNINST_KEY}" DisplayName
+  ${If} $R0 == ""
+    ReadRegStr $R0 HKCU "${UNINST_KEY}" UninstallString
+    ReadRegStr $R1 HKCU "${UNINST_KEY}" DisplayName
+  ${EndIf}
   ${If} $R0 != ""
   ${AndIf} ${Cmd} ${|} MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WANT_UNINSTALL_BEFORE)" /SD IDNO IDYES ${|}
     ExecWait $R0
@@ -752,100 +764,39 @@ Function .onInit ; initialise the installer {{{2
   !verbose 3
   ${GetParameters} $CMDARGS
 
-  !macro Parameter key Section
+  !macro Parameter Section key
     ${GetOptions} $CMDARGS /${key}= $1
     ${If} $1 == OFF
-      SectionGetFlags ${Section} $0
+      SectionGetFlags ${Sec${Section}} $0
       IntOp $2 ${SF_SELECTED} ~
       IntOp $0 $0 & $2
-      SectionSetFlags ${Section} $0
+      SectionSetFlags ${Sec${Section}} $0
     ${EndIf}
     ${If} $1 == ON
-      SectionGetFlags ${Section} $0
+      SectionGetFlags ${Sec${Section}} $0
       IntOp $0 $0 | ${SF_SELECTED}
-      SectionSetFlags ${Section} $0
+      SectionSetFlags ${Sec${Section}} $0
     ${EndIf}
   !macroend
 
-  !insertmacro Parameter GTK            ${SecGTK}
-  !insertmacro Parameter SHORTCUTS      ${secShortcuts}
-  !insertmacro Parameter ALLUSER        ${SecAlluser}
-  !insertmacro Parameter DESKTOP        ${SecDesktop}
-  !insertmacro Parameter QUICKLAUNCH    ${SecQUICKlaunch}
-  !insertmacro Parameter SVGEDITOR      ${SecSVGWriter}
-  !insertmacro Parameter CONTEXTMENUE   ${SecContextMenu}
-  !insertmacro Parameter PREFERENCES    ${SecPrefs}
-  !insertmacro Parameter ADDFILES       ${SecAddfiles}
-  !insertmacro Parameter EXAMPLES       ${SecExamples}
-  !insertmacro Parameter TUTORIALS      ${SecTutorials}
-  !insertmacro Parameter LANGUAGES      ${SecLanguages}
-  !insertmacro Parameter am             ${SecAmharic}
-  !insertmacro Parameter ar             ${SecArabic}
-  !insertmacro Parameter az             ${SecAzerbaijani}
-  !insertmacro Parameter be             ${SecByelorussian}
-  !insertmacro Parameter bg             ${SecBulgarian}
-  !insertmacro Parameter bn             ${SecBengali}
-  !insertmacro Parameter bn_BD          ${SecBengaliBangladesh}
-  !insertmacro Parameter br             ${SecBreton}
-  !insertmacro Parameter ca             ${SecCatalan}
-  !insertmacro Parameter ca@valencia    ${SecCatalanValencia}
-  !insertmacro Parameter cs             ${SecCzech}
-  !insertmacro Parameter da             ${SecDanish}
-  !insertmacro Parameter de             ${SecGerman}
-  !insertmacro Parameter dz             ${SecDzongkha}
-  !insertmacro Parameter el             ${SecGreek}
-  !insertmacro Parameter en_AU          ${SecEnglishAustralian}
-  !insertmacro Parameter en_CA          ${SecEnglishCanadian}
-  !insertmacro Parameter en_GB          ${SecEnglishBritain}
-  !insertmacro Parameter en_US@piglatin ${SecEnglishPiglatin}
-  !insertmacro Parameter eo             ${SecEsperanto}
-  !insertmacro Parameter es             ${SecSpanish}
-  !insertmacro Parameter es_MX          ${SecSpanishMexico}
-  !insertmacro Parameter et             ${SecEstonian}
-  !insertmacro Parameter eu             ${SecBasque}
-  !insertmacro Parameter fa             ${SecFarsi}
-  !insertmacro Parameter fi             ${SecFinnish}
-  !insertmacro Parameter fr             ${SecFrench}
-  !insertmacro Parameter ga             ${SecIrish}
-  !insertmacro Parameter gl             ${SecGalician}
-  !insertmacro Parameter he             ${SecHebrew}
-  !insertmacro Parameter hr             ${SecCroatian}
-  !insertmacro Parameter hu             ${SecHungarian}
-  !insertmacro Parameter hy             ${SecArmenian}
-  !insertmacro Parameter id             ${SecIndonesian}
-  !insertmacro Parameter is             ${SecIcelandic}
-  !insertmacro Parameter it             ${SecItalian}
-  !insertmacro Parameter ja             ${SecJapanese}
-  !insertmacro Parameter km             ${SecKhmer}
-  !insertmacro Parameter ko             ${SecKorean}
-  !insertmacro Parameter lt             ${SecLithuanian}
-  !insertmacro Parameter lv             ${SecLatvian}
-  !insertmacro Parameter mk             ${SecMacedonian}
-  !insertmacro Parameter mn             ${SecMongolian}
-  !insertmacro Parameter nb             ${SecNorwegianBokmal}
-  !insertmacro Parameter ne             ${SecNepali}
-  !insertmacro Parameter nl             ${SecDutch}
-  !insertmacro Parameter nn             ${SecNorwegianNynorsk}
-  !insertmacro Parameter pa             ${SecPanjabi}
-  !insertmacro Parameter pl             ${SecPolish}
-  !insertmacro Parameter pt             ${SecPortuguese}
-  !insertmacro Parameter pt_BR          ${SecPortugueseBrazil}
-  !insertmacro Parameter ro             ${SecRomanian}
-  !insertmacro Parameter ru             ${SecRussian}
-  !insertmacro Parameter rw             ${SecKinyarwanda}
-  !insertmacro Parameter sk             ${SecSlovak}
-  !insertmacro Parameter sl             ${SecSlovenian}
-  !insertmacro Parameter sq             ${SecAlbanian}
-  !insertmacro Parameter sr             ${SecSerbian}
-  !insertmacro Parameter sr@latin       ${SecSerbianLatin}
-  !insertmacro Parameter sv             ${SecSwedish}
-  !insertmacro Parameter te             ${SecTelugu}
-  !insertmacro Parameter th             ${SecThai}
-  !insertmacro Parameter tr             ${SecTurkish}
-  !insertmacro Parameter uk             ${SecUkrainian}
-  !insertmacro Parameter vi             ${SecVietnamese}
-  !insertmacro Parameter zh_CN          ${SecSimpChinese}
-  !insertmacro Parameter zh_TW          ${SecTradChinese}
+  !insertmacro Parameter GTK          GTK
+  !insertmacro Parameter Shortcuts    SHORTCUTS
+  !insertmacro Parameter Alluser      ALLUSER
+  !insertmacro Parameter Desktop      DESKTOP
+  !insertmacro Parameter QuickLaunch  QUICKLAUNCH
+  !insertmacro Parameter SVGWriter    SVGEDITOR
+  !insertmacro Parameter ContextMenu  CONTEXTMENUE
+  !insertmacro Parameter Prefs        PREFERENCES
+  !insertmacro Parameter Python       PYTHON
+  !insertmacro Parameter Addfiles     ADDFILES
+  !insertmacro Parameter Extensions   EXTENSIONS
+  !insertmacro Parameter Examples     EXAMPLES
+  !insertmacro Parameter Tutorials    TUTORIALS
+  !insertmacro Parameter Dictionaries DICTIONARIES
+  !insertmacro Parameter Languages    LANGUAGES
+
+  ; include list of available inkscape translations for parameter generation from /languages/_language_lists.nsh
+  !insertmacro INKSCAPE_TRANSLATIONS Parameter
 
   ClearErrors
   ${GetOptions} $CMDARGS /? $1
@@ -862,15 +813,21 @@ Function .onInit ; initialise the installer {{{2
       /SVGEDITOR=(OFF/ON): default SVG editor$\r$\n \
       /CONTEXTMENUE=(OFF/ON): context menue integration$\r$\n \
       /PREFERENCES=(OFF/ON): delete users preference files$\r$\n \
+      /PYTHON=(OFF/ON): python distribution$\r$\n \
       /ADDFILES=(OFF/ON): additional files$\r$\n \
+      /EXTENSIONS=(OFF/ON): extensions$\r$\n \
       /EXAMPLES=(OFF/ON): examples$\r$\n \
       /TUTORIALS=(OFF/ON): tutorials$\r$\n \
+      /DICTIONARIES=(OFF/ON): dictionaries$\r$\n \
       /LANGUAGES=(OFF/ON): translated menues, examples, etc.$\r$\n \
       /[locale code]=(OFF/ON): e.g am, es, es_MX as in Inkscape supported"
     Abort
-    !verbose pop
-  ${EndIf} ; }}}
+  ${EndIf}
+  !verbose pop ; }}}
 FunctionEnd ; .onInit }}}
+
+
+
 ; Uninstaller code {{{1
 Function un.onInit ; initialise uninstaller {{{
   ;begin uninstall, could be added on top of uninstall section instead
@@ -914,6 +871,7 @@ Function un.onInit ; initialise uninstaller {{{
 FunctionEnd ; un.onInit }}}
 
 Function un.CustomPageUninstall ; {{{
+  SetShellVarContext current
   !insertmacro MUI_HEADER_TEXT "$(UInstOpt)" "$(UInstOpt1)"
   !insertmacro MUI_INSTALLOPTIONS_WRITE inkscape.nsi.uninstall "Field 1" Text "$APPDATA\Inkscape\"
   !insertmacro MUI_INSTALLOPTIONS_WRITE inkscape.nsi.uninstall "Field 2" Text "$(PurgePrefs)"
@@ -924,6 +882,7 @@ FunctionEnd ; un.CustomPageUninstall }}}
 Section Uninstall ; do the uninstalling {{{
 !ifndef DUMMYINSTALL
   ; remove personal settings
+  SetShellVarContext current
   Delete $APPDATA\Inkscape\extension-errors.log
   ${If} $MultiUser = 0
     DetailPrint "Purging personal settings in $APPDATA\Inkscape"
@@ -982,16 +941,16 @@ Section Uninstall ; do the uninstalling {{{
   RMDir  $SMPROGRAMS\Inkscape
 
   InitPluginsDir
-  SetPluginUnload manual
 
   ClearErrors
-  FileOpen $0 $INSTDIR\uninstall.log r
+  FileOpen $9 $INSTDIR\uninstall.log r
   ${If} ${Errors} ;else uninstallnotfound
     MessageBox MB_OK|MB_ICONEXCLAMATION "$(UninstallLogNotFound)" /SD IDOK
   ${Else}
+    ${SHMessageBoxCheckInit} "inkscape_uninstall_other_files"
     ${Do}
       ClearErrors
-      FileRead $0 $1
+      FileRead $9 $1
       ${IfThen} ${Errors} ${|} ${ExitDo} ${|}
       ; cat the line into md5 and filename
       StrLen $2 $1
@@ -999,31 +958,23 @@ Section Uninstall ; do the uninstalling {{{
       StrCpy $3 $1 32
       StrCpy $filename $1 $2-36 34 ;remove trailing CR/LF
       StrCpy $filename $filename -2
-      ; $3 = MD5 when installed, then deletion choice
       ; $filename = file
-      ; $5 = MD5 now
-      ; $6 = always/never remove files touched by user
+      ; $0 = shall file be deleted?
+      ; $3 = MD5 when installed
+      ; $4 = MD5 now
 
       ${If} ${FileExists} $filename
-        ${If} $6 == always
-          StrCpy $3 2
+        md5dll::GetMD5File /NOUNLOAD $filename
+        Pop $4 ;md5 of file
+        ${If} $3 == $4
+          StrCpy $0 ${IDYES}
         ${Else}
-          md5dll::GetMD5File /NOUNLOAD $filename
-          Pop $5 ;md5 of file
-          ${If} $3 == $5
-            StrCpy $3 1 ; yes
-          ${ElseIf} $6 != never
-            ; the md5 sums does not match so we ask
-            messagebox::show MB_DEFBUTTON3|MB_TOPMOST "" 0,103 \
-              "$(FileChanged)" "$(Yes)" "$(AlwaysYes)" "$(No)" "$(AlwaysNo)"
-            Pop $3
-            ${IfThen} $3 = 2 ${|} StrCpy $6 always ${|}
-            ${IfThen} $3 = 4 ${|} StrCpy $6 never ${|}
-          ${EndIf}
+          ; the md5 sums does not match so we ask
+          ${SHMessageBoxCheck} "$(MUI_UNTEXT_CONFIRM_TITLE)" "$(FileChanged)" ${MB_YESNO}|${MB_ICONQUESTION}
+          Pop $0
         ${EndIf}
 
-        ${If}   $3 = 1 ; yes
-        ${OrIf} $3 = 2 ; always
+        ${If} $0 = ${IDYES}
           ; Remove File
           ClearErrors
           Delete $filename
@@ -1038,22 +989,39 @@ Section Uninstall ; do the uninstalling {{{
         ${EndIf}
       ${EndIf}
     ${Loop}
+    ${SHMessageBoxCheckCleanup}
   ${EndIf}
-  FileClose $0
+  FileClose $9
+  ; remove Python cache files that may have been created
+  loopFiles:
+      StrCpy $R1 0
+      ${Locate} "$INSTDIR" "/L=F /M=*.pyc" "un.DeleteFile"
+      StrCmp $R1 0 0 loopFiles
+  ; remove empty directories
+  loopDirs:
+    StrCpy $R1 0
+    ${Locate} "$INSTDIR" "/L=DE" "un.DeleteDir"
+    StrCmp $R1 0 0 loopDirs
+  ; remove the uninstaller and installation directory itself
+  Delete $INSTDIR\uninstall.dat
   Delete $INSTDIR\uninstall.log
   Delete $INSTDIR\uninstall.exe
-  ; remove empty directories
-  RMDir $INSTDIR\lib\locale
-  RMDir $INSTDIR\lib
-  RMDir $INSTDIR\data
-  RMDir $INSTDIR\doc
-  RMDir $INSTDIR\modules
-  RMDir $INSTDIR\plugins
   RMDir $INSTDIR
-  SetAutoClose false
 !endif
 SectionEnd ; Uninstall }}}
 ; }}}
 
+Function un.DeleteFile
+  Delete $R9
+  IntOp $R1 $R1 + 1
+  Push 0 # required by ${Locate}!
+FunctionEnd
+
+Function un.DeleteDir
+  RMDir $R9
+  IntOp $R1 $R1 + 1
+  Push 0 # required by ${Locate}!
+FunctionEnd
+
 ; This file has been optimised for use in Vim with folding.
 ; (If you can't cope, :set nofoldenable) vim:fen:fdm=marker
diff --git a/packaging/win32/languages/Breton.nsh b/packaging/win32/languages/Breton.nsh
index c73ced5aa..bbbb834ac 100644
--- a/packaging/win32/languages/Breton.nsh
+++ b/packaging/win32/languages/Breton.nsh
@@ -1,56 +1,65 @@
-;Language: Breton (1150, CP1252)
+;Language: Breton (1150)
 ;By matiphas@free.fr
 ${LangFileString} CaptionDescription "Embanner sturiadel SVG dieub"
-${LangFileString} LICENSE_BOTTOM_TEXT "Skignet eo $(^Name) dindan al la�vaz foran hollek (GPL) GNU. Pourchaset eo al la�vaz ama� evit rei� kelo� deoc'h nemetken. $_CLICK"
-${LangFileString} DIFFERENT_USER "Staliet eo bet Inkscape gant an arveriad $0.$\r$\nMar kendalc'hot gant ar stalia� e vo siek marteze !$\r$\nEn em gennaskit evel $0 ha klaskit en-dro."
-${LangFileString} WANT_UNINSTALL_BEFORE "Staliet eo bet $R1 endeo. $\nFellout a ra deoc'h dilemel ar staliadenn gent a-raok stalia� $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nKlika� war OK evit kenderc'hel pe CANCEL evit dilezel."
-${LangFileString} NO_ADMIN "N'hoc'h eus ket briento� an ardoer.$\r$\nSiek e c'hallfe beza� staliadenn Inkscape evit an holl arveriaded.$\r$\nDigevaskit, mar plij, an dibarzh 'evit an holl arveriaded'."
+${LangFileString} LICENSE_BOTTOM_TEXT "Skignet eo $(^Name) dindan al lañvaz foran hollek (GPL) GNU. Pourchaset eo al lañvaz amañ evit reiñ keloù deoc'h nemetken. $_CLICK"
+${LangFileString} DIFFERENT_USER "Staliet eo bet Inkscape gant an arveriad $0.$\r$\nMar kendalc'hot gant ar staliañ e vo siek marteze !$\r$\nEn em gennaskit evel $0 ha klaskit en-dro."
+${LangFileString} WANT_UNINSTALL_BEFORE "Staliet eo bet $R1 endeo. $\nFellout a ra deoc'h dilemel ar staliadenn gent a-raok staliañ $(^Name) ?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nKlikañ war OK evit kenderc'hel pe CANCEL evit dilezel."
+${LangFileString} NO_ADMIN "N'hoc'h eus ket brientoù an ardoer.$\r$\nSiek e c'hallfe bezañ staliadenn Inkscape evit an holl arveriaded.$\r$\nDigevaskit, mar plij, an dibarzh 'evit an holl arveriaded'."
 ${LangFileString} NOT_SUPPORTED "N'eo ket skoret Inkscape gant Windows 95/98/ME!$\r$\nKit war al lec'hienn gefridiel evit gouzout hiroc'h."
 ${LangFileString} Full "Klok"
 ${LangFileString} Optimal "Gwellek"
 ${LangFileString} Minimal "Izek"
 ${LangFileString} Core "Embanner SVG Inkscape (ret)"
-${LangFileString} CoreDesc "Restro� rekis Inkscape ha dllo�"
+${LangFileString} CoreDesc "Restroù rekis Inkscape ha dlloù"
 ${LangFileString} GTKFiles "Amva GTK+ (ret)"
-${LangFileString} GTKFilesDesc "Ur voestad binvio� liessavelenno� evit ketalio� kevregat, arveret gant Inkscape"
-${LangFileString} Shortcuts "Berradenno�"
-${LangFileString} ShortcutsDesc "Berradenno� evit loc'ha� Inkscape"
+${LangFileString} GTKFilesDesc "Ur voestad binvioù liessavelennoù evit ketalioù kevregat, arveret gant Inkscape"
+${LangFileString} Shortcuts "Berradennoù"
+${LangFileString} ShortcutsDesc "Berradennoù evit loc'hañ Inkscape"
 ${LangFileString} Alluser "Evit an holl arveriaded"
-${LangFileString} AlluserDesc "Stalia� ar meziant-ma� evit holl arveriaded an urzhiataer-ma�"
+${LangFileString} AlluserDesc "Staliañ ar meziant-mañ evit holl arveriaded an urzhiataer-mañ"
 ${LangFileString} Desktop "Burev"
-${LangFileString} DesktopDesc "Kroui� ur verradenn davit Inkscape war ar burev"
-${LangFileString} Startmenu "La�ser Loc'ha�"
-${LangFileString} StartmenuDesc "Kroui� un enankad Inkscape war al la�ser Loc'ha�"
-${LangFileString} Quicklaunch "Loc'ha� trumm"
-${LangFileString} QuicklaunchDesc " Kroui� ur verradenn davit Inkscape er varrennad loc'ha� trumm"
-${LangFileString} SVGWriter "Digeri� ar restro� SVG gant Inkscape"
-${LangFileString} SVGWriterDesc "Dibab Inkscape evel embanner dre ziouer evit ar restro� SVG"
-${LangFileString} ContextMenu "La�ser kemperzhel"
-${LangFileString} ContextMenuDesc "Ouzhpenna� Inkscape war la�ser kemperzhel ar restro� SVG"
-${LangFileString} DeletePrefs "Diverka� ar gwellvezio� personel"
-${LangFileString} DeletePrefsDesc "Diverka� ar gwellvezio� personel chomet gant ar staliadurio� kent"
-${LangFileString} Addfiles "Restro� ouzhpenn"
-${LangFileString} AddfilesDesc "Restro� ouzhpenn"
-${LangFileString} Examples "Skouerio�"
-${LangFileString} ExamplesDesc "Skouerio� arver eus Inkscape"
-${LangFileString} Tutorials "Skrido� kelenn"
-${LangFileString} TutorialsDesc " Skrido� kelenn diwar-benn arver Inkscape"
-${LangFileString} Languages "Troidigezhio�"
-${LangFileString} LanguagesDesc "Stalia� troidigezhio� evit Inkscape"
+${LangFileString} DesktopDesc "Krouiñ ur verradenn davit Inkscape war ar burev"
+${LangFileString} Startmenu "Lañser Loc'hañ"
+${LangFileString} StartmenuDesc "Krouiñ un enankad Inkscape war al lañser Loc'hañ"
+${LangFileString} Quicklaunch "Loc'hañ trumm"
+${LangFileString} QuicklaunchDesc " Krouiñ ur verradenn davit Inkscape er varrennad loc'hañ trumm"
+${LangFileString} SVGWriter "Digeriñ ar restroù SVG gant Inkscape"
+${LangFileString} SVGWriterDesc "Dibab Inkscape evel embanner dre ziouer evit ar restroù SVG"
+${LangFileString} ContextMenu "Lañser kemperzhel"
+${LangFileString} ContextMenuDesc "Ouzhpennañ Inkscape war lañser kemperzhel ar restroù SVG"
+${LangFileString} DeletePrefs "Diverkañ ar gwellvezioù personel"
+${LangFileString} DeletePrefsDesc "Diverkañ ar gwellvezioù personel chomet gant ar staliadurioù kent"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "Restroù ouzhpenn"
+${LangFileString} AddfilesDesc "Restroù ouzhpenn"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "Skouerioù"
+${LangFileString} ExamplesDesc "Skouerioù arver eus Inkscape"
+${LangFileString} Tutorials "Skridoù kelenn"
+${LangFileString} TutorialsDesc " Skridoù kelenn diwar-benn arver Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Troidigezhioù"
+${LangFileString} LanguagesDesc "Staliañ troidigezhioù evit Inkscape"
 ${LangFileString} lng_am "Amhareg"
 ${LangFileString} lng_ar "Arabeg"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbaidjaneg"
 ${LangFileString} lng_be "Bieloruseg"
 ${LangFileString} lng_bg "Bulgareg"
 ${LangFileString} lng_bn "Bengalieg"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Brezhoneg"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Katalaneg"
 ${LangFileString} lng_ca@valencia "Katalaneg Valensia"
 ${LangFileString} lng_cs "Tchekeg"
 ${LangFileString} lng_da "Daneg"
 ${LangFileString} lng_de "Alamaneg"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkheg"
 ${LangFileString} lng_el "Gresianeg"
 ${LangFileString} lng_en "Saozneg"
@@ -66,9 +75,11 @@ ${LangFileString} lng_eu "Euskareg"
 ${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finneg"
 ${LangFileString} lng_fr "Galleg"
-${LangFileString} lng_he "Hebraeg"
 ${LangFileString} lng_ga "Iwerzhoneg"
 ${LangFileString} lng_gl "Galisianeg"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "Hebraeg"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Kroateg"
 ${LangFileString} lng_hu "Hungareg"
 ${LangFileString} lng_hy "Armenian"
@@ -77,15 +88,26 @@ ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italianeg"
 ${LangFileString} lng_ja "Japoneg"
 ${LangFileString} lng_km "Khmereg"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Koreaneg"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituaneg"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "Mak�donieg"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Makédonieg"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongoleg"
-${LangFileString} lng_ne "Nepalieg"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
 ${LangFileString} lng_nb "Norvegeg Bokmal"
+${LangFileString} lng_ne "Nepalieg"
 ${LangFileString} lng_nl "Nederlandeg"
 ${LangFileString} lng_nn "Norvegeg Ninorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Pendjabeg"
 ${LangFileString} lng_pl "Poloneg"
 ${LangFileString} lng_pt "Portugaleg"
@@ -93,24 +115,31 @@ ${LangFileString} lng_pt_BR "Portugaleg Brazil"
 ${LangFileString} lng_ro "Romanieg"
 ${LangFileString} lng_ru "Ruseg"
 ${LangFileString} lng_rw "Kinyarwandeg"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Sloveg"
 ${LangFileString} lng_sl "Sloveneg"
 ${LangFileString} lng_sq "Albaneg"
 ${LangFileString} lng_sr "Serbeg"
 ${LangFileString} lng_sr@latin "Serbeg skrivet mod latin"
 ${LangFileString} lng_sv "Swedeg"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thaieg"
 ${LangFileString} lng_tr "Turkeg"
 ${LangFileString} lng_uk "Ukrenieg"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnameg"
 ${LangFileString} lng_zh_CN "Sineg eeunaet"
 ${LangFileString} lng_zh_TW "Sineg hengounel"
-${LangFileString} UInstOpt "Dibarzhio� distalia�"
-${LangFileString} UInstOpt1 "Dibabit e-touez an dibarzhio� ouzhpenn"
-${LangFileString} PurgePrefs "Mirout ar gwellvezio� personel"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log n'eo ket bet kavet !$\r$\nMar plij, distaliit dre skarzha� ar c'havlec'hiad $INSTDIR hoc'h unan !"
-${LangFileString} FileChanged "Kemmet eo bet ar restr $filename goude ar stalia�.$\r$\nFellout a ra deoc'h diverka� ar restr-ma� ?"
+${LangFileString} UInstOpt "Dibarzhioù distaliañ"
+${LangFileString} UInstOpt1 "Dibabit e-touez an dibarzhioù ouzhpenn"
+${LangFileString} PurgePrefs "Mirout ar gwellvezioù personel"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log n'eo ket bet kavet !$\r$\nMar plij, distaliit dre skarzhañ ar c'havlec'hiad $INSTDIR hoc'h unan !"
+${LangFileString} FileChanged "Kemmet eo bet ar restr $filename goude ar staliañ.$\r$\nFellout a ra deoc'h diverkañ ar restr-mañ ?"
 ${LangFileString} Yes "Ya"
 ${LangFileString} AlwaysYes "respont YA atav"
 ${LangFileString} No "Ket"
diff --git a/packaging/win32/languages/Catalan.nsh b/packaging/win32/languages/Catalan.nsh
index 7f3a967df..5c951c161 100644
--- a/packaging/win32/languages/Catalan.nsh
+++ b/packaging/win32/languages/Catalan.nsh
@@ -1,117 +1,146 @@
-;Language: Catalan (1027, CP1252)
+;Language: Catalan (1027)
 ;By Xavier Conde Rueda <xavi.conde@gmail.com>, inkscape@softcatalana.net
-${LangFileString} CaptionDescription "Editor de gr�fics vectorials escalables de codi obert"
-${LangFileString} LICENSE_BOTTOM_TEXT "L'$(^Name) s'ha alliberat sota la Llic�ncia P�blica General de GNU (GPL). La llic�ncia es proporciona aqu� nom�s per raons informatives. $_CLICK"
-${LangFileString} DIFFERENT_USER "L'usuari $0.$\r ha instal�lat l'Inkscape.$\nSi continueu, �s possible que no acabeu correctament.$\r$\nEntreu com a $0 i proveu de nou."
-${LangFileString} WANT_UNINSTALL_BEFORE "Ja s'ha instal�lat $R1. $\nVoleu suprimir la versi� anterior abans d'instal�lar $(^Name)?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nPremeu D'acord per continuar, o Cancel�la per a interrompre."
-${LangFileString} NO_ADMIN "No teniu privilegis d'administrador.$\r$\n�s possible que la instal�laci� per a tots els usuaris no es completi correctament.$\r$\nInhabiliteu l'opci� 'per a tots els usuaris'."
-${LangFileString} NOT_SUPPORTED "L'Inkscape no funciona correctament sobre Windows 95/98/ME.$\r$\nConsulteu el lloc web per a obtenir informaci� detallada."
+${LangFileString} CaptionDescription "Editor de gràfics vectorials escalables de codi obert"
+${LangFileString} LICENSE_BOTTOM_TEXT "L'$(^Name) s'ha alliberat sota la Llicència Pública General de GNU (GPL). La llicència es proporciona aquí només per raons informatives. $_CLICK"
+${LangFileString} DIFFERENT_USER "L'usuari $0.$\r ha instal·lat l'Inkscape.$\nSi continueu, és possible que no acabeu correctament.$\r$\nEntreu com a $0 i proveu de nou."
+${LangFileString} WANT_UNINSTALL_BEFORE "Ja s'ha instal·lat $R1. $\nVoleu suprimir la versió anterior abans d'instal·lar $(^Name)?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nPremeu D'acord per continuar, o Cancel·la per a interrompre."
+${LangFileString} NO_ADMIN "No teniu privilegis d'administrador.$\r$\nÉs possible que la instal·lació per a tots els usuaris no es completi correctament.$\r$\nInhabiliteu l'opció 'per a tots els usuaris'."
+${LangFileString} NOT_SUPPORTED "L'Inkscape no funciona correctament sobre Windows 95/98/ME.$\r$\nConsulteu el lloc web per a obtenir informació detallada."
 ${LangFileString} Full "Completa"
-${LangFileString} Optimal "�ptima"
-${LangFileString} Minimal "M�nima"
+${LangFileString} Optimal "Òptima"
+${LangFileString} Minimal "Mínima"
 ${LangFileString} Core "L'editor SVG Inkscape (requerit)"
 ${LangFileString} CoreDesc "Fitxers i dlls per a l'Inkscape"
-${LangFileString} GTKFiles "Entorn d'execuci� GTK+ (requerit)"
-${LangFileString} GTKFilesDesc "Un joc d'eines d'interf�cies gr�fiques multi-plataforma, usat per l'Inkscape"
+${LangFileString} GTKFiles "Entorn d'execució GTK+ (requerit)"
+${LangFileString} GTKFilesDesc "Un joc d'eines d'interfícies gràfiques multi-plataforma, usat per l'Inkscape"
 ${LangFileString} Shortcuts "Dreceres"
 ${LangFileString} ShortcutsDesc "Dreceres per a iniciar l'Inkscape"
 ${LangFileString} Alluser "Per a tots els usuaris"
-${LangFileString} AlluserDesc "Instal�la aquesta aplicaci� per a tots els usuaris que fan servir aquest ordinador"
+${LangFileString} AlluserDesc "Instal·la aquesta aplicació per a tots els usuaris que fan servir aquest ordinador"
 ${LangFileString} Desktop "Escriptori"
 ${LangFileString} DesktopDesc "Crea una drecera cap a l'Inkscape a l'escriptori"
-${LangFileString} Startmenu "Men� Inicia"
-${LangFileString} StartmenuDesc "Crea una entrada de men� per a l'Inkscape"
-${LangFileString} Quicklaunch "Inici r�pid"
-${LangFileString} QuicklaunchDesc "Crea una drecera cap a l'Inkscape a la barra d'eines d'Inici r�pid"
+${LangFileString} Startmenu "Menú Inicia"
+${LangFileString} StartmenuDesc "Crea una entrada de menú per a l'Inkscape"
+${LangFileString} Quicklaunch "Inici ràpid"
+${LangFileString} QuicklaunchDesc "Crea una drecera cap a l'Inkscape a la barra d'eines d'Inici ràpid"
 ${LangFileString} SVGWriter "Obre els fitxers SVG amb l'Inkscape"
 ${LangFileString} SVGWriterDesc "Seleciona l'Inkscape com a editor predeterminat per als fitxers SVG"
-${LangFileString} ContextMenu "Men� contextual"
-${LangFileString} ContextMenuDesc "Afegeix l'Inkscape al men� contextual per als fitxers SVG"
-${LangFileString} DeletePrefs "Suprimeix les prefer�ncies personals"
-${LangFileString} DeletePrefsDesc "Suprimeix les prefer�ncies personals d'anteriors instal�lacions"
+${LangFileString} ContextMenu "Menú contextual"
+${LangFileString} ContextMenuDesc "Afegeix l'Inkscape al menú contextual per als fitxers SVG"
+${LangFileString} DeletePrefs "Suprimeix les preferències personals"
+${LangFileString} DeletePrefsDesc "Suprimeix les preferències personals d'anteriors instal·lacions"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Fitxers addicionals"
 ${LangFileString} AddfilesDesc "Fitxers addicionals"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Exemples"
-${LangFileString} ExamplesDesc "Exemples d'�s de l'Inkscape"
+${LangFileString} ExamplesDesc "Exemples d'ús de l'Inkscape"
 ${LangFileString} Tutorials "Tutorials"
-${LangFileString} TutorialsDesc "Tutorials d'�s de l'Inkscape"
+${LangFileString} TutorialsDesc "Tutorials d'ús de l'Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Traduccions"
-${LangFileString} LanguagesDesc "Instal�la m�s traduccions per a l'Inkscape"
+${LangFileString} LanguagesDesc "Instal·la més traduccions per a l'Inkscape"
 ${LangFileString} lng_am "Amharic"
 ${LangFileString} lng_ar "Arabic"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbaijani"
-${LangFileString} lng_be "Biel�lor�s"
-${LangFileString} lng_bg "B�lgar"
-${LangFileString} lng_bn "Bengal�"
+${LangFileString} lng_be "Biel·lorús"
+${LangFileString} lng_bg "Búlgar"
+${LangFileString} lng_bn "Bengalí"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
-${LangFileString} lng_ca "Catal�"
-${LangFileString} lng_ca@valencia "Catal� valenci�"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Català"
+${LangFileString} lng_ca@valencia "Català valencià"
 ${LangFileString} lng_cs "Txec"
-${LangFileString} lng_da "Dan�s"
+${LangFileString} lng_da "Danès"
 ${LangFileString} lng_de "Alemany"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Grec"
-${LangFileString} lng_en "Angl�s"
-${LangFileString} lng_en_AU "Angl�s d'Austr�lia"
-${LangFileString} lng_en_CA "Angl�s del Canad�"
-${LangFileString} lng_en_GB "Angl�s brit�nic"
+${LangFileString} lng_en "Anglès"
+${LangFileString} lng_en_AU "Anglès d'Austràlia"
+${LangFileString} lng_en_CA "Anglès del Canadà"
+${LangFileString} lng_en_GB "Anglès britànic"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
 ${LangFileString} lng_es "Espanyol"
-${LangFileString} lng_es_MX "Espanyol mexic�"
-${LangFileString} lng_et "Estoni�"
+${LangFileString} lng_es_MX "Espanyol mexicà"
+${LangFileString} lng_et "Estonià"
 ${LangFileString} lng_eu "Basc"
-${LangFileString} lng_fi "Fin�s"
 ${LangFileString} lng_fa "Farsi"
-${LangFileString} lng_fr "Franc�s"
-${LangFileString} lng_ga "Irland�s"
+${LangFileString} lng_fi "Finès"
+${LangFileString} lng_fr "Francès"
+${LangFileString} lng_ga "Irlandès"
 ${LangFileString} lng_gl "Gallec"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebreu"
-${LangFileString} lng_id "Indonesi"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croat"
-${LangFileString} lng_hu "Hongar�s"
+${LangFileString} lng_hu "Hongarès"
 ${LangFileString} lng_hy "Armenian"
+${LangFileString} lng_id "Indonesi"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "Itali�"
-${LangFileString} lng_ja "Japon�s"
+${LangFileString} lng_it "Italià"
+${LangFileString} lng_ja "Japonès"
 ${LangFileString} lng_km "Khmer"
-${LangFileString} lng_ko "Core�"
-${LangFileString} lng_lt "Litu�"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Coreà"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "Lituà"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedoni"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongol"
-${LangFileString} lng_ne "Nepal�"
-${LangFileString} lng_nb "Noruec Bokm�l"
-${LangFileString} lng_nl "Holand�s"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Noruec Bokmål"
+${LangFileString} lng_ne "Nepalí"
+${LangFileString} lng_nl "Holandès"
 ${LangFileString} lng_nn "Noruec Nynorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
-${LangFileString} lng_pl "Polon�s"
-${LangFileString} lng_pt "Portugu�s"
-${LangFileString} lng_pt_BR "Portugu�s brasiler"
-${LangFileString} lng_ro "Roman�s"
+${LangFileString} lng_pl "Polonès"
+${LangFileString} lng_pt "Portuguès"
+${LangFileString} lng_pt_BR "Portuguès brasiler"
+${LangFileString} lng_ro "Romanès"
 ${LangFileString} lng_ru "Rus"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Eslovac"
 ${LangFileString} lng_sl "Esloveni"
-${LangFileString} lng_sq "Alban�s"
+${LangFileString} lng_sq "Albanès"
 ${LangFileString} lng_sr "Serbi"
-${LangFileString} lng_sr@latin "Serbi en alfabet llat�"
+${LangFileString} lng_sr@latin "Serbi en alfabet llatí"
 ${LangFileString} lng_sv "Suec"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
 ${LangFileString} lng_tr "Turc"
-${LangFileString} lng_uk "Ucra�n�s"
+${LangFileString} lng_uk "Ucraïnès"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamese"
-${LangFileString} lng_zh_CN "Xin�s simplificat"
-${LangFileString} lng_zh_TW "Xin�s tradicional"
-${LangFileString} UInstOpt "Opcions de desinstal�laci�"
+${LangFileString} lng_zh_CN "Xinès simplificat"
+${LangFileString} lng_zh_TW "Xinès tradicional"
+${LangFileString} UInstOpt "Opcions de desinstal·lació"
 ${LangFileString} UInstOpt1 "Seleccioneu les vostres opcions addicionals"
-${LangFileString} PurgePrefs "Conserva les prefer�ncies personals"
-${LangFileString} UninstallLogNotFound "No s'ha trobat $INSTDIR\uninstall.log.$\r$\nPer a desinstal�lar, haureu de netejar la carpeta $INSTDIR vosaltres mateixos!"
-${LangFileString} FileChanged "El fitxer $filename s'ha canviat despr�s de la instal�laci�.$\r$\nEncara voleu esborrar aquest fitxer?"
-${LangFileString} Yes "S�"
-${LangFileString} AlwaysYes "S� a tot"
+${LangFileString} PurgePrefs "Conserva les preferències personals"
+${LangFileString} UninstallLogNotFound "No s'ha trobat $INSTDIR\uninstall.log.$\r$\nPer a desinstal·lar, haureu de netejar la carpeta $INSTDIR vosaltres mateixos!"
+${LangFileString} FileChanged "El fitxer $filename s'ha canviat després de la instal·lació.$\r$\nEncara voleu esborrar aquest fitxer?"
+${LangFileString} Yes "Sí"
+${LangFileString} AlwaysYes "Sí a tot"
 ${LangFileString} No "No"
 ${LangFileString} AlwaysNo "No a tot"
diff --git a/packaging/win32/languages/Czech.nsh b/packaging/win32/languages/Czech.nsh
index 50c830a82..22385f46b 100644
--- a/packaging/win32/languages/Czech.nsh
+++ b/packaging/win32/languages/Czech.nsh
@@ -1,114 +1,143 @@
-;Language: Czech (1029, CP1250)
-;By Michal Kraus <Michal.Kraus@wige-mic.cz>, Josef Vyb�ral <josef.vybiral@gmail.com>
-${LangFileString} CaptionDescription "Open Source Editor �k�lovateln� Vektorov� Grafiky(SVG)"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) je vyd�v�n pod General Public License (GPL). Licen�n� ujedn�n� je zde pouze z informa�n�ch d�vod�. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape byl nainstalov�n u�ivatelem $0.$\r$\nInstalace nemus� b�t dokon�ena spr�vn� pokud v n� budete pokra�ovat!$\r$\nPros�m p�ihlaste se jako $0 a spus�te instalaci znovu."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 je ji� nainstalov�n. $\nChcete p�ed instalac� odstranit p�edchoz� verzi $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nStiskn�te OK pro pokra�ov�n�, CANCEL pro p�eru�en�."
-${LangFileString} NO_ADMIN "Nem�te administr�torsk� opr�vn�n�.$\r$\nInstalace Inkscape pro v�echny u�ivatele nemus� b�t �sp�n� dokon�ena.$\r$\nZru�te ozna�en� volby 'Pro v�echny u�ivatele'."
-${LangFileString} NOT_SUPPORTED "Inkscape neb�� na Windows 95/98/ME!$\r$\nPro podrobn�j�� informace se pros�m obra�te na ofici�ln� webov� str�nky."
-${LangFileString} Full "Pln�"
-${LangFileString} Optimal "Optim�ln�"
-${LangFileString} Minimal "Minim�ln�"
-${LangFileString} Core "Inkscape SVG editor (vy�adov�no)"
+;Language: Czech (1029)
+;By Michal Kraus <Michal.Kraus@wige-mic.cz>, Josef Vybíral <josef.vybiral@gmail.com>
+${LangFileString} CaptionDescription "Open Source Editor Škálovatelné Vektorové Grafiky(SVG)"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) je vydáván pod General Public License (GPL). Licenční ujednání je zde pouze z informačních důvodů. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape byl nainstalován uživatelem $0.$\r$\nInstalace nemusí být dokončena správně pokud v ní budete pokračovat!$\r$\nProsím přihlaste se jako $0 a spusťte instalaci znovu."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 je již nainstalován. $\nChcete před instalací odstranit předchozí verzi $(^Name) ?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nStiskněte OK pro pokračování, CANCEL pro přerušení."
+${LangFileString} NO_ADMIN "Nemáte administrátorská oprávnění.$\r$\nInstalace Inkscape pro všechny uživatele nemusí být úspěšně dokončena.$\r$\nZrušte označení volby 'Pro všechny uživatele'."
+${LangFileString} NOT_SUPPORTED "Inkscape neběží na Windows 95/98/ME!$\r$\nPro podrobnější informace se prosím obraťte na oficiální webové stránky."
+${LangFileString} Full "Plná"
+${LangFileString} Optimal "Optimální"
+${LangFileString} Minimal "Minimální"
+${LangFileString} Core "Inkscape SVG editor (vyžadováno)"
 ${LangFileString} CoreDesc "Soubory a knihovny Inkscape"
-${LangFileString} GTKFiles "GTK+ b�hov� prost�ed� (vy�adov�no)"
-${LangFileString} GTKFilesDesc "Multiplatformn� sada u�ivatelsk�ho rozhran�, pou�it�ho v Inkscape"
-${LangFileString} Shortcuts "Z�stupci"
-${LangFileString} ShortcutsDesc "Z�stupci pro spu�t�n� Inkscape"
-${LangFileString} Alluser "pro v�echny u�ivatele"
-${LangFileString} AlluserDesc "Instalovat aplikaci pro kohokoliv, kdo pou��v� tento po��ta�.(v�ichni u�ivatel�)"
+${LangFileString} GTKFiles "GTK+ běhové prostředí (vyžadováno)"
+${LangFileString} GTKFilesDesc "Multiplatformní sada uživatelského rozhraní, použitého v Inkscape"
+${LangFileString} Shortcuts "Zástupci"
+${LangFileString} ShortcutsDesc "Zástupci pro spuštění Inkscape"
+${LangFileString} Alluser "pro všechny uživatele"
+${LangFileString} AlluserDesc "Instalovat aplikaci pro kohokoliv, kdo používá tento počítač.(všichni uživatelé)"
 ${LangFileString} Desktop "Plocha"
-${LangFileString} DesktopDesc "Vytvo�it z�stupce Inkscape na plo�e"
-${LangFileString} Startmenu "Nab�dka Start"
-${LangFileString} StartmenuDesc "Vytvo�it pro Inkscape polo�ku v nab�dce Start"
-${LangFileString} Quicklaunch "Panel rychl�ho spu�t�n�"
-${LangFileString} QuicklaunchDesc "Vytvo�it pro Inkscape z�stupce na panelu rychl�ho spu�t�n�"
-${LangFileString} SVGWriter "Otv�rat SVG soubory v Inkscape"
-${LangFileString} SVGWriterDesc "Vybrat Inkscape jako v�choz� editor pro SVG soubory"
-${LangFileString} ContextMenu "Kontextov� nab�dka"
-${LangFileString} ContextMenuDesc "P�idat Inkscape do kontextov� nab�dky pro SVG soubory"
-${LangFileString} DeletePrefs "Smazat osobn� nastaven�"
-${LangFileString} DeletePrefsDesc "Smazat osobn� nastaven� p�edchoz� instalace"
-${LangFileString} Addfiles "Dal�� soubory"
-${LangFileString} AddfilesDesc "Dal�� soubory"
-${LangFileString} Examples "P��klady"
-${LangFileString} ExamplesDesc "P��klady pou�it� Inkscape"
-${LangFileString} Tutorials "Pr�vodci"
-${LangFileString} TutorialsDesc "Pr�vodci funkcemi Inkscape"
-${LangFileString} Languages "Jazykov� sady"
-${LangFileString} LanguagesDesc "Nainstalovat dal�� jazykov� sady Inkscape"
+${LangFileString} DesktopDesc "Vytvořit zástupce Inkscape na ploše"
+${LangFileString} Startmenu "Nabídka Start"
+${LangFileString} StartmenuDesc "Vytvořit pro Inkscape položku v nabídce Start"
+${LangFileString} Quicklaunch "Panel rychlého spuštění"
+${LangFileString} QuicklaunchDesc "Vytvořit pro Inkscape zástupce na panelu rychlého spuštění"
+${LangFileString} SVGWriter "Otvírat SVG soubory v Inkscape"
+${LangFileString} SVGWriterDesc "Vybrat Inkscape jako výchozí editor pro SVG soubory"
+${LangFileString} ContextMenu "Kontextová nabídka"
+${LangFileString} ContextMenuDesc "Přidat Inkscape do kontextové nabídky pro SVG soubory"
+${LangFileString} DeletePrefs "Smazat osobní nastavení"
+${LangFileString} DeletePrefsDesc "Smazat osobní nastavení předchozí instalace"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "Další soubory"
+${LangFileString} AddfilesDesc "Další soubory"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "Příklady"
+${LangFileString} ExamplesDesc "Příklady použití Inkscape"
+${LangFileString} Tutorials "Průvodci"
+${LangFileString} TutorialsDesc "Průvodci funkcemi Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Jazykové sady"
+${LangFileString} LanguagesDesc "Nainstalovat další jazykové sady Inkscape"
 ${LangFileString} lng_am "Amharic"
 ${LangFileString} lng_ar "Arabic"
-${LangFileString} lng_az "Azerbajd��n�tina"
-${LangFileString} lng_be "B�loru�tina"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "Azerbajdžánština"
+${LangFileString} lng_be "Běloruština"
 ${LangFileString} lng_bg "Bulgarian"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
-${LangFileString} lng_ca "Katal�n�tina"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Katalánština"
 ${LangFileString} lng_ca@valencia "Valencian Catalan"
-${LangFileString} lng_cs "�e�tina"
-${LangFileString} lng_da "D�n�tina"
-${LangFileString} lng_de "N�m�ina"
+${LangFileString} lng_cs "Čeština"
+${LangFileString} lng_da "Dánština"
+${LangFileString} lng_de "Němčina"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
-${LangFileString} lng_el "�e�tina"
-${LangFileString} lng_en "Angli�ina"
+${LangFileString} lng_el "Řečtina"
+${LangFileString} lng_en "Angličina"
 ${LangFileString} lng_en_AU "Australian English"
-${LangFileString} lng_en_CA "Kanadsk� Angli�tina"
-${LangFileString} lng_en_GB "Britsk� Angli�tina"
+${LangFileString} lng_en_CA "Kanadská Angličtina"
+${LangFileString} lng_en_GB "Britská Angličtina"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
-${LangFileString} lng_es "�pan�l�tina"
-${LangFileString} lng_es_MX "Mexick� �pan�l�tina"
-${LangFileString} lng_et "Eston�tina"
+${LangFileString} lng_es "Španělština"
+${LangFileString} lng_es_MX "Mexická Španělština"
+${LangFileString} lng_et "Estonština"
 ${LangFileString} lng_eu "Basque"
 ${LangFileString} lng_fa "Farsi"
-${LangFileString} lng_fi "Fin�tina"
-${LangFileString} lng_fr "Francouz�tina"
-${LangFileString} lng_ga "Ir�tina"
+${LangFileString} lng_fi "Finština"
+${LangFileString} lng_fr "Francouzština"
+${LangFileString} lng_ga "Irština"
 ${LangFileString} lng_gl "Galician"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebrew"
-${LangFileString} lng_hr "Chorvat�tina"
-${LangFileString} lng_hu "Ma�ar�tina"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "Chorvatština"
+${LangFileString} lng_hu "Maďarština"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesian"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "Ital�tina"
-${LangFileString} lng_ja "Japon�tina"
+${LangFileString} lng_it "Italština"
+${LangFileString} lng_ja "Japonština"
 ${LangFileString} lng_km "Khmer"
-${LangFileString} lng_ko "Korej�tina"
-${LangFileString} lng_lt "Litev�tina"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Korejština"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "Litevština"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "Makedon�tina"
-${LangFileString} lng_mn "Mongol�tina"
-${LangFileString} lng_ne "Nep�l�tina"
-${LangFileString} lng_nb "Nor�tina Bokmal"
-${LangFileString} lng_nl "Holand�tina"
-${LangFileString} lng_nn "Nor�tina Nynorsk"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Makedonština"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "Mongolština"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norština Bokmal"
+${LangFileString} lng_ne "Nepálština"
+${LangFileString} lng_nl "Holandština"
+${LangFileString} lng_nn "Norština Nynorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
-${LangFileString} lng_pl "Pol�tina"
-${LangFileString} lng_pt "Portugal�tina"
-${LangFileString} lng_pt_BR "Brazilsk� Portugal�tina"
+${LangFileString} lng_pl "Polština"
+${LangFileString} lng_pt "Portugalština"
+${LangFileString} lng_pt_BR "Brazilská Portugalština"
 ${LangFileString} lng_ro "Romanian"
-${LangFileString} lng_ru "Ru�tina"
+${LangFileString} lng_ru "Ruština"
 ${LangFileString} lng_rw "Kinyarwanda"
-${LangFileString} lng_sk "Sloven�tina"
-${LangFileString} lng_sl "Slovin�tina"
-${LangFileString} lng_sq "Alb�n�tina"
-${LangFileString} lng_sr "Srb�tina"
-${LangFileString} lng_sr@latin "Srb�tina v latince"
-${LangFileString} lng_sv "�v�d�tina"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "Slovenština"
+${LangFileString} lng_sl "Slovinština"
+${LangFileString} lng_sq "Albánština"
+${LangFileString} lng_sr "Srbština"
+${LangFileString} lng_sr@latin "Srbština v latince"
+${LangFileString} lng_sv "Švédština"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
-${LangFileString} lng_tr "Ture�tina"
-${LangFileString} lng_uk "Ukrajin�tina"
-${LangFileString} lng_vi "Vietnam�tina"
-${LangFileString} lng_zh_CN "Zjednodu�en� ��n�tina"
-${LangFileString} lng_zh_TW "Tradi�n� ��n�tina"
-${LangFileString} UInstOpt "Volby pro odinstalov�n�"
-${LangFileString} UInstOpt1 "Vyberte pros�m dal�� nastaven�"
-${LangFileString} PurgePrefs "Ponechat osobn� nastaven�"
+${LangFileString} lng_tr "Turečtina"
+${LangFileString} lng_uk "Ukrajinština"
+${LangFileString} lng_ur "Urdu"
+${LangFileString} lng_vi "Vietnamština"
+${LangFileString} lng_zh_CN "Zjednodušená Čínština"
+${LangFileString} lng_zh_TW "Tradiční Čínština"
+${LangFileString} UInstOpt "Volby pro odinstalování"
+${LangFileString} UInstOpt1 "Vyberte prosím další nastavení"
+${LangFileString} PurgePrefs "Ponechat osobní nastavení"
 ${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log not found!$\r$\nPlease uninstall by clearing directory $INSTDIR yourself!"
 ${LangFileString} FileChanged "The file $filename has been changed after installation.$\r$\nDo you still want to delete that file?"
 ${LangFileString} Yes "Yes"
diff --git a/packaging/win32/languages/Danish.nsh b/packaging/win32/languages/Danish.nsh
index e3f4bb246..f2a224b70 100644
--- a/packaging/win32/languages/Danish.nsh
+++ b/packaging/win32/languages/Danish.nsh
@@ -1,58 +1,67 @@
-;Language: Danish (1030, CP1252)
+;Language: Danish (1030)
 ;By scootergrisen
-${LangFileString} CaptionDescription "Open source skal�rbar vektor redigeringsprogram"
+${LangFileString} CaptionDescription "Open source skalérbar vektor redigeringsprogram"
 ${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) er udgivet under GNU General Public License (GPL). Licensen leveres her kun til orientering. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape er blevet installeret af brugeren $0.$\r$\nHvis du forts�tter lykkedes det m�ske ikke fuldt ud!$\r$\nLog venligst p� som $0 og pr�v igen."
+${LangFileString} DIFFERENT_USER "Inkscape er blevet installeret af brugeren $0.$\r$\nHvis du fortsætter lykkedes det måske ikke fuldt ud!$\r$\nLog venligst på som $0 og prøv igen."
 ${LangFileString} WANT_UNINSTALL_BEFORE "$R1 er allerede installeret. $\nVil du fjerne den tidligere version inden $(^Name) installeres?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nTryk p� OK for at forts�tte eller tryk p� ANNULLER for at afbryde."
-${LangFileString} NO_ADMIN "Du har ikke administratortilladelser.$\r$\nInstallationen af Inkscape for alle brugere lykkedes m�ske ikke fuldt ud.$\r$\nFrav�lg indstillingen 'Install�r for alle brugere'."
-${LangFileString} NOT_SUPPORTED "Inkscape er kendt for ikke at k�re under Windows 95/98/ME!$\r$\nSe venligst det officielle websted for detaljeret information."
+${LangFileString} OK_CANCEL_DESC "$\n$\nTryk på OK for at fortsætte eller tryk på ANNULLER for at afbryde."
+${LangFileString} NO_ADMIN "Du har ikke administratortilladelser.$\r$\nInstallationen af Inkscape for alle brugere lykkedes måske ikke fuldt ud.$\r$\nFravælg indstillingen 'Installér for alle brugere'."
+${LangFileString} NOT_SUPPORTED "Inkscape er kendt for ikke at køre under Windows 95/98/ME!$\r$\nSe venligst det officielle websted for detaljeret information."
 ${LangFileString} Full "Fuld"
 ${LangFileString} Optimal "Optimal"
 ${LangFileString} Minimal "Minimal"
-${LangFileString} Core "Inkscape SVG-redigering (p�kr�vet)"
-${LangFileString} CoreDesc "Grundl�ggende Inkscape-filer og dll'er"
-${LangFileString} GTKFiles "GTK+ Runtime Environment (p�kr�vet)"
+${LangFileString} Core "Inkscape SVG-redigering (påkrævet)"
+${LangFileString} CoreDesc "Grundlæggende Inkscape-filer og dll'er"
+${LangFileString} GTKFiles "GTK+ Runtime Environment (påkrævet)"
 ${LangFileString} GTKFilesDesc "Multi-platform GUI toolkit, anvendes af Inkscape"
 ${LangFileString} Shortcuts "Genveje"
 ${LangFileString} ShortcutsDesc "Genveje til at starte Inkscape"
-${LangFileString} Alluser "Install�r for alle brugere"
-${LangFileString} AlluserDesc "Install�r programmet for alle der bruger denne computer (alle brugere)"
+${LangFileString} Alluser "Installér for alle brugere"
+${LangFileString} AlluserDesc "Installér programmet for alle der bruger denne computer (alle brugere)"
 ${LangFileString} Desktop "Skrivebord"
-${LangFileString} DesktopDesc "Opret en genvej til Inkscape p� skrivebordet"
+${LangFileString} DesktopDesc "Opret en genvej til Inkscape på skrivebordet"
 ${LangFileString} Startmenu "Menuen Start"
 ${LangFileString} StartmenuDesc "Opret en post til Inkscape i menuen Start"
 ${LangFileString} Quicklaunch "Hurtig start"
-${LangFileString} QuicklaunchDesc "Opret en genvej til Inkscape p� v�rkt�jslinjen Hurtig start"
-${LangFileString} SVGWriter "�bn SVG-filer med Inkscape"
-${LangFileString} SVGWriterDesc "V�lg Inkscape som standardredigeringsprogram for SVG-filer"
+${LangFileString} QuicklaunchDesc "Opret en genvej til Inkscape på værktøjslinjen Hurtig start"
+${LangFileString} SVGWriter "Åbn SVG-filer med Inkscape"
+${LangFileString} SVGWriterDesc "Vælg Inkscape som standardredigeringsprogram for SVG-filer"
 ${LangFileString} ContextMenu "Genvejsmenu"
-${LangFileString} ContextMenuDesc "Tilf�j Inkscape i genvejsmenuen for SVG-filer"
+${LangFileString} ContextMenuDesc "Tilføj Inkscape i genvejsmenuen for SVG-filer"
 ${LangFileString} DeletePrefs "Slet personlige indstillinger"
 ${LangFileString} DeletePrefsDesc "Slet personlige indstillinger efterladt fra tidligere installationer"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Yderligere filer"
 ${LangFileString} AddfilesDesc "Yderligere filer"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Eksempler"
-${LangFileString} ExamplesDesc "Eksempler p� brug af Inkscape"
+${LangFileString} ExamplesDesc "Eksempler på brug af Inkscape"
 ${LangFileString} Tutorials "Vejledninger"
 ${LangFileString} TutorialsDesc "Vejledninger i brug af Inkscape"
-${LangFileString} Languages "Overs�ttelser"
-${LangFileString} LanguagesDesc "Install�r diverse overs�ttelser til Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Oversættelser"
+${LangFileString} LanguagesDesc "Installér diverse oversættelser til Inkscape"
 ${LangFileString} lng_am "Amharisk"
 ${LangFileString} lng_ar "Arabisk"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Aserbajdsjansk"
 ${LangFileString} lng_be "Hviderussisk"
 ${LangFileString} lng_bg "Bulgarsk"
 ${LangFileString} lng_bn "Bengalsk"
 ${LangFileString} lng_bn_BD "Bengalsk (Bangladesh)"
 ${LangFileString} lng_br "Bretonsk"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Katalansk"
 ${LangFileString} lng_ca@valencia "Valenciansk (Katalansk)"
 ${LangFileString} lng_cs "Tjekkisk"
 ${LangFileString} lng_da "Dansk"
 ${LangFileString} lng_de "Tysk"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
-${LangFileString} lng_el "Gr�sk"
+${LangFileString} lng_el "Græsk"
 ${LangFileString} lng_en "Engelsk"
 ${LangFileString} lng_en_AU "Australsk-engelsk"
 ${LangFileString} lng_en_CA "Canadisk-engelsk"
@@ -68,48 +77,69 @@ ${LangFileString} lng_fi "Finsk"
 ${LangFileString} lng_fr "Fransk"
 ${LangFileString} lng_ga "Irsk"
 ${LangFileString} lng_gl "Galicisk"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebraisk"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Kroatisk"
 ${LangFileString} lng_hu "Ungarsk"
 ${LangFileString} lng_hy "Armensk"
 ${LangFileString} lng_id "Indonesisk"
+${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiensk"
 ${LangFileString} lng_ja "Japansk"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Koreansk"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Litauisk"
 ${LangFileString} lng_lv "Lettisk"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Makedonsk"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongolsk"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norsk (bogmål)"
 ${LangFileString} lng_ne "Nepalesisk"
-${LangFileString} lng_nb "Norsk (bogm�l)"
 ${LangFileString} lng_nl "Nederlandsk"
 ${LangFileString} lng_nn "Norsk (nynorsk)"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Punjabisk"
 ${LangFileString} lng_pl "Polsk"
 ${LangFileString} lng_pt "Portugisisk"
 ${LangFileString} lng_pt_BR "Brasiliansk-portugisisk"
-${LangFileString} lng_ro "Rum�nsk"
+${LangFileString} lng_ro "Rumænsk"
 ${LangFileString} lng_ru "Russisk"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Slovakisk"
 ${LangFileString} lng_sl "Slovensk"
 ${LangFileString} lng_sq "Albansk"
 ${LangFileString} lng_sr "Serbisk"
 ${LangFileString} lng_sr@latin "Serbisk i latin skrift"
 ${LangFileString} lng_sv "Svensk"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
 ${LangFileString} lng_tr "Tyrkisk"
 ${LangFileString} lng_uk "Ukrainsk"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamesisk"
 ${LangFileString} lng_zh_CN "Forenklet kinesisk"
 ${LangFileString} lng_zh_TW "Traditionel kinesisk"
 ${LangFileString} UInstOpt "Afinstallationsindstillinger"
 ${LangFileString} UInstOpt1 "Foretag venligst dine valg af yderligere indstillinger"
 ${LangFileString} PurgePrefs "Behold personlige indstillinger"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ikke fundet!$\r$\nAfinstall�r venligst ved at rydde mappen $INSTDIR manuelt!"
-${LangFileString} FileChanged "Filen $filename er blevet �ndret efter installationen.$\r$\nVil du stadig slette filen?"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ikke fundet!$\r$\nAfinstallér venligst ved at rydde mappen $INSTDIR manuelt!"
+${LangFileString} FileChanged "Filen $filename er blevet ændret efter installationen.$\r$\nVil du stadig slette filen?"
 ${LangFileString} Yes "Ja"
 ${LangFileString} AlwaysYes "svar altid Ja"
 ${LangFileString} No "Nej"
diff --git a/packaging/win32/languages/Dutch.nsh b/packaging/win32/languages/Dutch.nsh
index 6ee5a6875..27ce36bd8 100644
--- a/packaging/win32/languages/Dutch.nsh
+++ b/packaging/win32/languages/Dutch.nsh
@@ -1,12 +1,12 @@
-;Language: Dutch (1033, ANSI)
+;Language: Dutch (1033)
 ;By Adib Taraben <theadib@gmail.com>
 ${LangFileString} CaptionDescription "Open Source Scalable Vector Graphics Editor"
 ${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) wordt beschikbaar gesteld onder de GNU General Public License (GPL). De licentie is hierboven ter info weergegeven. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape werd ge�nstalleerd door de gebruiker $0.$\r$\nIndien je voortgaat, kan je het mogelijk niet succesvol be�indigen!$\r$\nLog aub. in als $0 en probeer opnieuw."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 werd reeds ge�nstalleerd. $\nWil je de vorige versie verwijderen voor de installatie van $(^Name)?"
+${LangFileString} DIFFERENT_USER "Inkscape werd geïnstalleerd door de gebruiker $0.$\r$\nIndien je voortgaat, kan je het mogelijk niet succesvol beëindigen!$\r$\nLog aub. in als $0 en probeer opnieuw."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 werd reeds geïnstalleerd. $\nWil je de vorige versie verwijderen voor de installatie van $(^Name)?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nDruk op OK om door te gaan en ANNULEREN om te stoppen."
 ${LangFileString} NO_ADMIN "Je hebt geen beheerdersbevoegdheden.$\r$\nHet installeren van Inkscape voor alle gebruikers is wellicht niet mogelijk.$\r$\nDesactiveer de optie 'Installeren voor alle gebruikers'."
-${LangFileString} NOT_SUPPORTED "Het is bekend dat Inkscape niet draait onder Windows 95/98/ME!$\r$\nKijk aub. de offici�le website na voor gedetailleerde informatie."
+${LangFileString} NOT_SUPPORTED "Het is bekend dat Inkscape niet draait onder Windows 95/98/ME!$\r$\nKijk aub. de officiële website na voor gedetailleerde informatie."
 ${LangFileString} Full "Volledig"
 ${LangFileString} Optimal "Optimaal"
 ${LangFileString} Minimal "Minimaal"
@@ -30,33 +30,42 @@ ${LangFileString} ContextMenu "Contextmenu"
 ${LangFileString} ContextMenuDesc "Inkscape toevoegen aan het contextmenu voor SVG-bestanden"
 ${LangFileString} DeletePrefs "Persoonlijke voorkeuren verwijderen"
 ${LangFileString} DeletePrefsDesc "Persoonlijke voorkeuren van vorige installaties verwijderen"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Additionele bestanden"
 ${LangFileString} AddfilesDesc "Additionele bestanden"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Voorbeelden"
 ${LangFileString} ExamplesDesc "Voorbeelden van het gebruik van Inkscape"
 ${LangFileString} Tutorials "Handleidingen"
 ${LangFileString} TutorialsDesc "Handleidingen over het gebruik van Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Vertalingen"
 ${LangFileString} LanguagesDesc "Diverse vertalingen voor Inkscape installeren"
 ${LangFileString} lng_am "Amhaars"
 ${LangFileString} lng_ar "Arabisch"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azeri"
 ${LangFileString} lng_be "Wit-Russisch"
 ${LangFileString} lng_bg "Bulgaars"
 ${LangFileString} lng_bn "Bengaals"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretoens"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Catalaans"
 ${LangFileString} lng_ca@valencia "Catalaans/Valencia"
 ${LangFileString} lng_cs "Tsjechisch"
 ${LangFileString} lng_da "Deens"
 ${LangFileString} lng_de "Duits"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Grieks"
 ${LangFileString} lng_en "Engels"
-${LangFileString} lng_en_AU "Engels/Australi�"
+${LangFileString} lng_en_AU "Engels/Australië"
 ${LangFileString} lng_en_CA "Engels/Canada"
-${LangFileString} lng_en_GB "Engels/Groot-Brittanni�"
+${LangFileString} lng_en_GB "Engels/Groot-Brittannië"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
 ${LangFileString} lng_es "Spaans"
@@ -68,7 +77,9 @@ ${LangFileString} lng_fi "Fins"
 ${LangFileString} lng_fr "Frans"
 ${LangFileString} lng_ga "Iers"
 ${LangFileString} lng_gl "Galisisch"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebreeuws"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Kroatisch"
 ${LangFileString} lng_hu "Hongaars"
 ${LangFileString} lng_hy "Armenian"
@@ -77,39 +88,57 @@ ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiaans"
 ${LangFileString} lng_ja "Japans"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Koreaans"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Litouws"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedonisch"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongools"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Noors Bokmål"
 ${LangFileString} lng_ne "Nepalees"
-${LangFileString} lng_nb "Noors Bokm�l"
 ${LangFileString} lng_nl "Nederlands"
 ${LangFileString} lng_nn "Noors Nynorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Punjabi"
 ${LangFileString} lng_pl "Pools"
 ${LangFileString} lng_pt "Portugees"
-${LangFileString} lng_pt_BR "Portugees/Brazili�"
+${LangFileString} lng_pt_BR "Portugees/Brazilië"
 ${LangFileString} lng_ro "Roemeens"
 ${LangFileString} lng_ru "Russisch"
 ${LangFileString} lng_rw "Rwandees"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Slovaaks"
 ${LangFileString} lng_sl "Sloveens"
 ${LangFileString} lng_sq "Albanees"
 ${LangFileString} lng_sr "Servisch"
 ${LangFileString} lng_sr@latin "Servisch in Latijnse karakters"
 ${LangFileString} lng_sv "Zweeds"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
 ${LangFileString} lng_tr "Turks"
-${LangFileString} lng_uk "Oekra�ens"
+${LangFileString} lng_uk "Oekraïens"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamees"
 ${LangFileString} lng_zh_CN "Vereenvoudigd Chinees"
 ${LangFileString} lng_zh_TW "Traditioneel Chinees"
-${LangFileString} UInstOpt "De�nstallatieopties"
+${LangFileString} UInstOpt "Deïnstallatieopties"
 ${LangFileString} UInstOpt1 "Maak alstublief je keuzes voor additionele opties"
 ${LangFileString} PurgePrefs "Persoonlijke voorkeuren behouden"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log niet gevonden!$\r$\nDe�nstalleer alstublief door zelf de map $INSTDIR leeg te maken!"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log niet gevonden!$\r$\nDeïnstalleer alstublief door zelf de map $INSTDIR leeg te maken!"
 ${LangFileString} FileChanged "Het bestand $filename is gewijzigd na installatie.$\r$\nWil je nog steeds dat bestand verwijderen?"
 ${LangFileString} Yes "Ja"
 ${LangFileString} AlwaysYes "altijd Ja antwoorden"
diff --git a/packaging/win32/languages/English.nsh b/packaging/win32/languages/English.nsh
index 856adbcde..be6d6c217 100644
--- a/packaging/win32/languages/English.nsh
+++ b/packaging/win32/languages/English.nsh
@@ -1,4 +1,4 @@
-;Language: English (1033, ANSI)
+;Language: English (1033)
 ;By Adib Taraben <theadib@gmail.com>
 ${LangFileString} CaptionDescription "Open Source Scalable Vector Graphics Editor"
 ${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
@@ -11,7 +11,7 @@ ${LangFileString} Full "Full"
 ${LangFileString} Optimal "Optimal"
 ${LangFileString} Minimal "Minimal"
 ${LangFileString} Core "Inkscape SVG Editor (required)"
-${LangFileString} CoreDesc "Core Inkscape files and dlls"
+${LangFileString} CoreDesc "Inkscape core files and DLLs"
 ${LangFileString} GTKFiles "GTK+ Runtime Environment (required)"
 ${LangFileString} GTKFilesDesc "A multi-platform GUI toolkit, used by Inkscape"
 ${LangFileString} Shortcuts "Shortcuts"
@@ -30,27 +30,36 @@ ${LangFileString} ContextMenu "Context Menu"
 ${LangFileString} ContextMenuDesc "Add Inkscape into the Context Menu for SVG files"
 ${LangFileString} DeletePrefs "Delete personal preferences"
 ${LangFileString} DeletePrefsDesc "Delete personal preferences leftover from previous installations"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Additional Files"
 ${LangFileString} AddfilesDesc "Additional Files"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Examples"
 ${LangFileString} ExamplesDesc "Examples using Inkscape"
 ${LangFileString} Tutorials "Tutorials"
 ${LangFileString} TutorialsDesc "Tutorials using Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Translations"
-${LangFileString} LanguagesDesc "Install various translations for Inkscape"
+${LangFileString} LanguagesDesc "Translations and localized content for Inkscape"
 ${LangFileString} lng_am "Amharic"
 ${LangFileString} lng_ar "Arabic"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbaijani"
-${LangFileString} lng_be "Byelorussian"
+${LangFileString} lng_be "Belarusian"
 ${LangFileString} lng_bg "Bulgarian"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Catalan"
 ${LangFileString} lng_ca@valencia "Valencian Catalan"
 ${LangFileString} lng_cs "Czech"
 ${LangFileString} lng_da "Danish"
 ${LangFileString} lng_de "German"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Greek"
 ${LangFileString} lng_en "English"
@@ -68,7 +77,9 @@ ${LangFileString} lng_fi "Finnish"
 ${LangFileString} lng_fr "French"
 ${LangFileString} lng_ga "Irish"
 ${LangFileString} lng_gl "Galician"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebrew"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croatian"
 ${LangFileString} lng_hu "Hungarian"
 ${LangFileString} lng_hy "Armenian"
@@ -77,15 +88,26 @@ ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italian"
 ${LangFileString} lng_ja "Japanese"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Korean"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lithuanian"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedonian"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongolian"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norwegian Bokmål"
 ${LangFileString} lng_ne "Nepali"
-${LangFileString} lng_nb "Norwegian Bokm�l"
 ${LangFileString} lng_nl "Dutch"
 ${LangFileString} lng_nn "Norwegian Nynorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
 ${LangFileString} lng_pl "Polish"
 ${LangFileString} lng_pt "Portuguese"
@@ -93,16 +115,23 @@ ${LangFileString} lng_pt_BR "Brazilian Portuguese"
 ${LangFileString} lng_ro "Romanian"
 ${LangFileString} lng_ru "Russian"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Slovak"
 ${LangFileString} lng_sl "Slovenian"
 ${LangFileString} lng_sq "Albanian"
 ${LangFileString} lng_sr "Serbian"
 ${LangFileString} lng_sr@latin "Serbian in Latin script"
 ${LangFileString} lng_sv "Swedish"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
 ${LangFileString} lng_tr "Turkish"
 ${LangFileString} lng_uk "Ukrainian"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamese"
 ${LangFileString} lng_zh_CN "Simplifed Chinese"
 ${LangFileString} lng_zh_TW "Traditional Chinese"
diff --git a/packaging/win32/languages/Finnish.nsh b/packaging/win32/languages/Finnish.nsh
index fc5d0be9b..a33fa1722 100644
--- a/packaging/win32/languages/Finnish.nsh
+++ b/packaging/win32/languages/Finnish.nsh
@@ -1,56 +1,65 @@
-;Language: Finnish (1035, CP1252)
+;Language: Finnish (1035)
 ;By Riku Leino <tsoots@gmail.com>
-${LangFileString} CaptionDescription "Avoimen l�hdekoodin SVG-muokkain"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) on julkaistu GNU General Public License (GPL) -lisenssill�. $_CLICK"
-${LangFileString} DIFFERENT_USER "K�ytt�j� $0.$\r$\n on asentanut Inkscapen\nJos jatkat, asennus saattaa ep�onnistua.!$\r$\nKirjaudu sis��n k�ytt�j�n� $0 ja yrit� uudestaan."
+${LangFileString} CaptionDescription "Avoimen lähdekoodin SVG-muokkain"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) on julkaistu GNU General Public License (GPL) -lisenssillä. $_CLICK"
+${LangFileString} DIFFERENT_USER "Käyttäjä $0.$\r$\n on asentanut Inkscapen\nJos jatkat, asennus saattaa epäonnistua.!$\r$\nKirjaudu sisään käyttäjänä $0 ja yritä uudestaan."
 ${LangFileString} WANT_UNINSTALL_BEFORE "$R1 on jo asennettu. $\nHaluatko poistaa edellisen version ennen asennusta $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nPaina OK jatkaaksi tai Peruuta keskeytt��ksesi."
-${LangFileString} NO_ADMIN "Sinulla ei ole p��k�ytt�j�n oikeuksia.$\r$\nInkscapen asennus kaikille k�ytt�jille saattaa ep�onnistua.$\r$\n�l� k�yt� kaikille k�ytt�jille -ominaisuutta."
-${LangFileString} NOT_SUPPORTED "Inkscape ei toimi k�ytt�j�rjestelmiss� Windows 95/98/ME!$\r$\nLis�tietoja saat ohjelman kotisivulta."
-${LangFileString} Full "T�ysi"
+${LangFileString} OK_CANCEL_DESC "$\n$\nPaina OK jatkaaksi tai Peruuta keskeyttääksesi."
+${LangFileString} NO_ADMIN "Sinulla ei ole pääkäyttäjän oikeuksia.$\r$\nInkscapen asennus kaikille käyttäjille saattaa epäonnistua.$\r$\nÄlä käytä kaikille käyttäjille -ominaisuutta."
+${LangFileString} NOT_SUPPORTED "Inkscape ei toimi käyttöjärjestelmissä Windows 95/98/ME!$\r$\nLisätietoja saat ohjelman kotisivulta."
+${LangFileString} Full "Täysi"
 ${LangFileString} Optimal "Oletus"
-${LangFileString} Minimal "V�h�isin"
+${LangFileString} Minimal "Vähäisin"
 ${LangFileString} Core "Inkscape SVG-muokkain (pakollinen)"
 ${LangFileString} CoreDesc "Inkscape tiedostot ja dll-kirjastot"
-${LangFileString} GTKFiles "GTK+-ajoymp�rist� (pakollinen)"
-${LangFileString} GTKFilesDesc "Usealla alustalla toimiva k�ytt�liittym�kehys, jota Inkscape k�ytt��"
+${LangFileString} GTKFiles "GTK+-ajoympäristö (pakollinen)"
+${LangFileString} GTKFilesDesc "Usealla alustalla toimiva käyttöliittymäkehys, jota Inkscape käyttää"
 ${LangFileString} Shortcuts "Pikakuvakkeet"
-${LangFileString} ShortcutsDesc "Pikakuvakkeet Inkscapen k�ynnist�miseksi"
-${LangFileString} Alluser "kaikille k�ytt�jille"
-${LangFileString} AlluserDesc "Asenna Inkscape kaikille t�m�n tietokoneen k�ytt�jille"
-${LangFileString} Desktop "Ty�p�yt�"
-${LangFileString} DesktopDesc "Luo Inkscape-pikakuvake ty�p�yd�lle"
-${LangFileString} Startmenu "K�ynnist�-valikko"
-${LangFileString} StartmenuDesc "Lis�� Inkscape K�ynnist�-valikkoon"
-${LangFileString} Quicklaunch "Pikak�ynnistys"
-${LangFileString} QuicklaunchDesc "Lis�� Inkscape pikak�ynnistysriville"
+${LangFileString} ShortcutsDesc "Pikakuvakkeet Inkscapen käynnistämiseksi"
+${LangFileString} Alluser "kaikille käyttäjille"
+${LangFileString} AlluserDesc "Asenna Inkscape kaikille tämän tietokoneen käyttäjille"
+${LangFileString} Desktop "Työpöytä"
+${LangFileString} DesktopDesc "Luo Inkscape-pikakuvake työpöydälle"
+${LangFileString} Startmenu "Käynnistä-valikko"
+${LangFileString} StartmenuDesc "Lisää Inkscape Käynnistä-valikkoon"
+${LangFileString} Quicklaunch "Pikakäynnistys"
+${LangFileString} QuicklaunchDesc "Lisää Inkscape pikakäynnistysriville"
 ${LangFileString} SVGWriter "Avaa SVG-tiedostot Inkscapella"
 ${LangFileString} SVGWriterDesc "Tee Inkscapesta oletusmuokkain SVG-tiedostoille"
 ${LangFileString} ContextMenu "Kontekstivalikko"
-${LangFileString} ContextMenuDesc "Lis�� Inkscape SVG-tiedostojen pikavalikkoon"
+${LangFileString} ContextMenuDesc "Lisää Inkscape SVG-tiedostojen pikavalikkoon"
 ${LangFileString} DeletePrefs "Poista asetukset"
 ${LangFileString} DeletePrefsDesc "Poista edelliseen versioon tehdyt asetukset"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Valinnaiset tiedostot"
 ${LangFileString} AddfilesDesc "Valinnaiset tiedostot"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Esimerkit"
 ${LangFileString} ExamplesDesc "Inkscapen avulla tehdyt esimerkit"
 ${LangFileString} Tutorials "Ohjeet"
-${LangFileString} TutorialsDesc "Inkscapen k�ytt�� opettavat ohjeet (englanniksi)"
-${LangFileString} Languages "K��nn�kset"
-${LangFileString} LanguagesDesc "Asenna Inkscapen k��nn�kset"
+${LangFileString} TutorialsDesc "Inkscapen käyttöä opettavat ohjeet (englanniksi)"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Käännökset"
+${LangFileString} LanguagesDesc "Asenna Inkscapen käännökset"
 ${LangFileString} lng_am "amhari"
 ${LangFileString} lng_ar "Arabic"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "azerbaid?ani"
-${LangFileString} lng_be "valkoven�j�"
+${LangFileString} lng_be "valkovenäjä"
 ${LangFileString} lng_bg "bulgaria"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "katalaani"
 ${LangFileString} lng_ca@valencia "Valencian Catalan"
 ${LangFileString} lng_cs "t?ekki"
 ${LangFileString} lng_da "tanska"
 ${LangFileString} lng_de "saksa"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "dzongkha"
 ${LangFileString} lng_el "kreikka"
 ${LangFileString} lng_en "englanti"
@@ -68,7 +77,9 @@ ${LangFileString} lng_fi "suomi"
 ${LangFileString} lng_fr "ranska"
 ${LangFileString} lng_ga "iiri"
 ${LangFileString} lng_gl "galicia"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebrew"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "kroatia"
 ${LangFileString} lng_hu "unkari"
 ${LangFileString} lng_hy "Armenian"
@@ -77,41 +88,59 @@ ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "italia"
 ${LangFileString} lng_ja "japani"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "korea"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "liettua"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "makedonia"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "mongolia"
-${LangFileString} lng_ne "nepali"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
 ${LangFileString} lng_nb "kirjanorja"
+${LangFileString} lng_ne "nepali"
 ${LangFileString} lng_nl "hollanti"
 ${LangFileString} lng_nn "nykynorja"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "punjabi"
 ${LangFileString} lng_pl "puola"
 ${LangFileString} lng_pt "portugali"
 ${LangFileString} lng_pt_BR "Brasilian portugali"
 ${LangFileString} lng_ro "Romanian"
-${LangFileString} lng_ru "ven�j�"
+${LangFileString} lng_ru "venäjä"
 ${LangFileString} lng_rw "ruanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "slovakki"
 ${LangFileString} lng_sl "sloveeni"
 ${LangFileString} lng_sq "albania"
 ${LangFileString} lng_sr "serbia"
 ${LangFileString} lng_sr@latin "serbia (latin)"
 ${LangFileString} lng_sv "ruotsi"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "thai"
 ${LangFileString} lng_tr "turkki"
 ${LangFileString} lng_uk "ukraina"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "vietnami"
 ${LangFileString} lng_zh_CN "yksinkertaistettu kiina"
 ${LangFileString} lng_zh_TW "perinteinen kiina"
 ${LangFileString} UInstOpt "Ohjelman poiston asetukset"
 ${LangFileString} UInstOpt1 "Valitse haluamasi asetukset ohjelman poistamiseksi"
-${LangFileString} PurgePrefs "S�ilyt� omat asetukset"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ei l�ytynyt!$\r$\nPoista tyhjent�m�ll� asennuskansio $INSTDIR!"
-${LangFileString} FileChanged "Tiedosto $filename on muuttunut asennuksen j�lkeen.$\r$\nPoistetaanko se siit� huolimatta?"
-${LangFileString} Yes "Kyll�"
-${LangFileString} AlwaysYes "Kyll� kaikkiin"
+${LangFileString} PurgePrefs "Säilytä omat asetukset"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ei löytynyt!$\r$\nPoista tyhjentämällä asennuskansio $INSTDIR!"
+${LangFileString} FileChanged "Tiedosto $filename on muuttunut asennuksen jälkeen.$\r$\nPoistetaanko se siitä huolimatta?"
+${LangFileString} Yes "Kyllä"
+${LangFileString} AlwaysYes "Kyllä kaikkiin"
 ${LangFileString} No "Ei"
 ${LangFileString} AlwaysNo "Ei kaikkiin"
diff --git a/packaging/win32/languages/French.nsh b/packaging/win32/languages/French.nsh
index 172303d25..64d8793d4 100644
--- a/packaging/win32/languages/French.nsh
+++ b/packaging/win32/languages/French.nsh
@@ -1,56 +1,65 @@
-;Language: French (1036, CP1252)
+;Language: French (1036)
 ;By matiphas@free.fr, Nicolas Dufour <nicoduf@yahoo.fr>, Sylvain Chiron <chironsylvain@orange.fr>
-${LangFileString} CaptionDescription "�diteur vectoriel SVG libre"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) est mis � disposition sous les termes de la licence publique g�n�rale (GPL) GNU. La licence est fournie ici pour information uniquement. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape a d�j� �t� install� par l'utilisateur $0.$\r$\nSi vous continuez, l'installation pourrait devenir d�fectueuse�!$\r$\nVeuillez vous connecter en tant que $0 et essayer � nouveau."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a d�j� �t� install�. $\nVoulez-vous supprimer la version pr�c�dente avant l'installation d'$(^Name) ?"
+${LangFileString} CaptionDescription "Éditeur vectoriel SVG libre"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) est mis à disposition sous les termes de la licence publique générale (GPL) GNU. La licence est fournie ici pour information uniquement. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape a déjà été installé par l'utilisateur $0.$\r$\nSi vous continuez, l'installation pourrait devenir défectueuse !$\r$\nVeuillez vous connecter en tant que $0 et essayer à nouveau."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a déjà été installé. $\nVoulez-vous supprimer la version précédente avant l'installation d'$(^Name) ?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nCliquer sur OK pour continuer ou sur CANCEL pour annuler."
-${LangFileString} NO_ADMIN "Vous n'avez pas les privil�ges d'administration.$\r$\nL'installation d'Inkscape pour tous les utilisateurs pourrait devenir d�fectueuse.$\r$\nVeuillez d�cocher l'option ��pour tous les utilisateurs��."
-${LangFileString} NOT_SUPPORTED "Inkscape n'est pas ex�cutable sur Windows 95/98/Me�!$\r$\nVeuillez consulter le site web officiel pour plus d'informations."
-${LangFileString} Full "Compl�te"
+${LangFileString} NO_ADMIN "Vous n'avez pas les privilèges d'administration.$\r$\nL'installation d'Inkscape pour tous les utilisateurs pourrait devenir défectueuse.$\r$\nVeuillez décocher l'option « pour tous les utilisateurs »."
+${LangFileString} NOT_SUPPORTED "Inkscape n'est pas exécutable sur Windows 95/98/Me !$\r$\nVeuillez consulter le site web officiel pour plus d'informations."
+${LangFileString} Full "Complète"
 ${LangFileString} Optimal "Optimale"
 ${LangFileString} Minimal "Minimale"
-${LangFileString} Core "�diteur SVG Inkscape (n�cessaire)"
-${LangFileString} CoreDesc "Fichiers indispensables d'Inkscape et biblioth�ques dynamiques"
-${LangFileString} GTKFiles "Environnement GTK+ (n�cessaire)"
-${LangFileString} GTKFilesDesc "Une bo�te � outils multi-plateforme pour interfaces graphiques, utilis�e par Inkscape"
+${LangFileString} Core "Éditeur SVG Inkscape (nécessaire)"
+${LangFileString} CoreDesc "Fichiers indispensables d'Inkscape et bibliothèques dynamiques"
+${LangFileString} GTKFiles "Environnement GTK+ (nécessaire)"
+${LangFileString} GTKFilesDesc "Une boîte à outils multi-plateforme pour interfaces graphiques, utilisée par Inkscape"
 ${LangFileString} Shortcuts "Raccourcis"
-${LangFileString} ShortcutsDesc "Raccourcis pour d�marrer Inkscape"
+${LangFileString} ShortcutsDesc "Raccourcis pour démarrer Inkscape"
 ${LangFileString} Alluser "Pour tous les utilisateurs"
 ${LangFileString} AlluserDesc "Installer cette application pour tous les utilisateurs de cet ordinateur"
 ${LangFileString} Desktop "Bureau"
-${LangFileString} DesktopDesc "Cr�er un raccourci vers Inkscape sur le bureau"
-${LangFileString} Startmenu "Menu D�marrer"
-${LangFileString} StartmenuDesc "Cr�er une entr�e Inkscape dans le menu D�marrer"
-${LangFileString} Quicklaunch "Barre des t�ches"
-${LangFileString} QuicklaunchDesc "Cr�er un raccourci vers Inkscape dans la barre des t�ches"
+${LangFileString} DesktopDesc "Créer un raccourci vers Inkscape sur le bureau"
+${LangFileString} Startmenu "Menu Démarrer"
+${LangFileString} StartmenuDesc "Créer une entrée Inkscape dans le menu Démarrer"
+${LangFileString} Quicklaunch "Barre des tâches"
+${LangFileString} QuicklaunchDesc "Créer un raccourci vers Inkscape dans la barre des tâches"
 ${LangFileString} SVGWriter "Ouvrir les fichiers SVG avec Inkscape"
-${LangFileString} SVGWriterDesc "Choisir Inkscape comme �diteur par d�faut pour les fichiers SVG"
+${LangFileString} SVGWriterDesc "Choisir Inkscape comme éditeur par défaut pour les fichiers SVG"
 ${LangFileString} ContextMenu "Menu contextuel"
 ${LangFileString} ContextMenuDesc "Ajouter Inkscape dans le menu contextuel des fichiers SVG"
-${LangFileString} DeletePrefs "Effacer les pr�f�rences personnelles"
-${LangFileString} DeletePrefsDesc "Effacer les pr�f�rences personnelles laiss�es par les pr�c�dentes installations"
+${LangFileString} DeletePrefs "Effacer les préférences personnelles"
+${LangFileString} DeletePrefsDesc "Effacer les préférences personnelles laissées par les précédentes installations"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Fichiers additionnels"
 ${LangFileString} AddfilesDesc "Fichiers additionnels"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Exemples"
 ${LangFileString} ExamplesDesc "Exemples d'utilisation d'Inkscape"
 ${LangFileString} Tutorials "Didacticiels"
 ${LangFileString} TutorialsDesc "Didacticiels sur l'utilisation d'Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Traductions"
 ${LangFileString} LanguagesDesc "Installer les traductions d'Inkscape"
 ${LangFileString} lng_am "Amharique"
 ${LangFileString} lng_ar "Arabe"
-${LangFileString} lng_az "Az�ri"
-${LangFileString} lng_be "Bi�lorusse"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "Azéri"
+${LangFileString} lng_be "Biélorusse"
 ${LangFileString} lng_bg "Bulgare"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali (Bangladesh)"
 ${LangFileString} lng_br "Breton"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Catalan"
 ${LangFileString} lng_ca@valencia "Catalan (Valence)"
-${LangFileString} lng_cs "Tch�que"
+${LangFileString} lng_cs "Tchèque"
 ${LangFileString} lng_da "Danois"
 ${LangFileString} lng_de "Allemand"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Grec"
 ${LangFileString} lng_en "Anglais"
@@ -58,60 +67,80 @@ ${LangFileString} lng_en_AU "Anglais (Australie)"
 ${LangFileString} lng_en_CA "Anglais (Canada)"
 ${LangFileString} lng_en_GB "Anglais (Royaume-Uni)"
 ${LangFileString} lng_en_US@piglatin "Pig latin"
-${LangFileString} lng_eo "Esp�ranto"
+${LangFileString} lng_eo "Espéranto"
 ${LangFileString} lng_es "Espagnol"
 ${LangFileString} lng_es_MX "Espagnol (Mexique)"
 ${LangFileString} lng_et "Estonien"
 ${LangFileString} lng_eu "Basque"
 ${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finnois"
-${LangFileString} lng_fr "Fran�ais"
-${LangFileString} lng_he "H�breu"
+${LangFileString} lng_fr "Français"
 ${LangFileString} lng_ga "Irlandais"
 ${LangFileString} lng_gl "Galicien"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "Hébreu"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croate"
 ${LangFileString} lng_hu "Hongrois"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "Indon�sien"
+${LangFileString} lng_id "Indonésien"
 ${LangFileString} lng_is "Islandais"
 ${LangFileString} lng_it "Italien"
 ${LangFileString} lng_ja "Japonais"
 ${LangFileString} lng_km "Khmer"
-${LangFileString} lng_ko "Cor�en"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Coréen"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituanien"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "Mac�donien"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Macédonien"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongol"
-${LangFileString} lng_ne "N�palais"
-${LangFileString} lng_nb "Bokm�l (Norv�ge)"
-${LangFileString} lng_nl "N�erlandais"
-${LangFileString} lng_nn "Nynorsk (Norv�ge)"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Bokmål (Norvège)"
+${LangFileString} lng_ne "Népalais"
+${LangFileString} lng_nl "Néerlandais"
+${LangFileString} lng_nn "Nynorsk (Norvège)"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Pendjabi"
 ${LangFileString} lng_pl "Polonais"
 ${LangFileString} lng_pt "Portugais"
-${LangFileString} lng_pt_BR "Portugais (Br�sil)"
+${LangFileString} lng_pt_BR "Portugais (Brésil)"
 ${LangFileString} lng_ro "Roumain"
 ${LangFileString} lng_ru "Russe"
 ${LangFileString} lng_rw "Kinyarouandais"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Slovaque"
-${LangFileString} lng_sl "Slov�ne"
+${LangFileString} lng_sl "Slovène"
 ${LangFileString} lng_sq "Albanais"
 ${LangFileString} lng_sr "Serbe"
 ${LangFileString} lng_sr@latin "Serbe (notation latine)"
-${LangFileString} lng_sv "Su�dois"
+${LangFileString} lng_sv "Suédois"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
-${LangFileString} lng_th "Tha�"
+${LangFileString} lng_th "Thaï"
 ${LangFileString} lng_tr "Turc"
 ${LangFileString} lng_uk "Ukrainien"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamien"
 ${LangFileString} lng_zh_CN "Chinois"
-${LangFileString} lng_zh_TW "Chinois (Ta�wan)"
-${LangFileString} UInstOpt "Options de d�sinstallation"
+${LangFileString} lng_zh_TW "Chinois (Taïwan)"
+${LangFileString} UInstOpt "Options de désinstallation"
 ${LangFileString} UInstOpt1 "Choisissez parmi les options additionnelles"
-${LangFileString} PurgePrefs "Conserver les pr�f�rences personnelles"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log introuvable !$\r$\nVeuillez proc�der � la d�sinstallation en nettoyant le dossier $INSTDIR manuellement."
-${LangFileString} FileChanged "Le fichier $filename a �t� modifi� apr�s l'installation.$\r$\nVoulez-vous vraiment le supprimer ?"
+${LangFileString} PurgePrefs "Conserver les préférences personnelles"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log introuvable !$\r$\nVeuillez procéder à la désinstallation en nettoyant le dossier $INSTDIR manuellement."
+${LangFileString} FileChanged "Le fichier $filename a été modifié après l'installation.$\r$\nVoulez-vous vraiment le supprimer ?"
 ${LangFileString} Yes "Oui"
-${LangFileString} AlwaysYes "toujours r�pondre Oui"
+${LangFileString} AlwaysYes "toujours répondre Oui"
 ${LangFileString} No "Non"
-${LangFileString} AlwaysNo "toujours r�pondre Non"
+${LangFileString} AlwaysNo "toujours répondre Non"
diff --git a/packaging/win32/languages/Galician.nsh b/packaging/win32/languages/Galician.nsh
index d151c552e..bc5bd6724 100644
--- a/packaging/win32/languages/Galician.nsh
+++ b/packaging/win32/languages/Galician.nsh
@@ -1,117 +1,146 @@
-;Language: Galician (1110, CP1252)
+;Language: Galician (1110)
 ;By Leandro Regueiro leandro.regueiro@gmail.com
-${LangFileString} CaptionDescription "Editor de Gr�ficos Vectoriais Escalables (SVG) de C�digo Aberto"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) publ�case baixo GNU General Public License (GPL). A licenza am�sase aqu� s� para informalo. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape foi instalado polo usuario $0.$\r$\nSe continua pode que non consiga rematar a instalaci�n con �xito!$\r$\nEntre no sistema coma $0 e t�nteo de novo."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 xa foi instalado. $\nDesexa eliminar a versi�n anterior antes de instalar $(^Name) ?"
+${LangFileString} CaptionDescription "Editor de Gráficos Vectoriais Escalables (SVG) de Código Aberto"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) publícase baixo GNU General Public License (GPL). A licenza amósase aquí só para informalo. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape foi instalado polo usuario $0.$\r$\nSe continua pode que non consiga rematar a instalación con éxito!$\r$\nEntre no sistema coma $0 e ténteo de novo."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 xa foi instalado. $\nDesexa eliminar a versión anterior antes de instalar $(^Name) ?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nPrema Aceptar para continuar ou prema CANCELAR para abortar."
-${LangFileString} NO_ADMIN "Non ten privilexios de administrador.$\r$\nPode que non consiga rematar con �xito a instalaci�n de Inkscape para t�dolos usuarios.$\r$\nDesmarque a opci�n 'para t�dolos usuarios'."
-${LangFileString} NOT_SUPPORTED "S�bese que Inkscape non funciona en Windows 95/98/ME!$\r$\nConsulte o sitio web oficial para obter informaci�n m�is detallada."
+${LangFileString} NO_ADMIN "Non ten privilexios de administrador.$\r$\nPode que non consiga rematar con éxito a instalación de Inkscape para tódolos usuarios.$\r$\nDesmarque a opción 'para tódolos usuarios'."
+${LangFileString} NOT_SUPPORTED "Sábese que Inkscape non funciona en Windows 95/98/ME!$\r$\nConsulte o sitio web oficial para obter información máis detallada."
 ${LangFileString} Full "Completa"
-${LangFileString} Optimal "�ptima"
-${LangFileString} Minimal "M�nima"
+${LangFileString} Optimal "Óptima"
+${LangFileString} Minimal "Mínima"
 ${LangFileString} Core "Editor de SVG Inkscape (requirido)"
-${LangFileString} CoreDesc "Ficheiros b�sicos de Inkscape e dlls"
-${LangFileString} GTKFiles "Ambiente de Execuci�n GTK+ (requirido)"
+${LangFileString} CoreDesc "Ficheiros básicos de Inkscape e dlls"
+${LangFileString} GTKFiles "Ambiente de Execución GTK+ (requirido)"
 ${LangFileString} GTKFilesDesc "Un toolkit GUI multiplataforma, usado por Inkscape"
 ${LangFileString} Shortcuts "Accesos Directos"
 ${LangFileString} ShortcutsDesc "Accesos directos para iniciar Inkscape"
-${LangFileString} Alluser "para t�dolos usuarios"
-${LangFileString} AlluserDesc "Instalar esta aplicaci�n para t�dolos que usan este ordenador (t�dolos usuarios)"
+${LangFileString} Alluser "para tódolos usuarios"
+${LangFileString} AlluserDesc "Instalar esta aplicación para tódolos que usan este ordenador (tódolos usuarios)"
 ${LangFileString} Desktop "Escritorio"
 ${LangFileString} DesktopDesc "Crear un acceso directo para Inkscape no Escritorio"
-${LangFileString} Startmenu "Men� Inicio"
-${LangFileString} StartmenuDesc "Crear unha entrada no Men� Inicio para Inkscape"
-${LangFileString} Quicklaunch "Inicio R�pido"
-${LangFileString} QuicklaunchDesc "Crear un acceso directo para Inkscape na barra de Inicio R�pido"
+${LangFileString} Startmenu "Menú Inicio"
+${LangFileString} StartmenuDesc "Crear unha entrada no Menú Inicio para Inkscape"
+${LangFileString} Quicklaunch "Inicio Rápido"
+${LangFileString} QuicklaunchDesc "Crear un acceso directo para Inkscape na barra de Inicio Rápido"
 ${LangFileString} SVGWriter "Abrir ficheiros SVG con Inkscape"
 ${LangFileString} SVGWriterDesc "Seleccionar Inkscape coma o editor predeterminado para os ficheiros SVG"
-${LangFileString} ContextMenu "Men� Contextual"
-${LangFileString} ContextMenuDesc "Engadir Inkscape � Men� Contextual dos ficheiros SVG"
-${LangFileString} DeletePrefs "Eliminar as configuraci�ns persoais"
-${LangFileString} DeletePrefsDesc "Eliminar as configuraci�ns persoais de instalaci�ns anteriores"
+${LangFileString} ContextMenu "Menú Contextual"
+${LangFileString} ContextMenuDesc "Engadir Inkscape ó Menú Contextual dos ficheiros SVG"
+${LangFileString} DeletePrefs "Eliminar as configuracións persoais"
+${LangFileString} DeletePrefsDesc "Eliminar as configuracións persoais de instalacións anteriores"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Ficheiros Adicionais"
 ${LangFileString} AddfilesDesc "Ficheiros Adicionais"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Exemplos"
 ${LangFileString} ExamplesDesc "Exemplos de uso de Inkscape"
 ${LangFileString} Tutorials "Titoriais"
 ${LangFileString} TutorialsDesc "Titoriais de Inkscape"
-${LangFileString} Languages "Traduci�ns"
-${LangFileString} LanguagesDesc "Instala varias traduci�ns de Inkscape"
-${LangFileString} lng_am "Amh�rico"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Traducións"
+${LangFileString} LanguagesDesc "Instala varias traducións de Inkscape"
+${LangFileString} lng_am "Amhárico"
 ${LangFileString} lng_ar "Arabic"
-${LangFileString} lng_az "Azer�"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "Azerí"
 ${LangFileString} lng_be "Bielorruso"
-${LangFileString} lng_bg "B�lgaro"
-${LangFileString} lng_bn "Bengal�"
-${LangFileString} lng_br "Breton"
+${LangFileString} lng_bg "Búlgaro"
+${LangFileString} lng_bn "Bengalí"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${LangFileString} lng_ca "Catal�n"
-${LangFileString} lng_ca@valencia "Catal�n Valenciano"
+${LangFileString} lng_br "Breton"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Catalán"
+${LangFileString} lng_ca@valencia "Catalán Valenciano"
 ${LangFileString} lng_cs "Checo"
-${LangFileString} lng_da "Dan�s"
-${LangFileString} lng_de "Alem�n"
+${LangFileString} lng_da "Danés"
+${LangFileString} lng_de "Alemán"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Grego"
-${LangFileString} lng_en "Ingl�s"
-${LangFileString} lng_en_AU "Ingl�s Australiano"
-${LangFileString} lng_en_CA "Ingl�s Canadense"
-${LangFileString} lng_en_GB "Ingl�s Brit�nico"
+${LangFileString} lng_en "Inglés"
+${LangFileString} lng_en_AU "Inglés Australiano"
+${LangFileString} lng_en_CA "Inglés Canadense"
+${LangFileString} lng_en_GB "Inglés Británico"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
-${LangFileString} lng_es "Espa�ol"
-${LangFileString} lng_es_MX "Espa�ol Mexicano"
+${LangFileString} lng_es "Español"
+${LangFileString} lng_es_MX "Español Mexicano"
 ${LangFileString} lng_et "Estonio"
-${LangFileString} lng_eu "�uscaro "
+${LangFileString} lng_eu "Éuscaro "
 ${LangFileString} lng_fa "Farsi"
-${LangFileString} lng_fi "Fin�s"
-${LangFileString} lng_fr "Franc�s"
-${LangFileString} lng_ga "Ga�lico Irland�s"
+${LangFileString} lng_fi "Finés"
+${LangFileString} lng_fr "Francés"
+${LangFileString} lng_ga "Gaélico Irlandés"
 ${LangFileString} lng_gl "Galego"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebreo"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croata"
-${LangFileString} lng_hu "H�ngaro"
+${LangFileString} lng_hu "Húngaro"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesio"
 ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
-${LangFileString} lng_ja "Xapon�s"
+${LangFileString} lng_ja "Xaponés"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Coreano"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituano"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedonio"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongol"
-${LangFileString} lng_ne "Nepal�"
-${LangFileString} lng_nb "Noruegu�s Bokm�l"
-${LangFileString} lng_nl "Neerland�s"
-${LangFileString} lng_nn "Noruegu�s Nynorsk"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Noruegués Bokmål"
+${LangFileString} lng_ne "Nepalí"
+${LangFileString} lng_nl "Neerlandés"
+${LangFileString} lng_nn "Noruegués Nynorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Punjabi"
 ${LangFileString} lng_pl "Polaco"
-${LangFileString} lng_pt "Portugu�s"
-${LangFileString} lng_pt_BR "Portugu�s Brasileiro"
-${LangFileString} lng_ro "Roman�s"
+${LangFileString} lng_pt "Portugués"
+${LangFileString} lng_pt_BR "Portugués Brasileiro"
+${LangFileString} lng_ro "Romanés"
 ${LangFileString} lng_ru "Ruso"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Eslovaco"
 ${LangFileString} lng_sl "Eslovenio"
-${LangFileString} lng_sq "Alban�s"
+${LangFileString} lng_sq "Albanés"
 ${LangFileString} lng_sr "Serbio"
 ${LangFileString} lng_sr@latin "Serbio con alfabeto Latino"
 ${LangFileString} lng_sv "Sueco"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
-${LangFileString} lng_th "Tailand�s"
+${LangFileString} lng_th "Tailandés"
 ${LangFileString} lng_tr "Turco"
-${LangFileString} lng_uk "Ucra�no"
+${LangFileString} lng_uk "Ucraíno"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamita"
-${LangFileString} lng_zh_CN "Chin�s Simplificado"
-${LangFileString} lng_zh_TW "Chin�s Tradicional"
-${LangFileString} UInstOpt "Opci�ns de Desinstalaci�n"
-${LangFileString} UInstOpt1 "Escolla as opci�ns adicionais"
-${LangFileString} PurgePrefs "Conservar a Configuraci�n persoal"
+${LangFileString} lng_zh_CN "Chinés Simplificado"
+${LangFileString} lng_zh_TW "Chinés Tradicional"
+${LangFileString} UInstOpt "Opcións de Desinstalación"
+${LangFileString} UInstOpt1 "Escolla as opcións adicionais"
+${LangFileString} PurgePrefs "Conservar a Configuración persoal"
 ${LangFileString} UninstallLogNotFound "Non se atopou $INSTDIR\uninstall.log!$\r$\nDesinstale baleirando vostede mesmo o directorio $INSTDIR!"
-${LangFileString} FileChanged "O ficheiro $filename cambiou despois da instalaci�n.$\r$\nAinda desexa eliminar ese ficheiro?"
-${LangFileString} Yes "S�"
-${LangFileString} AlwaysYes "sempre responder S�"
+${LangFileString} FileChanged "O ficheiro $filename cambiou despois da instalación.$\r$\nAinda desexa eliminar ese ficheiro?"
+${LangFileString} Yes "Sí"
+${LangFileString} AlwaysYes "sempre responder Sí"
 ${LangFileString} No "Non"
 ${LangFileString} AlwaysNo "sempre responder Non"
diff --git a/packaging/win32/languages/German.nsh b/packaging/win32/languages/German.nsh
index 7c5438b79..c663456b8 100644
--- a/packaging/win32/languages/German.nsh
+++ b/packaging/win32/languages/German.nsh
@@ -1,116 +1,145 @@
-;Language: German (1031, CP1252)
+;Language: German (1031)
 ;By Adib Taraben <theadib@gmail.com>
-${LangFileString} CaptionDescription "Open Source SVG-Vektorillustrator"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) wird unter der GNU General Public License (GPL) ver�ffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 wurde bereits installiert. $\nSoll die vorhergehende Version vor dem Installieren von $(^Name) zuerst deinstalliert werden?"
+${LangFileString} CaptionDescription "Open-Source-Vektorgrafikeditor"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) wird unter der GNU General Public License (GPL) veröffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 wurde bereits installiert. $\nSoll die vorherige Version vor dem Installieren von $(^Name) zuerst deinstalliert werden?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nOK um fortzufahren oder Abbrechen zum sofortigen Beenden."
-${LangFileString} DIFFERENT_USER "Inkscape wurde durch den Benutzer $0 installiert.$\r$\nWenn Sie fortfahren kann die Aktion m�glicherweise nicht korrekt abgeschlossen werden!$\r$\nBitte melden Sie sich als $0 an und versuchen Sie es erneut."
-${LangFileString} NO_ADMIN "Sie sind nicht Computeradministrator.$\r$\nDas Installieren f�r alle Benutzer kann m�glicherweise nicht korrekt abgeschlossen werden.$\r$\nBitte deselektieren Sie die Option 'f�r Alle Benutzer'."
-${LangFileString} NOT_SUPPORTED "Es ist bekannt, dass Inkscape unter Windows 95/98/ME nicht oder nicht stabil l�uft!$\r$\nBitte pr�fen Sie die offizielle Webseite f�r detaillierte Informationen."
-${LangFileString} Full "Komplett"
+${LangFileString} DIFFERENT_USER "Inkscape wurde bereits durch den Benutzer $0 installiert.$\r$\nWenn Sie fortfahren kann die Aktion möglicherweise nicht korrekt abgeschlossen werden!$\r$\nBitte melden Sie sich als $0 an und versuchen Sie es erneut."
+${LangFileString} NO_ADMIN "Sie sind nicht Computeradministrator.$\r$\nDas Installieren für alle Benutzer kann möglicherweise nicht korrekt abgeschlossen werden.$\r$\nBitte wählen Sie die Option 'Für alle Benutzer' ab."
+${LangFileString} NOT_SUPPORTED "Es ist bekannt, dass Inkscape unter Windows 95/98/ME nicht oder nicht stabil läuft!$\r$\nBitte prüfen Sie die offizielle Webseite für detaillierte Informationen."
+${LangFileString} Full "Vollständig"
 ${LangFileString} Optimal "Optimal"
 ${LangFileString} Minimal "Minimal"
-${LangFileString} Core "Inkscape Vektorillustrator (erforderlich)"
-${LangFileString} CoreDesc "Inkscape Basis-Dateien und -DLLs"
-${LangFileString} GTKFiles "GTK+ Runtime Umgebung (erforderlich)"
-${LangFileString} GTKFilesDesc "Ein Multi-Plattform GUI Toolkit, verwendet von Inkscape"
-${LangFileString} Shortcuts "Verkn�pfungen"
-${LangFileString} ShortcutsDesc "Verkn�pfungen zum Start von Inkscape"
-${LangFileString} Alluser  "f�r Alle Benutzer"
-${LangFileString} AlluserDesc  "Installiert diese Anwendung f�r alle Benutzer dieses Computers (all users)"
-${LangFileString} Startmenu "Startmen�"
-${LangFileString} StartmenuDesc "Erstellt einen Eintrag f�r Inkscape im Startmen�"
+${LangFileString} Core "Inkscape-Vektorgrafikeditor (erforderlich)"
+${LangFileString} CoreDesc "Inkscape-Basisdateien und -DLLs"
+${LangFileString} GTKFiles "GTK+-Laufzeitumgebung (erforderlich)"
+${LangFileString} GTKFilesDesc "Ein Multi-Plattform-GUI-Toolkit, verwendet von Inkscape"
+${LangFileString} Shortcuts "Verknüpfungen"
+${LangFileString} ShortcutsDesc "Verknüpfungen zum Start von Inkscape"
+${LangFileString} Alluser "Für alle Benutzer"
+${LangFileString} AlluserDesc "Installiert diese Anwendung für alle Benutzer dieses Computers (all users)"
+${LangFileString} Startmenu "Startmenü"
+${LangFileString} StartmenuDesc "Erstellt einen Eintrag für Inkscape im Startmenü"
 ${LangFileString} Desktop "Desktop"
-${LangFileString} DesktopDesc "Erstellt eine Verkn�pfung zu Inkscape auf dem Desktop"
+${LangFileString} DesktopDesc "Erstellt eine Verknüpfung zu Inkscape auf dem Desktop"
 ${LangFileString} Quicklaunch "Schnellstartleiste"
-${LangFileString} QuicklaunchDesc "Erstellt eine Verkn�pfung zu Inkscape auf der Schnellstartleiste"
-${LangFileString} SVGWriter  "�ffne SVG Dateien mit Inkscape"
-${LangFileString} SVGWriterDesc  "W�hlen Sie Inkscape als Standardanwendung f�r SVG Dateien"
-${LangFileString} ContextMenu "Kontext-Men�"
-${LangFileString} ContextMenuDesc "F�gt Inkscape in das Kontext-Men� f�r SVG Dateien ein"
-${LangFileString} DeletePrefs "Pers�nliche Inkscape-Vorgaben l�schen"
-${LangFileString} DeletePrefsDesc "L�scht verbliebene pers�nliche Inkscape-Vorgaben einer vorhergehenden Version"
-${LangFileString} Addfiles "weitere Dateien"
-${LangFileString} AddfilesDesc "weitere Dateien"
+${LangFileString} QuicklaunchDesc "Erstellt eine Verknüpfung zu Inkscape in der Schnellstartleiste"
+${LangFileString} SVGWriter "SVG-Dateien mit Inkscape öffnen"
+${LangFileString} SVGWriterDesc "Inkscape als Standardanwendung für SVG-Dateien festlegen"
+${LangFileString} ContextMenu "Kontextmenü"
+${LangFileString} ContextMenuDesc "Fügt Inkscape in das Kontextmenü von SVG-Dateien ein"
+${LangFileString} DeletePrefs "Persönliche Inkscape-Einstellungen löschen"
+${LangFileString} DeletePrefsDesc "Löscht verbliebene persönliche Inkscape-Einstellungen einer vorherigen Installation"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "Ein Interpreter für die Programmiersprache Python und Python-Module zum Ausführen von Erweiterungen."
+${LangFileString} Addfiles "Zusätzliche Dateien"
+${LangFileString} AddfilesDesc "Zusätzliche Dateien"
+${LangFileString} Extensions "Erweiterungen"
+${LangFileString} ExtensionsDesc "Inkscape-Erweiterungen (inklusive vieler Import- und Exportplugins)"
 ${LangFileString} Examples "Beispiele"
-${LangFileString} ExamplesDesc "Beispiele mit Inkscape"
+${LangFileString} ExamplesDesc "Beispieldateien, die mit Inkscape erstellt wurden"
 ${LangFileString} Tutorials "Tutorials"
-${LangFileString} TutorialsDesc "Tutorials f�r die Benutzung mit Inkscape"
-${LangFileString} Languages "�bersetzungen"
-${LangFileString} LanguagesDesc "Installiert verschiedene �bersetzungen f�r Inkscape"
+${LangFileString} TutorialsDesc "Tutorials für die Benutzung von Inkscape"
+${LangFileString} Dictionaries "Wörterbücher"
+${LangFileString} DictionariesDesc "Wörterbücher für einige gängige Sprachen zur Rechtschreibprüfung in Inkscape"
+${LangFileString} Languages "Übersetzungen"
+${LangFileString} LanguagesDesc "Übersetzungen und sprachspezifische Inhalte für Inkscape"
 ${LangFileString} lng_am "Amharisch"
 ${LangFileString} lng_ar "Arabisch"
+${LangFileString} lng_as "Assamesisch"
 ${LangFileString} lng_az "Aserbaidschanisch"
-${LangFileString} lng_be "Wei�russisch"
+${LangFileString} lng_be "Weißrussisch"
 ${LangFileString} lng_bg "Bulgarisch"
-${LangFileString} lng_bn "Bengalisch"
-${LangFileString} lng_bn_BD "Bangladesch Bengalisch"
+${LangFileString} lng_bn "Bangla"
+${LangFileString} lng_bn_BD "Bangla Bangladesch"
 ${LangFileString} lng_br "Bretonisch"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Katalanisch"
-${LangFileString} lng_ca@valencia "Valencianisch Katalanisch"
+${LangFileString} lng_ca@valencia "Valencianisches Katalan"
 ${LangFileString} lng_cs "Tschechisch"
-${LangFileString} lng_da "D�nisch"
+${LangFileString} lng_da "Dänisch"
 ${LangFileString} lng_de "Deutsch"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Griechisch"
 ${LangFileString} lng_en "Englisch"
-${LangFileString} lng_en_AU "Australisch Englisch"
-${LangFileString} lng_en_CA "Kanadisch Englisch"
-${LangFileString} lng_en_GB "Britisch Englisch"
+${LangFileString} lng_en_AU "Englisch/Australien"
+${LangFileString} lng_en_CA "Englisch/Kanada"
+${LangFileString} lng_en_GB "Englisch/Großbritannien"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
 ${LangFileString} lng_es "Spanisch"
-${LangFileString} lng_es_MX "Spanisch-Mexio"
-${LangFileString} lng_et "Estonisch"
+${LangFileString} lng_es_MX "Spanisch/Mexico"
+${LangFileString} lng_et "Estnisch"
 ${LangFileString} lng_eu "Baskisch"
 ${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finnisch"
-${LangFileString} lng_fr "Franz�sisch"
+${LangFileString} lng_fr "Französisch"
 ${LangFileString} lng_ga "Irisch"
 ${LangFileString} lng_gl "Galizisch"
-${LangFileString} lng_he "Hebr�isch"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "Hebräisch"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Kroatisch"
 ${LangFileString} lng_hu "Ungarisch"
 ${LangFileString} lng_hy "Armenisch"
-${LangFileString} lng_id "Indonesian"
-${LangFileString} lng_is "Icelandic"
+${LangFileString} lng_id "Indonesisch"
+${LangFileString} lng_is "Isländisch"
 ${LangFileString} lng_it "Italienisch"
 ${LangFileString} lng_ja "Japanisch"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Koreanisch"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in lateinischer Schrift"
+${LangFileString} lng_ks@aran "Kashmiri in erweiterter arabischer Schrift"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari-Schrift"
 ${LangFileString} lng_lt "Litauisch"
 ${LangFileString} lng_lv "Lettisch"
-${LangFileString} lng_mn "Mongolisch"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Mazedonisch"
-${LangFileString} lng_ne "Nepalisch"
-${LangFileString} lng_nb "Norwegisch-Bokmal"
-${LangFileString} lng_nl "Holl�ndisch"
-${LangFileString} lng_nn "Nynorsk-Norwegisch"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "Mongolisch"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in bengalischer Schrift"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norwegisch/Bokmål"
+${LangFileString} lng_ne "Nepalesisch"
+${LangFileString} lng_nl "Niederländisch"
+${LangFileString} lng_nn "Norwegisch/Nynorsk"
+${LangFileString} lng_or "Orya"
 ${LangFileString} lng_pa "Panjabi"
 ${LangFileString} lng_pl "Polnisch"
 ${LangFileString} lng_pt "Portugiesisch"
-${LangFileString} lng_pt_BR "Portugiesisch Brazilien"
-${LangFileString} lng_ro "Rum�nisch"
+${LangFileString} lng_pt_BR "Portugiesisch/Brasilien"
+${LangFileString} lng_ro "Rumänisch"
 ${LangFileString} lng_ru "Russisch"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari-Schrift"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari-Schrift"
 ${LangFileString} lng_sk "Slowakisch"
 ${LangFileString} lng_sl "Slowenisch"
 ${LangFileString} lng_sq "Albanisch"
 ${LangFileString} lng_sr "Serbisch"
-${LangFileString} lng_sr@latin "Serbisch mit lat. Buchstaben"
+${LangFileString} lng_sr@latin "Serbisch in lateinischer Schrift"
 ${LangFileString} lng_sv "Schwedisch"
+${LangFileString} lng_ta "Tamilisch"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
-${LangFileString} lng_tr "T�rkisch"
+${LangFileString} lng_tr "Türkisch"
 ${LangFileString} lng_uk "Ukrainisch"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamesisch"
 ${LangFileString} lng_zh_CN "Chinesisch (vereinfacht)"
 ${LangFileString} lng_zh_TW "Chinesisch (traditionell)"
-${LangFileString} UInstOpt "Deinstallations Optionen"
-${LangFileString} UInstOpt1 "Bitte w�hlen Sie die optionalen Deinstalltionsparameter"
-${LangFileString} PurgePrefs  "behalte pers�nliche Inkscape-Vorgaben"
-${LangFileString} UninstallLogNotFound "Datei $INSTDIR\uninstall.log nicht gefunden!$\r$\nBitte deinstallieren Sie selbst durch L�schen von $INSTDIR!"
-${LangFileString} FileChanged "Die Datei $filename wurde nach der Installation ge�ndert.$\r$\nM�chten Sie trotzden diese Datei l�schen?"
+${LangFileString} UInstOpt "Deinstallations-Optionen"
+${LangFileString} UInstOpt1 "Bitte wählen Sie die optionalen Deinstallationsparameter"
+${LangFileString} PurgePrefs "Persönliche Inkscape-Einstellungen behalten"
+${LangFileString} UninstallLogNotFound "Datei $INSTDIR\uninstall.log nicht gefunden!$\r$\nBitte deinstallieren Sie selbst durch Löschen von $INSTDIR!"
+${LangFileString} FileChanged "Die Datei $filename wurde nach der Installation geändert.$\r$\nMöchten Sie diese Datei trotzdem löschen?"
 ${LangFileString} Yes "Ja"
 ${LangFileString} AlwaysYes "immer mit Ja antworten"
 ${LangFileString} No "Nein"
diff --git a/packaging/win32/languages/Greek.nsh b/packaging/win32/languages/Greek.nsh
index c8955aa63..a0fa0176f 100644
--- a/packaging/win32/languages/Greek.nsh
+++ b/packaging/win32/languages/Greek.nsh
@@ -1,117 +1,146 @@
-;Language: �������� (1032, CP1253)
-;By Dimitris Spingos (�������� �������) <dmtrs32@gmail.com>
-${LangFileString} CaptionDescription "������������ �������� ������������ ����������� �������� ������"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ��������� �� �� ������ ����� ������ (GPL). � ����� ��������� ��� ���� ��� ������ ������������. $_CLICK"
-${LangFileString} DIFFERENT_USER "�� Inkscape ������������� ��� �� ������ $0.$\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 ��� dlls"
-${LangFileString} GTKFiles "GTK+ Runtime Environment (����������)"
-${LangFileString} GTKFilesDesc "��� ������������ GUI ��������� ����������, ��������������� ��� �� Inkscape"
-${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 "������� ������� SVG �� �� Inkscape"
-${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 "���������"
+;Language: Ελληνικά (1032)
+;By Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>
+${LangFileString} CaptionDescription "Επεξεργαστής γραφικών κλιμακώσιμων διανυσμάτων ανοικτού κώδικα"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) εκδίδεται με τη γενική άδεια χρήσης (GPL). Η άδεια παρέχεται εδώ μόνο για λόγους πληροφόρησης. $_CLICK"
+${LangFileString} DIFFERENT_USER "Το Inkscape εγκαταστάθηκε από το χρήστη $0.$\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 και dlls"
+${LangFileString} GTKFiles "GTK+ Runtime Environment (απαιτείται)"
+${LangFileString} GTKFilesDesc "Μια εργαλειοθήκη GUI πολλαπλού λογισμικού, χρησιμοποιείται από το Inkscape"
+${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 "ʼνοιγμα αρχείων SVG με το Inkscape"
+${LangFileString} SVGWriterDesc "Επιλογή του Inkscape ως προεπιλεγμένου επεξεργαστή για αρχεία SVG"
+${LangFileString} ContextMenu "Θεματικό μενού"
+${LangFileString} ContextMenuDesc "Προσθήκη του Inkscape στο θεματικό μενού για αρχεία SVG"
+${LangFileString} DeletePrefs "Διαγραφή προσωπικών προτιμήσεων"
+${LangFileString} DeletePrefsDesc "Διαγραφή προσωπικών προτιμήσεων που απέμειναν από προηγούμενες εγκαταστάσεις"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "Πρόσθετα αρχεία"
+${LangFileString} AddfilesDesc "Πρόσθετα αρχεία"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "Παραδείγματα"
+${LangFileString} ExamplesDesc "Παραδείγματα χρήσης του Inkscape"
+${LangFileString} Tutorials "Μαθήματα"
+${LangFileString} TutorialsDesc "Μαθήματα χρήσης του Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Μεταφράσεις"
+${LangFileString} LanguagesDesc "Εγκατάσταση ποικίλων μεταφράσεων για το Inkscape"
+${LangFileString} lng_am "Αμχαρικά"
+${LangFileString} lng_ar "Αραβικά"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "Αζέρικα"
+${LangFileString} lng_be "Λευκορώσικα"
+${LangFileString} lng_bg "Βουλγαρικά"
+${LangFileString} lng_bn "Μπενγκάλι"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${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 "Pig ��������"
-${LangFileString} lng_eo "���������"
-${LangFileString} lng_es "��������"
-${LangFileString} lng_es_MX "�������� �������"
-${LangFileString} lng_et "��������"
-${LangFileString} lng_eu "�������"
-${LangFileString} lng_fa "�����"
-${LangFileString} lng_fi "����������"
-${LangFileString} lng_fr "�������"
-${LangFileString} lng_ga "���������"
-${LangFileString} lng_gl "�����������"
-${LangFileString} lng_he "�������"
-${LangFileString} lng_hr "��������"
-${LangFileString} lng_hu "��������"
+${LangFileString} lng_br "Βρετονικά"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Καταλανικά"
+${LangFileString} lng_ca@valencia "Καταλανικά Βαλένθιας"
+${LangFileString} lng_cs "Τσέχικα"
+${LangFileString} lng_da "Δανέζικα"
+${LangFileString} lng_de "Γερμανικά"
+${LangFileString} lng_doi "Dogri"
+${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 "Pig Λατινικά"
+${LangFileString} lng_eo "Εσπεράντο"
+${LangFileString} lng_es "Ισπανικά"
+${LangFileString} lng_es_MX "Ισπανικά Μεξικού"
+${LangFileString} lng_et "Εσθονικά"
+${LangFileString} lng_eu "Βασκικά"
+${LangFileString} lng_fa "Φαρσί"
+${LangFileString} lng_fi "Φινλανδικά"
+${LangFileString} lng_fr "Γαλλικά"
+${LangFileString} lng_ga "Ιρλανδικά"
+${LangFileString} lng_gl "Γαλικιανικά"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "Εβραϊκά"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "Κροατικά"
+${LangFileString} lng_hu "Ουγγρικά"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "�����������"
+${LangFileString} lng_id "Ινδονησιακά"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "�������"
-${LangFileString} lng_ja "�����������"
-${LangFileString} lng_km "����"
-${LangFileString} lng_ko "���������"
-${LangFileString} lng_lt "����������"
+${LangFileString} lng_it "Ιταλικά"
+${LangFileString} lng_ja "Γιαπωνέζικα"
+${LangFileString} lng_km "Χμερ"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Κορεατικά"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "Λιθουανικά"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "����������"
-${LangFileString} lng_mn "���������"
-${LangFileString} lng_ne "��������"
-${LangFileString} lng_nb "��������� Bokm�l"
-${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 "���������"
-${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 "��������� ����� ���"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Μακεδονικά"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "Μογγολικά"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Νορβηγικά Bokmεl"
+${LangFileString} lng_ne "Νεπαλικά"
+${LangFileString} lng_nl "Ολλανδικά"
+${LangFileString} lng_nn "Νορβηγικά Nynorsk"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "Παντζάμπικα"
+${LangFileString} lng_pl "Πολωνικά"
+${LangFileString} lng_pt "Πορτογαλικά"
+${LangFileString} lng_pt_BR "Πορτογαλικά Βραζιλίας"
+${LangFileString} lng_ro "Ρουμάνικα"
+${LangFileString} lng_ru "Ρώσικα"
+${LangFileString} lng_rw "Κίνιαρουάντα"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "Σλοβάκικα"
+${LangFileString} lng_sl "Σλοβένικα"
+${LangFileString} lng_sq "Αλβανικά"
+${LangFileString} lng_sr "Σέρβικα"
+${LangFileString} lng_sr@latin "Σέρβικα σε λατινική γραφή"
+${LangFileString} lng_sv "Σουηδικά"
+${LangFileString} lng_ta "Tamil"
+${LangFileString} lng_te "Τελούγκου"
+${LangFileString} lng_th "Τάι"
+${LangFileString} lng_tr "Τούρκικα"
+${LangFileString} lng_uk "Ουκρανικά"
+${LangFileString} lng_ur "Urdu"
+${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/Hebrew.nsh b/packaging/win32/languages/Hebrew.nsh
index 7c677f714..2de0d69c7 100644
--- a/packaging/win32/languages/Hebrew.nsh
+++ b/packaging/win32/languages/Hebrew.nsh
@@ -1,117 +1,146 @@
-;Language: Hebrew (1037, CP1255)
+;Language: Hebrew (1037)
 ;By Yaron Shahrabani <sh.yaron@gmail.com>
-${LangFileString} CaptionDescription "���� ������ ������� ����� ���� ����"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ����� ��� ���� ������� ������� ����� �� GNU (GPL). ������� ����� ��� ������ ���� ����. $_CLICK"
-${LangFileString} DIFFERENT_USER "��������� ������ ������ ������ $0.$\r$\n�� ������ ����� ���� ��� ����� �����!$\r$\n�� ������ ���� $0 ������ ���."
-${LangFileString} WANT_UNINSTALL_BEFORE "������ $R1 ��� ������. $\n��� ����� �� ����� ������ ���� ����� $(^Name)?"
-${LangFileString} OK_CANCEL_DESC "$\n$\n�� ����� �� ����� ��� ������ �� �� ����� ��� ����."
-${LangFileString} NO_ADMIN "��� �� ������ ��������.$\r$\n����� ��������� ��� �������� �� ����� �����.$\r$\n�� ���� �� ������ ���� ������� '����� ��� ��������'."
-${LangFileString} NOT_SUPPORTED "���� �� ���������� �� ������ ����� �� ��� Windows 95/98/ME!$\r$\n�� ������ ���� ����� ����� ����� ������."
-${LangFileString} Full "����"
-${LangFileString} Optimal "������"
-${LangFileString} Minimal "��������"
-${LangFileString} Core "���� ��SVN ��������� (����)"
-${LangFileString} CoreDesc "����� ���� ��dlls �� ���������"
-${LangFileString} GTKFiles "����� ������ GTK+ (�����)"
-${LangFileString} GTKFilesDesc "���� ���� ���� ������ ���������, ������ ���������"
-${LangFileString} Shortcuts "������ ���"
-${LangFileString} ShortcutsDesc "������ ��� ������ ���������"
-${LangFileString} Alluser "����� ���� �� ��������"
-${LangFileString} AlluserDesc "����� ����� �� ����� �� �� ������ ����� (�� ��������)"
-${LangFileString} Desktop "����� �����"
-${LangFileString} DesktopDesc "����� ����� ��� ���������� �� ����� ������"
-${LangFileString} Startmenu "����� �����"
-${LangFileString} StartmenuDesc "����� ����� ���������� ������ ������"
-${LangFileString} Quicklaunch "����� �����"
-${LangFileString} QuicklaunchDesc "����� ����� ��� ���������� ����� ������ ������"
-${LangFileString} SVGWriter "����� ����� SVG �� ���������"
-${LangFileString} SVGWriterDesc "����� ��������� ����� ���� ����� ������ SVG"
-${LangFileString} ContextMenu "����� ����"
-${LangFileString} ContextMenuDesc "����� ��������� ������ ����� �� ����� SVG"
-${LangFileString} DeletePrefs "����� ������ ������"
-${LangFileString} DeletePrefsDesc "����� ����� ������ ������ ������� ������"
-${LangFileString} Addfiles "����� ������"
-${LangFileString} AddfilesDesc "����� ������"
-${LangFileString} Examples "�������"
-${LangFileString} ExamplesDesc "������� ������ ����������"
-${LangFileString} Tutorials "�������"
-${LangFileString} TutorialsDesc "������� ������ ����������"
-${LangFileString} Languages "�������"
-${LangFileString} LanguagesDesc "����� ����� ������� ����������"
-${LangFileString} lng_am "������"
-${LangFileString} lng_ar "�����"
-${LangFileString} lng_az "�����"
-${LangFileString} lng_be "�������"
-${LangFileString} lng_bg "�������"
-${LangFileString} lng_bn "������"
+${LangFileString} CaptionDescription "עורך גרפיקת וקטורים נמתחת בקוד פתוח"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) מופצת תחת תנאי הרישיון הציבורי הכללי של GNU (GPL). הרישיון מסופק כאן לצורכי מידע בלבד. $_CLICK"
+${LangFileString} DIFFERENT_USER "אינקסקייפ הותקנה על־ידי המשתמש $0.$\r$\nאם ההתקנה תימשך יתכן שלא תושלם כראוי!$\r$\nנא להיכנס בתור $0 ולנסות שוב."
+${LangFileString} WANT_UNINSTALL_BEFORE "התכנית $R1 כבר הותקנה. $\nהאם להסיר את הגרסה הקודמת בטרם התקנת $(^Name)?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nיש ללחוץ על אישור כדי להמשיך או על ביטול כדי לצאת."
+${LangFileString} NO_ADMIN "אין לך הרשאות ניהוליות.$\r$\nהתקנת אינקסקייפ לכל המשתמשים לא תושלם כראוי.$\r$\nיש לבטל את הסימון שליד האפשרות 'התקנה לכל המשתמשים'."
+${LangFileString} NOT_SUPPORTED "ידוע כי לאינקסקייפ יש אפשרות לפעול על גבי Windows 95/98/ME!$\r$\nנא להסתכל באתר הרשמי לקבלת פרטים נוספים."
+${LangFileString} Full "מלאה"
+${LangFileString} Optimal "מיטבית"
+${LangFileString} Minimal "מינימלית"
+${LangFileString} Core "עורך ה־SVN אינקסקייפ (נדרש)"
+${LangFileString} CoreDesc "קובצי ליבה ו־dlls של אינקסקייפ"
+${LangFileString} GTKFiles "סביבת ההפעלה GTK+ (נדרשת)"
+${LangFileString} GTKFilesDesc "ערכת מנשק גרפי למגוון פלטפורמות, בשימוש אינקסקייפ"
+${LangFileString} Shortcuts "קיצורי דרך"
+${LangFileString} ShortcutsDesc "קיצורי דרך להפעלת אינקסקייפ"
+${LangFileString} Alluser "התקנה עבור כל המשתמשים"
+${LangFileString} AlluserDesc "התקנת יישום זה לטובת כל מי שמשתמש במחשב (כל המשתמשים)"
+${LangFileString} Desktop "שולחן עבודה"
+${LangFileString} DesktopDesc "יצירת קיצור דרך לאינקסקייפ על שולחן העבודה"
+${LangFileString} Startmenu "תפריט התחלה"
+${LangFileString} StartmenuDesc "יצירת רשומה לאינקסקייפ בתפריט ההתחלה"
+${LangFileString} Quicklaunch "הפעלה מהירה"
+${LangFileString} QuicklaunchDesc "יצירת קיצור דרך לאינקסקייפ בסרגל ההפעלה המהירה"
+${LangFileString} SVGWriter "פתיחת קובצי SVG עם אינקסקייפ"
+${LangFileString} SVGWriterDesc "בחירת אינקסקייפ כעורך בררת המחדל לקובצי SVG"
+${LangFileString} ContextMenu "תפריט הקשר"
+${LangFileString} ContextMenuDesc "הוספת אינקסקייפ לתפריט ההקשר של קובצי SVG"
+${LangFileString} DeletePrefs "מחיקת העדפות אישיות"
+${LangFileString} DeletePrefsDesc "מחיקת שיירי העדפות אישיות מהתקנות קודמות"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "קבצים נוספים"
+${LangFileString} AddfilesDesc "קבצים נוספים"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "דוגמאות"
+${LangFileString} ExamplesDesc "דוגמאות לשימוש באינקסקייפ"
+${LangFileString} Tutorials "מדריכים"
+${LangFileString} TutorialsDesc "מדריכים לשימוש באינקסקייפ"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "תרגומים"
+${LangFileString} LanguagesDesc "התקנת מגוון תרגומים לאינקסקייפ"
+${LangFileString} lng_am "אמהרית"
+${LangFileString} lng_ar "ערבית"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "אזרית"
+${LangFileString} lng_be "בלרוסית"
+${LangFileString} lng_bg "בולגרית"
+${LangFileString} lng_bn "בנגלית"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${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 "�����"
-${LangFileString} lng_fi "�����"
-${LangFileString} lng_fr "������"
-${LangFileString} lng_ga "�����"
-${LangFileString} lng_gl "������"
-${LangFileString} lng_he "�����"
-${LangFileString} lng_hr "�������"
-${LangFileString} lng_hu "�������"
+${LangFileString} lng_br "ברטונית"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "קטלאנית"
+${LangFileString} lng_ca@valencia "קטלאנית ולנסית"
+${LangFileString} lng_cs "צ׳כית"
+${LangFileString} lng_da "דנית"
+${LangFileString} lng_de "גרמנית"
+${LangFileString} lng_doi "Dogri"
+${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 "פרסית"
+${LangFileString} lng_fi "פינית"
+${LangFileString} lng_fr "צרפתית"
+${LangFileString} lng_ga "אירית"
+${LangFileString} lng_gl "גליסית"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "עברית"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "קרואטית"
+${LangFileString} lng_hu "הונגרית"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "���������"
+${LangFileString} lng_id "אינדונזית"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "�������"
-${LangFileString} lng_ja "�����"
-${LangFileString} lng_km "�����"
-${LangFileString} lng_ko "��������"
-${LangFileString} lng_lt "������"
+${LangFileString} lng_it "איטלקית"
+${LangFileString} lng_ja "יפנית"
+${LangFileString} lng_km "קמרית"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "קוריאנית"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "ליטאית"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "�������"
-${LangFileString} lng_mn "��������"
-${LangFileString} lng_ne "������"
-${LangFileString} lng_nb "������� ��������"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "מקדונית"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "מונגולית"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "נורבגית בוקמולית"
+${LangFileString} lng_ne "נפאלית"
 ${LangFileString} lng_nl "Dutch"
-${LangFileString} lng_nn "������� ���������"
-${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 "�����"
-${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 "���� ����� ��"
+${LangFileString} lng_nn "נורבגית נינורשקית"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "פנג׳אבי"
+${LangFileString} lng_pl "פולנית"
+${LangFileString} lng_pt "פורטוגלית"
+${LangFileString} lng_pt_BR "פורטוגלית בריזלאית"
+${LangFileString} lng_ro "רומנית"
+${LangFileString} lng_ru "רוסית"
+${LangFileString} lng_rw "קיניַרואנדה"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "סלובקית"
+${LangFileString} lng_sl "סלובנית"
+${LangFileString} lng_sq "אלבנית"
+${LangFileString} lng_sr "סרבית"
+${LangFileString} lng_sr@latin "סרבית בכתב לטיני"
+${LangFileString} lng_sv "שבדית"
+${LangFileString} lng_ta "Tamil"
+${LangFileString} lng_te "טלוגו"
+${LangFileString} lng_th "תאי"
+${LangFileString} lng_tr "טורקית"
+${LangFileString} lng_uk "אוקראינית"
+${LangFileString} lng_ur "Urdu"
+${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/Icelandic.nsh b/packaging/win32/languages/Icelandic.nsh
index c84251e20..f7dfaa104 100644
--- a/packaging/win32/languages/Icelandic.nsh
+++ b/packaging/win32/languages/Icelandic.nsh
@@ -1,118 +1,147 @@
-;Language: Icelandic (861, CP1252)
+;Language: Icelandic (1039)
 ;By Adib Taraben <theadib@gmail.com>
-;Translation by Sveinn � Felli <sv1@fellsnet.is>
-${LangFileString} CaptionDescription "Opin� og frj�lst teikniforrit fyrir vigramyndir (Scalable Vector Graphics)"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) er gefi� �t me� GNU General Public License (GPL) notkunarleyfinu. Notkunarleyfi� er haft h�r me� eing�ngu til uppl�singar. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape hefur �egar veri� sett upp af notandanum $0.$\r$\nEf �� heldur �fram g�ti veri� a� uppsetningin heppna�ist ekki!$\r$\nSkr��u �ig inn sem $0 og reyndu aftur."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 hefur �egar veri� sett upp. $\nViltu fjarl�gja fyrri �tg�funa ��ur en �� setur upp $(^Name)?"
-${LangFileString} OK_CANCEL_DESC "$\n$\n�ttu � '� lagi / OK' til a� halda �fram e�a � 'H�tta vi� / CANCEL' til a� h�tta vi�."
-${LangFileString} NO_ADMIN "�� ert ekki me� kerfisstj�rar�ttindi.$\r$\nUppsetning Inkscape fyrir alla notendur er ekki l�kleg til a� heppnast.$\r$\nTaktu haki� �r 'Setja upp fyrir alla notendur' valkostinum."
-${LangFileString} NOT_SUPPORTED "Inkscape keyrir ekki � Windows 95/98/ME!$\r$\nSko�a�u opinberu heimas��una til a� sj� �tarlegri uppl�singar."
+;Translation by Sveinn í Felli <sv1@fellsnet.is>
+${LangFileString} CaptionDescription "Opinð og frjálst teikniforrit fyrir vigramyndir (Scalable Vector Graphics)"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) er gefið út með GNU General Public License (GPL) notkunarleyfinu. Notkunarleyfið er haft hér með eingöngu til upplýsingar. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape hefur þegar verið sett upp af notandanum $0.$\r$\nEf þú heldur áfram gæti verið að uppsetningin heppnaðist ekki!$\r$\nSkráðu þig inn sem $0 og reyndu aftur."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 hefur þegar verið sett upp. $\nViltu fjarlægja fyrri útgáfuna áður en þú setur upp $(^Name)?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nÝttu á 'Í lagi / OK' til að halda áfram eða á 'Hætta við / CANCEL' til að hætta við."
+${LangFileString} NO_ADMIN "Þú ert ekki með kerfisstjóraréttindi.$\r$\nUppsetning Inkscape fyrir alla notendur er ekki líkleg til að heppnast.$\r$\nTaktu hakið úr 'Setja upp fyrir alla notendur' valkostinum."
+${LangFileString} NOT_SUPPORTED "Inkscape keyrir ekki í Windows 95/98/ME!$\r$\nSkoðaðu opinberu heimasíðuna til að sjá ítarlegri upplýsingar."
 ${LangFileString} Full "Full"
-${LangFileString} Optimal "Bestu�"
-${LangFileString} Minimal "L�gmarks"
+${LangFileString} Optimal "Bestuð"
+${LangFileString} Minimal "Lágmarks"
 ${LangFileString} Core "Inkscape SVG ritillinn (krafist)"
-${LangFileString} CoreDesc "Kjarni Inkscape skr�a og dll a�ger�as�fn"
+${LangFileString} CoreDesc "Kjarni Inkscape skráa og dll aðgerðasöfn"
 ${LangFileString} GTKFiles "GTK+ keyrsluumhverfi (krafist)"
-${LangFileString} GTKFilesDesc "Fj�lkerfa myndr�nt GUI t�lasett, nota� af Inkscape"
-${LangFileString} Shortcuts "Fl�tilei�ir"
-${LangFileString} ShortcutsDesc "Fl�tilei�ir til a� r�sa Inkscape"
+${LangFileString} GTKFilesDesc "Fjölkerfa myndrænt GUI tólasett, notað af Inkscape"
+${LangFileString} Shortcuts "Flýtileiðir"
+${LangFileString} ShortcutsDesc "Flýtileiðir til að ræsa Inkscape"
 ${LangFileString} Alluser "Setja upp fyrir alla notendur"
-${LangFileString} AlluserDesc "Setja �etta forrit upp fyrir alla sem nota �essa t�lvu (allir notendur)"
-${LangFileString} Desktop "Skj�bor�"
-${LangFileString} DesktopDesc "B�a til fl�tilei� fyrir Inkscape � skj�bor�inu (Desktop)"
-${LangFileString} Startmenu "A�alvalmynd"
-${LangFileString} StartmenuDesc "B�a til f�rslu � a�alvalmynd (Start Menu) fyrir Inkscape"
-${LangFileString} Quicklaunch "Fl�tir�sing"
-${LangFileString} QuicklaunchDesc "B�a til fl�tilei� fyrir Inkscape � fl�tir�sistikunni (Quick Launch)"
-${LangFileString} SVGWriter "Opna SVG skr�r me� Inkscape"
-${LangFileString} SVGWriterDesc "Velja Inkscape sem sj�lfgefi� forrit til a� vinna me� SVG skr�r"
+${LangFileString} AlluserDesc "Setja þetta forrit upp fyrir alla sem nota þessa tölvu (allir notendur)"
+${LangFileString} Desktop "Skjáborð"
+${LangFileString} DesktopDesc "Búa til flýtileið fyrir Inkscape á skjáborðinu (Desktop)"
+${LangFileString} Startmenu "Aðalvalmynd"
+${LangFileString} StartmenuDesc "Búa til færslu í aðalvalmynd (Start Menu) fyrir Inkscape"
+${LangFileString} Quicklaunch "Flýtiræsing"
+${LangFileString} QuicklaunchDesc "Búa til flýtileið fyrir Inkscape á flýtiræsistikunni (Quick Launch)"
+${LangFileString} SVGWriter "Opna SVG skrár með Inkscape"
+${LangFileString} SVGWriterDesc "Velja Inkscape sem sjálfgefið forrit til að vinna með SVG skrár"
 ${LangFileString} ContextMenu "Samhengisvalmynd"
-${LangFileString} ContextMenuDesc "B�ta Inkscape inn � samhengisvalmynd (Context Menu) fyrir SVG skr�r"
-${LangFileString} DeletePrefs "Ey�a pers�nulegum kj�rstillingum"
-${LangFileString} DeletePrefsDesc "Ey�a pers�nulegum kj�rstillingum sem hafa or�i� eftir fr� fyrri uppsetningum"
-${LangFileString} Addfiles "Vi�b�tarskr�r"
-${LangFileString} AddfilesDesc "Vi�b�tarskr�r"
-${LangFileString} Examples "S�nid�mi"
-${LangFileString} ExamplesDesc "S�nid�mi um notkun Inkscape"
+${LangFileString} ContextMenuDesc "Bæta Inkscape inn í samhengisvalmynd (Context Menu) fyrir SVG skrár"
+${LangFileString} DeletePrefs "Eyða persónulegum kjörstillingum"
+${LangFileString} DeletePrefsDesc "Eyða persónulegum kjörstillingum sem hafa orðið eftir frá fyrri uppsetningum"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "Viðbótarskrár"
+${LangFileString} AddfilesDesc "Viðbótarskrár"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "Sýnidæmi"
+${LangFileString} ExamplesDesc "Sýnidæmi um notkun Inkscape"
 ${LangFileString} Tutorials "Kennsluefni"
 ${LangFileString} TutorialsDesc "Kennsluefni fyrir notkun Inkscape"
-${LangFileString} Languages "���ingar"
-${LangFileString} LanguagesDesc "Setja inn �msar ���ingar � Inkscape"
-${LangFileString} lng_am "Amhar�ska"
-${LangFileString} lng_ar "Arab�ska"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Þýðingar"
+${LangFileString} LanguagesDesc "Setja inn ýmsar þýðingar á Inkscape"
+${LangFileString} lng_am "Amharíska"
+${LangFileString} lng_ar "Arabíska"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbadjanska"
-${LangFileString} lng_be "Hv�tr�ssneska"
-${LangFileString} lng_bg "B�lgarska"
+${LangFileString} lng_be "Hvítrússneska"
+${LangFileString} lng_bg "Búlgarska"
 ${LangFileString} lng_bn "Bengalska"
 ${LangFileString} lng_bn_BD "Bangladesh bengalska"
-${LangFileString} lng_br "Bret�nska"
-${LangFileString} lng_ca "Katal�nska"
-${LangFileString} lng_ca@valencia "Valens��nsk katal�nska"
-${LangFileString} lng_cs "T�kkneska"
+${LangFileString} lng_br "Bretónska"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Katalónska"
+${LangFileString} lng_ca@valencia "Valensíönsk katalónska"
+${LangFileString} lng_cs "Tékkneska"
 ${LangFileString} lng_da "Danska"
-${LangFileString} lng_de "��ska"
+${LangFileString} lng_de "Þýska"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
-${LangFileString} lng_el "Gr�ska"
+${LangFileString} lng_el "Gríska"
 ${LangFileString} lng_en "Enska"
-${LangFileString} lng_en_AU "�str�lsk enska"
-${LangFileString} lng_en_CA "Kanad�sk enska"
+${LangFileString} lng_en_AU "Áströlsk enska"
+${LangFileString} lng_en_CA "Kanadísk enska"
 ${LangFileString} lng_en_GB "Bresk enska"
-${LangFileString} lng_en_US@piglatin "Pig Lat�na"
-${LangFileString} lng_eo "Esperant�"
-${LangFileString} lng_es "Sp�nska"
-${LangFileString} lng_es_MX "Mex�k�nsk sp�nska"
+${LangFileString} lng_en_US@piglatin "Pig Latína"
+${LangFileString} lng_eo "Esperantó"
+${LangFileString} lng_es "Spænska"
+${LangFileString} lng_es_MX "Mexíkönsk spænska"
 ${LangFileString} lng_et "Eistneska"
 ${LangFileString} lng_eu "Baskneska"
 ${LangFileString} lng_fa "Farsi"
 ${LangFileString} lng_fi "Finnska"
 ${LangFileString} lng_fr "Franska"
-${LangFileString} lng_ga "�rska"
-${LangFileString} lng_gl "Galis�ska"
+${LangFileString} lng_ga "Írska"
+${LangFileString} lng_gl "Galisíska"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebreska"
-${LangFileString} lng_hr "Kr�at�ska"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "Króatíska"
 ${LangFileString} lng_hu "Ungverska"
 ${LangFileString} lng_hy "Armenska"
-${LangFileString} lng_id "Ind�nes�ska"
-${LangFileString} lng_is "�slenska"
-${LangFileString} lng_it "�talska"
+${LangFileString} lng_id "Indónesíska"
+${LangFileString} lng_is "Íslenska"
+${LangFileString} lng_it "Ítalska"
 ${LangFileString} lng_ja "Japanska"
-${LangFileString} lng_km "Khmer�ska"
-${LangFileString} lng_ko "K�reska"
-${LangFileString} lng_lt "Lith�enska"
+${LangFileString} lng_km "Khmeríska"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Kóreska"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "Litháenska"
 ${LangFileString} lng_lv "Lettneska"
-${LangFileString} lng_mk "Maked�nska"
-${LangFileString} lng_mn "Mong�lska"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Makedónska"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "Mongólska"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norskt bókmál"
 ${LangFileString} lng_ne "Nepalska"
-${LangFileString} lng_nb "Norskt b�km�l"
 ${LangFileString} lng_nl "Hollenska"
-${LangFileString} lng_nn "N�norska"
+${LangFileString} lng_nn "Nýnorska"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
-${LangFileString} lng_pl "P�lska"
-${LangFileString} lng_pt "Port�galska"
-${LangFileString} lng_pt_BR "Brasil�sk port�galska"
-${LangFileString} lng_ro "R�menska"
-${LangFileString} lng_ru "R�ssneska"
+${LangFileString} lng_pl "Pólska"
+${LangFileString} lng_pt "Portúgalska"
+${LangFileString} lng_pt_BR "Brasilísk portúgalska"
+${LangFileString} lng_ro "Rúmenska"
+${LangFileString} lng_ru "Rússneska"
 ${LangFileString} lng_rw "Kinyarwanda"
-${LangFileString} lng_sk "Sl�vak�ska"
-${LangFileString} lng_sl "Sl�venska"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "Slóvakíska"
+${LangFileString} lng_sl "Slóvenska"
 ${LangFileString} lng_sq "Albanska"
 ${LangFileString} lng_sr "Serbneska"
-${LangFileString} lng_sr@latin "Serbneska me� latnesku letri"
-${LangFileString} lng_sv "S�nska"
-${LangFileString} lng_te "Tel�g�"
-${LangFileString} lng_th "T�lenska"
+${LangFileString} lng_sr@latin "Serbneska með latnesku letri"
+${LangFileString} lng_sv "Sænska"
+${LangFileString} lng_ta "Tamil"
+${LangFileString} lng_te "Telúgú"
+${LangFileString} lng_th "Tælenska"
 ${LangFileString} lng_tr "Tyrkneska"
-${LangFileString} lng_uk "�kra�nska"
-${LangFileString} lng_vi "V�etnamska"
-${LangFileString} lng_zh_CN "Einf�ldu� k�nverska"
-${LangFileString} lng_zh_TW "Hef�bundin k�nverska"
-${LangFileString} UInstOpt "Valkostir vi� fjarl�gingu"
-${LangFileString} UInstOpt1 "�kveddu hva� �� vilt gera fyrir �essa aukavalkosti"
-${LangFileString} PurgePrefs "Halda pers�nulegum kj�rstillingum"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log fannst ekki!$\r$\nFjarl�g�u forriti� me� �v� a� hreinsa �t �r m�ppunni $INSTDIR yourself!"
-${LangFileString} FileChanged "Skr�in $filename hefur breyst eftir uppsetningu.$\r$\nViltu samt ey�a �essari skr�?"
-${LangFileString} Yes "J�"
-${LangFileString} AlwaysYes "alltaf svara J�"
+${LangFileString} lng_uk "Úkraínska"
+${LangFileString} lng_ur "Urdu"
+${LangFileString} lng_vi "Víetnamska"
+${LangFileString} lng_zh_CN "Einfölduð kínverska"
+${LangFileString} lng_zh_TW "Hefðbundin kínverska"
+${LangFileString} UInstOpt "Valkostir við fjarlægingu"
+${LangFileString} UInstOpt1 "Ákveddu hvað þú vilt gera fyrir þessa aukavalkosti"
+${LangFileString} PurgePrefs "Halda persónulegum kjörstillingum"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log fannst ekki!$\r$\nFjarlægðu forritið með því að hreinsa út úr möppunni $INSTDIR yourself!"
+${LangFileString} FileChanged "Skráin $filename hefur breyst eftir uppsetningu.$\r$\nViltu samt eyða þessari skrá?"
+${LangFileString} Yes "Já"
+${LangFileString} AlwaysYes "alltaf svara Já"
 ${LangFileString} No "Nei"
 ${LangFileString} AlwaysNo "alltaf svara Nei"
diff --git a/packaging/win32/languages/Indonesian.nsh b/packaging/win32/languages/Indonesian.nsh
index f64c884a9..8310ad186 100644
--- a/packaging/win32/languages/Indonesian.nsh
+++ b/packaging/win32/languages/Indonesian.nsh
@@ -1,4 +1,4 @@
-;Language: English (1033, ANSI)
+;Language: English (1033)
 ;By Adib Taraben <theadib@gmail.com>
 ${LangFileString} CaptionDescription "Open Source Scalable Vector Graphics Editor"
 ${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) dilepas dibawah GNU General Public License (GPL). Lisensi ditampilkan disini hanya untuk keperluan informasi saja. $_CLICK"
@@ -30,27 +30,36 @@ ${LangFileString} ContextMenu "Context Menu"
 ${LangFileString} ContextMenuDesc "Tambahkan Inkscape kedalam Context Menu untuk berkas SVG"
 ${LangFileString} DeletePrefs "Hapus preferensi personal"
 ${LangFileString} DeletePrefsDesc "Hapus preferensi personal dari pemasangan sebelumnya"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Berkas-berkas tambahan"
 ${LangFileString} AddfilesDesc "Berkas-berkas tambahan"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Contoh"
 ${LangFileString} ExamplesDesc "Contoh menggunakan Inkscape"
 ${LangFileString} Tutorials "Tutorial"
 ${LangFileString} TutorialsDesc "Tutorials menggunakan Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Terjemahan"
 ${LangFileString} LanguagesDesc "Pasang macam-macam terjemahan untuk Inkscape"
 ${LangFileString} lng_am "Amharic"
 ${LangFileString} lng_ar "Arab"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbaijan"
 ${LangFileString} lng_be "Belarus"
 ${LangFileString} lng_bg "Bulgaria"
 ${LangFileString} lng_bn "Benggala"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Breton"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Katalan"
 ${LangFileString} lng_ca@valencia "Katalan Valencia"
 ${LangFileString} lng_cs "Ceko"
 ${LangFileString} lng_da "Denmark"
 ${LangFileString} lng_de "Jerman"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Yunani"
 ${LangFileString} lng_en "Inggris"
@@ -68,7 +77,9 @@ ${LangFileString} lng_fi "Finlandia"
 ${LangFileString} lng_fr "Perancis"
 ${LangFileString} lng_ga "Irlandia"
 ${LangFileString} lng_gl "Galician"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Ibrani"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Kroasia"
 ${LangFileString} lng_hu "Hongaria"
 ${LangFileString} lng_hy "Armenian"
@@ -77,15 +88,26 @@ ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italia"
 ${LangFileString} lng_ja "Jepang"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Korea"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lithuania"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedonia"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongolia"
-${LangFileString} lng_ne "Nepal"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
 ${LangFileString} lng_nb "Bokmål Norwegia"
+${LangFileString} lng_ne "Nepal"
 ${LangFileString} lng_nl "Belanda"
 ${LangFileString} lng_nn "Nynorsk Norwegia"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
 ${LangFileString} lng_pl "Polandia"
 ${LangFileString} lng_pt "Portugis"
@@ -93,16 +115,23 @@ ${LangFileString} lng_pt_BR "Portugis Brasil"
 ${LangFileString} lng_ro "Rumania"
 ${LangFileString} lng_ru "Rusia"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Slovakia"
 ${LangFileString} lng_sl "Slovenia"
 ${LangFileString} lng_sq "Albania"
 ${LangFileString} lng_sr "Serbia"
 ${LangFileString} lng_sr@latin "Serbia dalam Latin"
 ${LangFileString} lng_sv "Swedia"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
 ${LangFileString} lng_tr "Turki"
 ${LangFileString} lng_uk "Ukraina"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnam"
 ${LangFileString} lng_zh_CN "Cina Simplifed"
 ${LangFileString} lng_zh_TW "Cina Tradisional"
diff --git a/packaging/win32/languages/Italian.nsh b/packaging/win32/languages/Italian.nsh
index 234694e8e..fa5ef113b 100644
--- a/packaging/win32/languages/Italian.nsh
+++ b/packaging/win32/languages/Italian.nsh
@@ -1,12 +1,12 @@
-;Language: Italian (1040, CP1252)
+;Language: Italian (1040)
 ;By Emanuele Mandola earween@gmail.com
 ${LangFileString} CaptionDescription "Editor di grafica vettoriale Open Source"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) � rilasciato sotto GNU General Public License (GPL). La licenza � fornita solo a scopo informativo. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape � stato installato dall'utente $0.  Potrebbe non essere possibile portare a termine l'installazione.   Accedere come $0 e riprovare."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 � gi� stata installata. $\nRimuovere la versione precedente prima di installare $(^Name) ?"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) è rilasciato sotto GNU General Public License (GPL). La licenza è fornita solo a scopo informativo. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape è stato installato dall'utente $0.  Potrebbe non essere possibile portare a termine l'installazione.   Accedere come $0 e riprovare."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 è già stata installata. $\nRimuovere la versione precedente prima di installare $(^Name) ?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nPremere OK per continuare o Annulla per uscire."
 ${LangFileString} NO_ADMIN "Non si posseggono i diritti di amministratore.  Potrebbe non essere possibile installare Inkscape per tutti gli utenti.  Non selezionare l'opzione 'Per Tutti Gli Utenti'"
-${LangFileString} NOT_SUPPORTED "Inkscape non � compatibile con i sistemi operativi Windows 95/98/ME!\n\nPer ulteriori informazioni consultare il sito ufficiale."
+${LangFileString} NOT_SUPPORTED "Inkscape non è compatibile con i sistemi operativi Windows 95/98/ME!\n\nPer ulteriori informazioni consultare il sito ufficiale."
 ${LangFileString} Full "Completa"
 ${LangFileString} Optimal "Consigliata"
 ${LangFileString} Minimal "Minima"
@@ -30,27 +30,36 @@ ${LangFileString} ContextMenu "Menu Contestuale"
 ${LangFileString} ContextMenuDesc "Aggiunge Inkscape nel Menu Contestuale per i file SVG"
 ${LangFileString} DeletePrefs "Rimuovere impostazioni personali"
 ${LangFileString} DeletePrefsDesc "Rimuove le impostazioni personali lasciate da installazioni precedenti"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "File Aggiuntivi"
 ${LangFileString} AddfilesDesc "File Aggiuntivi"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Esempi"
 ${LangFileString} ExamplesDesc "Esempi d'uso di Inkscape"
 ${LangFileString} Tutorials "Tutorial"
 ${LangFileString} TutorialsDesc "Tutorial per l'uso di Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Traduzioni"
 ${LangFileString} LanguagesDesc "Installa altre traduzioni per Inkscape"
 ${LangFileString} lng_am "Aramaico"
 ${LangFileString} lng_ar "Arabo"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbaigiano"
 ${LangFileString} lng_be "Bielorusso"
 ${LangFileString} lng_bg "Bulgaro"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "Bretone"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "Catalano"
 ${LangFileString} lng_ca@valencia "Catalano Valenciano"
 ${LangFileString} lng_cs "Ceco"
 ${LangFileString} lng_da "Danese"
 ${LangFileString} lng_de "Tedesco"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Greco"
 ${LangFileString} lng_en "Inglese"
@@ -68,7 +77,9 @@ ${LangFileString} lng_fi "Finlandese"
 ${LangFileString} lng_fr "Francese"
 ${LangFileString} lng_ga "Irlandese"
 ${LangFileString} lng_gl "Gallese"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Ebreo"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croato"
 ${LangFileString} lng_hu "Ungherese"
 ${LangFileString} lng_hy "Armenian"
@@ -77,15 +88,26 @@ ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
 ${LangFileString} lng_ja "Giopponese"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Koreano"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituano"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedone"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongolo"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norvegese Bokmål"
 ${LangFileString} lng_ne "Nepali"
-${LangFileString} lng_nb "Norvegese Bokm�l"
 ${LangFileString} lng_nl "Olandese"
 ${LangFileString} lng_nn "Norvegese Nynorsk"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
 ${LangFileString} lng_pl "Polacco"
 ${LangFileString} lng_pt "Portoghese"
@@ -93,16 +115,23 @@ ${LangFileString} lng_pt_BR "Portoghese Brasiliano"
 ${LangFileString} lng_ro "Rumeno"
 ${LangFileString} lng_ru "Russo"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Slovacco"
 ${LangFileString} lng_sl "Sloveno"
 ${LangFileString} lng_sq "Albanese"
 ${LangFileString} lng_sr "Serbo"
 ${LangFileString} lng_sr@latin "Serbo in caratteri Latini"
 ${LangFileString} lng_sv "Svedese"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Thai"
 ${LangFileString} lng_tr "Turco"
 ${LangFileString} lng_uk "Ucraino"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamese"
 ${LangFileString} lng_zh_CN "Cinese Semplificato"
 ${LangFileString} lng_zh_TW "Cinese Tradizionale"
@@ -110,8 +139,8 @@ ${LangFileString} UInstOpt "Opzioni di Disinstallazione"
 ${LangFileString} UInstOpt1 "Scegli ulteriori Opzioni"
 ${LangFileString} PurgePrefs "Mantieni le Impostazioni personali"
 ${LangFileString} UninstallLogNotFound "Impossibile trovare $INSTDIR\uninstall.log !$\r$\nPer continuare la rimozione, cancellare la cartella $INSTDIR a mano."
-${LangFileString} FileChanged "Il file $filename � stato modificato rispetto all'ultima installazione.$\r$\nRimuoverlo comunque?"
-${LangFileString} Yes "S�"
-${LangFileString} AlwaysYes "rispondere sempre S�"
+${LangFileString} FileChanged "Il file $filename è stato modificato rispetto all'ultima installazione.$\r$\nRimuoverlo comunque?"
+${LangFileString} Yes "Sì"
+${LangFileString} AlwaysYes "rispondere sempre Sì"
 ${LangFileString} No "No"
 ${LangFileString} AlwaysNo "rispondere sempre No"
diff --git a/packaging/win32/languages/Japanese.nsh b/packaging/win32/languages/Japanese.nsh
index 6cb58c2d9..023654aa2 100644
--- a/packaging/win32/languages/Japanese.nsh
+++ b/packaging/win32/languages/Japanese.nsh
@@ -1,117 +1,146 @@
-;Language: Japanese (1041, CP932)
+;Language: Japanese (1041)
 ;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} LICENSE_BOTTOM_TEXT "$(^Name) は GNU General Public License (GPL) の下でリリースされます。参考に当該ライセンスをここに表示します。$_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape はユーザー $0 によってインストールされています。$\r$\nこのまま続けると正常に完了しないかもしれません。$\r$\n$0 でログインしてから再度試みてください。"
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 は既にインストールされています。$\n$(^Name) をインストールする前に以前のバージョンを削除しますか?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nOK を押して継続するか CANCEL を押して中止してください。"
+${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 Editor (必須)"
+${LangFileString} CoreDesc "Inkscape のコアファイルとDLL"
+${LangFileString} GTKFiles "GTK+ ランタイム環境 (必須)"
+${LangFileString} GTKFilesDesc "マルチプラットフォーム対応 GUI ツールキット (Inkscape が使用)"
+${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 "SVG ファイルを Inkscape で開く"
+${LangFileString} SVGWriterDesc "SVG ファイルの標準エディターに Inkscape を設定"
+${LangFileString} ContextMenu "コンテキストメニュー"
+${LangFileString} ContextMenuDesc "SVG ファイルのコンテキストメニューに Inkscape を追加"
+${LangFileString} DeletePrefs "個人設定を削除"
+${LangFileString} DeletePrefsDesc "以前のインストール時から引き継いだ個人設定を削除"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "追加ファイル"
+${LangFileString} AddfilesDesc "追加ファイル"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "サンプルファイル"
+${LangFileString} ExamplesDesc "Inkscape のサンプルファイル"
+${LangFileString} Tutorials "チュートリアル"
+${LangFileString} TutorialsDesc "Inkscape のチュートリアル"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "言語"
+${LangFileString} LanguagesDesc "Inkscape のさまざまな言語ファイルをインストール"
+${LangFileString} lng_am "アムハラ語"
+${LangFileString} lng_ar "アラビア語"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "アゼルバイジャン語"
+${LangFileString} lng_be "ベラルーシ語"
+${LangFileString} lng_bg "ブルガリア語"
+${LangFileString} lng_bn "ベンガル語"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${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_br "ブルトン語"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "カタロニア語"
+${LangFileString} lng_ca@valencia "バレンシア語"
+${LangFileString} lng_cs "チェコ語"
+${LangFileString} lng_da "デンマーク語"
+${LangFileString} lng_de "ドイツ語"
+${LangFileString} lng_doi "Dogri"
+${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 "ファルシ語"
+${LangFileString} lng_fi "フィンランド語"
+${LangFileString} lng_fr "フランス語"
+${LangFileString} lng_ga "アイルランド語"
+${LangFileString} lng_gl "ガリシア語"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "ヘブライ語"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "クロアチア語"
+${LangFileString} lng_hu "ハンガリー語"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "�C���h�l�V�A��"
+${LangFileString} lng_id "インドネシア語"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "�C�^���A��"
-${LangFileString} lng_ja "���{��"
-${LangFileString} lng_km "�N���[����"
-${LangFileString} lng_ko "�؍���"
-${LangFileString} lng_lt "���g�A�j�A��"
+${LangFileString} lng_it "イタリア語"
+${LangFileString} lng_ja "日本語"
+${LangFileString} lng_km "クメール語"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "韓国語"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "リトアニア語"
 ${LangFileString} lng_lv "Latvian"
-${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 "�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 "���ׂĂ͂�"
-${LangFileString} No "������"
-${LangFileString} AlwaysNo "���ׂĂ�����"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "マケドニア語"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "モンゴル語"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "ノルウェー語ブークモール"
+${LangFileString} lng_ne "ネパール語"
+${LangFileString} lng_nl "オランダ語"
+${LangFileString} lng_nn "ノルウェー語ニーノシュク"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "パンジャブ語"
+${LangFileString} lng_pl "ポーランド語"
+${LangFileString} lng_pt "ポルトガル語"
+${LangFileString} lng_pt_BR "ポルトガル語 (ブラジル)"
+${LangFileString} lng_ro "ルーマニア語"
+${LangFileString} lng_ru "ロシア語"
+${LangFileString} lng_rw "キニヤルワンダ語"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "スロバキア語"
+${LangFileString} lng_sl "スロベニア語"
+${LangFileString} lng_sq "アルバニア語"
+${LangFileString} lng_sr "セルビア語"
+${LangFileString} lng_sr@latin "セルビア語ラテン文字"
+${LangFileString} lng_sv "スウェーデン語"
+${LangFileString} lng_ta "Tamil"
+${LangFileString} lng_te "テルグ語"
+${LangFileString} lng_th "タイ語"
+${LangFileString} lng_tr "トルコ語"
+${LangFileString} lng_uk "ウクライナ語"
+${LangFileString} lng_ur "Urdu"
+${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/Polish.nsh b/packaging/win32/languages/Polish.nsh
index 0e184d616..bea4dd958 100644
--- a/packaging/win32/languages/Polish.nsh
+++ b/packaging/win32/languages/Polish.nsh
@@ -1,56 +1,65 @@
-;Language: Polish (1045, CP1250)
-;By Przemys�aw Loesch <p_loesch@poczta.onet.pl>, Marcin Floryan <marcin.floryan@gmail.com>, Leszek(teo)�yczkowski <leszekz@gmail.com>
+;Language: Polish (1045)
+;By Przemysław Loesch <p_loesch@poczta.onet.pl>, Marcin Floryan <marcin.floryan@gmail.com>, Leszek(teo)Życzkowski <leszekz@gmail.com>
 ${LangFileString} CaptionDescription "otwarte oprogramowanie do grafiki wektorowej SVG"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) jest udost�pniony na licencji GNU General Public License (GPL). Tekst licencji jest do��czony jedynie w celach informacyjnych. $_CLICK"
-${LangFileString} DIFFERENT_USER "Program Inkscape zosta� zainstalowany przez u�ytkownika $0.$\r$\nJe�li instalacja b�dzie kontynuowana, mo�e zako�czy� si� niepowodzeniem!$\r$\nProsz� zalogowa� si� jako $0 i spr�bowa� ponownie."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 jest ju� zainstalowany. $\nCzy chcesz przed zainstalowaniem programu $(^Name) usun�� jego poprzedni� wersj�?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nAby kontynuowa� instalacj�, naci�nij przycisk OK, aby przerwa� � Anuluj."
-${LangFileString} NO_ADMIN "Nie masz uprawnie� administratora.$\r$\nInstalacja programu Inkscape dla wszystkich u�ytkownik�w mo�e zako�czy� si� niepowodzeniem.$\r$\nProsz� wy��czy� opcj� �Dla wszystkich u�ytkownik�w�."
-${LangFileString} NOT_SUPPORTED "Program Inkscape nie dzia�a w systemach Windows 95/98/ME!$\r$\nProsz� zapozna� si� z informacjami na ten temat na oficjalnej stronie internetowej programu."
-${LangFileString} Full "Pe�na"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) jest udostępniony na licencji GNU General Public License (GPL). Tekst licencji jest dołączony jedynie w celach informacyjnych. $_CLICK"
+${LangFileString} DIFFERENT_USER "Program Inkscape został zainstalowany przez użytkownika $0.$\r$\nJeśli instalacja będzie kontynuowana, może zakończyć się niepowodzeniem!$\r$\nProszę zalogować się jako $0 i spróbować ponownie."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 jest już zainstalowany. $\nCzy chcesz przed zainstalowaniem programu $(^Name) usunąć jego poprzednią wersję?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nAby kontynuować instalację, naciśnij przycisk OK, aby przerwać – Anuluj."
+${LangFileString} NO_ADMIN "Nie masz uprawnień administratora.$\r$\nInstalacja programu Inkscape dla wszystkich użytkowników może zakończyć się niepowodzeniem.$\r$\nProszę wyłączyć opcję „Dla wszystkich użytkowników”."
+${LangFileString} NOT_SUPPORTED "Program Inkscape nie działa w systemach Windows 95/98/ME!$\r$\nProszę zapoznać się z informacjami na ten temat na oficjalnej stronie internetowej programu."
+${LangFileString} Full "Pełna"
 ${LangFileString} Optimal "Optymalna"
 ${LangFileString} Minimal "Minimalna"
 ${LangFileString} Core "Inkscape Edytor SVG (wymagane)"
 ${LangFileString} CoreDesc "Podstawowe pliki i biblioteki dll dla programu Inkscape"
-${LangFileString} GTKFiles "�rodowisko pracy GTK+ (wymagane)"
-${LangFileString} GTKFilesDesc "Wieloplatformowe �rodowisko graficzne, z kt�rego korzysta Inkscape"
-${LangFileString} Shortcuts "Skr�ty"
-${LangFileString} ShortcutsDesc "Skr�ty do uruchamiania programu Inkscape"
-${LangFileString} Alluser "dla wszystkich u�ytkownik�w"
-${LangFileString} AlluserDesc "Program Inkscape zostanie zainstalowany dla wszystkich u�ytkownik�w tego komputera"
+${LangFileString} GTKFiles "Środowisko pracy GTK+ (wymagane)"
+${LangFileString} GTKFilesDesc "Wieloplatformowe środowisko graficzne, z którego korzysta Inkscape"
+${LangFileString} Shortcuts "Skróty"
+${LangFileString} ShortcutsDesc "Skróty do uruchamiania programu Inkscape"
+${LangFileString} Alluser "dla wszystkich użytkowników"
+${LangFileString} AlluserDesc "Program Inkscape zostanie zainstalowany dla wszystkich użytkowników tego komputera"
 ${LangFileString} Desktop "Pulpit"
-${LangFileString} DesktopDesc "Na pulpicie zostanie utworzony skr�t do uruchamiania programu Inkscape"
+${LangFileString} DesktopDesc "Na pulpicie zostanie utworzony skrót do uruchamiania programu Inkscape"
 ${LangFileString} Startmenu "Menu Start"
-${LangFileString} StartmenuDesc "W menu Start zostanie utworzony skr�t do uruchamiania programu Inkscape"
+${LangFileString} StartmenuDesc "W menu Start zostanie utworzony skrót do uruchamiania programu Inkscape"
 ${LangFileString} Quicklaunch "Pasek szybkiego uruchamiania"
-${LangFileString} QuicklaunchDesc "Na pasku szybkiego uruchamiania zostanie utworzony skr�t do uruchamiania programu Inkscape"
-${LangFileString} SVGWriter "Otwieraj pliki SVG za pomoc� programu Inkscape"
-${LangFileString} SVGWriterDesc "Program Inkscape b�dzie domy�lnym edytorem plik�w SVG"
+${LangFileString} QuicklaunchDesc "Na pasku szybkiego uruchamiania zostanie utworzony skrót do uruchamiania programu Inkscape"
+${LangFileString} SVGWriter "Otwieraj pliki SVG za pomocą programu Inkscape"
+${LangFileString} SVGWriterDesc "Program Inkscape będzie domyślnym edytorem plików SVG"
 ${LangFileString} ContextMenu "Menu kontekstowe"
 ${LangFileString} ContextMenuDesc "Do systemowego menu kontekstowego zostanie dodany program Inkscape"
-${LangFileString} DeletePrefs "Usu� ustawienia u�ytkownika"
-${LangFileString} DeletePrefsDesc "Zostan� usuni�te ustawienia u�ytkownika pozostawione przez poprzednie instalacje"
+${LangFileString} DeletePrefs "Usuń ustawienia użytkownika"
+${LangFileString} DeletePrefsDesc "Zostaną usunięte ustawienia użytkownika pozostawione przez poprzednie instalacje"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Pliki dodatkowe"
-${LangFileString} AddfilesDesc "Zostan� dodane wybrane poni�ej dodatkowe pliki"
-${LangFileString} Examples "Przyk�ady"
-${LangFileString} ExamplesDesc "Przyk�ady u�ycia programu Inkscape"
+${LangFileString} AddfilesDesc "Zostaną dodane wybrane poniżej dodatkowe pliki"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "Przykłady"
+${LangFileString} ExamplesDesc "Przykłady użycia programu Inkscape"
 ${LangFileString} Tutorials "Poradniki"
-${LangFileString} TutorialsDesc "Poradniki jak korzysta� z programu Inkscape"
-${LangFileString} Languages "J�zyki interfejsu"
-${LangFileString} LanguagesDesc "Dost�pne j�zyki interfejsu dla programu Inkscape"
+${LangFileString} TutorialsDesc "Poradniki jak korzystać z programu Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Języki interfejsu"
+${LangFileString} LanguagesDesc "Dostępne języki interfejsu dla programu Inkscape"
 ${LangFileString} lng_am "Amharski"
 ${LangFileString} lng_ar "Arabski"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerski"
-${LangFileString} lng_be "Bia�oruski"
-${LangFileString} lng_bg "Bu�garski"
+${LangFileString} lng_be "Białoruski"
+${LangFileString} lng_bg "Bułgarski"
 ${LangFileString} lng_bn "Bengalski"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${LangFileString} lng_br "Breto�ski"
-${LangFileString} lng_ca "Katalo�ski"
-${LangFileString} lng_ca@valencia "Walencki-Katalo�ski"
+${LangFileString} lng_br "Bretoński"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Kataloński"
+${LangFileString} lng_ca@valencia "Walencki-Kataloński"
 ${LangFileString} lng_cs "Czeski"
-${LangFileString} lng_da "Du�ski"
+${LangFileString} lng_da "Duński"
 ${LangFileString} lng_de "Niemiecki"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Grecki"
 ${LangFileString} lng_en "Angielski"
@@ -59,58 +68,78 @@ ${LangFileString} lng_en_CA "Angielski-Kanadyjski"
 ${LangFileString} lng_en_GB "Angielski-Brytyjski"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
-${LangFileString} lng_es "Hiszpa�ski"
-${LangFileString} lng_es_MX "Hiszpa�ski-Meksyka�ski"
-${LangFileString} lng_et "Esto�ski"
+${LangFileString} lng_es "Hiszpański"
+${LangFileString} lng_es_MX "Hiszpański-Meksykański"
+${LangFileString} lng_et "Estoński"
 ${LangFileString} lng_eu "Baskijski"
 ${LangFileString} lng_fa "Farsi"
-${LangFileString} lng_fi "Fi�ski"
+${LangFileString} lng_fi "Fiński"
 ${LangFileString} lng_fr "Francuski"
 ${LangFileString} lng_ga "Irlandzki"
 ${LangFileString} lng_gl "Galicyjski"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebrajski"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Chorwacki"
-${LangFileString} lng_hu "W�gierski"
+${LangFileString} lng_hu "Węgierski"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonezyjski"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "W�oski"
-${LangFileString} lng_ja "Japo�ski"
+${LangFileString} lng_it "Włoski"
+${LangFileString} lng_ja "Japoński"
 ${LangFileString} lng_km "Kmerski"
-${LangFileString} lng_ko "Korea�ski"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Koreański"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Litewski"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "Macedo�ski"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Macedoński"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongolski"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norweski Bokmĺl"
 ${LangFileString} lng_ne "Nepali"
-${LangFileString} lng_nb "Norweski Bokm�l"
 ${LangFileString} lng_nl "Holenderski"
 ${LangFileString} lng_nn "Norweski Nynorsk"
-${LangFileString} lng_pa "Pend�abski"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "Pendżabski"
 ${LangFileString} lng_pl "Polski"
 ${LangFileString} lng_pt "Portugalski"
 ${LangFileString} lng_pt_BR "Portugalski-Brazylijski"
-${LangFileString} lng_ro "Rumu�ski"
+${LangFileString} lng_ro "Rumuński"
 ${LangFileString} lng_ru "Rosyjski"
 ${LangFileString} lng_rw "Ruanda-Rundi "
-${LangFileString} lng_sk "S�owacki"
-${LangFileString} lng_sl "S�owe�ski"
-${LangFileString} lng_sq "Alba�ski"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "Słowacki"
+${LangFileString} lng_sl "Słoweński"
+${LangFileString} lng_sq "Albański"
 ${LangFileString} lng_sr "Serbski"
-${LangFileString} lng_sr@Latn "Serbski skrypt �aci�ski"
+${LangFileString} lng_sr@latin "Serbski skrypt łaciński"
 ${LangFileString} lng_sv "Szwedzki"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Tajski"
 ${LangFileString} lng_tr "Turecki"
-${LangFileString} lng_uk "Ukrai�ski"
+${LangFileString} lng_uk "Ukraiński"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Wietnamski"
-${LangFileString} lng_zh_CN "Chi�ski uproszczony"
-${LangFileString} lng_zh_TW "Chi�ski tradycyjny"
+${LangFileString} lng_zh_CN "Chiński uproszczony"
+${LangFileString} lng_zh_TW "Chiński tradycyjny"
 ${LangFileString} UInstOpt "Opcje dezinstalacji"
-${LangFileString} UInstOpt1 "Dokonaj wyboru spo�r�d dodatkowych opcji"
-${LangFileString} PurgePrefs "Zachowaj ustawienia u�ytkownika"
-${LangFileString} UninstallLogNotFound "Nie znaleziono $INSTDIR\uninstall.log!$\r$\nProsz� wykona� dezinstalacj� r�cznie poprzez usuni�cie katalogu $INSTDIR!"
-${LangFileString} FileChanged "Plik $filename zosta� zmieniony po zainstalowaniu.$\r$\nCzy nadal chcesz usun�� ten plik?"
+${LangFileString} UInstOpt1 "Dokonaj wyboru spośród dodatkowych opcji"
+${LangFileString} PurgePrefs "Zachowaj ustawienia użytkownika"
+${LangFileString} UninstallLogNotFound "Nie znaleziono $INSTDIR\uninstall.log!$\r$\nProszę wykonać dezinstalację ręcznie poprzez usunięcie katalogu $INSTDIR!"
+${LangFileString} FileChanged "Plik $filename został zmieniony po zainstalowaniu.$\r$\nCzy nadal chcesz usunąć ten plik?"
 ${LangFileString} Yes "Tak"
 ${LangFileString} AlwaysYes "Tak dla wszystkich"
 ${LangFileString} No "Nie"
diff --git a/packaging/win32/languages/Portuguese.nsh b/packaging/win32/languages/Portuguese.nsh
index c308f7e36..c17973801 100644
--- a/packaging/win32/languages/Portuguese.nsh
+++ b/packaging/win32/languages/Portuguese.nsh
@@ -1,117 +1,146 @@
-;Language: Portuguese (2070, CP1252)
+;Language: Portuguese (2070)
 ;By Rui <xande6ruz@yandex.com>
-${LangFileString} CaptionDescription "Editor de Gr�ficos Vetoriais Escal�veis de C�digo Aberto"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) � disponibilizado sob a GNU General Public License (GPL). A licen�a � disponibilizada aqui apenas para fins informativos. $_CLICK"
-${LangFileString} DIFFERENT_USER "O Inkscape j� foi instalado pelo utilizador $0.$\r$\nSe continuar, poder� n�o conseguir instalar por completo!$\r$\nPor favor entre na conta de $0 e tente de novo."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 j� foi instalado. $\nPretende remover a vers�o anterior antes de instalar o $(^Name)?"
+${LangFileString} CaptionDescription "Editor de Gráficos Vetoriais Escaláveis de Código Aberto"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) é disponibilizado sob a GNU General Public License (GPL). A licença é disponibilizada aqui apenas para fins informativos. $_CLICK"
+${LangFileString} DIFFERENT_USER "O Inkscape já foi instalado pelo utilizador $0.$\r$\nSe continuar, poderá não conseguir instalar por completo!$\r$\nPor favor entre na conta de $0 e tente de novo."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 já foi instalado. $\nPretende remover a versão anterior antes de instalar o $(^Name)?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nClique em OK para continuar ou clique em CANCELAR para abortar."
-${LangFileString} NO_ADMIN "A sua conta n�o tem privil�gios de administrador.$\r$\nPoder� n�o conseguir instalar o Inkscape em todas as contas.$\r$\nDesmarque a op��o 'Instalar em todas as contas'."
-${LangFileString} NOT_SUPPORTED "O Inkscape n�o corre nos sistemas operativos Windows 95/98/ME!$\r$\nPor favor consulte o site oficial para mais informa��es."
+${LangFileString} NO_ADMIN "A sua conta não tem privilégios de administrador.$\r$\nPoderá não conseguir instalar o Inkscape em todas as contas.$\r$\nDesmarque a opção 'Instalar em todas as contas'."
+${LangFileString} NOT_SUPPORTED "O Inkscape não corre nos sistemas operativos Windows 95/98/ME!$\r$\nPor favor consulte o site oficial para mais informações."
 ${LangFileString} Full "Completo"
 ${LangFileString} Optimal "Opcional"
-${LangFileString} Minimal "M�nimo"
-${LangFileString} Core "Inkscape - Editor SVG (necess�rio)"
-${LangFileString} CoreDesc "Ficheiros do n�cleo e dlls do Inkscape"
-${LangFileString} GTKFiles "GTK+ Runtime Environment (necess�rio)"
+${LangFileString} Minimal "Mínimo"
+${LangFileString} Core "Inkscape - Editor SVG (necessário)"
+${LangFileString} CoreDesc "Ficheiros do núcleo e dlls do Inkscape"
+${LangFileString} GTKFiles "GTK+ Runtime Environment (necessário)"
 ${LangFileString} GTKFilesDesc "Uma biblioteca de GUI multi-plataforma, usada pelo Inkscape"
 ${LangFileString} Shortcuts "Atalhos"
 ${LangFileString} ShortcutsDesc "Atalhos para abrir o Inkscape"
 ${LangFileString} Alluser "Instalar em todas as contas"
-${LangFileString} AlluserDesc "Instalar esta aplica��o para todos os utilizadores que usem este computador (todas as contas)"
+${LangFileString} AlluserDesc "Instalar esta aplicação para todos os utilizadores que usem este computador (todas as contas)"
 ${LangFileString} Desktop "Ambiente de Trabalho"
 ${LangFileString} DesktopDesc "Criar um atalho do Inkscape no Ambiente de Trabalho"
-${LangFileString} Startmenu "Menu de In�cio"
-${LangFileString} StartmenuDesc "Criar um atalho do Inkscape no Menu de In�cio"
-${LangFileString} Quicklaunch "Lan�amento R�pido"
-${LangFileString} QuicklaunchDesc "Criar um atalho do Inkscape na barra de Lan�amento R�pido"
+${LangFileString} Startmenu "Menu de Início"
+${LangFileString} StartmenuDesc "Criar um atalho do Inkscape no Menu de Início"
+${LangFileString} Quicklaunch "Lançamento Rápido"
+${LangFileString} QuicklaunchDesc "Criar um atalho do Inkscape na barra de Lançamento Rápido"
 ${LangFileString} SVGWriter "Abrir ficheiros SVG com o Inkscape"
-${LangFileString} SVGWriterDesc "Selecionar o Inkscape como o editor padr�o para ficheiros SVG"
+${LangFileString} SVGWriterDesc "Selecionar o Inkscape como o editor padrão para ficheiros SVG"
 ${LangFileString} ContextMenu "Menu de Contexto"
 ${LangFileString} ContextMenuDesc "Adicionar o Inkscape no Menu de Contexto para ficheiros SVG"
-${LangFileString} DeletePrefs "Eliminar prefer�ncias"
-${LangFileString} DeletePrefsDesc "Eliminar prefer�ncias de vers�es anteriormente instaladas do Inkscape"
+${LangFileString} DeletePrefs "Eliminar preferências"
+${LangFileString} DeletePrefsDesc "Eliminar preferências de versões anteriormente instaladas do Inkscape"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "Um interpretador para a linguagem de programação Python e módulos Python necessários para correr extensões Inkscape."
 ${LangFileString} Addfiles "Ficheiros Adicionais"
 ${LangFileString} AddfilesDesc "Ficheiros Adicionais"
+${LangFileString} Extensions "Extensões"
+${LangFileString} ExtensionsDesc "Extensões Inkscape extensions (incluindo muitos plugins de importação e exportação)"
 ${LangFileString} Examples "Exemplos"
-${LangFileString} ExamplesDesc "Exemplos de utiliza��o do Inkscape"
+${LangFileString} ExamplesDesc "Exemplos de utilização do Inkscape"
 ${LangFileString} Tutorials "Tutoriais"
 ${LangFileString} TutorialsDesc "Tutoriais para aprender a usar o Inkscape"
-${LangFileString} Languages "Tradu��es"
-${LangFileString} LanguagesDesc "Instalar v�rias tradu��es do Inkscape"
-${LangFileString} lng_am "Am�rico"
-${LangFileString} lng_ar "Ar�bico"
+${LangFileString} Dictionaries "Dicionários"
+${LangFileString} DictionariesDesc "Dicionários para algumas linguagens comuns para correcção ortográfica no Inkscape"
+${LangFileString} Languages "Traduções"
+${LangFileString} LanguagesDesc "Instalar várias traduções do Inkscape"
+${LangFileString} lng_am "Amárico"
+${LangFileString} lng_ar "Arábico"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbaijano"
 ${LangFileString} lng_be "Bielorrusso"
-${LangFileString} lng_bg "B�lgaro"
+${LangFileString} lng_bg "Búlgaro"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali do Bangladeche"
-${LangFileString} lng_br "Bret�o"
-${LangFileString} lng_ca "Catal�o"
-${LangFileString} lng_ca@valencia "Catal�o Valenciano"
+${LangFileString} lng_br "Bretão"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Catalão"
+${LangFileString} lng_ca@valencia "Catalão Valenciano"
 ${LangFileString} lng_cs "Checo"
-${LangFileString} lng_da "Dinamarqu�s"
-${LangFileString} lng_de "Alem�o"
-${LangFileString} lng_dz "Butan�s"
+${LangFileString} lng_da "Dinamarquês"
+${LangFileString} lng_de "Alemão"
+${LangFileString} lng_doi "Dogri"
+${LangFileString} lng_dz "Butanês"
 ${LangFileString} lng_el "Grego"
-${LangFileString} lng_en "Ingl�s"
-${LangFileString} lng_en_AU "Ingl�s Australiano"
-${LangFileString} lng_en_CA "Ingl�s Canadiano"
-${LangFileString} lng_en_GB "Ingl�s Brit�nico"
+${LangFileString} lng_en "Inglês"
+${LangFileString} lng_en_AU "Inglês Australiano"
+${LangFileString} lng_en_CA "Inglês Canadiano"
+${LangFileString} lng_en_GB "Inglês Britânico"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
 ${LangFileString} lng_es "Espanhol"
 ${LangFileString} lng_es_MX "Espanhol Mexicano"
-${LangFileString} lng_et "Est�nio"
+${LangFileString} lng_et "Estónio"
 ${LangFileString} lng_eu "Basco"
 ${LangFileString} lng_fa "Persa"
-${LangFileString} lng_fi "Finland�s"
-${LangFileString} lng_fr "Franc�s"
-${LangFileString} lng_ga "Irland�s"
+${LangFileString} lng_fi "Finlandês"
+${LangFileString} lng_fr "Francês"
+${LangFileString} lng_ga "Irlandês"
 ${LangFileString} lng_gl "Galego"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebraico"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croata"
-${LangFileString} lng_hu "H�ngaro"
-${LangFileString} lng_hy "Arm�nio"
-${LangFileString} lng_id "Indon�sio"
-${LangFileString} lng_is "Island�s"
+${LangFileString} lng_hu "Húngaro"
+${LangFileString} lng_hy "Arménio"
+${LangFileString} lng_id "Indonésio"
+${LangFileString} lng_is "Islandês"
 ${LangFileString} lng_it "Italiano"
-${LangFileString} lng_ja "Japon�s"
+${LangFileString} lng_ja "Japonês"
 ${LangFileString} lng_km "Cambojano"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Coreano"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituano"
-${LangFileString} lng_lv "Let�o"
-${LangFileString} lng_mk "Maced�nio"
+${LangFileString} lng_lv "Letão"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Macedónio"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongol"
-${LangFileString} lng_ne "Nepal�s"
-${LangFileString} lng_nb "Bokm�l Noruegu�s"
-${LangFileString} lng_nl "Neerland�s"
-${LangFileString} lng_nn "Novo Noruegu�s"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri no alfabeto Bengali"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Bokmål Norueguês"
+${LangFileString} lng_ne "Nepalês"
+${LangFileString} lng_nl "Holandês"
+${LangFileString} lng_nn "Novo Norueguês"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
 ${LangFileString} lng_pl "Polaco"
-${LangFileString} lng_pt "Portugu�s"
-${LangFileString} lng_pt_BR "Portugu�s do Brasil"
+${LangFileString} lng_pt "Português"
+${LangFileString} lng_pt_BR "Português do Brasil"
 ${LangFileString} lng_ro "Romeno"
 ${LangFileString} lng_ru "Russo"
 ${LangFileString} lng_rw "Quiniaruanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Eslovaco"
 ${LangFileString} lng_sl "Esloveno"
-${LangFileString} lng_sq "Alban�s"
-${LangFileString} lng_sr "S�rvio"
-${LangFileString} lng_sr@latin "S�rvio no alfabeto Latino"
+${LangFileString} lng_sq "Albanês"
+${LangFileString} lng_sr "Sérvio"
+${LangFileString} lng_sr@latin "Sérvio no alfabeto Latino"
 ${LangFileString} lng_sv "Sueco"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugo"
-${LangFileString} lng_th "Tailand�s"
+${LangFileString} lng_th "Tailandês"
 ${LangFileString} lng_tr "Turco"
 ${LangFileString} lng_uk "Ucraniano"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamita"
-${LangFileString} lng_zh_CN "Chin�s Simplificado"
-${LangFileString} lng_zh_TW "Chin�s Traditional"
-${LangFileString} UInstOpt "Op��es de Desinstala��o"
-${LangFileString} UInstOpt1 "Por favor fa�a as suas escolhas para op��es adicionais"
-${LangFileString} PurgePrefs "Manter Prefer�ncias"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log n�o foi encontrado!$\r$\nPor favor desinstale manualmente eliminado a pasta $INSTDIR!"
+${LangFileString} lng_zh_CN "Chinês Simplificado"
+${LangFileString} lng_zh_TW "Chinês Traditional"
+${LangFileString} UInstOpt "Opções de Desinstalação"
+${LangFileString} UInstOpt1 "Por favor faça as suas escolhas para opções adicionais"
+${LangFileString} PurgePrefs "Manter Preferências"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log não foi encontrado!$\r$\nPor favor desinstale manualmente eliminado a pasta $INSTDIR!"
 ${LangFileString} FileChanged "O ficheiro $filename foi alterado depois de instalado.$\r$\nQuer mesmo eliminar o ficheiro?"
 ${LangFileString} Yes "Sim"
 ${LangFileString} AlwaysYes "responder sempre Sim"
-${LangFileString} No "N�o"
-${LangFileString} AlwaysNo "responder sempre N�o"
+${LangFileString} No "Não"
+${LangFileString} AlwaysNo "responder sempre Não"
diff --git a/packaging/win32/languages/PortugueseBR.nsh b/packaging/win32/languages/PortugueseBR.nsh
index dc7a06bda..15a6cc3db 100644
--- a/packaging/win32/languages/PortugueseBR.nsh
+++ b/packaging/win32/languages/PortugueseBR.nsh
@@ -1,117 +1,146 @@
-;Language: Brazilian Portuguese (1046, CP1252)
+;Language: Brazilian Portuguese (1046)
 ;By Rodrigo Padula de Oliveira contato@rodrigopadula.com
-${LangFileString} CaptionDescription "Editor Software Livre de gr�ficos vetoriais"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) � publicado sob GNU General Public License (GPL). A licen�a � fornecida aqui apenas para car�ter informativo. $_CLICK"
-${LangFileString} DIFFERENT_USER "O Inkscape j� foi instalado pelo usu�rio $0. Se voc� continuar a instala��o poder� n�o ser conclu�da com sucesso. Acesse como $0 e tente novamente."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 j� est� instalado. $\nVoc� deseja remover a instala��o anterior antes de instalar novamente $(^Name) ?"
+${LangFileString} CaptionDescription "Editor Software Livre de gráficos vetoriais"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) é publicado sob GNU General Public License (GPL). A licença é fornecida aqui apenas para caráter informativo. $_CLICK"
+${LangFileString} DIFFERENT_USER "O Inkscape já foi instalado pelo usuário $0. Se você continuar a instalação poderá não ser concluída com sucesso. Acesse como $0 e tente novamente."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 já está instalado. $\nVocê deseja remover a instalação anterior antes de instalar novamente $(^Name) ?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nPressione OK para continuar ou pressiona CANCELAR para abortar."
-${LangFileString} NO_ADMIN "Voc� n�o tem privil�gios de administrador. A instala��o do Inkscape para todos os usu�rios pode n�o ser finalizada com sucesso. Desmarque a op��o 'Instalar para todos os usu�rios'"
-${LangFileString} NOT_SUPPORTED "Inkscape n�o � compat�vel com Windows 95/98/ME!\n\nPor favor visite o site oficial do Inkscape para mariores informa��es."
+${LangFileString} NO_ADMIN "Você não tem privilégios de administrador. A instalação do Inkscape para todos os usuários pode não ser finalizada com sucesso. Desmarque a opção 'Instalar para todos os usuários'"
+${LangFileString} NOT_SUPPORTED "Inkscape não é compatível com Windows 95/98/ME!\n\nPor favor visite o site oficial do Inkscape para mariores informações."
 ${LangFileString} Full "Completa"
 ${LangFileString} Optimal "Opcional"
-${LangFileString} Minimal "M�nima"
+${LangFileString} Minimal "Mínima"
 ${LangFileString} Core "Inkscape SVG Editor (requerido)"
 ${LangFileString} CoreDesc "Arquivos Core Inkscape e DLLs"
 ${LangFileString} GTKFiles "GTK+ Runtime Environment (requerido)"
-${LangFileString} GTKFilesDesc "Bibliotecas gr�ficas multi-plataforma, usadas pelo inkscape"
+${LangFileString} GTKFilesDesc "Bibliotecas gráficas multi-plataforma, usadas pelo inkscape"
 ${LangFileString} Shortcuts "Atalhos"
 ${LangFileString} ShortcutsDesc "Atalhos para iniciar o Inkscape"
-${LangFileString} Alluser "Instalar para todos os usu�rios"
-${LangFileString} AlluserDesc "Instalar esta aplica��o para todas as pessoas que usam este computador (todos usu�rios)"
+${LangFileString} Alluser "Instalar para todos os usuários"
+${LangFileString} AlluserDesc "Instalar esta aplicação para todas as pessoas que usam este computador (todos usuários)"
 ${LangFileString} Desktop "Desktop"
 ${LangFileString} DesktopDesc "Cria um atalho para o Inkscape em seu Desktop"
 ${LangFileString} Startmenu "Menu Iniciar"
 ${LangFileString} StartmenuDesc "Cria atalhos para o Inkscape no Menu Iniciar"
-${LangFileString} Quicklaunch "Inicializa��o R�pida"
-${LangFileString} QuicklaunchDesc "Cria uma atalho para o Inkscape na barra de Inicializa��o R�pida"
+${LangFileString} Quicklaunch "Inicialização Rápida"
+${LangFileString} QuicklaunchDesc "Cria uma atalho para o Inkscape na barra de Inicialização Rápida"
 ${LangFileString} SVGWriter "Abrir arquivos SVG com Inkscape"
-${LangFileString} SVGWriterDesc "Seleciona o Inkscape como editor padr�o de arquivos SVG"
+${LangFileString} SVGWriterDesc "Seleciona o Inkscape como editor padrão de arquivos SVG"
 ${LangFileString} ContextMenu "Menu de Contexto"
 ${LangFileString} ContextMenuDesc "Adiciona o Inkscape no Menu de Contexto para arquivos SVG"
-${LangFileString} DeletePrefs "Remover prefer�ncias pessoais"
-${LangFileString} DeletePrefsDesc "Remover prefer�ncias pessoais deixadas por instala��es anteriores"
+${LangFileString} DeletePrefs "Remover preferências pessoais"
+${LangFileString} DeletePrefsDesc "Remover preferências pessoais deixadas por instalações anteriores"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Arquivos Adicionais"
 ${LangFileString} AddfilesDesc "Arquivos Adicionais"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Examples"
 ${LangFileString} ExamplesDesc "Examples de uso do Inkscape"
 ${LangFileString} Tutorials "Tutorial"
 ${LangFileString} TutorialsDesc "Tutorial para o uso Inkscape"
-${LangFileString} Languages "Tradu��es"
-${LangFileString} LanguagesDesc "Instala v�rias tradu�oes do Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Traduções"
+${LangFileString} LanguagesDesc "Instala várias traduçoes do Inkscape"
 ${LangFileString} lng_am "Aramaico"
-${LangFileString} lng_ar "�rabe"
-${LangFileString} lng_az "Azerbaij�o"
+${LangFileString} lng_ar "Árabe"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "Azerbaijão"
 ${LangFileString} lng_be "Bielo-Russo"
-${LangFileString} lng_bg "B�lgaro"
+${LangFileString} lng_bg "Búlgaro"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${LangFileString} lng_br "Bret�o"
-${LangFileString} lng_ca "Catal�o"
-${LangFileString} lng_ca@valencia "Catal�o de Val�ncia"
+${LangFileString} lng_br "Bretão"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Catalão"
+${LangFileString} lng_ca@valencia "Catalão de Valência"
 ${LangFileString} lng_cs "Tcheco"
-${LangFileString} lng_da "Dinamarqu�s"
-${LangFileString} lng_de "Alem�o"
+${LangFileString} lng_da "Dinamarquês"
+${LangFileString} lng_de "Alemão"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Grego"
-${LangFileString} lng_en "Ingl�s"
-${LangFileString} lng_en_AU "Ingl�s Australiano"
-${LangFileString} lng_en_CA "Ingl�s Canadense"
-${LangFileString} lng_en_GB "Ingl�s Brit�nico"
+${LangFileString} lng_en "Inglês"
+${LangFileString} lng_en_AU "Inglês Australiano"
+${LangFileString} lng_en_CA "Inglês Canadense"
+${LangFileString} lng_en_GB "Inglês Britânico"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
 ${LangFileString} lng_es "Espanhol"
 ${LangFileString} lng_es_MX "Espanhol Mexicano"
-${LangFileString} lng_et "Est�nia"
+${LangFileString} lng_et "Estônia"
 ${LangFileString} lng_eu "Basco"
 ${LangFileString} lng_fa "Persa"
-${LangFileString} lng_fi "Finland�s"
-${LangFileString} lng_fr "Franc�s"
-${LangFileString} lng_ga "Irland�s"
+${LangFileString} lng_fi "Finlandês"
+${LangFileString} lng_fr "Francês"
+${LangFileString} lng_ga "Irlandês"
 ${LangFileString} lng_gl "Galego"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebreu"
-${LangFileString} lng_hy "Arm�nio"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croata"
-${LangFileString} lng_hu "H�ngaro"
-${LangFileString} lng_id "Indon�sio"
-${LangFileString} lng_is "Island�s"
+${LangFileString} lng_hu "Húngaro"
+${LangFileString} lng_hy "Armênio"
+${LangFileString} lng_id "Indonésio"
+${LangFileString} lng_is "Islandês"
 ${LangFileString} lng_it "Italiano"
-${LangFileString} lng_ja "Japon�s"
+${LangFileString} lng_ja "Japonês"
 ${LangFileString} lng_km "Khmer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Coreano"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituano"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "Maced�nio"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Macedônio"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongol"
-${LangFileString} lng_ne "Nepal�s"
-${LangFileString} lng_nb "Bokm�l Noruegu�s"
-${LangFileString} lng_nl "Holand�s"
-${LangFileString} lng_nn "Nynorsk Noruegu�s"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Bokmål Norueguês"
+${LangFileString} lng_ne "Nepalês"
+${LangFileString} lng_nl "Holandês"
+${LangFileString} lng_nn "Nynorsk Norueguês"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Punjabi"
-${LangFileString} lng_pl "Polon�s"
-${LangFileString} lng_pt "Portugu�s"
-${LangFileString} lng_pt_BR "Portugu�s do Brasil"
+${LangFileString} lng_pl "Polonês"
+${LangFileString} lng_pt "Português"
+${LangFileString} lng_pt_BR "Português do Brasil"
 ${LangFileString} lng_ro "Romeno"
 ${LangFileString} lng_ru "Russo"
 ${LangFileString} lng_rw "Quiniaruanda"
-${LangFileString} lng_sk "Eslov�quio"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "Eslováquio"
 ${LangFileString} lng_sl "Esloveno"
-${LangFileString} lng_sq "Alban�s"
-${LangFileString} lng_sr "S�rvio"
-${LangFileString} lng_sr@latin "S�rvio no alfabeto latino"
+${LangFileString} lng_sq "Albanês"
+${LangFileString} lng_sr "Sérvio"
+${LangFileString} lng_sr@latin "Sérvio no alfabeto latino"
 ${LangFileString} lng_sv "Sueco"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
-${LangFileString} lng_th "Tailand�s"
+${LangFileString} lng_th "Tailandês"
 ${LangFileString} lng_tr "Turco"
 ${LangFileString} lng_uk "Ucraniano"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamita"
-${LangFileString} lng_zh_CN "Chin�s Simplificado"
-${LangFileString} lng_zh_TW "Chin�s Tradicional"
-${LangFileString} UInstOpt "Op��es de Desinstala��o"
-${LangFileString} UInstOpt1 "Determine suas op��es adicionais"
-${LangFileString} PurgePrefs "Manter Prefer�ncias pessoais"
-${LangFileString} UninstallLogNotFound "Imposs�vel encontrar $INSTDIR\uninstall.log !$\r$\nPara continuar a desinstala��o, remova o diret�rio $INSTDIR manualmente!"
-${LangFileString} FileChanged "O arquivo $filename foi modificado ap�s a instala��o.$\r$\nDeseja remov�-lo?"
+${LangFileString} lng_zh_CN "Chinês Simplificado"
+${LangFileString} lng_zh_TW "Chinês Tradicional"
+${LangFileString} UInstOpt "Opções de Desinstalação"
+${LangFileString} UInstOpt1 "Determine suas opções adicionais"
+${LangFileString} PurgePrefs "Manter Preferências pessoais"
+${LangFileString} UninstallLogNotFound "Impossível encontrar $INSTDIR\uninstall.log !$\r$\nPara continuar a desinstalação, remova o diretório $INSTDIR manualmente!"
+${LangFileString} FileChanged "O arquivo $filename foi modificado após a instalação.$\r$\nDeseja removê-lo?"
 ${LangFileString} Yes "Sim"
 ${LangFileString} AlwaysYes "Sempre responda Sim"
-${LangFileString} No "N�o"
-${LangFileString} AlwaysNo "Sempre responda N�o"
+${LangFileString} No "Não"
+${LangFileString} AlwaysNo "Sempre responda Não"
diff --git a/packaging/win32/languages/Romanian.nsh b/packaging/win32/languages/Romanian.nsh
index bae1c4fc2..e69502793 100644
--- a/packaging/win32/languages/Romanian.nsh
+++ b/packaging/win32/languages/Romanian.nsh
@@ -1,117 +1,146 @@
-;Language: Romanian (1048, CP1250)
-;By Cristian Secar� <cristi AT secarica DOT ro>
-${LangFileString} CaptionDescription "Editor Open Source pentru grafic� vectorial� scalabil� (SVG)"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) este publicat sub licen�a public� general� GNU (GPL). Licen�a este furnizat� aici numai cu scop informativ. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape a fost deja instalat de utilizatorul $0.$\r$\nDac� ve�i continua, s-ar putea s� nu termina�i instalarea cu succes !$\r$\nAutentifica�i-v� ca $0 �i �ncerca�i din nou."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a fost deja instalat. $\nVre�i s� dezinstala�i versiunea precedent� �nainde de a instala $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nAp�sa�i butonul OK pentru a continua, sau butonul RENUN�� pentru a opri instalarea."
-${LangFileString} NO_ADMIN "Nu ave�i privilegii de administrator.$\r$\nInstalarea Inkscape pentru to�i utilizatorii ar putea s� nu se termine cu succes.$\r$\nDebifa�i op�iunea �Pentru to�i utilizatorii�."
-${LangFileString} NOT_SUPPORTED "Este �tiut faptul c� Inkscape nu ruleaz� sub Windows 95/98/ME !$\r$\nVerifica�i saitul web oficial pentru informa�ii detaliate."
+;Language: Romanian (1048)
+;By Cristian Secară <cristi AT secarica DOT ro>
+${LangFileString} CaptionDescription "Editor Open Source pentru grafică vectorială scalabilă (SVG)"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) este publicat sub licenţa publică generală GNU (GPL). Licenţa este furnizată aici numai cu scop informativ. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape a fost deja instalat de utilizatorul $0.$\r$\nDacă veţi continua, s-ar putea să nu terminaţi instalarea cu succes !$\r$\nAutentificaţi-vă ca $0 şi încercaţi din nou."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 a fost deja instalat. $\nVreţi să dezinstalaţi versiunea precedentă înainde de a instala $(^Name) ?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nApăsaţi butonul OK pentru a continua, sau butonul RENUNŢĂ pentru a opri instalarea."
+${LangFileString} NO_ADMIN "Nu aveţi privilegii de administrator.$\r$\nInstalarea Inkscape pentru toţi utilizatorii ar putea să nu se termine cu succes.$\r$\nDebifaţi opţiunea „Pentru toţi utilizatorii”."
+${LangFileString} NOT_SUPPORTED "Este ştiut faptul că Inkscape nu rulează sub Windows 95/98/ME !$\r$\nVerificaţi saitul web oficial pentru informaţii detaliate."
 ${LangFileString} Full "Complet"
 ${LangFileString} Optimal "Optim"
 ${LangFileString} Minimal "Minim"
 ${LangFileString} Core "Editorul SVG Inkscape (necesar)"
-${LangFileString} CoreDesc "Fi�iere �i dll-uri indispensabile pentru Inkscape"
+${LangFileString} CoreDesc "Fişiere şi dll-uri indispensabile pentru Inkscape"
 ${LangFileString} GTKFiles "Mediul GTK+ Runtime (necesar)"
-${LangFileString} GTKFilesDesc "Kit de instrumente multiplatform� pentru interfe�e grafice, folosit de Inkscape"
-${LangFileString} Shortcuts "Scurt�turi"
-${LangFileString} ShortcutsDesc "Scurt�turi pentru pornirea Inkscape"
-${LangFileString} Alluser "Pentru to�i utilizatorii"
-${LangFileString} AlluserDesc "Instaleaz� aceast� aplica�ie pentru oricine folose�te acest calculator (to�i utilizatorii)"
+${LangFileString} GTKFilesDesc "Kit de instrumente multiplatformă pentru interfeţe grafice, folosit de Inkscape"
+${LangFileString} Shortcuts "Scurtături"
+${LangFileString} ShortcutsDesc "Scurtături pentru pornirea Inkscape"
+${LangFileString} Alluser "Pentru toţi utilizatorii"
+${LangFileString} AlluserDesc "Instalează această aplicaţie pentru oricine foloseşte acest calculator (toţi utilizatorii)"
 ${LangFileString} Desktop "Desktop"
-${LangFileString} DesktopDesc "Creeaz� o scurt�tur� c�tre Inkscape pe Desktop"
+${LangFileString} DesktopDesc "Creează o scurtătură către Inkscape pe Desktop"
 ${LangFileString} Startmenu "Meniul Start"
-${LangFileString} StartmenuDesc "Creeaz� o intrare pentru Inkscape �n meniul Start"
-${LangFileString} Quicklaunch "Lansare rapid�"
-${LangFileString} QuicklaunchDesc "Creeaz� o scurt�tur� c�tre Inkscape pe bara de lansare rapid�"
-${LangFileString} SVGWriter "Deschidere fi�iere SVG cu Inkscape"
-${LangFileString} SVGWriterDesc "Selecteaz� Inkscape ca editor implicit pentru fi�iere SVG"
+${LangFileString} StartmenuDesc "Creează o intrare pentru Inkscape în meniul Start"
+${LangFileString} Quicklaunch "Lansare rapidă"
+${LangFileString} QuicklaunchDesc "Creează o scurtătură către Inkscape pe bara de lansare rapidă"
+${LangFileString} SVGWriter "Deschidere fişiere SVG cu Inkscape"
+${LangFileString} SVGWriterDesc "Selectează Inkscape ca editor implicit pentru fişiere SVG"
 ${LangFileString} ContextMenu "Meniu contextual"
-${LangFileString} ContextMenuDesc "Adaug� Inkscape �n meniul contextual pentru fi�iere SVG"
-${LangFileString} DeletePrefs "�tergere preferin�ele personale"
-${LangFileString} DeletePrefsDesc "�terge preferin�ele personale r�mase de la instal�ri precedente"
-${LangFileString} Addfiles "Fi�iere adi�ionale"
-${LangFileString} AddfilesDesc "Fi�iere adi�ionale"
+${LangFileString} ContextMenuDesc "Adaugă Inkscape în meniul contextual pentru fişiere SVG"
+${LangFileString} DeletePrefs "Ştergere preferinţele personale"
+${LangFileString} DeletePrefsDesc "Şterge preferinţele personale rămase de la instalări precedente"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "Fişiere adiţionale"
+${LangFileString} AddfilesDesc "Fişiere adiţionale"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Exemple"
 ${LangFileString} ExamplesDesc "Exemple folosind Inkscape"
 ${LangFileString} Tutorials "Ghiduri practice"
 ${LangFileString} TutorialsDesc "Ghiduri practice pentru utilizarea Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Traduceri"
-${LangFileString} LanguagesDesc "Instaleaz� diverse traduceri ale interfe�ei pentru Inkscape"
-${LangFileString} lng_am "Amharic�"
-${LangFileString} lng_ar "Arab�"
-${LangFileString} lng_az "Azer�"
-${LangFileString} lng_be "Bielorus�"
-${LangFileString} lng_bg "Bulgar�"
+${LangFileString} LanguagesDesc "Instalează diverse traduceri ale interfeţei pentru Inkscape"
+${LangFileString} lng_am "Amharică"
+${LangFileString} lng_ar "Arabă"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "Azeră"
+${LangFileString} lng_be "Bielorusă"
+${LangFileString} lng_bg "Bulgară"
 ${LangFileString} lng_bn "Bengali"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${LangFileString} lng_br "Breton�"
-${LangFileString} lng_ca "Catalan�"
-${LangFileString} lng_ca@valencia "Catalan�, Valencian"
-${LangFileString} lng_cs "Ceh�"
-${LangFileString} lng_da "Danez�"
-${LangFileString} lng_de "German�"
+${LangFileString} lng_br "Bretonă"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Catalană"
+${LangFileString} lng_ca@valencia "Catalană, Valencian"
+${LangFileString} lng_cs "Cehă"
+${LangFileString} lng_da "Daneză"
+${LangFileString} lng_de "Germană"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
-${LangFileString} lng_el "Greac�"
-${LangFileString} lng_en "Englez�"
-${LangFileString} lng_en_AU "Englez� australian�"
-${LangFileString} lng_en_CA "Englez� canadian�"
-${LangFileString} lng_en_GB "Englez� britanic�"
+${LangFileString} lng_el "Greacă"
+${LangFileString} lng_en "Engleză"
+${LangFileString} lng_en_AU "Engleză australiană"
+${LangFileString} lng_en_CA "Engleză canadiană"
+${LangFileString} lng_en_GB "Engleză britanică"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
-${LangFileString} lng_es "Spaniol�"
-${LangFileString} lng_es_MX "Spaniol� mexican�"
-${LangFileString} lng_et "Estonian�"
-${LangFileString} lng_eu "Basc�"
+${LangFileString} lng_es "Spaniolă"
+${LangFileString} lng_es_MX "Spaniolă mexicană"
+${LangFileString} lng_et "Estoniană"
+${LangFileString} lng_eu "Bască"
 ${LangFileString} lng_fa "Farsi"
-${LangFileString} lng_fi "Finlandez�"
-${LangFileString} lng_fr "Francez�"
-${LangFileString} lng_ga "Irlandez�"
-${LangFileString} lng_gl "Galician�"
-${LangFileString} lng_he "Ebraic�"
-${LangFileString} lng_hr "Croat�"
-${LangFileString} lng_hu "Maghiar�"
+${LangFileString} lng_fi "Finlandeză"
+${LangFileString} lng_fr "Franceză"
+${LangFileString} lng_ga "Irlandeză"
+${LangFileString} lng_gl "Galiciană"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "Ebraică"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "Croată"
+${LangFileString} lng_hu "Maghiară"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "Indonezian�"
+${LangFileString} lng_id "Indoneziană"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "Italian�"
-${LangFileString} lng_ja "Japonez�"
-${LangFileString} lng_km "Khmer�"
-${LangFileString} lng_ko "Korean�"
-${LangFileString} lng_lt "Lituanian�"
+${LangFileString} lng_it "Italiană"
+${LangFileString} lng_ja "Japoneză"
+${LangFileString} lng_km "Khmeră"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "Koreană"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "Lituaniană"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "Macedonean�"
-${LangFileString} lng_mn "Mongol�"
-${LangFileString} lng_ne "Nepalez�"
-${LangFileString} lng_nb "Norvegian� c�rtur�reasc�"
-${LangFileString} lng_nl "Olandez�"
-${LangFileString} lng_nn "Norvegian� nou�"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "Macedoneană"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "Mongolă"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Norvegiană cărturărească"
+${LangFileString} lng_ne "Nepaleză"
+${LangFileString} lng_nl "Olandeză"
+${LangFileString} lng_nn "Norvegiană nouă"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Panjabi"
-${LangFileString} lng_pl "Polonez�"
-${LangFileString} lng_pt "Portughez�"
-${LangFileString} lng_pt_BR "Portughez� brazilian�"
-${LangFileString} lng_ro "Roman�n�"
-${LangFileString} lng_ru "Rus�"
+${LangFileString} lng_pl "Poloneză"
+${LangFileString} lng_pt "Portugheză"
+${LangFileString} lng_pt_BR "Portugheză braziliană"
+${LangFileString} lng_ro "Romanână"
+${LangFileString} lng_ru "Rusă"
 ${LangFileString} lng_rw "Kinyarwanda"
-${LangFileString} lng_sk "Slovac�"
-${LangFileString} lng_sl "Sloven�"
-${LangFileString} lng_sq "Albanez�"
-${LangFileString} lng_sr "S�rb�"
-${LangFileString} lng_sr@latin "S�rb� (alfabet Latin)"
-${LangFileString} lng_sv "Suedez�"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "Slovacă"
+${LangFileString} lng_sl "Slovenă"
+${LangFileString} lng_sq "Albaneză"
+${LangFileString} lng_sr "Sârbă"
+${LangFileString} lng_sr@latin "Sârbă (alfabet Latin)"
+${LangFileString} lng_sv "Suedeză"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
-${LangFileString} lng_th "Tailandez�"
-${LangFileString} lng_tr "Turc�"
-${LangFileString} lng_uk "Ucrainean�"
-${LangFileString} lng_vi "Vietnamez�"
-${LangFileString} lng_zh_CN "Chinez� simplificat�"
-${LangFileString} lng_zh_TW "Chinez� tradi�ional�"
-${LangFileString} UInstOpt "Op�iuni de dezinstalare"
-${LangFileString} UInstOpt1 "Alege�i dintre op�iunile adi�ionale"
-${LangFileString} PurgePrefs "P�streaz� preferin�ele personale"
-${LangFileString} UninstallLogNotFound "Fi�ierul $INSTDIR\uninstall.log nu a fost g�sit !$\r$\nDezinstala�i prin golirea manual� a $INSTDIR !"
-${LangFileString} FileChanged "Fi�ierul $filename a fost modificat dup� instalare.$\r$\nTot vre�i s� �terge�i acel fi�ier ?"
+${LangFileString} lng_th "Tailandeză"
+${LangFileString} lng_tr "Turcă"
+${LangFileString} lng_uk "Ucraineană"
+${LangFileString} lng_ur "Urdu"
+${LangFileString} lng_vi "Vietnameză"
+${LangFileString} lng_zh_CN "Chineză simplificată"
+${LangFileString} lng_zh_TW "Chineză tradiţională"
+${LangFileString} UInstOpt "Opţiuni de dezinstalare"
+${LangFileString} UInstOpt1 "Alegeţi dintre opţiunile adiţionale"
+${LangFileString} PurgePrefs "Păstrează preferinţele personale"
+${LangFileString} UninstallLogNotFound "Fişierul $INSTDIR\uninstall.log nu a fost găsit !$\r$\nDezinstalaţi prin golirea manuală a $INSTDIR !"
+${LangFileString} FileChanged "Fişierul $filename a fost modificat după instalare.$\r$\nTot vreţi să ştergeţi acel fişier ?"
 ${LangFileString} Yes "Da"
-${LangFileString} AlwaysYes "Da �ntotdeauna"
+${LangFileString} AlwaysYes "Da întotdeauna"
 ${LangFileString} No "Nu"
-${LangFileString} AlwaysNo "Nu �ntotdeauna"
+${LangFileString} AlwaysNo "Nu întotdeauna"
diff --git a/packaging/win32/languages/Russian.nsh b/packaging/win32/languages/Russian.nsh
index 9b75a0a3e..16d5f0d4f 100644
--- a/packaging/win32/languages/Russian.nsh
+++ b/packaging/win32/languages/Russian.nsh
@@ -1,117 +1,146 @@
-;Language: Russian (1049, CP1251)
+;Language: Russian (1049)
 ;By Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
-${LangFileString} CaptionDescription "�������� ��������� ������� � �������� �������� �����"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) ������� �� �������� GNU General Public License (GPL). �������� ������������ ��� ������������. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape ���������� ������������� $0.$\r$\n���� �� ����������, ��������� ����� �� ����������� �������!$\r$\n������� � ������� ��� ������������ $0 � ���������� �����."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ��� �����������. $\n�� ������ ������� ���������� ������ ����� ���������� $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\n������� �OK� ��� ����������� ��� ������� ��� ���������� ���������."
-${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"
-${LangFileString} GTKFiles "����� ���������� GTK+ (���������)"
-${LangFileString} GTKFilesDesc "������������������ �������� ����������, ����������� ��� Inkscape"
-${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 "��������� ����� SVG � Inkscape"
-${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_bn_BD "Bengali Bangladesh"
-${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 "�����"
-${LangFileString} lng_fi "�������"
-${LangFileString} lng_fr "�����������"
-${LangFileString} lng_ga "����������"
-${LangFileString} lng_gl "�����������"
-${LangFileString} lng_he "�����"
-${LangFileString} lng_hr "����������"
-${LangFileString} lng_hu "����������"
-${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "�������������"
-${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "�����������"
-${LangFileString} lng_ja "��������"
-${LangFileString} lng_km "���������"
-${LangFileString} lng_ko "���������"
-${LangFileString} lng_lt "���������"
-${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "�����������"
-${LangFileString} lng_mn "�����������"
-${LangFileString} lng_ne "����������"
-${LangFileString} lng_nb "���������� (������)"
-${LangFileString} lng_nl "�������"
-${LangFileString} lng_nn "���������� (�������)"
-${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 "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 "������ �������� ����"
+${LangFileString} CaptionDescription "Редактор векторной графики с открытым исходным кодом"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) выпущен на условиях GNU General Public License (GPL). Лицензия предлагается для ознакомления. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape установлен пользователем $0.$\r$\nЕсли вы продолжите, установка может не завершиться успешно!$\r$\nВойдите в систему как пользователь $0 и попробуйте снова."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 уже установлена. $\nВы хотите удалить предыдущую версию перед установкой $(^Name) ?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nНажмите «OK» для продолжения или «Отмена» для прерывания установки."
+${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"
+${LangFileString} GTKFiles "Среда исполнения GTK+ (требуется)"
+${LangFileString} GTKFilesDesc "Многоплатформенные средства разработки, необходимые для Inkscape"
+${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 "Открывать файлы SVG в Inkscape"
+${LangFileString} SVGWriterDesc "Выбрать Inkscape редактором файлов SVG по умолчанию"
+${LangFileString} ContextMenu "Контекстное меню"
+${LangFileString} ContextMenuDesc "Добавить Inkscape в контекстное меню для файлов SVG"
+${LangFileString} DeletePrefs "Удалить личные настройки"
+${LangFileString} DeletePrefsDesc "Удалить личные настройки, оставшиеся от предыдущих версий программы"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "Интерпретатор для языка программирования Python и модули Python для запуска расширений Inkscape."
+${LangFileString} Addfiles "Дополнительные файлы"
+${LangFileString} AddfilesDesc "Дополнительные файлы"
+${LangFileString} Extensions "Расширения"
+${LangFileString} ExtensionsDesc "Расширения Inkscape (в том числе, для импорта и экспорта файлов)"
+${LangFileString} Examples "Примеры"
+${LangFileString} ExamplesDesc "Примеры файлов, созданных в Inkscape"
+${LangFileString} Tutorials "Уроки"
+${LangFileString} TutorialsDesc "Уроки по использованию Inkscape"
+${LangFileString} Dictionaries "Словари"
+${LangFileString} DictionariesDesc "Словари для проверки правописания в текстах на некоторых распространенных языках"
+${LangFileString} Languages "Переводы"
+${LangFileString} LanguagesDesc "Установка переводов Inkscape на разные языки"
+${LangFileString} lng_am "Амхарский (Амаринья)"
+${LangFileString} lng_ar "Арабский"
+${LangFileString} lng_as "Ассамский"
+${LangFileString} lng_az "Азербайджанский"
+${LangFileString} lng_be "Белорусский"
+${LangFileString} lng_bg "Болгарский"
+${LangFileString} lng_bn "Бенгальский"
+${LangFileString} lng_bn_BD "Бенгальский (Бангладеш)"
+${LangFileString} lng_br "Бретонский"
+${LangFileString} lng_brx "Бодо"
+${LangFileString} lng_ca "Каталанский"
+${LangFileString} lng_ca@valencia "Каталонский (Валенсия)"
+${LangFileString} lng_cs "Чешский"
+${LangFileString} lng_da "Датский"
+${LangFileString} lng_de "Немецкий"
+${LangFileString} lng_doi "Догри"
+${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 "Фарси"
+${LangFileString} lng_fi "Финский"
+${LangFileString} lng_fr "Французский"
+${LangFileString} lng_ga "Ирландский"
+${LangFileString} lng_gl "Галисийский"
+${LangFileString} lng_gu "Гуджарати"
+${LangFileString} lng_he "Иврит"
+${LangFileString} lng_hi "Хинди"
+${LangFileString} lng_hr "Хорватский"
+${LangFileString} lng_hu "Венгерский"
+${LangFileString} lng_hy "Армянский"
+${LangFileString} lng_id "Индонезийский"
+${LangFileString} lng_is "Исландский"
+${LangFileString} lng_it "Итальянский"
+${LangFileString} lng_ja "Японский"
+${LangFileString} lng_km "Кхмерский"
+${LangFileString} lng_kn "Каннада"
+${LangFileString} lng_ko "Корейский"
+${LangFileString} lng_kok "Конкани"
+${LangFileString} lng_kok@latin "Конкани на латинице"
+${LangFileString} lng_ks@aran "Кашмирский в арабском письме"
+${LangFileString} lng_ks@deva "Кашмирский в письме деванагари"
+${LangFileString} lng_lt "Литовский"
+${LangFileString} lng_lv "Латвийский"
+${LangFileString} lng_mai "Майтхили"
+${LangFileString} lng_mk "Македонский"
+${LangFileString} lng_ml "Малаялам"
+${LangFileString} lng_mn "Монгольский"
+${LangFileString} lng_mni "Манипури"
+${LangFileString} lng_mni@beng "Манипури в бенгальском письме"
+${LangFileString} lng_mr "Маратхи"
+${LangFileString} lng_nb "Норвежский (букмол)"
+${LangFileString} lng_ne "Непальский"
+${LangFileString} lng_nl "Датский"
+${LangFileString} lng_nn "Норвежский (нюнорск)"
+${LangFileString} lng_or "Ория"
+${LangFileString} lng_pa "Пенджабский"
+${LangFileString} lng_pl "Польский"
+${LangFileString} lng_pt "Португальский"
+${LangFileString} lng_pt_BR "Португальский (Бразилия)"
+${LangFileString} lng_ro "Румынский"
+${LangFileString} lng_ru "Русский"
+${LangFileString} lng_rw "Киньяруанда"
+${LangFileString} lng_sa "Санскрит"
+${LangFileString} lng_sat "Сантали"
+${LangFileString} lng_sat@deva "Сантали в письме деванагари"
+${LangFileString} lng_sd "Синдхи"
+${LangFileString} lng_sd@deva "Синдхи в письме деванагари"
+${LangFileString} lng_sk "Словацкий"
+${LangFileString} lng_sl "Словенский"
+${LangFileString} lng_sq "Албанский"
+${LangFileString} lng_sr "Сербский"
+${LangFileString} lng_sr@latin "Сербский (латиница)"
+${LangFileString} lng_sv "Шведский"
+${LangFileString} lng_ta "Тамильский"
+${LangFileString} lng_te "Телугу"
+${LangFileString} lng_th "Тайский"
+${LangFileString} lng_tr "Турецкий"
+${LangFileString} lng_uk "Украинский"
+${LangFileString} lng_ur "Урду"
+${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/SimpChinese.nsh b/packaging/win32/languages/SimpChinese.nsh
index a06918a4b..79105b76c 100644
--- a/packaging/win32/languages/SimpChinese.nsh
+++ b/packaging/win32/languages/SimpChinese.nsh
@@ -1,117 +1,146 @@
-;Language: Simplified Chinese (2052, CP936)
+;Language: Simplified Chinese (2052)
 ;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} 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} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "其他文件类型"
+${LangFileString} AddfilesDesc "其他文件类型"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "范例"
+${LangFileString} ExamplesDesc "Inkscape 使用范例"
+${LangFileString} Tutorials "指导手册"
+${LangFileString} TutorialsDesc "Inkscape 使用说明"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "语言"
+${LangFileString} LanguagesDesc "安装 Inkscape 各种语言翻译"
+${LangFileString} lng_am "am 阿比西尼亚语"
+${LangFileString} lng_ar "ar 阿拉伯语"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "az 亚塞拜然语"
+${LangFileString} lng_be "be 白俄罗斯语"
+${LangFileString} lng_bg "bg 保加利亚语"
+${LangFileString} lng_bn "bn 孟加拉语"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${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_br "br 不列塔尼语"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "ca 加泰隆语"
+${LangFileString} lng_ca@valencia "ca@valencia 瓦伦西亚语 加泰罗尼亚语"
+${LangFileString} lng_cs "cs 捷克语"
+${LangFileString} lng_da "da 丹麦语"
+${LangFileString} lng_de "de 德语"
+${LangFileString} lng_doi "Dogri"
+${LangFileString} lng_dz "dz 宗卡语"
+${LangFileString} lng_el "el 希腊语"
+${LangFileString} lng_en "en 英语"
+${LangFileString} lng_en_AU "en_AU 英语(澳大利亚)"
+${LangFileString} lng_en_CA "en_CA 英语(加拿大)"
+${LangFileString} lng_en_GB "en_GB 英语(英国)"
+${LangFileString} lng_en_US@piglatin "en_US@piglatin 猪拉丁语"
+${LangFileString} lng_eo "eo 世界语"
+${LangFileString} lng_es "es 西班牙文"
+${LangFileString} lng_es_MX "es_MX 西班牙语(墨西哥)"
+${LangFileString} lng_et "et 爱沙尼亚语"
+${LangFileString} lng_eu "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_fi "fi 芬兰语"
+${LangFileString} lng_fr "fr 法文"
+${LangFileString} lng_ga "ga 爱尔兰语"
+${LangFileString} lng_gl "gl 加里西亚语"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "he 希伯來语"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "hr 克罗埃西亚语"
+${LangFileString} lng_hu "hu 匈牙利语"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "ӡ????"
+${LangFileString} lng_id "id 印尼语"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "????????"
-${LangFileString} lng_ja "????"
-${LangFileString} lng_km "??????"
-${LangFileString} lng_ko "????"
-${LangFileString} lng_lt "��??????"
+${LangFileString} lng_it "it 意大利文"
+${LangFileString} lng_ja "ja 日文"
+${LangFileString} lng_km "km 高棉语"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "ko 韩文"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "lt 立陶宛语"
 ${LangFileString} lng_lv "Latvian"
-${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_mai "Maithili"
+${LangFileString} lng_mk "mk 马其顿语"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "mn 蒙古语"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "nb 挪威 Bokmal 语"
+${LangFileString} lng_ne "ne 尼泊尔语"
+${LangFileString} lng_nl "nl 荷兰语"
+${LangFileString} lng_nn "nn 挪威 Nynorsk 语"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "pa 旁遮普语"
+${LangFileString} lng_pl "po 波兰语"
+${LangFileString} lng_pt "pt 葡萄牙文"
+${LangFileString} lng_pt_BR "pt_BR 葡萄牙文(巴西)"
+${LangFileString} lng_ro "ro 罗马尼亚语"
+${LangFileString} lng_ru "ru 俄文"
+${LangFileString} lng_rw "rw 金亚卢安达语"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "sk 斯洛法克语"
+${LangFileString} lng_sl "sl 斯洛凡尼亚语"
+${LangFileString} lng_sq "sq 阿尔巴尼亚语"
+${LangFileString} lng_sr "sr 赛尔维亚语"
+${LangFileString} lng_sr@latin "sr@latin 塞尔维亚文-拉丁"
+${LangFileString} lng_sv "sv 瑞典语"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "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 "ȫ???Է?"
+${LangFileString} lng_th "th 泰语"
+${LangFileString} lng_tr "tr 土耳其语"
+${LangFileString} lng_uk "uk 乌克兰语"
+${LangFileString} lng_ur "Urdu"
+${LangFileString} lng_vi "vi 越南話"
+${LangFileString} lng_zh_CN "zh_CH 简体中文"
+${LangFileString} lng_zh_TW "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/Slovak.nsh b/packaging/win32/languages/Slovak.nsh
index 6d98b70e9..cb4d84d1b 100644
--- a/packaging/win32/languages/Slovak.nsh
+++ b/packaging/win32/languages/Slovak.nsh
@@ -1,117 +1,146 @@
-;Language: Slovak (1051, CP1250)
-;By Ivan Mas�r <helix84@centrum.sk>
+;Language: Slovak (1051)
+;By Ivan Masár <helix84@centrum.sk>
 ${LangFileString} CaptionDescription "Open source editor SVG grafiky"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) je mo�n� ��ri� za podmienok General Public License (GPL). Licen�n� zmluva je tu len pre informa�n� ��ely. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape nain�taloval pou��vate� $0.$\r$\nIn�tal�cia nemus� spr�vne skon�i�, ak v nej budete pokra�ova�!$\r$\nPros�m, prihl�ste sa ako $0 a spustite in�tal�ciu znova."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 u� je nain�talovan�. $\nChcete odstr�ni� predch�dzaj�cu verziu predt�m, ne� nain�talujete $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nPokra�ujte stla�en�m OK alebo zru�te in�tal�ciu stla�en�m Zru�i�."
-${LangFileString} NO_ADMIN "Nem�te pr�va spr�vcu.$\r$\nIn�tal�cia Inkscape pre v�etk�ch pou��vate�ov nemus� skon�i� �spe�ne.$\r$\nZru�te ozna�enie vo�by �Pre v�etk�ch pou��vate�ov�."
-${LangFileString} NOT_SUPPORTED "Inkscape nebe�� na Windows 95/98/ME!$\r$\nPodrobnej�ie inform�cie n�jdete na ofici�lnom webe."
-${LangFileString} Full "Pln�"
-${LangFileString} Optimal "Optim�lna"
-${LangFileString} Minimal "Minim�lna"
-${LangFileString} Core "Inkscape SVG editor (povinn�)"
-${LangFileString} CoreDesc "S�bory a kni�nice Inkscape"
-${LangFileString} GTKFiles "GTK+ runtime environment (povinn�)"
-${LangFileString} GTKFilesDesc "Multiplatformov� sada pou��vate�sk�ho rozhrania pou�it�ho v Inkscape"
-${LangFileString} Shortcuts "Z�stupcovia"
-${LangFileString} ShortcutsDesc "Z�stupcovia pre �tart Inkscape"
-${LangFileString} Alluser "pre v�etk�ch pou��vate�ov"
-${LangFileString} AlluserDesc "In�talova� aplik�ciu pre kohoko�vek, kto pou��va tento po��ta�. (v�etci pou��vatelia)"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) je možné šíriť za podmienok General Public License (GPL). Licenčná zmluva je tu len pre informačné účely. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape nainštaloval používateľ $0.$\r$\nInštalácia nemusí správne skončiť, ak v nej budete pokračovať!$\r$\nProsím, prihláste sa ako $0 a spustite inštaláciu znova."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 už je nainštalovaný. $\nChcete odstrániť predchádzajúcu verziu predtým, než nainštalujete $(^Name) ?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nPokračujte stlačením OK alebo zrušte inštaláciu stlačením Zrušiť."
+${LangFileString} NO_ADMIN "Nemáte práva správcu.$\r$\nInštalácia Inkscape pre všetkých používateľov nemusí skončiť úspešne.$\r$\nZrušte označenie voľby „Pre všetkých používateľov“."
+${LangFileString} NOT_SUPPORTED "Inkscape nebeží na Windows 95/98/ME!$\r$\nPodrobnejšie informácie nájdete na oficiálnom webe."
+${LangFileString} Full "Plná"
+${LangFileString} Optimal "Optimálna"
+${LangFileString} Minimal "Minimálna"
+${LangFileString} Core "Inkscape SVG editor (povinné)"
+${LangFileString} CoreDesc "Súbory a knižnice Inkscape"
+${LangFileString} GTKFiles "GTK+ runtime environment (povinné)"
+${LangFileString} GTKFilesDesc "Multiplatformová sada používateľského rozhrania použitého v Inkscape"
+${LangFileString} Shortcuts "Zástupcovia"
+${LangFileString} ShortcutsDesc "Zástupcovia pre štart Inkscape"
+${LangFileString} Alluser "pre všetkých používateľov"
+${LangFileString} AlluserDesc "Inštalovať aplikáciu pre kohokoľvek, kto používa tento počítač. (všetci používatelia)"
 ${LangFileString} Desktop "Plocha"
-${LangFileString} DesktopDesc "Vytvo�it z�stupcu Inkscape na ploche"
-${LangFileString} Startmenu "Ponuka �tart"
-${LangFileString} StartmenuDesc "Vytvori� pre Inkscape polo�ku ve ponuke �tart"
-${LangFileString} Quicklaunch "Panel r�chleho spustenia"
-${LangFileString} QuicklaunchDesc "Vytvori� pre Inkscape z�stupcu v paneli r�chleho spustenia"
-${LangFileString} SVGWriter "Otv�ra� SVG s�bory v Inkscape"
-${LangFileString} SVGWriterDesc "Vybra� Inkscape ako �tandardn� editor pre SVG s�bory"
-${LangFileString} ContextMenu "Kontextov� ponuka"
-${LangFileString} ContextMenuDesc "Prida� Inkscape do kontextov�ho menu pre SVG s�bory"
-${LangFileString} DeletePrefs "Zmaza� osobn� nastavenia"
-${LangFileString} DeletePrefsDesc "Zmaza� osobn� nastavenia ponechan� z predch�dzaj�cich in�tal�ci�"
-${LangFileString} Addfiles "�al�ie s�bory"
-${LangFileString} AddfilesDesc "�al�ie s�bory"
-${LangFileString} Examples "Pr�klady"
-${LangFileString} ExamplesDesc "Pr�klady pou��vania Inkscape"
+${LangFileString} DesktopDesc "Vytvořit zástupcu Inkscape na ploche"
+${LangFileString} Startmenu "Ponuka Štart"
+${LangFileString} StartmenuDesc "Vytvoriť pre Inkscape položku ve ponuke Štart"
+${LangFileString} Quicklaunch "Panel rýchleho spustenia"
+${LangFileString} QuicklaunchDesc "Vytvoriť pre Inkscape zástupcu v paneli rýchleho spustenia"
+${LangFileString} SVGWriter "Otvárať SVG súbory v Inkscape"
+${LangFileString} SVGWriterDesc "Vybrať Inkscape ako štandardný editor pre SVG súbory"
+${LangFileString} ContextMenu "Kontextová ponuka"
+${LangFileString} ContextMenuDesc "Pridať Inkscape do kontextového menu pre SVG súbory"
+${LangFileString} DeletePrefs "Zmazať osobné nastavenia"
+${LangFileString} DeletePrefsDesc "Zmazať osobné nastavenia ponechané z predchádzajúcich inštalácií"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "Ďalšie súbory"
+${LangFileString} AddfilesDesc "Ďalšie súbory"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "Príklady"
+${LangFileString} ExamplesDesc "Príklady používania Inkscape"
 ${LangFileString} Tutorials "Sprievodcovia"
 ${LangFileString} TutorialsDesc "Sprievodcovia funkciami Inkscape"
-${LangFileString} Languages "Jazykov� sady"
-${LangFileString} LanguagesDesc "Nain�talova� �al�ie jazykov� sady Inkscape"
-${LangFileString} lng_am "amhar�ina"
-${LangFileString} lng_ar "arab�ina"
-${LangFileString} lng_az "azerbajd�an�ina"
-${LangFileString} lng_be "bieloru�tina"
-${LangFileString} lng_bg "bulhar�ina"
-${LangFileString} lng_bn "beng�l�ina"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "Jazykové sady"
+${LangFileString} LanguagesDesc "Nainštalovať ďalšie jazykové sady Inkscape"
+${LangFileString} lng_am "amharčina"
+${LangFileString} lng_ar "arabčina"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "azerbajdžančina"
+${LangFileString} lng_be "bieloruština"
+${LangFileString} lng_bg "bulharčina"
+${LangFileString} lng_bn "bengálčina"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${LangFileString} lng_br "bret�n�ina"
-${LangFileString} lng_ca "katal�n�ina"
-${LangFileString} lng_ca@valencia "valencij�ina"
-${LangFileString} lng_cs "�e�tina"
-${LangFileString} lng_da "d�n�ina"
-${LangFileString} lng_de "nem�ina"
-${LangFileString} lng_dz "dzongk�"
-${LangFileString} lng_el "gr��tina"
-${LangFileString} lng_en "angli�tina"
-${LangFileString} lng_en_AU "angli�tina (Austr�lia)"
-${LangFileString} lng_en_CA "angli�tina (Kanada)"
-${LangFileString} lng_en_GB "angli�tina (Spojen� kr�ovstvo)"
+${LangFileString} lng_br "bretónčina"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "katalánčina"
+${LangFileString} lng_ca@valencia "valencijčina"
+${LangFileString} lng_cs "čeština"
+${LangFileString} lng_da "dánčina"
+${LangFileString} lng_de "nemčina"
+${LangFileString} lng_doi "Dogri"
+${LangFileString} lng_dz "dzongkä"
+${LangFileString} lng_el "gréčtina"
+${LangFileString} lng_en "angličtina"
+${LangFileString} lng_en_AU "angličtina (Austrália)"
+${LangFileString} lng_en_CA "angličtina (Kanada)"
+${LangFileString} lng_en_GB "angličtina (Spojené kráľovstvo)"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "esperanto"
-${LangFileString} lng_es "�paniel�ina"
-${LangFileString} lng_es_MX "�paniel�ina (Mexiko)"
-${LangFileString} lng_et "est�n�ina"
-${LangFileString} lng_eu "baski�tina"
+${LangFileString} lng_es "španielčina"
+${LangFileString} lng_es_MX "španielčina (Mexiko)"
+${LangFileString} lng_et "estónčina"
+${LangFileString} lng_eu "baskičtina"
 ${LangFileString} lng_fa "farsi"
-${LangFileString} lng_fi "f�n�ina"
-${LangFileString} lng_fr "franc�z�tina"
-${LangFileString} lng_ga "�r�ina"
-${LangFileString} lng_gl "gal�cij�ina"
-${LangFileString} lng_he "hebrej�ina"
-${LangFileString} lng_hr "chorv�t�ina"
-${LangFileString} lng_hu "ma�ar�ina"
+${LangFileString} lng_fi "fínčina"
+${LangFileString} lng_fr "francúzština"
+${LangFileString} lng_ga "írčina"
+${LangFileString} lng_gl "galícijčina"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "hebrejčina"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "chorvátčina"
+${LangFileString} lng_hu "maďarčina"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "indon�z�tina"
+${LangFileString} lng_id "indonézština"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "talian�ina"
-${LangFileString} lng_ja "japon�ina"
-${LangFileString} lng_km "khm�r�ina"
-${LangFileString} lng_ko "k�rej�ina"
-${LangFileString} lng_lt "litov�ina"
+${LangFileString} lng_it "taliančina"
+${LangFileString} lng_ja "japončina"
+${LangFileString} lng_km "khmérčina"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "kórejčina"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "litovčina"
 ${LangFileString} lng_lv "Latvian"
-${LangFileString} lng_mk "maced�n�ina"
-${LangFileString} lng_mn "mongol�ina"
-${LangFileString} lng_ne "nep�l�ina"
-${LangFileString} lng_nb "n�rsky bokmal"
-${LangFileString} lng_nl "holand�ina"
-${LangFileString} lng_nn "n�rsky nynorsk"
-${LangFileString} lng_pa "pand��b�ina"
-${LangFileString} lng_pl "po��tina"
-${LangFileString} lng_pt "portugal�ina"
-${LangFileString} lng_pt_BR "portugal�ina (Braz�lia)"
-${LangFileString} lng_ro "rumun�ina"
-${LangFileString} lng_ru "ru�tina"
-${LangFileString} lng_rw "rwand�ina"
-${LangFileString} lng_sk "sloven�ina"
-${LangFileString} lng_sl "slovin�ina"
-${LangFileString} lng_sq "alb�n�ina"
-${LangFileString} lng_sr "srb�ina"
-${LangFileString} lng_sr@latin "srb�ina (latinka)"
-${LangFileString} lng_sv "�v�d�ina"
+${LangFileString} lng_mai "Maithili"
+${LangFileString} lng_mk "macedónčina"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "mongolčina"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "nórsky bokmal"
+${LangFileString} lng_ne "nepálčina"
+${LangFileString} lng_nl "holandčina"
+${LangFileString} lng_nn "nórsky nynorsk"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "pandžábčina"
+${LangFileString} lng_pl "poľština"
+${LangFileString} lng_pt "portugalčina"
+${LangFileString} lng_pt_BR "portugalčina (Brazília)"
+${LangFileString} lng_ro "rumunčina"
+${LangFileString} lng_ru "ruština"
+${LangFileString} lng_rw "rwandčina"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "slovenčina"
+${LangFileString} lng_sl "slovinčina"
+${LangFileString} lng_sq "albánčina"
+${LangFileString} lng_sr "srbčina"
+${LangFileString} lng_sr@latin "srbčina (latinka)"
+${LangFileString} lng_sv "švédčina"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "telugu"
-${LangFileString} lng_th "thaj�ina"
-${LangFileString} lng_tr "ture�tina"
-${LangFileString} lng_uk "ukrajin�ina"
+${LangFileString} lng_th "thajčina"
+${LangFileString} lng_tr "turečtina"
+${LangFileString} lng_uk "ukrajinčina"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamese"
-${LangFileString} lng_zh_CN "��n�tina (zjednodu�en�)"
-${LangFileString} lng_zh_TW "��n�tina (tradi�n�)"
-${LangFileString} UInstOpt "Mo�nosti dein�tal�cie"
-${LangFileString} UInstOpt1 "Zvo�te pros�m �al�ie mo�nosti"
-${LangFileString} PurgePrefs "Ponecha� osobn� nastavenia"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log nebol n�jden�!$\r$\nPros�m, odin�talujte ru�n�m vy�isten�m adres�ra $INSTDIR !"
-${LangFileString} FileChanged "S�bor $filename sa po in�tal�cii zmenil.$\r$\nChcete ho napriek tomu vymaza�?"
-${LangFileString} Yes "�no"
-${LangFileString} AlwaysYes "�no v�etky"
+${LangFileString} lng_zh_CN "čínština (zjednodušená)"
+${LangFileString} lng_zh_TW "čínština (tradičná)"
+${LangFileString} UInstOpt "Možnosti deinštalácie"
+${LangFileString} UInstOpt1 "Zvoľte prosím ďalšie možnosti"
+${LangFileString} PurgePrefs "Ponechať osobné nastavenia"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log nebol nájdený!$\r$\nProsím, odinštalujte ručným vyčistením adresára $INSTDIR !"
+${LangFileString} FileChanged "Súbor $filename sa po inštalácii zmenil.$\r$\nChcete ho napriek tomu vymazať?"
+${LangFileString} Yes "Áno"
+${LangFileString} AlwaysYes "Áno všetky"
 ${LangFileString} No "Nie"
-${LangFileString} AlwaysNo "Nie v�etky"
+${LangFileString} AlwaysNo "Nie všetky"
diff --git a/packaging/win32/languages/Slovenian.nsh b/packaging/win32/languages/Slovenian.nsh
index f5562b502..8042f3cb6 100644
--- a/packaging/win32/languages/Slovenian.nsh
+++ b/packaging/win32/languages/Slovenian.nsh
@@ -1,116 +1,145 @@
-;Language: Slovenian (1060, CP1250)
+;Language: Slovenian (1060)
 ;By Martin Srebotnjak
 ${LangFileString} CaptionDescription "Odprtokodni urejevalnik vektorskih slik"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) je izdan pod licenco GNU General Public License (GPL). Prilo�ena licenca slu�i le v informativne namene. $_CLICK"
-${LangFileString} DIFFERENT_USER "Uporabnik $0 je �e namestil Inkscape.$\r$\n�e nadaljujete, namestitev morda ne bo uspe�no dokon�ana!$\r$\nPonovno se prijavite kot $0 in poskusite znova."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 je �e name��en. $\n�elite odstraniti predhodno razli�ico, preden namestite $(^Name) ?"
-${LangFileString} OK_CANCEL_DESC "$\n$\nPritisnite V redu za nadaljevanje ali Prekli�i za preklic."
-${LangFileString} NO_ADMIN "Nimate skrbni�kih pravic.$\r$\nName��anje programa Inkscape za vse uporabnike se morda ne bo kon�ala uspe�no.$\r$\nIzklopite mo�nost 'za vse uporabnike'."
-${LangFileString} NOT_SUPPORTED "Za Inkscape velja, da ne te�e v okoljih Windows 95/98/ME!$\r$\nProsim, oglejte si uradno spletno stran za podrobnej�e informacije."
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) je izdan pod licenco GNU General Public License (GPL). Priložena licenca služi le v informativne namene. $_CLICK"
+${LangFileString} DIFFERENT_USER "Uporabnik $0 je že namestil Inkscape.$\r$\nČe nadaljujete, namestitev morda ne bo uspešno dokončana!$\r$\nPonovno se prijavite kot $0 in poskusite znova."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 je že nameščen. $\nŽelite odstraniti predhodno različico, preden namestite $(^Name) ?"
+${LangFileString} OK_CANCEL_DESC "$\n$\nPritisnite V redu za nadaljevanje ali Prekliči za preklic."
+${LangFileString} NO_ADMIN "Nimate skrbniških pravic.$\r$\nNameščanje programa Inkscape za vse uporabnike se morda ne bo končala uspešno.$\r$\nIzklopite možnost 'za vse uporabnike'."
+${LangFileString} NOT_SUPPORTED "Za Inkscape velja, da ne teče v okoljih Windows 95/98/ME!$\r$\nProsim, oglejte si uradno spletno stran za podrobnejše informacije."
 ${LangFileString} Full "Polna"
 ${LangFileString} Optimal "Optimalna"
 ${LangFileString} Minimal "Minimalna"
 ${LangFileString} Core "Urejevalnik SVG Inkscape (obvezno)"
 ${LangFileString} CoreDesc "Osnovne datoteke in dll-ji Inkscape"
 ${LangFileString} GTKFiles "Izvajalno okolje GTK+ (obvezno)"
-${LangFileString} GTKFilesDesc "Ve�platformna osnova za uporabni�ki vmesnik, ki ga uporablja tudi Inkscape"
-${LangFileString} Shortcuts "Bli�njice"
-${LangFileString} ShortcutsDesc "Bli�njice za zagon Inkscape"
+${LangFileString} GTKFilesDesc "Večplatformna osnova za uporabniški vmesnik, ki ga uporablja tudi Inkscape"
+${LangFileString} Shortcuts "Bližnjice"
+${LangFileString} ShortcutsDesc "Bližnjice za zagon Inkscape"
 ${LangFileString} Alluser "Za vse uporabnike"
-${LangFileString} AlluserDesc "Namesti program za vse, ki uporabljajo ta ra�unalnik (vsi uporabniki)"
+${LangFileString} AlluserDesc "Namesti program za vse, ki uporabljajo ta računalnik (vsi uporabniki)"
 ${LangFileString} Desktop "Namizje"
-${LangFileString} DesktopDesc "Ustvari bli�njico do Inkscape na namizju"
+${LangFileString} DesktopDesc "Ustvari bližnjico do Inkscape na namizju"
 ${LangFileString} Startmenu "Meni Start"
 ${LangFileString} StartmenuDesc "Ustvari vnos Inkscape v meniju Start"
 ${LangFileString} Quicklaunch "Hitri zagon"
-${LangFileString} QuicklaunchDesc "Ustvari bli�njico Inkscape na orodni vrstici Hitri zagon"
+${LangFileString} QuicklaunchDesc "Ustvari bližnjico Inkscape na orodni vrstici Hitri zagon"
 ${LangFileString} SVGWriter "Odpiraj datoteke SVG z Inkscape-om"
 ${LangFileString} SVGWriterDesc "Izbere Inkscape kot privzeti urejevalnik za datoteke SVG"
 ${LangFileString} ContextMenu "Pojavni meni"
 ${LangFileString} ContextMenuDesc "Doda Inkscape v pojavni meni za datoteke SVG"
-${LangFileString} DeletePrefs "Izbri�i osebne nastavitve"
-${LangFileString} DeletePrefsDesc "Izbri�i osebne nastavitve, ki so ostale od predhodno name��ene razli�ice"
+${LangFileString} DeletePrefs "Izbriši osebne nastavitve"
+${LangFileString} DeletePrefsDesc "Izbriši osebne nastavitve, ki so ostale od predhodno nameščene različice"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Dodatne datoteke"
 ${LangFileString} AddfilesDesc "Dodatne datoteke"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Primeri"
 ${LangFileString} ExamplesDesc "Primeri uporabe Inkscape"
-${LangFileString} Tutorials "Vodi�i s primeri"
-${LangFileString} TutorialsDesc "Vodi�i s primeri uporabe Inkscape-a"
+${LangFileString} Tutorials "Vodiči s primeri"
+${LangFileString} TutorialsDesc "Vodiči s primeri uporabe Inkscape-a"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Prevodi"
-${LangFileString} LanguagesDesc "Namesti razli�ne prevode za Inkscape"
+${LangFileString} LanguagesDesc "Namesti različne prevode za Inkscape"
 ${LangFileString} lng_am "amharski"
 ${LangFileString} lng_ar "arabski"
-${LangFileString} lng_az "azerbajd�anski"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "azerbajdžanski"
 ${LangFileString} lng_be "beloruski"
 ${LangFileString} lng_bg "bolgarski"
 ${LangFileString} lng_bn "bengalski"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
 ${LangFileString} lng_br "bretonski"
+${LangFileString} lng_brx "Bodo"
 ${LangFileString} lng_ca "katalonski"
 ${LangFileString} lng_ca@valencia "valencijski katalonski"
-${LangFileString} lng_cs "�e�ki"
+${LangFileString} lng_cs "češki"
 ${LangFileString} lng_da "danski"
-${LangFileString} lng_de "nem�ki"
-${LangFileString} lng_dz "d�ong�ki"
-${LangFileString} lng_el "gr�ki"
-${LangFileString} lng_en "angle�ki"
-${LangFileString} lng_en_AU "avstralsko angle�ki"
-${LangFileString} lng_en_CA "kanadsko angle�ki"
-${LangFileString} lng_en_GB "britansko angle�ki"
-${LangFileString} lng_en_US@piglatin "obrnjeni angle�ki zlogi"
+${LangFileString} lng_de "nemški"
+${LangFileString} lng_doi "Dogri"
+${LangFileString} lng_dz "džongški"
+${LangFileString} lng_el "grški"
+${LangFileString} lng_en "angleški"
+${LangFileString} lng_en_AU "avstralsko angleški"
+${LangFileString} lng_en_CA "kanadsko angleški"
+${LangFileString} lng_en_GB "britansko angleški"
+${LangFileString} lng_en_US@piglatin "obrnjeni angleški zlogi"
 ${LangFileString} lng_eo "esperanto"
-${LangFileString} lng_es "�panski"
-${LangFileString} lng_es_MX "mehi�ko �panski"
+${LangFileString} lng_es "španski"
+${LangFileString} lng_es_MX "mehiško španski"
 ${LangFileString} lng_et "estonski"
 ${LangFileString} lng_eu "baskovski"
 ${LangFileString} lng_fa "farsi"
 ${LangFileString} lng_fi "finski"
 ${LangFileString} lng_fr "francoski"
 ${LangFileString} lng_ga "irski"
-${LangFileString} lng_gl "galega�ki"
+${LangFileString} lng_gl "galegaški"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "hebrejski"
-${LangFileString} lng_hr "hrva�ki"
-${LangFileString} lng_hu "mad�arski"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "hrvaški"
+${LangFileString} lng_hu "madžarski"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "indonezijski"
 ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "italijanski"
 ${LangFileString} lng_ja "japonski"
 ${LangFileString} lng_km "kmerski"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "korejski"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "litovski"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "makedonski"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "mongolski"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "norveški Bokmal"
 ${LangFileString} lng_ne "nepalski"
-${LangFileString} lng_nb "norve�ki Bokmal"
 ${LangFileString} lng_nl "nizozemski"
-${LangFileString} lng_nn "norve�ki Nyorsk"
-${LangFileString} lng_pa "pund�abski"
+${LangFileString} lng_nn "norveški Nyorsk"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "pundžabski"
 ${LangFileString} lng_pl "poljski"
 ${LangFileString} lng_pt "portugalski"
 ${LangFileString} lng_pt_BR "brazilski portugalski"
 ${LangFileString} lng_ro "romunski"
 ${LangFileString} lng_ru "ruski"
 ${LangFileString} lng_rw "kinjarvandski"
-${LangFileString} lng_sk "slova�ki"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "slovaški"
 ${LangFileString} lng_sl "slovenski"
 ${LangFileString} lng_sq "albanski"
 ${LangFileString} lng_sr "srbski"
 ${LangFileString} lng_sr@latin "srbski - latinica"
-${LangFileString} lng_sv "�vedski"
+${LangFileString} lng_sv "švedski"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "telugu"
 ${LangFileString} lng_th "tajski"
-${LangFileString} lng_tr "tur�ki"
+${LangFileString} lng_tr "turški"
 ${LangFileString} lng_uk "ukrajinski"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "vietnamski"
 ${LangFileString} lng_zh_CN "poenostavljeni kitajski"
 ${LangFileString} lng_zh_TW "tradicionalni kitajski"
-${LangFileString} UInstOpt "Mo�nosti odstranitve"
-${LangFileString} UInstOpt1 "Izberite dodatne mo�nosti"
+${LangFileString} UInstOpt "Možnosti odstranitve"
+${LangFileString} UInstOpt1 "Izberite dodatne možnosti"
 ${LangFileString} PurgePrefs "Ohrani osebne nastavitve"
-${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ni mogo�e najti!$\r$\nNamestitev odstranite tako, da sami po�istite mapo $INSTDIR!"
-${LangFileString} FileChanged "Datoteka $filename je bila spremenjena po namestitvi.$\r$\nJo kljub temu �elite izbrisati?"
+${LangFileString} UninstallLogNotFound "$INSTDIR\uninstall.log ni mogoče najti!$\r$\nNamestitev odstranite tako, da sami počistite mapo $INSTDIR!"
+${LangFileString} FileChanged "Datoteka $filename je bila spremenjena po namestitvi.$\r$\nJo kljub temu želite izbrisati?"
 ${LangFileString} Yes "Da"
 ${LangFileString} AlwaysYes "vedno odgovori z Da"
 ${LangFileString} No "Ne"
diff --git a/packaging/win32/languages/Spanish.nsh b/packaging/win32/languages/Spanish.nsh
index be38de68c..af38422f6 100644
--- a/packaging/win32/languages/Spanish.nsh
+++ b/packaging/win32/languages/Spanish.nsh
@@ -1,117 +1,146 @@
-;Language: Spanish (1034, CP1252)
+;Language: Spanish (1034)
 ;By Lucas Vieites <lucas@codexion.com>
-${LangFileString} CaptionDescription "Editor de gr�ficos vectoriales escalables (SVG) de c�digo abierto"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) se publica bajo la Licencia P�blica General GNU (GPL). Esta licencia se muestra aqu� solamente como informaci�n. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape ha sido instalado por el usuario $0.$\r$\nSi contin�a, la operaci�n podr�a finalizar sin �xito.$\r$\nInicie sesi�n como $0 y vuelva a intentarlo."
-${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ya ha sido instalado. $\n�Desea eliminar la versi�n anterior antes de instalar $(^Name) ?"
+${LangFileString} CaptionDescription "Editor de gráficos vectoriales escalables (SVG) de código abierto"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) se publica bajo la Licencia Pública General GNU (GPL). Esta licencia se muestra aquí solamente como información. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape ha sido instalado por el usuario $0.$\r$\nSi continúa, la operación podría finalizar sin éxito.$\r$\nInicie sesión como $0 y vuelva a intentarlo."
+${LangFileString} WANT_UNINSTALL_BEFORE "$R1 ya ha sido instalado. $\n¿Desea eliminar la versión anterior antes de instalar $(^Name) ?"
 ${LangFileString} OK_CANCEL_DESC "$\n$\nPulse Aceptar para continuar o Cancelar para terminar."
-${LangFileString} NO_ADMIN "No dispone de privilegios de administrador.$\r$\nLa instalaci�n de Inkscape para todos los usuarios podr�a terminar sin �xito.$\r$\ndesmarque la casilla �para todos los usuarios�."
-${LangFileString} NOT_SUPPORTED "Inkscape no se ejecuta correctamente en Windows 95/98/ME$\r$\nAcceda a la p�gina web oficial si desea obtener m�s informaci�n."
+${LangFileString} NO_ADMIN "No dispone de privilegios de administrador.$\r$\nLa instalación de Inkscape para todos los usuarios podría terminar sin éxito.$\r$\ndesmarque la casilla «para todos los usuarios»."
+${LangFileString} NOT_SUPPORTED "Inkscape no se ejecuta correctamente en Windows 95/98/ME$\r$\nAcceda a la página web oficial si desea obtener más información."
 ${LangFileString} Full "Completa"
-${LangFileString} Optimal "�ptima"
-${LangFileString} Minimal "M�nima"
+${LangFileString} Optimal "Óptima"
+${LangFileString} Minimal "Mínima"
 ${LangFileString} Core "Inkscape Editor SVG (requerido)"
-${LangFileString} CoreDesc "Archivos Inkscape b�sicos y dlls"
+${LangFileString} CoreDesc "Archivos Inkscape básicos y dlls"
 ${LangFileString} GTKFiles "GTK+ Runtime Environment (requerido)"
 ${LangFileString} GTKFilesDesc "Un conjunto de herramientas GUI, utilizado por Inkscape"
 ${LangFileString} Shortcuts "Acceso directo"
 ${LangFileString} ShortcutsDesc "Accesos directos para iniciar Inkscape"
 ${LangFileString} Alluser "para todos los usuarios"
-${LangFileString} AlluserDesc "Instalar esta aplicaci�n para todos los que utilizan este equipo (todos los usuarios)"
+${LangFileString} AlluserDesc "Instalar esta aplicación para todos los que utilizan este equipo (todos los usuarios)"
 ${LangFileString} Desktop "Escritorio"
 ${LangFileString} DesktopDesc "Crear un acceso directo a Inkscape en el escritorio"
-${LangFileString} Startmenu "Men� Inicio"
-${LangFileString} StartmenuDesc "Crear una entrada en el men� Inicio para Inkscape"
-${LangFileString} Quicklaunch "Acceso r�pido"
-${LangFileString} QuicklaunchDesc "Crear un acceso directo a Inkscape en la barra de acceso r�pido"
+${LangFileString} Startmenu "Menú Inicio"
+${LangFileString} StartmenuDesc "Crear una entrada en el menú Inicio para Inkscape"
+${LangFileString} Quicklaunch "Acceso rápido"
+${LangFileString} QuicklaunchDesc "Crear un acceso directo a Inkscape en la barra de acceso rápido"
 ${LangFileString} SVGWriter "Abrir archivos SVG con Inkscape"
 ${LangFileString} SVGWriterDesc "Seleccionar Inkscape como editor predeterminado para archivos"
-${LangFileString} ContextMenu "Men� contextual"
-${LangFileString} ContextMenuDesc "A�adir Inkscape al men� contextual para archivos SVG"
+${LangFileString} ContextMenu "Menú contextual"
+${LangFileString} ContextMenuDesc "Añadir Inkscape al menú contextual para archivos SVG"
 ${LangFileString} DeletePrefs "Eliminar preferencias personales"
 ${LangFileString} DeletePrefsDesc "Eliminar las preferencias personales restantes de instalaciones anteriores."
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
 ${LangFileString} Addfiles "Archivos adicionales"
 ${LangFileString} AddfilesDesc "Archivos adicionales"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
 ${LangFileString} Examples "Ejemplos"
 ${LangFileString} ExamplesDesc "Ejemplos de uso de Inkscape"
 ${LangFileString} Tutorials "Tutoriales"
 ${LangFileString} TutorialsDesc "Tutoriales del uso de Inkscape"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
 ${LangFileString} Languages "Traducciones"
 ${LangFileString} LanguagesDesc "Instalar varias traducciones para Inkscape"
-${LangFileString} lng_am "Am�rico"
-${LangFileString} lng_ar "�rabe"
+${LangFileString} lng_am "Amárico"
+${LangFileString} lng_ar "Árabe"
+${LangFileString} lng_as "Assamese"
 ${LangFileString} lng_az "Azerbayano"
 ${LangFileString} lng_be "Bielorruso"
-${LangFileString} lng_bg "B�lgaro"
-${LangFileString} lng_bn "Bengal�"
+${LangFileString} lng_bg "Búlgaro"
+${LangFileString} lng_bn "Bengalí"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${LangFileString} lng_br "Bret�n"
-${LangFileString} lng_ca "Catal�n"
+${LangFileString} lng_br "Bretón"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "Catalán"
 ${LangFileString} lng_ca@valencia "Valenciano"
 ${LangFileString} lng_cs "Checo"
-${LangFileString} lng_da "Dan�"
-${LangFileString} lng_de "Alem�n"
+${LangFileString} lng_da "Dané"
+${LangFileString} lng_de "Alemán"
+${LangFileString} lng_doi "Dogri"
 ${LangFileString} lng_dz "Dzongkha"
 ${LangFileString} lng_el "Griego"
-${LangFileString} lng_en "Ingl�s"
-${LangFileString} lng_en_AU "Ingl�s australiano"
-${LangFileString} lng_en_CA "Ingl�s canadiense"
-${LangFileString} lng_en_GB "Ingl�s brit�nico"
+${LangFileString} lng_en "Inglés"
+${LangFileString} lng_en_AU "Inglés australiano"
+${LangFileString} lng_en_CA "Inglés canadiense"
+${LangFileString} lng_en_GB "Inglés británico"
 ${LangFileString} lng_en_US@piglatin "Pig Latin"
 ${LangFileString} lng_eo "Esperanto"
-${LangFileString} lng_es "Espa�ol"
-${LangFileString} lng_es_MX "Espa�ol mexicano"
+${LangFileString} lng_es "Español"
+${LangFileString} lng_es_MX "Español mexicano"
 ${LangFileString} lng_et "Estonio"
 ${LangFileString} lng_eu "Euskera"
 ${LangFileString} lng_fa "Farsi"
-${LangFileString} lng_fi "Fin�s"
-${LangFileString} lng_fr "Franc�s"
-${LangFileString} lng_ga "Irland�s"
+${LangFileString} lng_fi "Finés"
+${LangFileString} lng_fr "Francés"
+${LangFileString} lng_ga "Irlandés"
 ${LangFileString} lng_gl "Galego"
+${LangFileString} lng_gu "Gujarati"
 ${LangFileString} lng_he "Hebreo"
+${LangFileString} lng_hi "Hindi"
 ${LangFileString} lng_hr "Croata"
-${LangFileString} lng_hu "H�ngaro"
+${LangFileString} lng_hu "Húngaro"
 ${LangFileString} lng_hy "Armenian"
 ${LangFileString} lng_id "Indonesio"
 ${LangFileString} lng_is "Icelandic"
 ${LangFileString} lng_it "Italiano"
-${LangFileString} lng_ja "Japon�s"
+${LangFileString} lng_ja "Japonés"
 ${LangFileString} lng_km "Jemer"
+${LangFileString} lng_kn "Kannada"
 ${LangFileString} lng_ko "Coreano"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
 ${LangFileString} lng_lt "Lituano"
 ${LangFileString} lng_lv "Latvian"
+${LangFileString} lng_mai "Maithili"
 ${LangFileString} lng_mk "Macedonio"
+${LangFileString} lng_ml "Malayalam"
 ${LangFileString} lng_mn "Mongol"
-${LangFileString} lng_ne "Nepal�"
-${LangFileString} lng_nb "Bokm�l noruego"
-${LangFileString} lng_nl "Holand�s"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "Bokmål noruego"
+${LangFileString} lng_ne "Nepalí"
+${LangFileString} lng_nl "Holandés"
 ${LangFileString} lng_nn "Nynorsk noruego"
+${LangFileString} lng_or "Odia"
 ${LangFileString} lng_pa "Punyabi"
 ${LangFileString} lng_pl "Polaco"
-${LangFileString} lng_pt "Portugu�s"
-${LangFileString} lng_pt_BR "Portugu�s brasile�o"
+${LangFileString} lng_pt "Portugués"
+${LangFileString} lng_pt_BR "Portugués brasileño"
 ${LangFileString} lng_ro "Rumano"
 ${LangFileString} lng_ru "Ruso"
 ${LangFileString} lng_rw "Kinyarwanda"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
 ${LangFileString} lng_sk "Eslovaco"
 ${LangFileString} lng_sl "Esloveno"
 ${LangFileString} lng_sq "Albano"
 ${LangFileString} lng_sr "Serbio"
 ${LangFileString} lng_sr@latin "Serbio en escritura latina"
 ${LangFileString} lng_sv "Sueco"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "Telugu"
 ${LangFileString} lng_th "Tai"
 ${LangFileString} lng_tr "Turco"
 ${LangFileString} lng_uk "Ucranio"
+${LangFileString} lng_ur "Urdu"
 ${LangFileString} lng_vi "Vietnamita"
 ${LangFileString} lng_zh_CN "Chino simplificado"
-${LangFileString} lng_zh_TW "Chino taiwan�s"
-${LangFileString} UInstOpt "Opciones de desinstalaci�n"
+${LangFileString} lng_zh_TW "Chino taiwanés"
+${LangFileString} UInstOpt "Opciones de desinstalación"
 ${LangFileString} UInstOpt1 "Elija sus opciones adicionales"
 ${LangFileString} PurgePrefs "Guardar las preferencias personales"
 ${LangFileString} UninstallLogNotFound "No se ha encontrado $INSTDIR\uninstall.log.$\r$\nDesinstale limpiando el directorio $INSTDIR."
-${LangFileString} FileChanged "El archivo $filename ha sido cambiado despu�s de la instalaci�n.$\r$\n�Est� seguro de que desea eliminar este archivo?"
-${LangFileString} Yes "S�"
-${LangFileString} AlwaysYes "siempre responder S�"
+${LangFileString} FileChanged "El archivo $filename ha sido cambiado después de la instalación.$\r$\n¿Está seguro de que desea eliminar este archivo?"
+${LangFileString} Yes "Sí"
+${LangFileString} AlwaysYes "siempre responder Sí"
 ${LangFileString} No "No"
 ${LangFileString} AlwaysNo "siempre responder No"
diff --git a/packaging/win32/languages/TradChinese.nsh b/packaging/win32/languages/TradChinese.nsh
index d38e6a872..6e75dea77 100644
--- a/packaging/win32/languages/TradChinese.nsh
+++ b/packaging/win32/languages/TradChinese.nsh
@@ -1,117 +1,146 @@
-;Language: Traditional Chinese (1028, CP950)
+;Language: Traditional Chinese (1028)
 ;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} CaptionDescription "開放原始碼向量繪圖軟體"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) 是以 GNU 通用公共許可證 (GPL) 發行。 這裡提供的許可證僅為參考訊息。 $_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} Python "Python 2.7"
+${LangFileString} PythonDesc "An interpreter for the Python programming language and Python modules required to run Inkscape extensions."
+${LangFileString} Addfiles "其他檔案"
+${LangFileString} AddfilesDesc "其他檔案"
+${LangFileString} Extensions "Extensions"
+${LangFileString} ExtensionsDesc "Inkscape extensions (including many import and export plugins)"
+${LangFileString} Examples "範例"
+${LangFileString} ExamplesDesc "Inkscape 使用範例"
+${LangFileString} Tutorials "指導手冊"
+${LangFileString} TutorialsDesc "Inkscape 使用教學"
+${LangFileString} Dictionaries "Dictionaries"
+${LangFileString} DictionariesDesc "Dictionaries for some common languages for spell checking in Inkscape"
+${LangFileString} Languages "語言"
+${LangFileString} LanguagesDesc "安裝 Inkscape 各種語言翻譯"
+${LangFileString} lng_am "阿比西尼亞語"
+${LangFileString} lng_ar "阿拉伯語"
+${LangFileString} lng_as "Assamese"
+${LangFileString} lng_az "亞塞拜然語"
+${LangFileString} lng_be "白俄羅斯語"
+${LangFileString} lng_bg "保加利亞語"
+${LangFileString} lng_bn "孟加拉語"
 ${LangFileString} lng_bn_BD "Bengali Bangladesh"
-${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_br "不列塔尼語"
+${LangFileString} lng_brx "Bodo"
+${LangFileString} lng_ca "加泰隆語"
+${LangFileString} lng_ca@valencia "瓦倫西亞語 加泰羅尼亞語"
+${LangFileString} lng_cs "捷克語"
+${LangFileString} lng_da "丹麥語"
+${LangFileString} lng_de "德語"
+${LangFileString} lng_doi "Dogri"
+${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 "�����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_fi "芬蘭語"
+${LangFileString} lng_fr "法文"
+${LangFileString} lng_ga "愛爾蘭語"
+${LangFileString} lng_gl "加里西亞語"
+${LangFileString} lng_gu "Gujarati"
+${LangFileString} lng_he "希伯來語"
+${LangFileString} lng_hi "Hindi"
+${LangFileString} lng_hr "克羅埃西亞語"
+${LangFileString} lng_hu "匈牙利語"
 ${LangFileString} lng_hy "Armenian"
-${LangFileString} lng_id "�L���y"
+${LangFileString} lng_id "印尼語"
 ${LangFileString} lng_is "Icelandic"
-${LangFileString} lng_it "�q�j�Q��"
-${LangFileString} lng_ja "���"
-${LangFileString} lng_km "���ֻy"
-${LangFileString} lng_ko "����"
-${LangFileString} lng_lt "�߳��{�y"
+${LangFileString} lng_it "義大利文"
+${LangFileString} lng_ja "日文"
+${LangFileString} lng_km "高棉語"
+${LangFileString} lng_kn "Kannada"
+${LangFileString} lng_ko "韓文"
+${LangFileString} lng_kok "Konkani"
+${LangFileString} lng_kok@latin "Konkani in Latin script"
+${LangFileString} lng_ks@aran "Kashmiri in Perso-Arabic script"
+${LangFileString} lng_ks@deva "Kashmiri in Devanagari script"
+${LangFileString} lng_lt "立陶宛語"
 ${LangFileString} lng_lv "Latvian"
-${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_mai "Maithili"
+${LangFileString} lng_mk "馬其頓語"
+${LangFileString} lng_ml "Malayalam"
+${LangFileString} lng_mn "蒙古語"
+${LangFileString} lng_mni "Manipuri"
+${LangFileString} lng_mni@beng "Manipuri in Bengali script"
+${LangFileString} lng_mr "Marathi"
+${LangFileString} lng_nb "挪威 Bokmal 語"
+${LangFileString} lng_ne "尼泊爾語"
+${LangFileString} lng_nl "荷蘭語"
+${LangFileString} lng_nn "挪威 Nynorsk 語"
+${LangFileString} lng_or "Odia"
+${LangFileString} lng_pa "旁遮普語"
+${LangFileString} lng_pl "波蘭語"
+${LangFileString} lng_pt "葡萄牙文"
+${LangFileString} lng_pt_BR "葡萄牙文(巴西)"
+${LangFileString} lng_ro "羅馬尼亞語"
+${LangFileString} lng_ru "俄文"
+${LangFileString} lng_rw "金亞盧安達語"
+${LangFileString} lng_sa "Sanskrit"
+${LangFileString} lng_sat "Santali"
+${LangFileString} lng_sat@deva "Santali in Devanagari script"
+${LangFileString} lng_sd "Sindhi"
+${LangFileString} lng_sd@deva "Sindhi in Devanagari script"
+${LangFileString} lng_sk "斯洛法克語"
+${LangFileString} lng_sl "斯洛凡尼亞語"
+${LangFileString} lng_sq "阿爾巴尼亞語"
+${LangFileString} lng_sr "賽爾維亞語"
+${LangFileString} lng_sr@latin "塞爾維亞文-拉丁"
+${LangFileString} lng_sv "瑞典語"
+${LangFileString} lng_ta "Tamil"
 ${LangFileString} lng_te "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 "�����ҧ_"
+${LangFileString} lng_th "泰語"
+${LangFileString} lng_tr "土耳其語"
+${LangFileString} lng_uk "烏克蘭語"
+${LangFileString} lng_ur "Urdu"
+${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/Ukrainian.nsh b/packaging/win32/languages/Ukrainian.nsh
index ee5dfbf1f..5c015da1e 100644
--- a/packaging/win32/languages/Ukrainian.nsh
+++ b/packaging/win32/languages/Ukrainian.nsh
@@ -1,117 +1,146 @@
-;Language: Ukrainian (1058, CP1251)
+;Language: Ukrainian (1058)
 ;By Yuri Chornoivan <yurchor@ukr.net>
-${LangFileString} CaptionDescription "�������� �������� ������� � ��������� ��������� ������"
-${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) �������� �� ���� ���������� GNU General Public License (GPL). ���� ����糿 �������� ���� � ��������� �����. $_CLICK"
-${LangFileString} DIFFERENT_USER "Inkscape ���� ����������� ������������ $0.$\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 "�������� SVG Inkscape (���������)"
-${LangFileString} CoreDesc "������� ����� � �������� Inkscape"
-${LangFileString} GTKFiles "���������� ��������� GTK+ (���������)"
-${LangFileString} GTKFilesDesc "���� ����������� �������� ����������, �� ��������������� Inkscape"
-${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 "³�������� ����� SVG �� ��������� Inkscape"
-${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_bn_BD "������������ (���������)"
-${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 "����"
-${LangFileString} lng_fi "Գ������"
-${LangFileString} lng_fr "�����������"
-${LangFileString} lng_ga "�����������"
-${LangFileString} lng_gl "����������"
-${LangFileString} lng_he "�������"
-${LangFileString} lng_hr "�����������"
-${LangFileString} lng_hu "���������"
-${LangFileString} lng_hy "³���������"
-${LangFileString} lng_id "�������������"
-${LangFileString} lng_is "�����������"
-${LangFileString} lng_it "����������"
-${LangFileString} lng_ja "���������"
-${LangFileString} lng_km "����������"
-${LangFileString} lng_ko "����������"
-${LangFileString} lng_lt "����������"
-${LangFileString} lng_lv "����������"
-${LangFileString} lng_mk "������������"
-${LangFileString} lng_mn "������������"
-${LangFileString} lng_ne "�����������"
-${LangFileString} lng_nb "���������� (������)"
-${LangFileString} lng_nl "������������"
-${LangFileString} lng_nn "���������� (�������)"
-${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 "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 "������ ��������� �ͳ�"
+${LangFileString} CaptionDescription "Редактор векторної графіки з відкритими вихідними кодами"
+${LangFileString} LICENSE_BOTTOM_TEXT "$(^Name) випущено за умов дотримання GNU General Public License (GPL). Файл ліцензії наведено лише з довідковою метою. $_CLICK"
+${LangFileString} DIFFERENT_USER "Inkscape було встановлено користувачем $0.$\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 "Редактор SVG Inkscape (необхідне)"
+${LangFileString} CoreDesc "Основні файли і бібліотеки Inkscape"
+${LangFileString} GTKFiles "Середовище виконання GTK+ (необхідне)"
+${LangFileString} GTKFilesDesc "Набір інструментів побудови інтерфейсу, що використовується Inkscape"
+${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 "Відкривати файли SVG за допомогою Inkscape"
+${LangFileString} SVGWriterDesc "Призначити Inkscape типовим редактором файлів SVG"
+${LangFileString} ContextMenu "Контекстне меню"
+${LangFileString} ContextMenuDesc "Додати пункт Inkscape до контекстного меню файлів SVG"
+${LangFileString} DeletePrefs "Вилучити особисті налаштування"
+${LangFileString} DeletePrefsDesc "Вилучити особисті налаштування, які залишилися після попередніх встановлень"
+${LangFileString} Python "Python 2.7"
+${LangFileString} PythonDesc "Інтерпретатор мови програмування Python та модулі Python, які знадобляться для запуску розширень Inkscape."
+${LangFileString} Addfiles "Додаткові файли"
+${LangFileString} AddfilesDesc "Додаткові приклади"
+${LangFileString} Extensions "Розширення"
+${LangFileString} ExtensionsDesc "Розширення Inkscape (зокрема багато додатків імпортування та експортування даних)"
+${LangFileString} Examples "Приклади"
+${LangFileString} ExamplesDesc "Приклади файлів, створених за допомогою Inkscape"
+${LangFileString} Tutorials "Підручники"
+${LangFileString} TutorialsDesc "Підручники з користування Inkscape"
+${LangFileString} Dictionaries "Словники"
+${LangFileString} DictionariesDesc "Словники для перевірки правопису поширеними мовами у Inkscape"
+${LangFileString} Languages "Переклади"
+${LangFileString} LanguagesDesc "Встановити переклади Inkscape різними мовами"
+${LangFileString} lng_am "Амхарською"
+${LangFileString} lng_ar "Арабською"
+${LangFileString} lng_as "Асамською"
+${LangFileString} lng_az "Азербайджанською"
+${LangFileString} lng_be "Білоруською"
+${LangFileString} lng_bg "Болгарською"
+${LangFileString} lng_bn "Бенгальською"
+${LangFileString} lng_bn_BD "Бенгальською (Бангладеш)"
+${LangFileString} lng_br "Бретонською"
+${LangFileString} lng_brx "Бодо"
+${LangFileString} lng_ca "Каталанською"
+${LangFileString} lng_ca@valencia "Валенсійською каталанською"
+${LangFileString} lng_cs "Чеською"
+${LangFileString} lng_da "Данською"
+${LangFileString} lng_de "Німецькою"
+${LangFileString} lng_doi "Dogri"
+${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 "Фарсі"
+${LangFileString} lng_fi "Фінською"
+${LangFileString} lng_fr "Французькою"
+${LangFileString} lng_ga "Ірландською"
+${LangFileString} lng_gl "Галісійською"
+${LangFileString} lng_gu "Гуджараті"
+${LangFileString} lng_he "Івритом"
+${LangFileString} lng_hi "Гінді"
+${LangFileString} lng_hr "Хорватською"
+${LangFileString} lng_hu "Угорською"
+${LangFileString} lng_hy "Вірменською"
+${LangFileString} lng_id "Індонезійською"
+${LangFileString} lng_is "Ісландською"
+${LangFileString} lng_it "Італійською"
+${LangFileString} lng_ja "Японською"
+${LangFileString} lng_km "Кхмерською"
+${LangFileString} lng_kn "Каннадською"
+${LangFileString} lng_ko "Корейською"
+${LangFileString} lng_kok "Конкані"
+${LangFileString} lng_kok@latin "Конкані з латинською писемністю"
+${LangFileString} lng_ks@aran "Кашмірською із персо-арабською писемністю"
+${LangFileString} lng_ks@deva "Кашмірською із писемністю деванагарі"
+${LangFileString} lng_lt "Литовською"
+${LangFileString} lng_lv "Латвійською"
+${LangFileString} lng_mai "Майтілі"
+${LangFileString} lng_mk "Македонською"
+${LangFileString} lng_ml "Малаялам"
+${LangFileString} lng_mn "Монгольською"
+${LangFileString} lng_mni "Маніпурі"
+${LangFileString} lng_mni@beng "Маніпурі із бенгальською писемністю"
+${LangFileString} lng_mr "Мараті"
+${LangFileString} lng_nb "Норвезькою (букмол)"
+${LangFileString} lng_ne "Непальською"
+${LangFileString} lng_nl "Голландською"
+${LangFileString} lng_nn "Норвезькою (нюноршк)"
+${LangFileString} lng_or "Одія"
+${LangFileString} lng_pa "Пенджабі"
+${LangFileString} lng_pl "Польською"
+${LangFileString} lng_pt "Португальською"
+${LangFileString} lng_pt_BR "Бразильською португальською"
+${LangFileString} lng_ro "Румунською"
+${LangFileString} lng_ru "Російською"
+${LangFileString} lng_rw "Киньяруанда"
+${LangFileString} lng_sa "Санскритом"
+${LangFileString} lng_sat "Санталі"
+${LangFileString} lng_sat@deva "Санталі із писемністю деванагарі"
+${LangFileString} lng_sd "Сіндською"
+${LangFileString} lng_sd@deva "Сіндською із писемністю деванагарі"
+${LangFileString} lng_sk "Словацькою"
+${LangFileString} lng_sl "Словенською"
+${LangFileString} lng_sq "Албанською"
+${LangFileString} lng_sr "Сербською"
+${LangFileString} lng_sr@latin "Сербською (латиницею)"
+${LangFileString} lng_sv "Шведською"
+${LangFileString} lng_ta "Тамільською"
+${LangFileString} lng_te "Телугу"
+${LangFileString} lng_th "Тайською"
+${LangFileString} lng_tr "Турецькою"
+${LangFileString} lng_uk "Українською"
+${LangFileString} lng_ur "Урду"
+${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/_language_lists.nsh b/packaging/win32/languages/_language_lists.nsh
new file mode 100644
index 000000000..5aefeb0cc
--- /dev/null
+++ b/packaging/win32/languages/_language_lists.nsh
@@ -0,0 +1,140 @@
+# This file contains a list of

+#    - available installer translations (*.nsh in this directory)

+#    - available Inkscape translations (*.po in /src/po)

+#

+# The list is formatted for use in the NSIS installer script

+# and should be updated whenever new translations are added.

+

+

+### List of available installer translations.

+# Every entry should

+#    - have a name (e.g. "Breton") matching a header file in this directory (e.g. "Breton.nsh")

+#      that in addition should match the name of an available NSIS translation file (see "NSIS\Contrib\Language files")

+#    - include a valid locale ID (see https://msdn.microsoft.com/goglobal/bb964664.aspx)

+!macro INSTALLER_TRANSLATIONS _MACRONAME

+    !insertmacro ${_MACRONAME} Breton       1150

+    !insertmacro ${_MACRONAME} Catalan      1027

+    !insertmacro ${_MACRONAME} Czech        1029

+    !insertmacro ${_MACRONAME} Danish       1030

+    !insertmacro ${_MACRONAME} Dutch        1043

+    !insertmacro ${_MACRONAME} Finnish      1035

+    !insertmacro ${_MACRONAME} French       1036

+    !insertmacro ${_MACRONAME} Galician     1110

+    !insertmacro ${_MACRONAME} German       1031

+    !insertmacro ${_MACRONAME} Greek        1032

+    !insertmacro ${_MACRONAME} Hebrew       1037

+    !insertmacro ${_MACRONAME} Icelandic    1039

+    !insertmacro ${_MACRONAME} Indonesian   1057

+    !insertmacro ${_MACRONAME} Italian      1040

+    !insertmacro ${_MACRONAME} Japanese     1041

+    !insertmacro ${_MACRONAME} Polish       1045

+    !insertmacro ${_MACRONAME} Portuguese   2070

+    !insertmacro ${_MACRONAME} PortugueseBR 1046

+    !insertmacro ${_MACRONAME} Romanian     1048

+    !insertmacro ${_MACRONAME} Russian      1049

+    !insertmacro ${_MACRONAME} Slovak       1051

+    !insertmacro ${_MACRONAME} Slovenian    1060

+    !insertmacro ${_MACRONAME} Spanish      1034

+    !insertmacro ${_MACRONAME} SimpChinese  2052

+    !insertmacro ${_MACRONAME} TradChinese  1028

+    !insertmacro ${_MACRONAME} Ukrainian    1058

+!macroend

+

+

+### List of available Inkscape translations.

+# Every entry should

+#    - specify a name (e.g. "Amharic") that matches the installer translation name above (if present)

+#    - specify a language code (e.g. "am") that has a matching PO file (e.g. "am.po")

+#      in the /po folder in the root of Inkscape source directory

+!macro INKSCAPE_TRANSLATIONS _MACRONAME

+    !insertmacro ${_MACRONAME} Amharic             am

+    !insertmacro ${_MACRONAME} Arabic              ar

+    !insertmacro ${_MACRONAME} Assamese            as

+    !insertmacro ${_MACRONAME} Azerbaijani         az

+    !insertmacro ${_MACRONAME} Belarusian          be

+    !insertmacro ${_MACRONAME} Bulgarian           bg

+    !insertmacro ${_MACRONAME} Bengali             bn

+    !insertmacro ${_MACRONAME} BengaliBangladesh   bn_BD

+    !insertmacro ${_MACRONAME} Breton              br

+    !insertmacro ${_MACRONAME} Bodo                brx

+    !insertmacro ${_MACRONAME} Catalan             ca

+    !insertmacro ${_MACRONAME} CatalanValencia     ca@valencia

+    !insertmacro ${_MACRONAME} Czech               cs

+    !insertmacro ${_MACRONAME} Danish              da

+    !insertmacro ${_MACRONAME} German              de

+    !insertmacro ${_MACRONAME} Dogri               doi

+    !insertmacro ${_MACRONAME} Dzongkha            dz

+    !insertmacro ${_MACRONAME} Greek               el

+    !insertmacro ${_MACRONAME} EnglishAustralian   en_AU

+    !insertmacro ${_MACRONAME} EnglishCanadian     en_CA

+    !insertmacro ${_MACRONAME} EnglishBritain      en_GB

+    !insertmacro ${_MACRONAME} EnglishPiglatin     en_US@piglatin

+    !insertmacro ${_MACRONAME} Esperanto           eo

+    !insertmacro ${_MACRONAME} Spanish             es

+    !insertmacro ${_MACRONAME} SpanishMexico       es_MX

+    !insertmacro ${_MACRONAME} Estonian            et

+    !insertmacro ${_MACRONAME} Basque              eu

+    !insertmacro ${_MACRONAME} Farsi               fa

+    !insertmacro ${_MACRONAME} Finnish             fi

+    !insertmacro ${_MACRONAME} French              fr

+    !insertmacro ${_MACRONAME} Irish               ga

+    !insertmacro ${_MACRONAME} Galician            gl

+    !insertmacro ${_MACRONAME} Gujarati            gu

+    !insertmacro ${_MACRONAME} Hebrew              he

+    !insertmacro ${_MACRONAME} Hindi               hi

+    !insertmacro ${_MACRONAME} Croatian            hr

+    !insertmacro ${_MACRONAME} Hungarian           hu

+    !insertmacro ${_MACRONAME} Armenian            hy

+    !insertmacro ${_MACRONAME} Indonesian          id

+    !insertmacro ${_MACRONAME} Icelandic           is

+    !insertmacro ${_MACRONAME} Italian             it

+    !insertmacro ${_MACRONAME} Japanese            ja

+    !insertmacro ${_MACRONAME} Khmer               km

+    !insertmacro ${_MACRONAME} Kannada             kn

+    !insertmacro ${_MACRONAME} Korean              ko

+    !insertmacro ${_MACRONAME} Konkani             kok

+    !insertmacro ${_MACRONAME} KonkaniLatin        kok@latin

+    !insertmacro ${_MACRONAME} KashmiriPersoArabic ks@aran

+    !insertmacro ${_MACRONAME} KashmiriDevanagari  ks@deva

+    !insertmacro ${_MACRONAME} Lithuanian          lt

+    !insertmacro ${_MACRONAME} Latvian             lv

+    !insertmacro ${_MACRONAME} Maithili            mai

+    !insertmacro ${_MACRONAME} Macedonian          mk

+    !insertmacro ${_MACRONAME} Malayalam           ml

+    !insertmacro ${_MACRONAME} Mongolian           mn

+    !insertmacro ${_MACRONAME} Manipuri            mni

+    !insertmacro ${_MACRONAME} ManipuriBengali     mni@beng

+    !insertmacro ${_MACRONAME} Marathi             mr

+    !insertmacro ${_MACRONAME} NorwegianBokmal     nb

+    !insertmacro ${_MACRONAME} Nepali              ne

+    !insertmacro ${_MACRONAME} Dutch               nl

+    !insertmacro ${_MACRONAME} NorwegianNynorsk    nn

+    !insertmacro ${_MACRONAME} Odia                or

+    !insertmacro ${_MACRONAME} Panjabi             pa

+    !insertmacro ${_MACRONAME} Polish              pl

+    !insertmacro ${_MACRONAME} Portuguese          pt

+    !insertmacro ${_MACRONAME} PortugueseBR        pt_BR

+    !insertmacro ${_MACRONAME} Romanian            ro

+    !insertmacro ${_MACRONAME} Russian             ru

+    !insertmacro ${_MACRONAME} Kinyarwanda         rw

+    !insertmacro ${_MACRONAME} Sanskrit            sa

+    !insertmacro ${_MACRONAME} Santali             sat

+    !insertmacro ${_MACRONAME} SantaliDevanagari   sat@deva

+    !insertmacro ${_MACRONAME} Sindhi              sd

+    !insertmacro ${_MACRONAME} SindhiDevanagari    sd@deva

+    !insertmacro ${_MACRONAME} Slovak              sk

+    !insertmacro ${_MACRONAME} Slovenian           sl

+    !insertmacro ${_MACRONAME} Albanian            sq

+    !insertmacro ${_MACRONAME} Serbian             sr

+    !insertmacro ${_MACRONAME} SerbianLatin        sr@latin

+    !insertmacro ${_MACRONAME} Swedish             sv

+    !insertmacro ${_MACRONAME} Tamil               ta

+    !insertmacro ${_MACRONAME} Telugu              te

+    !insertmacro ${_MACRONAME} Thai                th

+    !insertmacro ${_MACRONAME} Turkish             tr

+    !insertmacro ${_MACRONAME} Ukrainian           uk

+    !insertmacro ${_MACRONAME} Urdu                ur

+    !insertmacro ${_MACRONAME} Vietnamese          vi

+    !insertmacro ${_MACRONAME} SimpChinese         zh_CN

+    !insertmacro ${_MACRONAME} TradChinese         zh_TW

+!macroend

diff --git a/packaging/win32/AdvUninstLog.nsh b/packaging/win32/macros/AdvUninstLog.nsh
index f48049164..a932aa873 100644
--- a/packaging/win32/AdvUninstLog.nsh
+++ b/packaging/win32/macros/AdvUninstLog.nsh
@@ -425,7 +425,7 @@
         ${uninstall.log_install} "${UNLOG_PART}${ID}" "${EXCLU_LIST}" "$OUTDIR"
         ${uninstall.log_mergeID} "${UNLOG_PART}${ID}"
 
-   !undef ID ${__LINE__}
+   !undef ID
 
   !verbose pop
 !macroend
diff --git a/packaging/win32/AdvUninstLog.txt b/packaging/win32/macros/AdvUninstLog.txt
index c294c3df2..c294c3df2 100644
--- a/packaging/win32/AdvUninstLog.txt
+++ b/packaging/win32/macros/AdvUninstLog.txt
diff --git a/packaging/win32/macros/RequireLatestNSIS.nsh b/packaging/win32/macros/RequireLatestNSIS.nsh
new file mode 100644
index 000000000..7d6308e58
--- /dev/null
+++ b/packaging/win32/macros/RequireLatestNSIS.nsh
@@ -0,0 +1,4 @@
+!searchparse ${NSIS_VERSION} "v" V
+!if ${V} < 3.0
+	!error "You only have NSIS ${V}, but NSIS 3.0 or later is required to support Unicode and Windows 10. Please upgrade to NSIS 3.0 or later and try again."
+!endif
diff --git a/packaging/win32/macros/SHMessageBoxCheck.nsh b/packaging/win32/macros/SHMessageBoxCheck.nsh
new file mode 100644
index 000000000..502923bf2
--- /dev/null
+++ b/packaging/win32/macros/SHMessageBoxCheck.nsh
@@ -0,0 +1,94 @@
+# SHMessageBoxCheck

+#   Works like MessageBox but includes a checkbox that gives the user the option not to show the message box again.

+#   In that case the return value (first value on the stack) is always set to the last user choice

+#

+# See

+#   http://nsis.sourceforge.net/SHMessageBoxCheck   (documentation)

+#   https://msdn.microsoft.com/library/windows/desktop/bb773836.aspx   (implementation details)

+#

+

+# types to indicate the buttons displayed in the message box

+!define MB_OK                0x00000000

+!define MB_OKCANCEL          0x00000001

+!define MB_ABORTRETRYIGNORE  0x00000002 # not officially supported, use at your own risk!

+!define MB_YESNOCANCEL       0x00000003 # not officially supported, use at your own risk!

+!define MB_YESNO             0x00000004

+!define MB_RETRYCANCEL       0x00000005 # not officially supported, use at your own risk!

+!define MB_CANCELTRYCONTINUE 0x00000006 # not officially supported, use at your own risk!

+!define MB_HELP              0x00004000 # not officially supported, use at your own risk!

+

+# types to display an icon in the message box

+!define MB_ICONHAND          0x00000010

+!define MB_ICONQUESTION      0x00000020 # MS bug: Same as MB_ICONEXCLAMATION

+!define MB_ICONEXCLAMATION   0x00000030

+!define MB_ICONINFORMATION   0x00000040

+

+

+# return values

+!define IDOK        1

+!define IDCANCEL    2

+!define IDABORT     3

+!define IDRETRY     4

+!define IDIGNORE    5

+!define IDYES       6

+!define IDNO        7

+!define IDCONTINUE 11

+!define IDTRYAGAIN 10

+

+

+

+# the user's previous choice (i.e. the button clicked in the message box)

+Var _lastReturnValue

+

+# The value that the call to SHMessageBoxCheck should return when the user chose not to display the message box again

+!define _DEFAULT 9999

+

+# Windows XP does not expose the function name, so we have to specify the function by ordinal value

+!ifdef NSIS_UNICODE

+    !define _SHMessageBoxCheck_Ordinal 191

+!else

+    !define _SHMessageBoxCheck_Ordinal 185

+!endif

+

+

+

+!macro SHMessageBoxCheckInit _UNIQUE_STRING

+    # SHMessageBoxCheck stores the user's choice not to display the message box again in the registry, see

+    #   HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain

+    !ifdef _PSZ_REG_VAL

+        !error "Only call SHMessageBoxCheckInit once and make sure to call SHMessageBoxCheckCleanup before using it again"

+    !else

+        # the unique string used to identify this message (and name of the registry value used to store the checkbox status)

+        !define _PSZ_REG_VAL ${_UNIQUE_STRING}

+    !endif

+

+    # make sure the registry value is not yet set (for whatever reason)

+    ${SHMessageBoxCheckCleanup}

+!macroend

+!define SHMessageBoxCheckInit "!insertmacro SHMessageBoxCheckInit"

+

+

+!macro SHMessageBoxCheckCleanup

+    # delete the registry key that is used to store the checkbox status so we can start fresh next time

+    DeleteRegValue HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain" "${_PSZ_REG_VAL}"

+!macroend

+!define SHMessageBoxCheckCleanup "!insertmacro SHMessageBoxCheckCleanup"

+

+

+!macro SHMessageBoxCheck _CAPTION _TEXT _TYPE

+    # this would be the simple way (by name)

+    # System::Call "shlwapi::SHMessageBoxCheck(p $HWNDPARENT, t '${_TEXT}', t '${_CAPTION}', i ${_TYPE}, i ${_DEFAULT}, t '${_PSZ_REG_VAL}') i .r0"

+

+    # for backwards-compatibility we get the process address by specifying the function's ordinal value

+    System::Call "kernel32::GetModuleHandle(t 'shlwapi.dll') p .s"

+    System::Call "kernel32::GetProcAddress(p s, i ${_SHMessageBoxCheck_Ordinal}) p .r0"

+    System::Call "::$0(p $HWNDPARENT, t '${_TEXT}', t '${_CAPTION}', i ${_TYPE}, i ${_DEFAULT}, t '${_PSZ_REG_VAL}') i .r0"

+

+    # save the user's choice (unless the default value was returned - then don't update and return the saved choice)

+    StrCmp $0 ${_DEFAULT} +2 0

+        StrCpy $_lastReturnValue $0

+

+    # push the return value to the stack

+    Push $_lastReturnValue

+!macroend

+!define SHMessageBoxCheck "!insertmacro SHMessageBoxCheck"
\ No newline at end of file
diff --git a/packaging/win32/macros/VersionCompleteXXXX.nsh b/packaging/win32/macros/VersionCompleteXXXX.nsh
new file mode 100644
index 000000000..6ea780508
--- /dev/null
+++ b/packaging/win32/macros/VersionCompleteXXXX.nsh
@@ -0,0 +1,60 @@
+; See http://nsis.sourceforge.net/VersionCompleteXXXX for documentation
+!macro VersionCompleteXXXRevision _INPUT_VALUE _OUTPUT_SYMBOL _REVISION
+	!searchparse /noerrors ${_INPUT_VALUE} "" _VERSION_1 "." _VERSION_2 "." _VERSION_3 "." _VERSION_4
+	!ifndef _VERSION_1
+		!define _VERSION_1 0
+	!else if `${_VERSION_1}` == ``
+		!define /redef _VERSION_1 0
+	!endif
+	!ifndef _VERSION_2
+		!define _VERSION_2 0
+	!else if `${_VERSION_2}` == ``
+		!define /redef _VERSION_2 0
+	!endif
+	!ifndef _VERSION_3
+		!define _VERSION_3 0
+	!else if `${_VERSION_3}` == ``
+		!define /redef _VERSION_3 0
+	!endif
+	!ifndef _VERSION_4
+		!define _VERSION_4 0
+	!else if `${_VERSION_4}` == ``
+		!define /redef _VERSION_4 0
+	!endif
+	!define ${_OUTPUT_SYMBOL} ${_VERSION_1}.${_VERSION_2}.${_VERSION_3}.${_REVISION}
+	!undef _VERSION_1
+	!undef _VERSION_2
+	!undef _VERSION_3
+	!undef _VERSION_4
+	!undef _REVISION
+!macroend
+!define VersionCompleteXXXRevision `!insertmacro VersionCompleteXXXRevision`
+!macro VersionCompleteXXXX _INPUT_VALUE _OUTPUT_SYMBOL
+	!searchparse /noerrors ${_INPUT_VALUE} "" _VERSION_1 "." _VERSION_2 "." _VERSION_3 "." _VERSION_4
+	!ifndef _VERSION_1
+		!define _VERSION_1 0
+	!else if `${_VERSION_1}` == ``
+		!define /redef _VERSION_1 0
+	!endif
+	!ifndef _VERSION_2
+		!define _VERSION_2 0
+	!else if `${_VERSION_2}` == ``
+		!define /redef _VERSION_2 0
+	!endif
+	!ifndef _VERSION_3
+		!define _VERSION_3 0
+	!else if `${_VERSION_3}` == ``
+		!define /redef _VERSION_3 0
+	!endif
+	!ifndef _VERSION_4
+		!define _VERSION_4 0
+	!else if `${_VERSION_4}` == ``
+		!define /redef _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`
\ No newline at end of file
diff --git a/packaging/win32/ifexist.nsh b/packaging/win32/macros/ifexist.nsh
index f14236c2e..5a0ea62b9 100644
--- a/packaging/win32/ifexist.nsh
+++ b/packaging/win32/macros/ifexist.nsh
@@ -19,3 +19,18 @@
 		!undef _FILE_EXISTS
 !macroend
 !define !ifnexist "!insertmacro !ifnexist"
+
+!macro !defineifexist _FILE_NAME _VAR_NAME _VAR_VALUE
+	!tempfile _TEMPFILE
+	!ifdef NSIS_WIN32_MAKENSIS
+		; Windows - cmd.exe
+		!system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} ${_VAR_VALUE} > "${_TEMPFILE}"'
+	!else
+		; Posix - sh
+		!system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME} ${_VAR_VALUE}" > "${_TEMPFILE}"; fi'
+	!endif
+	!include '${_TEMPFILE}'
+	!delfile '${_TEMPFILE}'
+	!undef _TEMPFILE
+!macroend
+!define !defineifexist "!insertmacro !defineifexist"
diff --git a/packaging/win32/md5dll.dll b/packaging/win32/md5dll.dll
deleted file mode 100644
index abefbb038..000000000
--- a/packaging/win32/md5dll.dll
+++ /dev/null
diff --git a/packaging/win32/messagebox.dll b/packaging/win32/messagebox.dll
deleted file mode 100644
index 97407fa1a..000000000
--- a/packaging/win32/messagebox.dll
+++ /dev/null
diff --git a/packaging/win32/plugins/md5dll.dll b/packaging/win32/plugins/md5dll.dll
new file mode 100644
index 000000000..bde153f70
--- /dev/null
+++ b/packaging/win32/plugins/md5dll.dll
diff --git a/packaging/win32/md5dll.txt b/packaging/win32/plugins/md5dll.txt
index a8d3572c7..a8d3572c7 100644
--- a/packaging/win32/md5dll.txt
+++ b/packaging/win32/plugins/md5dll.txt
diff --git a/packaging/wix/README b/packaging/wix/README
index f40e104e7..a13d4d5c3 100644
--- a/packaging/wix/README
+++ b/packaging/wix/README
@@ -1,25 +1,32 @@
 howto create windows msi installer
 
 you need:
-1. windows installer XML installed and callable from your path
+1. WiX Toolset (aka Windows Installer XML)
    get it from http://wixtoolset.org/
-   Because of a bug in the current version of wix the installer works using version 3.7 only.
+   (3.10 works fine at the time of this writing)
 
 build the installer
 1. build inkscape
 2. open command shell "cmd"
 3. change current directory to inkscape\packaging\wix
-4. set environment variables
-   wixenv.bat
-5. create installer using batch
-   install.bat
+4. set environment variables using
+     wixenv.bat    (adjust paths in the file if necessary!)
+5. create installer using
+     install.bat
 
 when completed there should be inkscape.msi in your path
 
+helpful tips
+- set  CompressionLevel="none"  in inkscape.wxs
+  while experimenting with installer creation
+  (results in huge installer but much faster compilation times)
+
 things still todo
 - detailed explanation what to do for new revisions
 - better filenames (nightly builds versus releases)
 - howto remove python .pyc files after deinstallation
 - localisation into the installer
-   
-theAdib
+- make "Typical" and "Complete" installations actually install different files
+  (at least don't lie to the user by suggesting there would be two different choices)
+- conditionally install localized content according to the users previous feature choices
+  (e.g. only install translated versions of tutorials if the "Tutorials" feature is selected)
diff --git a/packaging/wix/files.py b/packaging/wix/files.py
index ada4d62f2..7034021ac 100644
--- a/packaging/wix/files.py
+++ b/packaging/wix/files.py
@@ -1,19 +1,25 @@
 #!/usr/bin/python
 
+from __future__ import print_function
 
-# list files in directory
 import os
+import re
 import uuid
 
+from helpers import get_inkscape_dist_dir, get_inkscape_locales_and_names
+
 directory_ids = {}
 file_ids = {}
 
 def indent(level):
 	indentstring = ''
 	for i in range(level):
-		indentstring += '    '
+		indentstring += '	'
 	return indentstring
 
+def valid_id(identifier):
+	return identifier.replace('@','_')
+
 def directory(root, breadcrumb, level, exclude=[]):
 	"""
 	list all files and directory recursivly
@@ -34,7 +40,7 @@ def directory(root, breadcrumb, level, exclude=[]):
 		wxs.write(indent(level + 1)+ "<File Id='file" + _id + "' Name='" + file + "' DiskId='1' Source='" + file_key + "' KeyPath='yes' />\n")
 		wxs.write(indent(level)+ "</Component>\n")
 	# then all directories
-	
+
 	dirs = [ f for f in os.listdir(root) if os.path.isdir(os.path.join(root,f)) ]
 	for dir in dirs:
 		directory_key = breadcrumb + '__' + dir
@@ -43,15 +49,32 @@ def directory(root, breadcrumb, level, exclude=[]):
 		wxs.write(indent(level) + "<Directory Id='" + directory_ids[directory_key] + "' Name='" + dir + "'>\n")
 		directory(os.path.join(root, dir), directory_key, level + 1)
 		wxs.write(indent(level) + "</Directory>\n")
-	
-	
-def ComponentGroup(name, condition, level):
+
+def test_conditions(value, conditions):
+	"""
+	check if "value" fullfills any of the "conditions", where a condition can be
+	   - a string that has to be a substring of "value"
+	   - a compiled regex pattern which has to match in "value"
+	"""
+	if not isinstance(conditions, list):
+		conditions = [conditions]
+	for condition in conditions:
+		if isinstance(condition, basestring):
+			if condition in value:
+				return True
+		elif isinstance(condition, type(re.compile(''))):
+			if re.search(condition, value):
+				return True
+	return False
+
+
+def ComponentGroup(name, conditions, level):
 	"""
 	add componentgroup that contain all items from file_ids that match condition
 	remove the matched elements from file_ids
 	"""
 	global file_ids
-	keys = [k for k in file_ids.keys() if condition in k]
+	keys = [k for k in file_ids.keys() if test_conditions(k, conditions)]
 	wxs.write(indent(level) + "<ComponentGroup Id='" + name + "'>\n")
 	for component in keys:
 		wxs.write(indent(level + 1) + "<ComponentRef Id='" + file_ids[component] + "' />\n")
@@ -59,6 +82,12 @@ def ComponentGroup(name, condition, level):
 	for key in keys:
 		del file_ids[key]
 
+# get directory containing the Inkscape distribution files
+inkscape_dist_dir = get_inkscape_dist_dir()
+
+# get locales currently supported by Inkscape (dict of the form {'de': 'German (de)'})
+locales = get_inkscape_locales_and_names()
+
 with open('files.wxs', 'w') as wxs:
 	wxs.write("<!-- do not edit, this file is created by files.py tool any changes will be lost -->\n")
 	wxs.write("<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\n")
@@ -68,23 +97,38 @@ with open('files.wxs', 'w') as wxs:
 	wxs.write(indent(2) + "<Directory Id='TARGETDIR' Name='SourceDir'>\n")
 	wxs.write(indent(3) + "<Directory Id='$(var.ProgramFilesFolder)' Name='PFiles'>\n")
 	wxs.write(indent(4) + "<Directory Id='INSTALLDIR' Name='Inkscape'>\n")
-	print "start parsing ..\..\inkscape"
-	directory('..\..\inkscape', 'inkscape', 5, ['inkscape.dbg', 'inkview.dbg', 'gdb.exe'])
-	print "found %d files" % len(file_ids.keys())
+	print("start parsing files from " + inkscape_dist_dir)
+	directory(inkscape_dist_dir, 'inkscape', 5, ['inkscape.dbg', 'inkview.dbg', 'gdb.exe'])
+	print("found %d files" % len(file_ids.keys()))
 	wxs.write(indent(4) + "</Directory>\n")
 	wxs.write(indent(3) + "</Directory>\n")
-	# link to ProgrmMenu
+	# link to ProgramMenu
 	wxs.write(indent(3) + "<Directory Id='ProgramMenuFolder'>\n")
 	wxs.write(indent(4) + "<Directory Id='ApplicationProgramsFolder' Name='$(var.FullProductName)'/>\n")
 	wxs.write(indent(3) + "</Directory>\n")
 	wxs.write(indent(3) + "<Directory Id='DesktopFolder' Name='Desktop' />\n")
 	wxs.write(indent(2) + "</Directory>\n")
-	ComponentGroup("Examples", 'inkscape\\share\\examples', 2)
+
+	# Python
+	ComponentGroup("Python", 'inkscape\\python\\', 2)
+	# translations and localized content
+	for lang_code in sorted(locales):
+		ComponentGroup("Translation_" + valid_id(lang_code), ['\\' + lang_code + '\\',
+		                                                      re.compile(r'\.' + lang_code + r'\.[a-z]+$')], 2)
+	# other components
+	ComponentGroup("Extensions", 'inkscape\\share\\extensions\\', 2)
+	ComponentGroup("Examples", 'inkscape\\share\\examples\\', 2)
 	ComponentGroup("Tutorials", 'inkscape\\share\\tutorials\\', 2)
-	ComponentGroup("Translations", '\\locale\\', 2)
+	ComponentGroup("Dictionaries", 'inkscape\\lib\\aspell-0.60\\', 2)
+	# everything that is left (which should be the Inkscape core unless inkscape_dist_dir contains unnecessary files or we defined our components poorly)
 	ComponentGroup("AllOther", '', 2)
+
+	# create a FeatureGroup for translations
+	wxs.write(indent(2) + "<FeatureGroup Id='Translations'>\n")
+	for lang_code in sorted(locales):
+		wxs.write(indent(3) + "<Feature Id='Translation_" + valid_id(lang_code) + "' Level='1' Title='" + locales[lang_code] + "' AllowAdvertise='no'>\n")
+		wxs.write(indent(4) + "<ComponentGroupRef Id='Translation_" + valid_id(lang_code) + "' />\n")
+		wxs.write(indent(3) + "</Feature>\n")
+	wxs.write(indent(2) + "</FeatureGroup>\n")
 	wxs.write(indent(1) + "</Fragment>\n")
 	wxs.write("</Wix>\n")
-
-	
-
diff --git a/packaging/wix/helpers.py b/packaging/wix/helpers.py
new file mode 100644
index 000000000..7bd706398
--- /dev/null
+++ b/packaging/wix/helpers.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python

+

+from __future__ import print_function

+

+import os

+import re

+import sys

+

+

+# check where to look for the Inkscape files to bundle

+#    - btool builds used [root]/inkscape

+#    - cmake builds use [root]/build/inkscape unless "DESTDIR" is specified

+def get_inkscape_dist_dir():

+    # fisrt check the environment variable

+    sourcedir = os.getenv('INKSCAPE_DIST_PATH')

+    if sourcedir is None:

+        sourcedir = ''

+    if not os.path.isdir(sourcedir):

+        sourcedir = '..\\..\\inkscape'

+    if not os.path.isdir(sourcedir):

+        sourcedir = '..\\..\\build\\inkscape'

+    if not os.path.isdir(sourcedir):

+        print("could not find inkscape distribution files, please set environment variable 'INKSCAPE_DIST_PATH'")

+        sys.exit(1)

+    return sourcedir

+

+

+# get the full list of available Inkscape UI translations (by looking at available .po files in the /po directory)

+def get_inkscape_locales():

+    files = os.listdir('..\\..\\po')

+    po_files = [file for file in files if file.endswith('.po')]

+    locales = [po_file[0:-3] for po_file in po_files if po_file.endswith('.po')]

+

+    return locales

+

+

+# get the list of available Inkscape UI translations (by parsing inkscape-preferences.cpp)

+def get_inkscape_locales_and_names():

+    re_languages = re.compile(r'Glib::ustring languages\[\] = \{(.+?)\};', re.DOTALL)

+    re_langValues = re.compile(r'Glib::ustring langValues\[\] = \{(.+?)\};', re.DOTALL)

+    re_quotes = re.compile(r'"(.*?)"')

+

+    # get the raw array contents from inkscape-preferences.cpp

+    with open('..\\..\\src\\ui\\dialog\\inkscape-preferences.cpp', 'r') as f:

+        languages = re.search(re_languages, f.read())

+        f.seek(0)

+        langValues = re.search(re_langValues, f.read())

+

+    # split array elements and extract strings

+    if languages and langValues:

+        languages = languages.group(1).split(',')

+        langValues = langValues.group(1).split(',')

+        languages = [re.search(re_quotes, language).group(1) for language in languages]

+        langValues = [re.search(re_quotes, langValue).group(1) for langValue in langValues]

+

+    # return the results as a dict (remove first element which is "System default")

+    if languages and langValues:

+        return dict(zip(langValues[1:], languages[1:]))

+    else:

+        print("Could not get the list of Inkscape translations from inkscape-preferences.cpp")

+        sys.exit(1)

diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs
index 0f1e9f2b9..051c1cfc1 100644
--- a/packaging/wix/inkscape.wxs
+++ b/packaging/wix/inkscape.wxs
@@ -2,21 +2,21 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">

 	<?include version.wxi?>

 

-    <!-- change Product Id for every new version and subversion, do not change UpgradeCode -->

+	<!-- change Product Id for every new version and subversion, do not change UpgradeCode -->

 	<Product Name="$(var.FullProductName)" Id='81922150-317e-4bb0-a31d-ff1c14f707c5' UpgradeCode='4d5fedaa-84a0-48be-bd2a-08246398361a' Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='inkscape.org'>

 

 		<Package Id='*' Keywords='Installer' Description="Inkscape Installer" Comments='inkscape is registered trademark of inkscape.org' Manufacturer='inkscape.org' InstallerVersion='$(var.InstallerVersion)' Platform='$(var.Platform)' Languages='1033' Compressed='yes' SummaryCodepage='1252' />

-        

-		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />

+

+		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" CompressionLevel="high"/>

 		<Property Id='DiskPrompt' Value="inkscape Installation [1]" />

 

 		<Property Id='ALLUSERS' Value="2" />

-        

-        <MajorUpgrade DowngradeErrorMessage="A newer version is already installed." />

-		

+

+		<MajorUpgrade DowngradeErrorMessage="A newer version is already installed." />

+

 		<DirectoryRef Id="ApplicationProgramsFolder">

 			<Component Id="ApplicationShortcut" Guid="37de8ea4-e83a-4e40-8f9c-c6066b78d935" Win64='$(var.Win64)' >

-				<Shortcut Id="ApplicationStartMenuShortcut" 

+				<Shortcut Id="ApplicationStartMenuShortcut"

 						  Name="$(var.FullProductName)"

 						  Description="Inkscape Vector Graphics Application"

 						  Target="[INSTALLDIR]inkscape.exe"

@@ -32,7 +32,7 @@
 		<DirectoryRef Id="DesktopFolder">

 			<Component Id="DesktopShortcut" Guid="3afc08a7-05a1-40cf-90c2-0d6c042bfc41" Win64='$(var.Win64)'>

 				<!-- Shortcut Id="desktopFoobar10" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' Icon="file_inkscape_exe" IconIndex="0" / -->

-				<Shortcut Id="desktopFoobar10" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' />

+				<Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' />

 				<RemoveFolder Id="DesktopFolder" On="uninstall"/>

 				<RegistryValue Root="HKCU" Key="Software\inkscape.org\Inkscape" Name="desktop_installed" Type="integer" Value="1" KeyPath="yes"/>

 			</Component>

@@ -47,60 +47,76 @@
 					<Extension Id='svgz' ContentType='image/svg+xml'>

 						<Verb Id='open' Command='Open with Inkscape' TargetFile='file_inkscape_exe' Argument='"%1"' />

 					</Extension>

-

 				</ProgId>

 			</Component>

 		</DirectoryRef>

 

-

-

-		<Feature Id='Complete' Title="$(var.FullProductName)" Description='The complete Package' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'  Absent="disallow" AllowAdvertise='no'>

-			<!--

-			<Feature Id='MainProgram' Level='1' Title='inkscape Application' Description='the inkscape Application' Absent="disallow" AllowAdvertise='no'>

-				<ComponentRef Id='MainExecutable' />

-			</Feature>

--->

-			<!--

-			<Feature Id='MainProgram' Level='1' Title='inkscape Application' Description='the inkscape Application' Absent="disallow" AllowAdvertise='no'>

-			-->

+		<Feature Id='Inkscape' Level='1' Absent="disallow" Display="expand" ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'

+				 Title="$(var.FullProductName)"

+				 Description='Inkscape core files, shortcuts and file extension'>

+			<!-- core files, i.e. everything that does not fit into any of the other features -->

 			<ComponentGroupRef Id='AllOther' />

-			<!--

-			</Feature>

-			-->

 

-			<!-- shortcuts -->

-			<Feature Id='ApplicationShortcut' Level='1' Title='Start Menu entry' Description='an entry in the start Menu' AllowAdvertise='no'>

+			<!-- shortcuts and file extensions -->

+			<Feature Id='ApplicationShortcut' Level='1' AllowAdvertise='no'

+					 Title='Start Menu entry'

+					 Description='Create a link in the start menu.'>

 				<ComponentRef Id='ApplicationShortcut' />

 			</Feature>

-

-			<Feature Id='DesktopShortcut' Level='1' Title='Desktop link' Description='an link on the desktop' AllowAdvertise='no'>

+			<Feature Id='DesktopShortcut' Level='1' AllowAdvertise='no'

+					 Title='Desktop shortcut'

+					 Description='Create a link on the desktop.' >

 				<ComponentRef Id='DesktopShortcut' />

 			</Feature>

-

-			<Feature Id='RegisterExtension' Level='1' Title='Register file extension' Description='register .svg and .svgz file extension in explorer context menu' AllowAdvertise='no'>

+			<Feature Id='RegisterExtension' Level='1' AllowAdvertise='no'

+					 Title='Register file extensions'

+					 Description='Register SVG files (.svg and .svgz) with Inkscape and add entries in Explorer context menu.'>

 				<ComponentRef Id='RegisterExtension' />

 			</Feature>

+		</Feature>

 

-			<Feature Id='Examples' Level='1' Title='Examples' Description='examples as svg' AllowAdvertise='no'>

-				<ComponentGroupRef Id='Examples' />

-			</Feature>

+		<Feature Id='Python' Level='1' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'

+				 Title='Python 2.7'

+				 Description='Bundled Distribution of Python 2.7 including modules required to run Inkscape extensions.'>

+			<ComponentGroupRef Id='Python' />

+		</Feature>

 

-			<Feature Id='Translations' Level='1' Title='Translations' Description='translations' AllowAdvertise='no'>

-				<ComponentGroupRef Id='Translations' />

+		<Feature Id='Additional' Level='1' ConfigurableDirectory='INSTALLDIR'  AllowAdvertise='no'

+				 Title="Additional files"

+				 Description='Additional components to enhance Inkscape functionality and provide supplemental documentation.'>

+			<Feature Id='Extensions' Level='1' AllowAdvertise='no'

+					 Title='Extensions (recommended)'

+					 Description='Inkscape extensions (including many import and export plugins). Requires Python.'>

+				<ComponentGroupRef Id='Extensions' />

 			</Feature>

-

-			<Feature Id='Tutorials' Level='1' Title='Tutorials' Description='tutorials as svg' AllowAdvertise='no'>

+			<Feature Id='Dictionaries' Level='1' AllowAdvertise='no'

+					 Title='Dictionaries'

+					 Description='GNU Aspell dictionaries of some common languages for spell checking in Inkscape' >

+				<ComponentGroupRef Id='Dictionaries' />

+			</Feature>

+			<Feature Id='Examples' Level='1' AllowAdvertise='no'

+					 Title='Examples'

+					 Description='Example files highlighting some of the features of the SVG file format and Inkscape functionality.' >

+				<ComponentGroupRef Id='Examples' />

+			</Feature>

+			<Feature Id='Tutorials' Level='1' AllowAdvertise='no'

+					 Title='Tutorials'

+					 Description='Tutorials on how to use specific Inkscape features.' >

 				<ComponentGroupRef Id='Tutorials' />

 			</Feature>

-			<!--

-			<ComponentRef Id='ProgramMenuDir' />

--->

 		</Feature>

+

+		<Feature Id='Translations' Level='1' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'

+				 Title='Translations'

+				 Description='Translations and localized content for Inkscape. Note: Some translations might be incomplete, translators welcome!' >

+			<FeatureGroupRef Id='Translations' />

+		</Feature>

+

 		<!-- set license text -->

 		<WixVariable Id="WixUILicenseRtf" Value="gpl-2.0.rtf" />

 		<!-- set dialog custom bitmaps -->

 		<WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dialog.bmp"/>

-		<WixVariable Id="WixUIBannerBmp" Value="Bitmaps\banner.bmp"/>	

+		<WixVariable Id="WixUIBannerBmp" Value="Bitmaps\banner.bmp"/>

 

 		<UIRef Id="WixUI_Mondo" />

 		<UIRef Id="WixUI_ErrorProgressText" />

diff --git a/packaging/wix/install.bat b/packaging/wix/install.bat
index 1b42a596b..f0dd0bdee 100644
--- a/packaging/wix/install.bat
+++ b/packaging/wix/install.bat
@@ -1,9 +1,11 @@
 

 @echo build files.wxs

 python files.py

+@if NOT %ERRORLEVEL% == 0 goto theend

 

 @echo create version information

 for /f "tokens=*" %%a in ('python version.py') do (set INKSCAPE_VER=%%a)

+@if NOT %ERRORLEVEL% == 0 goto theend

 

 @echo call wix compiler ...

 candle inkscape.wxs -ext WiXUtilExtension

@@ -27,6 +29,6 @@ pause the program is now installed. press any key to run uninstaller ...
 @echo deinstall ...

 msiexec /x inkscape-%INKSCAPE_VER%.msi

 

-@echo ... finished

 

 :theend

+@echo ... finished
\ No newline at end of file
diff --git a/packaging/wix/version.py b/packaging/wix/version.py
index dc5e06de9..a7ffebaa0 100644
--- a/packaging/wix/version.py
+++ b/packaging/wix/version.py
@@ -1,8 +1,12 @@
 #!/usr/bin/python

 

+from __future__ import print_function

+

 import os

 import struct

 

+from helpers import get_inkscape_dist_dir

+

 version = ''

 versionstr = ''

 architecture = ''

@@ -27,7 +31,10 @@ def is64bitArchitecture(filename):
 			return True

 	return False

 

-if is64bitArchitecture('..\..\inkscape\inkscape.exe'):

+#get directory containing the inkscape distribution files

+inkscape_dist_dir = get_inkscape_dist_dir()

+

+if is64bitArchitecture(inkscape_dist_dir + '\\inkscape.exe'):

 	architecture = '-x64'

 else:

 	architecture = ''

@@ -44,7 +51,7 @@ with open('..\..\src\inkscape.rc', 'r') as rc:
 			versionstr = versionstr.replace('"', '')

 			versionstr = versionstr.replace("'", "")

 			# version = version.replace("+", "_")

-			print versionstr + architecture

+			print(versionstr + architecture)

 		if 'versioninfo' in line.lower():

 			isversioninfo = True

 		if 'begin' in line.lower():

diff --git a/packaging/wix/wixenv.bat b/packaging/wix/wixenv.bat
index 2cddd7146..106898683 100644
--- a/packaging/wix/wixenv.bat
+++ b/packaging/wix/wixenv.bat
@@ -1,19 +1,9 @@
-@echo Setting environment variables for creating msi installer

+@echo Setting environment variables for creating msi installer (adjust if necesssary!)

 

-@echo detect OS version

-ver | findstr /i "6\.1\." > nul

-IF %ERRORLEVEL% EQU 0 goto win7

-

-@rem all other cases

-IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.9\bin

-IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs

-goto setpath

-

-:win7

-IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.9\bin

+IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.10\bin

 IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs

 

-:setpath

-set PATH=%DEVLIBS_PATH%\python;%WIX_PATH%;%PATH%

+rem uncomment and adjust the line below if your Inkscape distribution files are in a non-standard location

+rem IF "%INKSCAPE_DIST_PATH%"=="" set INKSCAPE_DIST_PATH=..\..\build\inkscape

 

-:end

+set PATH=%DEVLIBS_PATH%\python;%WIX_PATH%;%PATH%
\ No newline at end of file