[PATCH 3 of 3] merge

[Wald Commits]

# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1407245672 -7200
# Node ID 8dc9b2cd20d4274501aad93e33effba0f2823c92
# Parent  478bc3f42a4eb0b62caa67c20856923d15bb3b02
# Parent  3f23130b16b23907dfdfc9b439c40e778f7ed996
merge

diff -r 478bc3f42a4e -r 8dc9b2cd20d4 packaging/linux-installer.inc.in
--- a/packaging/linux-installer.inc.in	Tue Aug 05 15:34:00 2014 +0200
+++ b/packaging/linux-installer.inc.in	Tue Aug 05 15:34:32 2014 +0200
@@ -355,7 +355,7 @@
 ------------------------------------------------------------------------
 
    TrustBridge - Installer
-   Version ${instcfg[VERSION]}
+   Version ${instcfg[VERSION]} (Testversion)
 
 ------------------------------------------------------------------------
 EOF
diff -r 478bc3f42a4e -r 8dc9b2cd20d4 packaging/trustbridge.nsi
--- a/packaging/trustbridge.nsi	Tue Aug 05 15:34:00 2014 +0200
+++ b/packaging/trustbridge.nsi	Tue Aug 05 15:34:32 2014 +0200
@@ -70,10 +70,12 @@
 !define MUI_UNICON "resources\uninstall.ico"
 
 ; MUI welcome page text
-!define MUI_WELCOMEPAGE_TITLE  "Willkommen zur Installation"
+!define MUI_WELCOMEPAGE_TITLE  "Willkommen zur Installation von TrustBridge ${version_number}"
 ;!define MUI_WELCOMEPAGE_TITLE_3LINES
 !define MUI_WELCOMEPAGE_TEXT "${productname} ist eine Anwendung \
-um Wurzelzertifikate auf ihrem System zu installieren und aktuell zu halten."
+um Wurzelzertifikate auf ihrem System zu installieren und aktuell zu halten. \
+$\r$\n$\r$\n$\r$\n$\r$\n \
+Achtung: Dies ist eine Testversion!"
 
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE