[dia/dia-0-97] Updates from master branch, cosmetic updates.

[Steffen Macke <sdteffen src gnome org>]

commit 66e629eb5dd0724cb3fc295fccbb24a3674ec740
Author: Steffen Macke <sdteffen sdteffen de>
Date:   Tue Mar 25 17:45:05 2014 +0100

    Updates from master branch, cosmetic updates.

 installer/win32/dia.nsi |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/installer/win32/dia.nsi b/installer/win32/dia.nsi
index 59540b7..b22a879 100644
--- a/installer/win32/dia.nsi
+++ b/installer/win32/dia.nsi
@@ -1,9 +1,9 @@
 ; Dia -- an diagram creation/manipulation program
-; Copyright (C) 1998-2011 Alexander Larsson, Lars Clausen and others
+; Copyright (C) 1998-2010 Alexander Larsson, Lars Clausen and others
 ;  
 ; dia-installer.nsi : Nullsoft Installation System (NSIS) script
 ; Copyright (C) 2000-2004 Herman Bloggs, Steffen Macke
-; Copyright (C) 2005-2011 Steffen Macke <sdteffen sdteffen de>
+; Copyright (C) 2005-2014 Steffen Macke <sdteffen sdteffen de>
 ;  
 ; This program is free software; you can redistribute it and/or modify
 ; it under the terms of the GNU General Public License as published by
@@ -103,7 +103,7 @@ XPStyle On
   
 VIAddVersionKey "ProductName" "Dia for Windows"
 VIAddVersionKey "CompanyName" "The Dia Developers"
-VIAddVersionKey "LegalCopyright" "(c) 2003-2011 Alexander Larsson and others"
+VIAddVersionKey "LegalCopyright" "(c) 2003-2014 Alexander Larsson and others"
 VIAddVersionKey "FileDescription" "Dia for Windows Installer"
 VIAddVersionKey "FileVersion" "0.97.2.0"
 VIProductVersion "0.97.2.0"
@@ -158,10 +158,10 @@ VIProductVersion "0.97.2.0"
   ;; in alphabetical order (at least the strings actually displayed
   ;; will be).
 
+  !insertmacro MUI_LANGUAGE "English"
   !insertmacro MUI_LANGUAGE "Basque"
   !insertmacro MUI_LANGUAGE "Czech"
   !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "English"
   !insertmacro MUI_LANGUAGE "French"
   !insertmacro MUI_LANGUAGE "Finnish"
   !insertmacro MUI_LANGUAGE "Galician"
@@ -192,6 +192,7 @@ VIProductVersion "0.97.2.0"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "GERMAN" "locale\german.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "FINNISH" "locale\fi.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "HUNGARIAN" "locale\hungarian.nsh"
+#  !insertmacro DIA_MACRO_INCLUDE_LANGFILE "ROMANIAN" "locale\ro.nsh"
 #  !insertmacro DIA_MACRO_INCLUDE_LANGFILE "KOREAN" "locale\ko.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "PORTUGUESE" "locale\pt.nsh"
   !insertmacro DIA_MACRO_INCLUDE_LANGFILE "SIMPCHINESE" "locale\zh.nsh"
@@ -282,15 +283,15 @@ ${File} "..\..\" "COPYING"
 ${SetOutPath} "$INSTDIR\bin"
 ; jEdit replacement: (^.*\\)(.*)$ 
 ; \${File} "$1" "$2"
-${File} "..\..\build\win32\bin\" "dia.exe"
-${File} "..\..\build\win32\bin\" "diaw.exe"
+${File} "..\..\app\" "dia.exe"
+${File} "..\..\app\" "diaw.exe"
 ${File} "..\..\app\" "dia-win-remote.exe"
-${File} "..\..\build\win32\bin\" "dia-app.dll"
+${File} "..\..\app\" "dia-app.dll"
 ${File} "..\..\..\bin\" "libart_lgpl_2-2.dll"
 ${File} "..\..\..\bin\" "libcairo-2.dll"
-${File} "..\..\build\win32\bin\" "libdia.dll"
+${File} "..\..\lib\" "libdia.dll"
 ${File} "..\..\..\bin\" "iconv.dll"
-${File} "..\..\..\bin\" "libintl.dll"
+${File} "..\..\..\bin\" "intl.dll"
 ${File} "..\..\..\bin\" "libxml2.dll"
 ${File} "..\..\..\bin\" "libxslt.dll"
 ${SetOutPath} "$INSTDIR\etc"
@@ -412,8 +413,10 @@ ${File} "..\..\shapes\Assorted\" "sun.png"
 ${File} "..\..\shapes\Assorted\" "sun.shape"
 ${File} "..\..\shapes\Assorted\" "trapezoid.png"
 ${File} "..\..\shapes\Assorted\" "trapezoid.shape"
