Merge branch 'master' of https://github.com/Amebis/MSIBuild

# Conflicts: # UI/Makefile
2016-05-16 12:29:48 +02:00 · 2016-05-16 12:29:48 +02:00 · 72bbc4bfe6
commit 72bbc4bfe6
parent e296098c6d ba78c3148e
6 changed files with 6277 additions and 3767 deletions
--- a/UI/Makefile
+++ b/UI/Makefile
@ -836,18 +836,18 @@ ExecuteAction		1300
 <<NOKEEP


-#######################################################################
-## ListBox
-#
-#All :: "$(LANG).$(PLAT).$(CFG).ListBox-1.idt"
-#
-#"$(LANG).$(PLAT).$(CFG).ListBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-#	-if exist $@ del /f /q $@
-#	move /y << $@ > NUL
-#Property	Order	Value	Text
-#s$(MSIBUILD_LENGTH_ID)	i2	s64	L64
-#ListBox	Property	Order
-#<<NOKEEP
+######################################################################
+# ListBox
+
+All :: "$(LANG).$(PLAT).$(CFG).ListBox-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).ListBox-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Property	Order	Value	Text
+s$(MSIBUILD_LENGTH_ID)	i2	s64	L64
+ListBox	Property	Order
+<<NOKEEP


 #######################################################################
--- a/locale/MSIBuild.pot
+++ b/locale/MSIBuild.pot
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po