-${File} "..\..\shapes\Assorted\" "triangle-isoceles.png"
-${File} "..\..\shapes\Assorted\" "triangle-isoceles.shape"
+Delete "$INSTDIR\shapes\Assorted\triangle-isoceles.png"
+Delete "$INSTDIR\shapes\Assorted\triangle-isoceles.shape"
+${File} "..\..\shapes\Assorted\" "triangle-isosceles.png"
+${File} "..\..\shapes\Assorted\" "triangle-isosceles.shape"
 ${File} "..\..\shapes\Assorted\" "triangle-rightangle.png"
 ${File} "..\..\shapes\Assorted\" "triangle-rightangle.shape"
 ${SetOutPath} "$INSTDIR\shapes\BPMN"
@@ -699,6 +702,10 @@ ${File} "..\..\shapes\Circuit\" "vresistor_de.png"
 ${File} "..\..\shapes\Circuit\" "vzener.png"
 ${File} "..\..\shapes\Circuit\" "vzener.shape"
 ${File} "..\..\shapes\Circuit\" "vzener.png"
+${File} "..\..\shapes\Circuit\" "xtal_h.png"
+${File} "..\..\shapes\Circuit\" "xtal_h.shape"
+${File} "..\..\shapes\Circuit\" "xtal_v.png"
+${File} "..\..\shapes\Circuit\" "xtal_v.shape"
 ${SetOutPath} "$INSTDIR\shapes\Cisco"
 ${File} "..\..\shapes\Cisco\" "1000.png"
 ${File} "..\..\shapes\Cisco\" "1000.shape"
@@ -2029,15 +2036,6 @@ ${File} "..\..\shapes\Pneumatic\" "seijack.png"
 ${File} "..\..\shapes\Pneumatic\" "seojack.png"
 ${File} "..\..\shapes\Pneumatic\" "seojack.shape"
 ${File} "..\..\shapes\Pneumatic\" "seojack.png"
-${SetOutPath} "$INSTDIR\shapes\RDP"
-${File} "..\..\shapes\RDP\" "place.png"
-${File} "..\..\shapes\RDP\" "place.shape"
-${File} "..\..\shapes\RDP\" "place_marquee.png"
-${File} "..\..\shapes\RDP\" "place_marquee.shape"
-${File} "..\..\shapes\RDP\" "transition.png"
-${File} "..\..\shapes\RDP\" "transition.shape"
-${File} "..\..\shapes\RDP\" "t_transition.png"
-${File} "..\..\shapes\RDP\" "t_transition.shape"
 ${SetOutPath} "$INSTDIR\shapes\SDL"
 ${File} "..\..\shapes\SDL\" "block.png"
 ${File} "..\..\shapes\SDL\" "block.shape"
@@ -2342,6 +2340,10 @@ ${File} "..\..\data\" "integrated-ui.xml"
 ${File} "..\..\data\" "popup-ui.xml"
 ${File} "..\..\data\" "toolbar-ui.xml"
 ${File} "..\..\data\" "toolbox-ui.xml"
+${File} "..\..\data\" "sheets-edit-dialog.xml"
+${File} "..\..\data\" "sheets-main-dialog.xml"
+${File} "..\..\data\" "sheets-new-dialog.xml"
+${File} "..\..\data\" "sheets-remove-dialog.xml"
 
 !ifdef DIA_INCLUDE_GTK
 ${SetOutPath} "$INSTDIR\bin"
@@ -2378,7 +2380,7 @@ ${File} "..\..\..\bin\" "libpangocairo-1.0-0.dll"
 ${File} "..\..\..\bin\" "libpangoft2-1.0-0.dll"
 ${File} "..\..\..\bin\" "libpangowin32-1.0-0.dll"
 ;${File} "..\..\..\bin\" "libpng12.dll"
-${File} "..\..\..\bin\" "libpng14-14.dll"
+${File} "..\..\..\bin\" "libpng12-0.dll"
 ${File} "..\..\..\bin\" "librsvg-2-2.dll"
 ;${File} "..\..\..\bin\" "librle3.dll"
 ${File} "..\..\..\bin\" "libtiff3.dll"
@@ -2535,6 +2537,8 @@ Section $(TRANSLATIONS_SECTION_TITLE) SecTranslations
   ${File} "..\..\build\win32\locale\en_CA\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\en_GB\LC_MESSAGES"
   ${File} "..\..\build\win32\locale\en_GB\LC_MESSAGES\" "dia.mo"
+  #${SetOutPath} "$INSTDIR\locale\eo\LC_MESSAGES"
+  #${File} "..\..\build\win32\locale\eo\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\es\LC_MESSAGES"
   ${File} "..\..\build\win32\locale\es\LC_MESSAGES\" "dia.mo"
   ${SetOutPath} "$INSTDIR\locale\eu\LC_MESSAGES"