Attachment 6588 Details for Bug 37488

[patch] Patch

bug37488.patch (text/plain), 65.51 KB, created by Alexander Kläser on 2015-01-09 14:29 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kläser

Created: 2015-01-09 14:29 CET

Size: 65.51 KB

patch

obsolete

>Index: debian/univention-system-setup-boot.postrm
>===================================================================
>--- debian/univention-system-setup-boot.postrm	(Revision 57193)
>+++ debian/univention-system-setup-boot.postrm	(Arbeitskopie)
>@@ -42,7 +42,7 @@
> 	ucr set apache2/startsite="$system_setup_prev_apache2_startsite"
> 	ucr unset system/setup/prev/apache2/startsite
> 	if [ -x /etc/init.d/apache2 ]; then
>-		/etc/init.d/apache2 restart
>+		/etc/init.d/apache2 reload
> 	fi
> fi
> 
>Index: umc/js/de.po
>===================================================================
>--- umc/js/de.po	(Revision 57193)
>+++ umc/js/de.po	(Arbeitskopie)
>@@ -3,7 +3,7 @@
> msgstr ""
> "Project-Id-Version: univention-management-console-module-setup\n"
> "Report-Msgid-Bugs-To: packages@univention.de\n"
>-"POT-Creation-Date: 2014-12-03 13:55+0100\n"
>+"POT-Creation-Date: 2015-01-09 13:40+0100\n"
> "PO-Revision-Date: 2012-02-20 11:34+0100\n"
> "Last-Translator: Univention GmbH <packages@univention.de>\n"
> "Language-Team: Univention GmbH <packages@univention.de>\n"
>@@ -12,11 +12,30 @@
> "Content-Type: text/plain; charset=UTF-8\n"
> "Content-Transfer-Encoding: 8bit\n"
> 
>-#: umc/js/setup/ApplianceWizard.js:468
>+#: umc/js/setup/ApplianceWizard.js:298
>+#, python-format
>+msgid "%s setup"
>+msgstr "%s Einrichtung"
>+
>+#: umc/js/setup/ApplianceWizard.js:300
>+#, python-format
>+msgid "%s setup - An error occurred"
>+msgstr "%s Einrichtung - Ein Fehler ist aufgetreten"
>+
>+#: umc/js/setup/ApplianceWizard.js:299
>+#, python-format
>+msgid "%s setup successful"
>+msgstr "%s Einrichtung erfolgreich"
>+
>+#: umc/js/setup/ApplianceWizard.js:392
>+msgid "(Request address again)"
>+msgstr "(Adresse erneut anfordern)"
>+
>+#: umc/js/setup/ApplianceWizard.js:499
> msgid "(configure proxy settings)"
> msgstr "(Einrichten von Proxy-Einstellungen)"
> 
>-#: umc/js/setup/ApplianceWizard.js:1217
>+#: umc/js/setup/ApplianceWizard.js:1248
> msgid "Unknown"
> msgstr "Unbekannt"
> 
>@@ -58,7 +77,7 @@
> "logisch mit nur einem oder mehreren physikalischen NetzwerkgerÃ¤ten zu "
> "trennen."
> 
>-#: umc/js/setup/ApplianceWizard.js:1587
>+#: umc/js/setup/ApplianceWizard.js:1622
> msgid ""
> "After clicking on the button Finish the system will be prepared "
> "for the first boot procedure and will be rebooted."
>@@ -66,15 +85,8 @@
> "Nach dem Klicken auf die SchaltflÃ¤che Fertigstellen wird das "
> "System auf den ersten Bootvorgang vorbereitet und neu gestartet."
> 
>-#: umc/js/setup/ApplianceWizard.js:1589
>+#: umc/js/setup/ApplianceWizard.js:852
> msgid ""
>-"Click now on the button Finish to complete the setup process."
>-msgstr ""
>-"Klicken Sie jetzt auf die SchaltflÃ¤che Fertigstellen, um die "
>-"Einrichtung abzuschlieÃen."
>-
>-#: umc/js/setup/ApplianceWizard.js:821
>-msgid ""
> "Enter the name of your organization and an e-mail address to activate UCS."
> ""
> msgstr ""
>@@ -81,7 +93,7 @@
> "Geben Sie den Namen Ihrer Organisation und eine E-Mail-Adresse fÃ¼r die "
> "Aktivierung von UCS ein."
> 
>-#: umc/js/setup/ApplianceWizard.js:577
>+#: umc/js/setup/ApplianceWizard.js:608
> msgid ""
> "Enter the name of your organization, an e-mail address to activate UCS "
> "and a password for your Administrator account.The password is "
>@@ -94,7 +106,15 @@
> "Administrator-Konto als auch fÃ¼r den lokalen Superuser root verwendet."
> ""
> 
>-#: umc/js/setup/ApplianceWizard.js:1972
>+#: umc/js/setup/ApplianceWizard.js:1624
>+msgid ""
>+"It is mandatory to click on Finish for putting UCS into operation "
>+"and completing the setup process."
>+msgstr ""
>+"Es ist erforderlich auf Fertigstellen zu klicken, um UCS in "
>+"Betrieb zu nehmen und die Einrichtung abzuschlieÃen."
>+
>+#: umc/js/setup/ApplianceWizard.js:2007
> #, python-format
> msgid ""
> "One or more network interfaces could not obtain an IP address via DHCP. "
>@@ -108,7 +128,7 @@
> "ihre DHCP-Konfiguration an oder bestÃ¤tigen Sie die Nutzung der privaten "
> "Adresse(n)."
> 
>-#: umc/js/setup/ApplianceWizard.js:719
>+#: umc/js/setup/ApplianceWizard.js:750
> msgid ""
> "Select UCS software components for installation on this system. This step "
> "can be skipped; the components are also available in the Univention App "
>@@ -121,16 +141,8 @@
> "p>Software vor Drittanbietern (bspw. Groupware) kann ebenfalls Ã¼ber das "
> "Univention App Center installiert werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:291
>+#: umc/js/setup/ApplianceWizard.js:2011
> msgid ""
>-"Welcome to Univention Corporate Server (UCS).A few questions are "
>-"needed to complete the configuration process."
>-msgstr ""
>-"Herzlich willkommen bei Univention Corporate Server (UCS). Ein paar "
>-"Fragen sind notwendig, um die Einrichtung abzuschlieÃen."
>-
>-#: umc/js/setup/ApplianceWizard.js:1976
>-msgid ""
> "With the current settings no internet access is available.</"
> "p>Because of this some functions like the App Center or software-updates "
> "will not be accessible"
>@@ -139,27 +151,27 @@
> "Dadurch werden einige Funktionen wie zum Beispiel das App Center oder "
> "Software-Aktualisierungen nicht zur VerfÃ¼gung stehen."
> 
>-#: umc/js/setup/ApplianceWizard.js:1215
>+#: umc/js/setup/ApplianceWizard.js:1246
> #, python-format
> msgid "<tr><td>City:</td><td>%s</td></tr>"
> msgstr "<tr><td>Stadt:</td><td>%s</td></tr>"
> 
>-#: umc/js/setup/ApplianceWizard.js:1235
>+#: umc/js/setup/ApplianceWizard.js:1266
> #, python-format
> msgid "<tr><td>Default locale:</td><td>%s</td></tr>"
> msgstr "<tr><td>Standard-Systemsprache:</td><td>%s</td></tr>"
> 
>-#: umc/js/setup/ApplianceWizard.js:1264
>+#: umc/js/setup/ApplianceWizard.js:1295
> #, python-format
> msgid "<tr><td>Keyboard layout:</td><td>%s</td></tr>"
> msgstr "<tr><td>Tastaturlayout:</td><td>%s</td></tr>"
> 
>-#: umc/js/setup/ApplianceWizard.js:1218
>+#: umc/js/setup/ApplianceWizard.js:1249
> #, python-format
> msgid "<tr><td>Timezone:</td><td>%s</td></tr>"
> msgstr "<tr><td>Zeitzone:</td><td>%s</td></tr>"
> 
>-#: umc/js/setup/ApplianceWizard.js:549
>+#: umc/js/setup/ApplianceWizard.js:580
> msgid ""
> "A DC backup is the fallback system for the UCS DC master and can take over "
> "the role of the DC master permanently. It is recommended to use at least one "
>@@ -169,11 +181,15 @@
> "des DC Masters langfristig Ã¼bernehmen. Es ist empfohlen, mindestens einen DC "
> "Backup in der DomÃ¤ne zu verwenden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1383
>+#: umc/js/setup/ApplianceWizard.js:302
>+msgid "A few questions are needed to complete the configuration process."
>+msgstr "Ein paar Fragen sind notwendig, um die Einrichtung abzuschlieÃen."
>+
>+#: umc/js/setup/ApplianceWizard.js:1414
> msgid "A new UCS domain will be created."
> msgstr "Eine neue UCS-DomÃ¤ne wird erstellt."
> 
>-#: umc/js/setup/ApplianceWizard.js:945
>+#: umc/js/setup/ApplianceWizard.js:976
> msgid ""
> "A proxy address needs to be specified in the format: http://proxy."
> "mydomain.intranet:3128 Proxy access with username and password may "
>@@ -185,7 +201,7 @@
> "Password kann das folgenden Format verwendet werden: http://benutzername:"
> "passwort@proxy.meinedomaene.intranet:3128"
> 
>-#: umc/js/setup/ApplianceWizard.js:939
>+#: umc/js/setup/ApplianceWizard.js:970
> msgid ""
> "A valid e-mail address allows to activate the UCS system for using the "
> "Univention App Center. An e-mail with a personalized license key will then "
>@@ -198,15 +214,15 @@
> "werden. Die Lizenz kann Ã¼ber den Lizenzdialog der Univention Management "
> "Console eingespielt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:576 umc/js/setup/ApplianceWizard.js:1417
>+#: umc/js/setup/ApplianceWizard.js:607 umc/js/setup/ApplianceWizard.js:1448
> msgid "Account information"
> msgstr "Kontoinformationen"
> 
>-#: umc/js/setup/ApplianceWizard.js:605
>+#: umc/js/setup/ApplianceWizard.js:636
> msgid "Active Directory join information"
> msgstr "Active Directory-Kontoinformationen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1274
>+#: umc/js/setup/ApplianceWizard.js:1305
> msgid "Adapt settings"
> msgstr "Einstellungen anpassen"
> 
>@@ -230,16 +246,16 @@
> msgid "Additional options for this network interface"
> msgstr "Weitere Optionen fÃ¼r dieses NetzwerkgerÃ¤t"
> 
>-#: umc/js/setup/ApplianceWizard.js:1444
>+#: umc/js/setup/ApplianceWizard.js:1475
> msgid "Address configuration"
> msgstr "Adresskonfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:1453
>+#: umc/js/setup/ApplianceWizard.js:1484
> #, python-format
> msgid "Address for %s"
> msgstr "Adresse fÃ¼r %s"
> 
>-#: umc/js/setup/ApplianceWizard.js:610
>+#: umc/js/setup/ApplianceWizard.js:641
> msgid ""
> "Address of Active Directory domain controller or name of Active Directory "
> "domain"
>@@ -247,7 +263,7 @@
> "Adresse des Active Directory-DomÃ¤nencontrollers oder Name der Active "
> "Directory-DomÃ¤ne"
> 
>-#: umc/js/setup/ApplianceWizard.js:1996 umc/js/setup/ApplianceWizard.js:2045
>+#: umc/js/setup/ApplianceWizard.js:2031 umc/js/setup/ApplianceWizard.js:2080
> msgid "Adjust settings"
> msgstr "Einstellungen anpassen"
> 
>@@ -255,11 +271,11 @@
> msgid "Advanced configuration"
> msgstr "Erweiterte Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:461
>+#: umc/js/setup/ApplianceWizard.js:492
> msgid "Alternate DNS server"
> msgstr "Alternativer DNS-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:1539
>+#: umc/js/setup/ApplianceWizard.js:1570
> msgid ""
> "Alternatively, you may click on the button Finish to exit the wizard "
> "and resolve the described problems at a later point."
>@@ -268,7 +284,7 @@
> "Einrichtungsassistenten zu beenden und die beschriebenen Probleme zu einem "
> "spÃ¤teren Zeitpunkt zu beheben."
> 
>-#: umc/js/setup/ApplianceWizard.js:1529 umc/js/setup/ApplianceWizard.js:1544
>+#: umc/js/setup/ApplianceWizard.js:1560 umc/js/setup/ApplianceWizard.js:1575
> msgid ""
> "Alternatively, you may click on the button Finish to exit the wizard "
> "and resolve the described problems via Univention Management Console."
>@@ -277,7 +293,7 @@
> "Einrichtungsassistenten zu beenden und die beschriebenen Probleme mittels "
> "Univention Management Console zu beheben."
> 
>-#: umc/js/setup.js:151 umc/js/setup.js:495
>+#: umc/js/setup.js:152 umc/js/setup.js:497
> msgid "Apply changes"
> msgstr "Ãnderungen Ã¼bernehmen"
> 
>@@ -289,7 +305,7 @@
> "Mindestens eine IP-Adresse muss angegeben werden oder DHCP oder SLAAC muss "
> "eingeschaltet sein."
> 
>-#: umc/js/setup/ApplianceWizard.js:1784
>+#: umc/js/setup/ApplianceWizard.js:1819
> msgid "At least one network device needs to be properly configured."
> msgstr "Wenigstens ein NetzwerkgerÃ¤t muss konfiguriert werden."
> 
>@@ -341,9 +357,9 @@
> msgid "Business unit"
> msgstr "Abteilung"
> 
>-#: umc/js/setup/InterfaceGrid.js:131 umc/js/setup/ApplianceWizard.js:1980
>-#: umc/js/setup/ApplianceWizard.js:2152 umc/js/setup.js:144
>-#: umc/js/setup.js:492
>+#: umc/js/setup/InterfaceGrid.js:131 umc/js/setup/ApplianceWizard.js:2015
>+#: umc/js/setup/ApplianceWizard.js:2187 umc/js/setup.js:145
>+#: umc/js/setup.js:494
> msgid "Cancel"
> msgstr "Abbrechen"
> 
>@@ -384,7 +400,7 @@
> "zur Folge haben. Dies kann ernsthafte Auswirkungen haben, sollte sich das "
> "System im Produktiveinsatz befinden."
> 
>-#: umc/js/setup.js:283
>+#: umc/js/setup.js:285
> #, python-format
> msgid ""
> "Changing network settings is disabled due to specific UVMM settings. See %s "
>@@ -393,7 +409,7 @@
> "Ãndern von Netzwerkeinstellungen ist durch spezifische UVMM Einstellungen "
> "deaktiviert. FÃ¼r weitere Informationen siehe %s."
> 
>-#: umc/js/setup.js:287
>+#: umc/js/setup.js:289
> msgid ""
> "Changing network settings is disabled. It can be re enabled by unsetting the "
> "UCR variable \"umc/modules/setup/network/disabled/by\"."
>@@ -406,15 +422,15 @@
> msgid "Choose interface type"
> msgstr "WÃ¤hle NetzwerkgerÃ¤tetyp aus"
> 
>-#: umc/js/setup/ApplianceWizard.js:295
>+#: umc/js/setup/ApplianceWizard.js:320
> msgid "Choose your language"
> msgstr "WÃ¤hlen Sie Ihre Sprache aus"
> 
>-#: umc/js/setup/ApplianceWizard.js:323
>+#: umc/js/setup/ApplianceWizard.js:348
> msgid "Choose your system's localization settings."
> msgstr "WÃ¤hlen Sie die Systemsprache."
> 
>-#: umc/js/setup.js:134 umc/js/setup.js:139
>+#: umc/js/setup.js:135 umc/js/setup.js:140
> msgid "Close"
> msgstr "SchlieÃen"
> 
>@@ -426,7 +442,7 @@
> msgid "Configuration"
> msgstr "Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:1814 umc/js/setup.js:565
>+#: umc/js/setup/ApplianceWizard.js:1849 umc/js/setup.js:567
> msgid "Configuration finished"
> msgstr "Konfiguration abgeschlossen"
> 
>@@ -434,11 +450,11 @@
> msgid "Configuration of IPv4 and IPv6 adresses"
> msgstr "Konfiguration der IPv4 und IPv6 Adressen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1103
>+#: umc/js/setup/ApplianceWizard.js:1134
> msgid "Configure system"
> msgstr "System konfigurieren"
> 
>-#: umc/js/setup/ApplianceWizard.js:494
>+#: umc/js/setup/ApplianceWizard.js:525
> msgid ""
> "Configure this system as first system for the new domain. Additional systems "
> "can join the domain later."
>@@ -446,11 +462,11 @@
> "Dieses System als erstes System einer neuen DomÃ¤ne einrichten. ZusÃ¤tzliche "
> "Systeme kÃ¶nnen der DomÃ¤ne spÃ¤ter beitreten."
> 
>-#: umc/js/setup/ApplianceWizard.js:731
>+#: umc/js/setup/ApplianceWizard.js:762
> msgid "Confirm configuration settings"
> msgstr "BestÃ¤tigen der Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1533
>+#: umc/js/setup/ApplianceWizard.js:1564
> msgid ""
> "Connect to Univention Management Console on this system either as user "
> "Administrator or as user root in case the system has not yet "
>@@ -460,7 +476,7 @@
> "entweder als Benutzer Administrator oder als Benutzer root, "
> "falls das System noch keine neue UCS-DomÃ¤ne erstellt hat:"
> 
>-#: umc/js/setup/ApplianceWizard.js:1548
>+#: umc/js/setup/ApplianceWizard.js:1579
> msgid ""
> "Connect to Univention Management Console on this system either as user "
> "Administrator or as user root in case the system has not yet "
>@@ -470,27 +486,27 @@
> "entweder als Benutzer Administrator oder als Benutzer root, "
> "falls das System noch nicht der DomÃ¤ne beigetreten ist:"
> 
>-#: umc/js/setup/ApplianceWizard.js:2101
>+#: umc/js/setup/ApplianceWizard.js:2136
> msgid "Connection failed. Please recheck the address"
> msgstr "Verbindungsaufbau gescheitert. Bitte Ã¼berprÃ¼fen Sie die Adresse"
> 
>-#: umc/js/setup/ApplianceWizard.js:2098
>+#: umc/js/setup/ApplianceWizard.js:2133
> msgid "Connection refused. Please recheck the password"
> msgstr "Verbindungsaufbau abgelehnt. Bitte Ã¼berprÃ¼fen Sie das Passwort"
> 
>-#: umc/js/setup/ApplianceWizard.js:2155
>+#: umc/js/setup/ApplianceWizard.js:2190
> msgid "Continue"
> msgstr "Fortfahren"
> 
>-#: umc/js/setup/ApplianceWizard.js:1973
>+#: umc/js/setup/ApplianceWizard.js:2008
> msgid "Continue with 169.254.*.* addresse(s)"
> msgstr "Fortfahren mit 169.254.*.* Adresse(n)"
> 
>-#: umc/js/setup/ApplianceWizard.js:2048
>+#: umc/js/setup/ApplianceWizard.js:2083
> msgid "Continue with incomplete settings"
> msgstr "Fortfahren mit unvollstÃ¤ndigen Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1977 umc/js/setup/ApplianceWizard.js:1999
>+#: umc/js/setup/ApplianceWizard.js:2012 umc/js/setup/ApplianceWizard.js:2034
> msgid "Continue without internet access"
> msgstr "Ohne Internetzugriff fortfahren"
> 
>@@ -502,7 +518,7 @@
> msgid "Country code"
> msgstr "LÃ¤ndercode"
> 
>-#: umc/js/setup/ApplianceWizard.js:488
>+#: umc/js/setup/ApplianceWizard.js:519
> msgid "Create a new UCS domain"
> msgstr "Erstellen einer neuen UCS-DomÃ¤ne"
> 
>@@ -510,19 +526,19 @@
> msgid "Created:"
> msgstr "Erstellt:"
> 
>-#: umc/js/setup/ApplianceWizard.js:1388
>+#: umc/js/setup/ApplianceWizard.js:1419
> msgid "DC Backup"
> msgstr "DC Backup"
> 
>-#: umc/js/setup/ApplianceWizard.js:1394
>+#: umc/js/setup/ApplianceWizard.js:1425
> msgid "DC Master"
> msgstr "DC Master"
> 
>-#: umc/js/setup/ApplianceWizard.js:1389
>+#: umc/js/setup/ApplianceWizard.js:1420
> msgid "DC Slave"
> msgstr "DC Slave"
> 
>-#: umc/js/setup/ApplianceWizard.js:560
>+#: umc/js/setup/ApplianceWizard.js:591
> msgid ""
> "DC slave systems are ideal for site servers, they provide authentication "
> "services for the domain. Local services running on a DC slave can access the "
>@@ -533,7 +549,7 @@
> "Zugriff auf die lokale LDAP-Datenbank."
> 
> #: umc/js/setup/InterfaceWizard.js:616 umc/js/setup/InterfaceWizard.js:642
>-#: umc/js/setup/ApplianceWizard.js:917
>+#: umc/js/setup/ApplianceWizard.js:948
> msgid "DHCP query failed."
> msgstr "DHCP-Anfrage schlug fehl."
> 
>@@ -541,11 +557,11 @@
> msgid "DHCP-Query"
> msgstr "DHCP-Anfrage"
> 
>-#: umc/js/setup/ApplianceWizard.js:1463
>+#: umc/js/setup/ApplianceWizard.js:1494
> msgid "DNS server"
> msgstr "DNS-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:327 umc/js/setup/LanguagePage.js:149
>+#: umc/js/setup/ApplianceWizard.js:352 umc/js/setup/LanguagePage.js:149
> #: umc/js/setup/LanguagePage.js:229
> msgid "Default system locale"
> msgstr "Standard-System-Sprachdefinition"
>@@ -554,27 +570,27 @@
> msgid "Delete"
> msgstr "LÃ¶schen"
> 
>-#: umc/js/setup/ApplianceWizard.js:522
>+#: umc/js/setup/ApplianceWizard.js:553
> msgid "Do not use any domain"
> msgstr "Keine DomÃ¤ne benutzen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1425
>+#: umc/js/setup/ApplianceWizard.js:1456
> msgid "Domain and host configuration"
> msgstr "DomÃ¤nen- und Rechnereinstellung"
> 
>-#: umc/js/setup/ApplianceWizard.js:351
>+#: umc/js/setup/ApplianceWizard.js:376
> msgid "Domain and network configuration"
> msgstr "DomÃ¤nen- und Netzwerkeinstellung"
> 
>-#: umc/js/setup/ApplianceWizard.js:543
>+#: umc/js/setup/ApplianceWizard.js:574
> msgid "Domain controller backup"
> msgstr "DomÃ¤nencontroller Backup"
> 
>-#: umc/js/setup/ApplianceWizard.js:555
>+#: umc/js/setup/ApplianceWizard.js:586
> msgid "Domain controller slave"
> msgstr "DomÃ¤nencontroller Slave"
> 
>-#: umc/js/setup/ApplianceWizard.js:626
>+#: umc/js/setup/ApplianceWizard.js:657
> msgid "Domain join information"
> msgstr "Informationen zum DomÃ¤nenbeitritt"
> 
>@@ -586,7 +602,7 @@
> msgid "Domain name server (max. 3)"
> msgstr "DomÃ¤nen-DNS-Server (max. 3)"
> 
>-#: umc/js/setup/ApplianceWizard.js:482
>+#: umc/js/setup/ApplianceWizard.js:513
> msgid "Domain setup"
> msgstr "DomÃ¤neneinstellungen"
> 
>@@ -594,8 +610,8 @@
> msgid "Dynamic (DHCP)"
> msgstr "Dynamisch (DHCP)"
> 
>-#: umc/js/setup/ApplianceWizard.js:591 umc/js/setup/ApplianceWizard.js:1321
>-#: umc/js/setup/ApplianceWizard.js:1420
>+#: umc/js/setup/ApplianceWizard.js:622 umc/js/setup/ApplianceWizard.js:1352
>+#: umc/js/setup/ApplianceWizard.js:1451
> msgid "E-mail address to activate UCS"
> msgstr "E-Mail-Adresse zur Aktivierung von UCS"
> 
>@@ -615,7 +631,7 @@
> msgid "Email address"
> msgstr "E-Mail-Adresse"
> 
>-#: umc/js/setup/ApplianceWizard.js:308
>+#: umc/js/setup/ApplianceWizard.js:333
> msgid ""
> "Enter a city nearby to preconfigure settings such as timezone, system "
> "language, keyboard layout."
>@@ -623,7 +639,7 @@
> "Geben Sie eine nahegelegene Stadt zur Einrichtung von Zeitzone, "
> "Systemsprache und Tastaturlayout ein."
> 
>-#: umc/js/setup/ApplianceWizard.js:606 umc/js/setup/ApplianceWizard.js:627
>+#: umc/js/setup/ApplianceWizard.js:637 umc/js/setup/ApplianceWizard.js:658
> msgid ""
> "Enter name and password of a user account which is authorised to join a "
> "system into this domain."
>@@ -643,7 +659,7 @@
> msgid "External name server (max. 3)"
> msgstr "Externer DNS-Server (max. 3)"
> 
>-#: umc/js/setup/ApplianceWizard.js:1530
>+#: umc/js/setup/ApplianceWizard.js:1561
> msgid ""
> "Failed join scripts can be executed via the UMC module Domain join."
> msgstr ""
>@@ -650,7 +666,7 @@
> "Fehlgeschlagene DomÃ¤nenbeitritt-Skripte kÃ¶nnen mit dem UMC-Modul "
> "DomÃ¤nenbeitritt ausgefÃ¼hrt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1545
>+#: umc/js/setup/ApplianceWizard.js:1576
> msgid ""
> "Failed join scripts or a new join of the system can be executed via the UMC "
> "module Domain join."
>@@ -658,7 +674,7 @@
> "Fehlgeschlagene DomÃ¤nenbeitritt-Skripte oder ein erneuter DomÃ¤nenbeitritt "
> "kann mit dem UMC-Modul DomÃ¤nenbeitritt ausgefÃ¼hrt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1106
>+#: umc/js/setup/ApplianceWizard.js:1137
> msgid "Finish"
> msgstr "Fertigstellen"
> 
>@@ -670,7 +686,7 @@
> "Nach Vergabe der Zertifikatseinstellungen wird ein neues Root-"
> "Zertifikat fÃ¼r die DomÃ¤ne erstellt."
> 
>-#: umc/js/setup/ApplianceWizard.js:942
>+#: umc/js/setup/ApplianceWizard.js:973
> msgid ""
> "For a specified host name, the domain name is automatically derived from the "
> "domain name server. A fully qualified domain may be necessary for mail "
>@@ -687,9 +703,9 @@
> msgid "Forwarding delay"
> msgstr "Forwarding-VerzÃ¶gerung"
> 
>-#: umc/js/setup/ApplianceWizard.js:679 umc/js/setup/ApplianceWizard.js:1339
>-#: umc/js/setup/ApplianceWizard.js:1427 umc/js/setup/ApplianceWizard.js:1431
>-#: umc/js/setup/ApplianceWizard.js:1436
>+#: umc/js/setup/ApplianceWizard.js:710 umc/js/setup/ApplianceWizard.js:1370
>+#: umc/js/setup/ApplianceWizard.js:1458 umc/js/setup/ApplianceWizard.js:1462
>+#: umc/js/setup/ApplianceWizard.js:1467
> msgid "Fully qualified domain name"
> msgstr "VollstÃ¤ndiger Rechnername"
> 
>@@ -704,8 +720,8 @@
> "handbuch-%s.html#computers:networkcomplex\" target=\"_blank\">UCS "
> "Dokumentation</a> gefunden werden."
> 
>-#: umc/js/setup/InterfaceWizard.js:627 umc/js/setup/ApplianceWizard.js:449
>-#: umc/js/setup/ApplianceWizard.js:1455
>+#: umc/js/setup/InterfaceWizard.js:627 umc/js/setup/ApplianceWizard.js:480
>+#: umc/js/setup/ApplianceWizard.js:1486
> msgid "Gateway"
> msgstr "Gateway"
> 
>@@ -726,27 +742,27 @@
> msgstr "Globale Netzwerk-Einstellungen"
> 
> #: umc/js/setup/NetworkPage.js:125 umc/js/setup/NetworkPage.js:295
>-#: umc/js/setup/ApplianceWizard.js:474 umc/js/setup/ApplianceWizard.js:1467
>+#: umc/js/setup/ApplianceWizard.js:505 umc/js/setup/ApplianceWizard.js:1498
> msgid "HTTP proxy"
> msgstr "HTTP-Proxy"
> 
>-#: umc/js/setup/ApplianceWizard.js:671 umc/js/setup/ApplianceWizard.js:694
>+#: umc/js/setup/ApplianceWizard.js:702 umc/js/setup/ApplianceWizard.js:725
> msgid "Host settings"
> msgstr "Rechnereinstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1341 umc/js/setup/ApplianceWizard.js:1436
>+#: umc/js/setup/ApplianceWizard.js:1372 umc/js/setup/ApplianceWizard.js:1467
> msgid "Hostname"
> msgstr "Rechnername"
> 
>-#: umc/js/setup/ApplianceWizard.js:650
>+#: umc/js/setup/ApplianceWizard.js:681
> msgid "Hostname of the domain controller master"
> msgstr "Rechnername des DomÃ¤nencontroller Masters"
> 
>-#: umc/js/setup/ApplianceWizard.js:703
>+#: umc/js/setup/ApplianceWizard.js:734
> msgid "Hostname or fully qualified domain name"
> msgstr "Rechnername oder vollstÃ¤ndiger DomÃ¤nenname"
> 
>-#: umc/js/setup/ApplianceWizard.js:1444
>+#: umc/js/setup/ApplianceWizard.js:1475
> msgid "IP address is obtained dynamically via DHCP"
> msgstr "Die IP-Adresse wird dynamisch Ã¼ber DHCP bezogen"
> 
>@@ -758,8 +774,8 @@
> msgid "IPv4 address"
> msgstr "IPv4-Adresse"
> 
>-#: umc/js/setup/ApplianceWizard.js:388 umc/js/setup/ApplianceWizard.js:405
>-#: umc/js/setup/ApplianceWizard.js:423 umc/js/setup/ApplianceWizard.js:441
>+#: umc/js/setup/ApplianceWizard.js:419 umc/js/setup/ApplianceWizard.js:436
>+#: umc/js/setup/ApplianceWizard.js:454 umc/js/setup/ApplianceWizard.js:472
> #, python-brace-format
> msgid "IPv4 net mask/IPv6 prefix {interface}"
> msgstr "IPv4-Netzmaske/IPv6-PrÃ¤fix {interface}"
>@@ -768,8 +784,8 @@
> msgid "IPv4 network interface configuration"
> msgstr "IPv4-NetzwerkgerÃ¤tkonfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:379 umc/js/setup/ApplianceWizard.js:395
>-#: umc/js/setup/ApplianceWizard.js:413 umc/js/setup/ApplianceWizard.js:431
>+#: umc/js/setup/ApplianceWizard.js:410 umc/js/setup/ApplianceWizard.js:426
>+#: umc/js/setup/ApplianceWizard.js:444 umc/js/setup/ApplianceWizard.js:462
> #, python-brace-format
> msgid "IPv4/IPv6 address {interface}"
> msgstr "IPv4/IPv6-Adresse {interface}"
>@@ -790,7 +806,7 @@
> msgid "Identifier"
> msgstr "Bezeichner"
> 
>-#: umc/js/setup/ApplianceWizard.js:532
>+#: umc/js/setup/ApplianceWizard.js:563
> msgid "If unsure, select Create a new UCS domain."
> msgstr "Wenn unsicher, wÃ¤hlen Sie Erstellen einer neuen UCS-DomÃ¤ne."
> 
>@@ -802,16 +818,16 @@
> "In den Netzwerkeinstellungen kÃ¶nnen IP-Adressen (IPv4 und IPv6) sowie "
> "DNS-Server, Gateways und HTTP-Proxy festgelegt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1797 umc/js/setup.js:547
>+#: umc/js/setup/ApplianceWizard.js:1832 umc/js/setup.js:549
> msgid "Initialize the configuration process ..."
> msgstr "Initialisiere den Konfigurationsvorgang ..."
> 
>-#: umc/js/setup/ApplianceWizard.js:1050
>+#: umc/js/setup/ApplianceWizard.js:1081
> #, python-format
> msgid "Installation of %d additional software components."
> msgstr "Installation von %d zusÃ¤tzlichen Software-Komponenten."
> 
>-#: umc/js/setup/ApplianceWizard.js:1048
>+#: umc/js/setup/ApplianceWizard.js:1079
> msgid "Installation of one additional software component."
> msgstr "Installation einer zusÃ¤tzlichen Software-Komponente."
> 
>@@ -832,11 +848,11 @@
> msgid "Interface type"
> msgstr "NetzwerkgerÃ¤tetyp"
> 
>-#: umc/js/setup/ApplianceWizard.js:134
>+#: umc/js/setup/ApplianceWizard.js:135
> msgid "Invalid IP address! Expected format is IPv4 or IPv6."
> msgstr "UngÃ¼ltige IP-Adresse! Erwartetes Format ist IPv4 oder IPv6."
> 
>-#: umc/js/setup/ApplianceWizard.js:143
>+#: umc/js/setup/ApplianceWizard.js:144
> msgid ""
> "Invalid IPv4 net mask or IPv6 prefix! Expected for IPv4 is a number "
> "between 0 and 32 or a format similar to 255.255.255.0. Expected "
>@@ -847,7 +863,7 @@
> "255.255.255.0. Erwartetes Format fÃ¼r IPv6 ist eine Zahl zwischen "
> "0 und 128."
> 
>-#: umc/js/setup/ApplianceWizard.js:206
>+#: umc/js/setup/ApplianceWizard.js:207
> msgid ""
> "Invalid LDAP base! The LDAP base may neither contain blanks nor any "
> "special characters. Its structure needs to consist of at least two relative "
>@@ -854,17 +870,17 @@
> "distinguished names (RDN) with attribute tags 'dc', 'cn', 'c', 'o', or "
> "'l' (e.g., dc=test,dc=net)."
> msgstr ""
>-"UngÃ¼ltige LDAP-Basis! Die LDAP-Basis darf weder Leer- noch Sonderzeichen enthalten. "
>-"Ihre Struktur muss aus mindestens zwei Relative Distinguished Names (RDN) "
>-"bestehen, die eines der Attribut-Tags 'dc', 'cn', 'c', 'o', or 'l' verwenden "
>-"(z.B. dc=test,dc=net)."
>+"UngÃ¼ltige LDAP-Basis! Die LDAP-Basis darf weder Leer- noch Sonderzeichen "
>+"enthalten. Ihre Struktur muss aus mindestens zwei Relative Distinguished "
>+"Names (RDN) bestehen, die eines der Attribut-Tags 'dc', 'cn', 'c', 'o', or "
>+"'l' verwenden (z.B. dc=test,dc=net)."
> 
>-#: umc/js/setup/ApplianceWizard.js:126
>+#: umc/js/setup/ApplianceWizard.js:127
> msgid "Invalid e-mail address! Expected format is:mail@example.com"
> msgstr ""
> "UngÃ¼ltige E-Mail-Adresse! Erwartetes Format: mail@beispiel.de"
> 
>-#: umc/js/setup/ApplianceWizard.js:189
>+#: umc/js/setup/ApplianceWizard.js:190
> msgid ""
> "Invalid fully qualified domain name! Expected format: hostname."
> "mydomain.intranet"
>@@ -872,7 +888,7 @@
> "UngÃ¼ltiger vollstÃ¤ndiger DomÃ¤nenname! Erwartetes Format: rechnername."
> "meinedomaene.intranet"
> 
>-#: umc/js/setup/ApplianceWizard.js:198
>+#: umc/js/setup/ApplianceWizard.js:199
> msgid ""
> "Invalid hostname or fully qualified domain name! Expected format: "
> "myhost or hostname.mydomain.intranet"
>@@ -880,7 +896,7 @@
> "UngÃ¼ltiger Rechnername oder vollstÃ¤ndiger DomÃ¤nenname! Erwartetes "
> "Format: rechnername oder rechnername.meinedomaene.intranet"
> 
>-#: umc/js/setup/ApplianceWizard.js:1742
>+#: umc/js/setup/ApplianceWizard.js:1777
> msgid ""
> "It is not possible to install KVM and XEN components on one system. Please "
> "select only one of these components."
>@@ -888,7 +904,7 @@
> "Es ist nicht mÃ¶glich KVM- und XEN-Komponenten auf einem System zu "
> "installieren. Bitte wÃ¤hlen Sie nur eine dieser Komponenten aus."
> 
>-#: umc/js/setup/ApplianceWizard.js:1738
>+#: umc/js/setup/ApplianceWizard.js:1773
> msgid ""
> "It is not possible to install Samba 3 and Samba 4 on one system. Please "
> "select only one of these components."
>@@ -896,15 +912,15 @@
> "Es ist nicht mÃ¶glich Samba 3 und Samba 4 auf einem System zu installieren. "
> "Bitte wÃ¤hlen Sie nur eine dieser Komponenten aus."
> 
>-#: umc/js/setup/ApplianceWizard.js:500
>+#: umc/js/setup/ApplianceWizard.js:531
> msgid "Join into an existing Active Directory domain"
> msgstr "Einer bestehenden Active-Directory-DomÃ¤ne beitreten"
> 
>-#: umc/js/setup/ApplianceWizard.js:511
>+#: umc/js/setup/ApplianceWizard.js:542
> msgid "Join into an existing UCS domain"
> msgstr "Einer bestehenden UCS-DomÃ¤ne beitreten"
> 
>-#: umc/js/setup/ApplianceWizard.js:340 umc/js/setup/LanguagePage.js:88
>+#: umc/js/setup/ApplianceWizard.js:365 umc/js/setup/LanguagePage.js:88
> #: umc/js/setup/LanguagePage.js:217
> msgid "Keyboard layout"
> msgstr "Tastaturlayout"
>@@ -917,7 +933,7 @@
> msgid "Keyboard variant"
> msgstr "Tastaturvariante"
> 
>-#: umc/js/setup/ApplianceWizard.js:687 umc/js/setup/ApplianceWizard.js:1440
>+#: umc/js/setup/ApplianceWizard.js:718 umc/js/setup/ApplianceWizard.js:1471
> msgid "LDAP base"
> msgstr "LDAP-Basis"
> 
>@@ -937,12 +953,12 @@
> msgid "Language settings"
> msgstr "Spracheinstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:713
>+#: umc/js/setup/ApplianceWizard.js:744
> msgid "Local root password"
> msgstr "Lokales Root-Passwort"
> 
>-#: umc/js/setup/ApplianceWizard.js:316 umc/js/setup/ApplianceWizard.js:322
>-#: umc/js/setup/ApplianceWizard.js:1405
>+#: umc/js/setup/ApplianceWizard.js:341 umc/js/setup/ApplianceWizard.js:347
>+#: umc/js/setup/ApplianceWizard.js:1436
> msgid "Localization settings"
> msgstr "Standorteinstellungen"
> 
>@@ -958,11 +974,11 @@
> msgid "MII link monitoring frequency"
> msgstr "MII-TrÃ¤gerÃ¼berwachungsfrequenz"
> 
>-#: umc/js/setup/ApplianceWizard.js:566 umc/js/setup/ApplianceWizard.js:1390
>+#: umc/js/setup/ApplianceWizard.js:597 umc/js/setup/ApplianceWizard.js:1421
> msgid "Member server"
> msgstr "Member-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:571
>+#: umc/js/setup/ApplianceWizard.js:602
> msgid ""
> "Member servers should be used for services which do not need a local "
> "authentication database, for example for file or print servers."
>@@ -1014,7 +1030,7 @@
> msgid "Network interface configuration"
> msgstr "NetzwerkgerÃ¤tkonfiguration"
> 
>-#: umc/js/setup/NetworkPage.js:299 umc/js/setup/ApplianceWizard.js:1332
>+#: umc/js/setup/NetworkPage.js:299 umc/js/setup/ApplianceWizard.js:1363
> msgid "Network interfaces"
> msgstr "NetzwerkgerÃ¤te"
> 
>@@ -1022,19 +1038,19 @@
> msgid "Network settings"
> msgstr "Netzwerk-Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1045
>+#: umc/js/setup/ApplianceWizard.js:1076
> msgid "No additional software component will be installed."
> msgstr "Keine zusÃ¤tzliche Software-Komponente wird installiert."
> 
>-#: umc/js/setup/ApplianceWizard.js:1475
>+#: umc/js/setup/ApplianceWizard.js:1506
> msgid "No additional software components will be installed."
> msgstr "Keine zusÃ¤tzliche Software-Komponenten werden installiert."
> 
>-#: umc/js/setup.js:432
>+#: umc/js/setup.js:434
> msgid "No changes have been made."
> msgstr "Es wurden keine Ãnderungen durchgefÃ¼hrt."
> 
>-#: umc/js/setup/ApplianceWizard.js:2044
>+#: umc/js/setup/ApplianceWizard.js:2079
> msgid ""
> "No domain controller was found at the address of the name server. It is "
> "recommended to verify that the network settings are correct."
>@@ -1042,7 +1058,7 @@
> "Unter der Adresse des DNS-Servers konnte kein DomÃ¤nencontroller gefunden "
> "werden. Die Netzwerkeinstellungen sollten Ã¼berprÃ¼ft werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:2057
>+#: umc/js/setup/ApplianceWizard.js:2092
> msgid ""
> "No domain controller was found at the address of the name server. Please "
> "adjust your network settings."
>@@ -1050,11 +1066,11 @@
> "Unter der Adresse des DNS-Servers konnte kein DomÃ¤nencontroller gefunden "
> "werden. Bitte Ã¼berprÃ¼fen Sie die Netzwerkeinstellungen."
> 
>-#: umc/js/setup/ApplianceWizard.js:667
>+#: umc/js/setup/ApplianceWizard.js:698
> msgid "No domain warning"
> msgstr "Warnung: Keine DomÃ¤ne"
> 
>-#: umc/js/setup/ApplianceWizard.js:1995
>+#: umc/js/setup/ApplianceWizard.js:2030
> msgid ""
> "No gateway has been specified and thus no access to the internet is "
> "possible. As UCS requires internet access for its functionality, certain "
>@@ -1071,15 +1087,15 @@
> msgid "None"
> msgstr "Kein"
> 
>-#: umc/js/setup.js:589
>+#: umc/js/setup.js:591
> msgid "Not all changes could be applied successfully:"
> msgstr "Nicht alle Ãnderungen konnten erfolgreich Ã¼bernommen werden:"
> 
>-#: umc/js/setup/ApplianceWizard.js:367
>+#: umc/js/setup/ApplianceWizard.js:397
> msgid "Obtain IP address automatically (DHCP)"
> msgstr "IP-Adresse automatisch beziehen (DHCP)"
> 
>-#: umc/js/setup.js:593
>+#: umc/js/setup.js:595
> msgid "Ok"
> msgstr "Ok"
> 
>@@ -1087,7 +1103,7 @@
> msgid "Organization"
> msgstr "Organisation"
> 
>-#: umc/js/setup/ApplianceWizard.js:586 umc/js/setup/ApplianceWizard.js:1419
>+#: umc/js/setup/ApplianceWizard.js:617 umc/js/setup/ApplianceWizard.js:1450
> msgid "Organization name"
> msgstr "Name der Organisation"
> 
>@@ -1099,8 +1115,8 @@
> msgid "Parent interface"
> msgstr "Ãbergeordnetes NetzwerkgerÃ¤t"
> 
>-#: umc/js/setup/ApplianceWizard.js:601 umc/js/setup/ApplianceWizard.js:621
>-#: umc/js/setup/ApplianceWizard.js:662
>+#: umc/js/setup/ApplianceWizard.js:632 umc/js/setup/ApplianceWizard.js:652
>+#: umc/js/setup/ApplianceWizard.js:693
> msgid "Password"
> msgstr "Passwort"
> 
>@@ -1109,14 +1125,15 @@
> msgstr ""
> "Bitte wÃ¤hlen Sie ein NetzwerkgerÃ¤t bevor Sie eine DHCP-Adresse anfragen."
> 
>-#: umc/js/setup/ApplianceWizard.js:732
>+#: umc/js/setup/ApplianceWizard.js:763
> msgid ""
>-"Please confirm the chosen configuration settings which are summarized below."
>+"Please confirm the chosen configuration settings which are summarized in the "
>+"following."
> msgstr ""
>-"Bitte bestÃ¤tigen Sie die gewÃ¤hlten Einstellungen, die unten zusammengefasst "
>-"dargestellt werden."
>+"Bitte bestÃ¤tigen Sie die gewÃ¤hlten Einstellungen, die nachstehend "
>+"zusammengefasst sind."
> 
>-#: umc/js/setup.js:487
>+#: umc/js/setup.js:489
> msgid ""
> "Please confirm to apply these changes to the system. This may take some time."
> msgstr ""
>@@ -1127,7 +1144,7 @@
> msgid "Please confirm to delete the following interfaces:"
> msgstr "Bitte LÃ¶schung der folgenden NetzwerkgerÃ¤te bestÃ¤tigen:"
> 
>-#: umc/js/setup/ApplianceWizard.js:483
>+#: umc/js/setup/ApplianceWizard.js:514
> msgid "Please select your domain settings."
> msgstr "Bitte wÃ¤hlen Sie die DomÃ¤neneinstellungen."
> 
>@@ -1135,16 +1152,16 @@
> msgid "Please specify the ports which will be added to the bridge."
> msgstr "Bitte geben Sie die Ports an, die zu der Bridge hinzugefÃ¼gt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:455
>+#: umc/js/setup/ApplianceWizard.js:486
> msgid "Preferred DNS server"
> msgstr "Bevorzugter DNS-Server"
> 
> #: umc/js/setup/NetworkPage.js:101 umc/js/setup/NetworkPage.js:303
>-#: umc/js/setup/ApplianceWizard.js:1335
>+#: umc/js/setup/ApplianceWizard.js:1366
> msgid "Primary network interface"
> msgstr "PrimÃ¤res NetzwerkgerÃ¤t"
> 
>-#: umc/js/setup/ApplianceWizard.js:1105
>+#: umc/js/setup/ApplianceWizard.js:1136
> msgid "Reconfigure"
> msgstr "Erneut konfigurieren"
> 
>@@ -1152,11 +1169,11 @@
> msgid "Removed:"
> msgstr "GelÃ¶scht:"
> 
>-#: umc/js/setup.js:360 umc/js/setup.js:367
>+#: umc/js/setup.js:362 umc/js/setup.js:369
> msgid "Restarting server components..."
> msgstr "Neustart der Server-Komponenten..."
> 
>-#: umc/js/setup/ApplianceWizard.js:2151
>+#: umc/js/setup/ApplianceWizard.js:2186
> msgid "Root password empty. Continue?"
> msgstr "Root-Passwort ist leer. MÃ¶chten Sie fortfahren?"
> 
>@@ -1164,11 +1181,11 @@
> msgid "SSL root certificate"
> msgstr "SSL-Root-Zertifikat"
> 
>-#: umc/js/setup/ApplianceWizard.js:642
>+#: umc/js/setup/ApplianceWizard.js:673
> msgid "Search Domain controller master in DNS"
> msgstr "DomÃ¤nencontroller Master im DNS suchen"
> 
>-#: umc/js/setup.js:282
>+#: umc/js/setup.js:284
> msgid "Setup for UCS Virtual Machine Manager"
> msgstr "Einrichtung fÃ¼r UCS Virtual Machine Manager"
> 
>@@ -1176,7 +1193,7 @@
> msgid "Several network types can be chosen."
> msgstr "Mehrere Netzwerktypen kÃ¶nnen ausgewÃ¤hlt werden."
> 
>-#: umc/js/setup.js:138
>+#: umc/js/setup.js:139
> msgid "Should the UMC module be closed? All unsaved modification will be lost."
> msgstr ""
> "Soll das UMC-Modul geschlossen werden? Alle nicht gespeicherten Ãnderungen "
>@@ -1187,31 +1204,31 @@
> msgid "Should the nameserver and gateway be set: %s"
> msgstr "Sollen DNS-Server und Gateway gesetzt werden: %s"
> 
>-#: umc/js/setup/ApplianceWizard.js:1021
>+#: umc/js/setup/ApplianceWizard.js:1052
> msgid "Software component"
> msgstr "Softwarekomponente"
> 
>-#: umc/js/setup/ApplianceWizard.js:1475 umc/js/setup/ApplianceWizard.js:1478
>+#: umc/js/setup/ApplianceWizard.js:1506 umc/js/setup/ApplianceWizard.js:1509
> msgid "Software components"
> msgstr "Softwarekomponenten"
> 
>-#: umc/js/setup/ApplianceWizard.js:718
>+#: umc/js/setup/ApplianceWizard.js:749
> msgid "Software configuration"
> msgstr "Software-Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:672 umc/js/setup/ApplianceWizard.js:695
>+#: umc/js/setup/ApplianceWizard.js:703 umc/js/setup/ApplianceWizard.js:726
> msgid "Specify the name of this system."
> msgstr "Eingabe des Namens dieses Systems."
> 
>-#: umc/js/setup/ApplianceWizard.js:352
>+#: umc/js/setup/ApplianceWizard.js:377
> msgid "Specify the network settings for this system."
> msgstr "Eingabe der Netzwerkeinstellungen dieses Systems."
> 
>-#: umc/js/setup/ApplianceWizard.js:538
>+#: umc/js/setup/ApplianceWizard.js:569
> msgid "Specify the type of this system."
> msgstr "Eingabe des Typs dieses Systems."
> 
>-#: umc/js/setup/ApplianceWizard.js:631
>+#: umc/js/setup/ApplianceWizard.js:662
> msgid "Start join at the end of the installation"
> msgstr "DomÃ¤nenbeitritt am Ende der Installation starten"
> 
>@@ -1227,15 +1244,20 @@
> msgid "Static (IPv6)"
> msgstr "Statisch (IPv6)"
> 
>-#: umc/js/setup/ApplianceWizard.js:537
>+#: umc/js/setup/ApplianceWizard.js:568
> msgid "System role"
> msgstr "Systemrolle"
> 
>-#: umc/js/setup.js:577 umc/js/setup.js:583
>+#: umc/js/setup/ApplianceWizard.js:1600
>+#, python-format
>+msgid "The %s appliance has been successfully set up."
>+msgstr "Die %s Appliance wurde erfolgreich eingerichtet."
>+
>+#: umc/js/setup.js:579 umc/js/setup.js:585
> msgid "The changes have been applied successfully."
> msgstr "Die Ãnderungen wurden erfolgreich Ã¼bernommen."
> 
>-#: umc/js/setup.js:560
>+#: umc/js/setup.js:562
> #, python-brace-format
> msgid ""
> "The connection to the server could not be established after {time} seconds. "
>@@ -1248,15 +1270,15 @@
> "fÃ¼hren sein. Loggen Sie sich in diesem Fall erneut auf Univention Management "
> "Console unter der {linkStart}neuen Adresse{linkEnd} ein."
> 
>-#: umc/js/setup.js:481
>+#: umc/js/setup.js:483
> msgid "The following changes will be applied to the system:"
> msgstr "Die folgenden Ãnderungen werden auf das System Ã¼bertragen:"
> 
>-#: umc/js/setup/ApplianceWizard.js:723 umc/js/setup.js:454 umc/js/setup.js:530
>+#: umc/js/setup/ApplianceWizard.js:754 umc/js/setup.js:456 umc/js/setup.js:532
> msgid "The following entries could not be validated:"
> msgstr "Die folgenden EintrÃ¤ge konnten nicht validiert werden:"
> 
>-#: umc/js/setup/ApplianceWizard.js:1517
>+#: umc/js/setup/ApplianceWizard.js:1548
> msgid "The following errors occurred while applying the settings."
> msgstr ""
> "Die folgenden Fehler sind beim Setzen der Konfigurationseinstellungen "
>@@ -1270,7 +1292,7 @@
> "Die folgenden NetzwerkgerÃ¤te sind bereits von anderen NetzwerkgerÃ¤ten in "
> "Verwendung und kÃ¶nnen nicht gelÃ¶scht werden:"
> 
>-#: umc/js/setup/ApplianceWizard.js:668
>+#: umc/js/setup/ApplianceWizard.js:699
> msgid ""
> "The installed UCS system will not offer any web-based domain management "
> "functions and will not be able to be a domain member. Such an UCS system "
>@@ -1280,7 +1302,7 @@
> "anbieten und kein Mitglied einer DomÃ¤ne werden. Solch ein UCS-System sollte "
> "nur in seltenen FÃ¤llen aufgesetzt werden, etwa als Firewall-System."
> 
>-#: umc/js/setup/ApplianceWizard.js:1770
>+#: umc/js/setup/ApplianceWizard.js:1805
> msgid ""
> "The root password is too short. For security reasons, your password must "
> "contain at least 8 characters."
>@@ -1288,7 +1310,7 @@
> "Das Root-Passwort ist zu kurz, aus SicherheitsgrÃ¼nden muss es mindestens 8 "
> "Zeichen lang sein."
> 
>-#: umc/js/setup/ApplianceWizard.js:1516
>+#: umc/js/setup/ApplianceWizard.js:1547
> msgid ""
> "The system configuration could not be completed. Please choose to retry the "
> "configuration process or finish the wizard."
>@@ -1297,12 +1319,12 @@
> "den Konfigurationsvorgang zu wiederholen oder den Einrichtungsassistenten zu "
> "beenden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1571
>+#: umc/js/setup/ApplianceWizard.js:1606
> #, python-format
> msgid "The system has been configured with the IP address(es) %s."
> msgstr "Das System wurde mit der/den IP-Adresse(n) %s konfiguriert."
> 
>-#: umc/js/setup/ApplianceWizard.js:1540 umc/js/setup/ApplianceWizard.js:1581
>+#: umc/js/setup/ApplianceWizard.js:1571 umc/js/setup/ApplianceWizard.js:1616
> #, python-format
> msgid ""
> "The system is reachable at %s or via its IP address(es) %s."
>@@ -1310,7 +1332,7 @@
> "Das System ist unter %s oder seiner/seinen IP-Adresse(n) %s "
> "erreichbar."
> 
>-#: umc/js/setup/ApplianceWizard.js:1583
>+#: umc/js/setup/ApplianceWizard.js:1618
> #, python-format
> msgid "The system is reachable at %s."
> msgstr "Das System ist unter %s erreichbar."
>@@ -1319,11 +1341,11 @@
> msgid "There are no more physical interfaces to create."
> msgstr "Es gibt keine weiteren physikalischen NetzwerkgerÃ¤te zum HinzufÃ¼gen."
> 
>-#: umc/js/setup.js:360 umc/js/setup.js:367
>+#: umc/js/setup.js:362 umc/js/setup.js:369
> msgid "This may take a few seconds..."
> msgstr "Dies kann einige Sekunden in Anspruch nehmen..."
> 
>-#: umc/js/setup/ApplianceWizard.js:527
>+#: umc/js/setup/ApplianceWizard.js:558
> msgid ""
> "This should only be used in rare use cases, for example as firewall systems."
> msgstr ""
>@@ -1330,7 +1352,7 @@
> "Diese Einstellung sollte nur in speziellen Szenarien, z.B. Firewall-"
> "Systemen, gewÃ¤hlt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1385
>+#: umc/js/setup/ApplianceWizard.js:1416
> msgid ""
> "This system will be a base system without domain integration and without the "
> "capabilities to join one in the future."
>@@ -1338,23 +1360,23 @@
> "Dieses System wird ein Basissystem ohne jegliche DomÃ¤nenintegration und ohne "
> "MÃ¶glichkeit, spÃ¤ter einer DomÃ¤ne beizutreten."
> 
>-#: umc/js/setup/ApplianceWizard.js:505
>+#: umc/js/setup/ApplianceWizard.js:536
> msgid "This system will become part of an existing Active Directory domain."
> msgstr "Dieses System wird Teil einer existierenden Active-Directory-DomÃ¤ne."
> 
>-#: umc/js/setup/ApplianceWizard.js:1396
>+#: umc/js/setup/ApplianceWizard.js:1427
> #, python-format
> msgid "This sytem will join an existing AD domain with the role %s."
> msgstr ""
> "Das System tritt einer existierenden AD-DomÃ¤ne mit der Rolle %s bei."
> 
>-#: umc/js/setup/ApplianceWizard.js:1398
>+#: umc/js/setup/ApplianceWizard.js:1429
> #, python-format
> msgid "This sytem will join an existing UCS domain with the role %s."
> msgstr ""
> "Das System tritt einer existierenden UCS-DomÃ¤ne mit der Rolle %s bei."
> 
>-#: umc/js/setup/ApplianceWizard.js:334 umc/js/setup/LanguagePage.js:76
>+#: umc/js/setup/ApplianceWizard.js:359 umc/js/setup/LanguagePage.js:76
> #: umc/js/setup/LanguagePage.js:209
> msgid "Time zone"
> msgstr "Zeitzone"
>@@ -1363,7 +1385,7 @@
> msgid "Time zone and keyboard settings"
> msgstr "Zeitzonen- und Tastatureinstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1574
>+#: umc/js/setup/ApplianceWizard.js:1609
> msgid ""
> "To administrate the domain as well as the local system, login to Univention "
> "Management Console as user Administrator:"
>@@ -1371,7 +1393,7 @@
> "Um die DomÃ¤ne sowie das lokale System zu administrieren, kÃ¶nnen Sie sich mit "
> "dem Benutzer Administrator an Univention Management Console anmelden:"
> 
>-#: umc/js/setup/ApplianceWizard.js:1576
>+#: umc/js/setup/ApplianceWizard.js:1611
> msgid ""
> "To administrate the local system, login to Univention Management Console "
> "with the domain account Administrator:"
>@@ -1383,40 +1405,40 @@
> msgid "Type"
> msgstr "Typ"
> 
>-#: umc/js/setup/ApplianceWizard.js:1380
>+#: umc/js/setup/ApplianceWizard.js:1411
> msgid "UCS configuration"
> msgstr "UCS-Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:755
>-msgid "UCS has been set up successfully"
>-msgstr "UCS wurde erfolgreich eingerichtet"
>-
>-#: umc/js/setup/ApplianceWizard.js:1568
>+#: umc/js/setup/ApplianceWizard.js:1602
> msgid "UCS has been successfully set up."
> msgstr "UCS wurde erfolgreich eingerichtet."
> 
>-#: umc/js/setup/ApplianceWizard.js:290
>+#: umc/js/setup/ApplianceWizard.js:293
> msgid "UCS setup"
> msgstr "UCS-Einrichtung"
> 
>-#: umc/js/setup/ApplianceWizard.js:745
>+#: umc/js/setup/ApplianceWizard.js:295
> msgid "UCS setup - An error occurred"
> msgstr "UCS-Einrichtung - Ein Fehler ist aufgetreten"
> 
>+#: umc/js/setup/ApplianceWizard.js:294
>+msgid "UCS setup successful"
>+msgstr "UCS-Einrichtung erfolgreich"
>+
> #: umc/js/setup/Interfaces.js:136
> msgid "Unconfigured"
> msgstr "Unkonfiguriert"
> 
>-#: umc/js/setup/ApplianceWizard.js:741
>+#: umc/js/setup/ApplianceWizard.js:772
> msgid "Update system after setup"
> msgstr "System nach der Einrichtung aktualisieren"
> 
>-#: umc/js/setup/ApplianceWizard.js:516
>+#: umc/js/setup/ApplianceWizard.js:547
> msgid "Use this option if you already have one or more UCS systems."
> msgstr ""
> "WÃ¤hlen Sie diese Option, falls bereits mindestens ein UCS-System existiert."
> 
>-#: umc/js/setup/ApplianceWizard.js:615 umc/js/setup/ApplianceWizard.js:656
>+#: umc/js/setup/ApplianceWizard.js:646 umc/js/setup/ApplianceWizard.js:687
> msgid "Username"
> msgstr "Benutzername"
> 
>@@ -1424,11 +1446,11 @@
> msgid "VLAN ID"
> msgstr "VLAN ID"
> 
>-#: umc/js/setup/ApplianceWizard.js:246 umc/js/setup.js:60
>+#: umc/js/setup/ApplianceWizard.js:247 umc/js/setup.js:60
> msgid "Validation error"
> msgstr "Validierungsfehler"
> 
>-#: umc/js/setup/ApplianceWizard.js:722
>+#: umc/js/setup/ApplianceWizard.js:753
> msgid "Validation failed"
> msgstr "Validierungsfehler"
> 
>@@ -1436,12 +1458,21 @@
> msgid "Virtual LAN"
> msgstr "Virtuelles LAN"
> 
>-#: umc/js/setup/ApplianceWizard.js:1986 umc/js/setup/ApplianceWizard.js:2002
>-#: umc/js/setup/ApplianceWizard.js:2051 umc/js/setup/ApplianceWizard.js:2158
>+#: umc/js/setup/ApplianceWizard.js:2021 umc/js/setup/ApplianceWizard.js:2037
>+#: umc/js/setup/ApplianceWizard.js:2086 umc/js/setup/ApplianceWizard.js:2193
> msgid "Warning"
> msgstr "Warnung"
> 
>-#: umc/js/setup/ApplianceWizard.js:1524
>+#: umc/js/setup/ApplianceWizard.js:292
>+msgid "Welcome to Univention Corporate Server (UCS)."
>+msgstr "Wilkommen bei Univention Corporate Server (UCS)."
>+
>+#: umc/js/setup/ApplianceWizard.js:297
>+#, python-format
>+msgid "Welcome to the %s appliance with Univention Corporate Server (UCS)."
>+msgstr "Willkommen bei der %s Appliance mit Univention Corporate Server (UCS)."
>+
>+#: umc/js/setup/ApplianceWizard.js:1555
> msgid "You may restart the configuration process again with modified settings."
> msgstr ""
> "Sie kÃ¶nnen den Konfigurationsvorgang mit verÃ¤nderten Einstellungen erneut "
>@@ -1451,17 +1482,17 @@
> msgid "don't set"
> msgstr "nicht setzen"
> 
>-#: umc/js/setup/ApplianceWizard.js:309
>+#: umc/js/setup/ApplianceWizard.js:334
> msgid "e.g., Boston..."
> msgstr "bspw. Bremen..."
> 
>-#: umc/js/setup.js:282
>+#: umc/js/setup.js:284
> #, python-format
> msgid "http://docs.univention.de/computers-%s.html#uvmm"
> msgstr ""
> 
>-#: umc/js/setup/ApplianceWizard.js:476 umc/js/setup/ApplianceWizard.js:593
>-#: umc/js/setup/ApplianceWizard.js:705
>+#: umc/js/setup/ApplianceWizard.js:507 umc/js/setup/ApplianceWizard.js:624
>+#: umc/js/setup/ApplianceWizard.js:736
> msgid "more information"
> msgstr "mehr Informationen"
> 
>Index: umc/js/setup/ApplianceWizard.js
>===================================================================
>--- umc/js/setup/ApplianceWizard.js	(Revision 57193)
>+++ umc/js/setup/ApplianceWizard.js	(Arbeitskopie)
>@@ -45,6 +45,7 @@
> 	"dijit/Tooltip",
> 	"dijit/focus",
> 	"dojox/timing/_base",
>+	"dojox/html/styles",
> 	"umc/dialog",
> 	"umc/tools",
> 	"umc/widgets/TextBox",
>@@ -63,7 +64,7 @@
> 	"umc/i18n/tools",
> 	"umc/i18n!umc/modules/setup",
> 	"dojo/NodeList-manipulate"
>-], function(dojo, declare, lang, array, dojoEvent, domClass, on, Evented, topic, Deferred, all, Memory, Select, Tooltip, focusUtil, timing, dialog, tools, TextBox, CheckBox, ComboBox, Text, Button, TitlePane, PasswordInputBox, PasswordBox, Wizard, Grid, RadioButton, ProgressBar, LiveSearch, i18nTools, _) {
>+], function(dojo, declare, lang, array, dojoEvent, domClass, on, Evented, topic, Deferred, all, Memory, Select, Tooltip, focusUtil, timing, styles, dialog, tools, TextBox, CheckBox, ComboBox, Text, Button, TitlePane, PasswordInputBox, PasswordBox, Wizard, Grid, RadioButton, ProgressBar, LiveSearch, i18nTools, _) {
> 
> 	var _Grid = declare(Grid, {
> 		_onRowClick: function(evt) {
>@@ -266,6 +267,8 @@
> 		autoValidate: false,
> 		autoFocus: true,
> 
>+		ucr: {},
>+
> 		_gallery: null,
> 		_appGalleryUpdated: null,
> 		_nLocaleSettingsConfigured: false,
>@@ -285,10 +288,32 @@
> 				mainBootstrapClasses: 'col-xs-12 col-sm-8 col-md-8 col-lg-8'
> 			};
> 
>+			// customize some texts for an app appliance case
>+			var welcomeMessage = _('Welcome to Univention Corporate Server (UCS).');
>+			var welcomeHeader = _('UCS setup');
>+			var doneHeader = _('UCS setup successful');
>+			var errorHeader = _('UCS setup - An error occurred');
>+			if (this.ucr['umc/web/appliance/name']) {
>+				welcomeMessage = _('Welcome to the %s appliance with Univention Corporate Server (UCS).', this.ucr['umc/web/appliance/name']);
>+				welcomeHeader = _('%s setup', this.ucr['umc/web/appliance/name']);
>+				doneHeader = _('%s setup successful', this.ucr['umc/web/appliance/name']);
>+				errorHeader = _('%s setup - An error occurred', this.ucr['umc/web/appliance/name']);
>+			}
>+			welcomeMessage += ' ' + _('A few questions are needed to complete the configuration process.');
>+			if (this.ucr['umc/web/appliance/logo']) {
>+				// override UCS logo with app logo on welcome page
>+				var logoURL = this.ucr['umc/web/appliance/logo'];
>+				if (logoURL.indexOf('/') != 0) {
>+					// use path relative to dijit/themes/umc
>+					logoURL = require.toUrl('dijit/themes/umc/' + logoURL);
>+				}
>+				styles.insertCssRule('.umc-setup-page-welcome .umcPageIcon', lang.replace('background-image: url({0}) !important;', [logoURL]));
>+			}
>+
> 			this.pages = [lang.mixin({}, pageConf, {
> 				name: 'welcome',
>-				headerText: _('UCS setup'),
>-				helpText: _('Welcome to Univention Corporate Server (UCS).A few questions are needed to complete the configuration process.'),
>+				headerText: welcomeHeader,
>+				helpText: welcomeMessage,
> 				widgets: [{
> 					type: Select,
> 					name: '_language',
>@@ -351,7 +376,7 @@
> 				headerText: _('Domain and network configuration'),
> 				helpText: _('Specify the network settings for this system.'),
> 				layout: [
>-					'_dhcp',
>+					['_dhcp', '_renewLease'],
> 					['_ip0', '_netmask0'],
> 					['_ip1', '_netmask1'],
> 					['_ip2', '_netmask2'],
>@@ -362,15 +387,22 @@
> 					'configureProxySettings'
> 				],
> 				widgets: [{
>+					type: Text,
>+					name: '_renewLease',
>+					label: '<a href="javascript:void(0);" onclick="require(\'dijit/registry\').byId(\'{id}\').dhclient();">' + _('(Request address again)') + '</a>',
>+					content: '',
>+					visible: false
>+				}, {
> 					type: CheckBox,
> 					name: '_dhcp',
> 					label: _('Obtain IP address automatically (DHCP)'),
> 					onChange: lang.hitch(this, function(value) {
> 						this._disableNetworkAddressWidgets(value);
>+						this.getWidget('network', '_renewLease').set('visible', value);
> 						var focused = this.getWidget('network', '_dhcp').focused;
> 						if (value && focused) {
> 							// see whether DHCP is working
>-							this._dhclient();
>+							this.dhclient();
> 						}
> 					})
> 				}, {
>@@ -729,7 +761,7 @@
> 			}), lang.mixin({}, pageConf, {
> 				name: 'summary',
> 				headerText: _('Confirm configuration settings'),
>-				helpText: _('Please confirm the chosen configuration settings which are summarized below.'),
>+				helpText: _('Please confirm the chosen configuration settings which are summarized in the following.'),
> 				widgets: [{
> 					type: Text,
> 					name: 'info',
>@@ -742,7 +774,7 @@
> 				}]
> 			}), lang.mixin({}, pageConf, {
> 				name: 'error',
>-				headerText: _('UCS setup - An error occurred'),
>+				headerText: errorHeader,
> 				helpText: '_',
> 				widgets: [{
> 					type: Text,
>@@ -752,7 +784,7 @@
> 				}]
> 			}), lang.mixin({}, pageConf, {
> 				name: 'done',
>-				headerText: _('UCS has been set up successfully'),
>+				headerText: doneHeader,
> 				helpTextRegion: 'main',
> 				helpText: '_',
> 				widgets: []
>@@ -855,7 +887,7 @@
> 			}));
> 		},
> 
>-		_dhclient: function() {
>+		dhclient: function() {
> 			// send out queries for each network device
> 			var queries = {};
> 			var dev2index = {};
>@@ -970,6 +1002,7 @@
> 		_setupJavaScriptLinks: function() {
> 			array.forEach([
> 					['network', 'configureProxySettings'],
>+					['network', '_renewLease'],
> 					['credentials-master', 'email_address'],
> 					['fqdn-nonmaster-all', 'hostname'],
> 					['network', 'proxy/http']
>@@ -1565,7 +1598,11 @@
> 			var ips = this._getIPAdresses();
> 
> 			var msg = '';
>-			msg += '' + _('UCS has been successfully set up.') + '';
>+			if (this.ucr['umc/web/appliance/name']) {
>+				msg += '' + _('The %s appliance has been successfully set up.', this.ucr['umc/web/appliance/name']) + '';
>+			} else {
>+				msg += '' + _('UCS has been successfully set up.') + '';
>+			}
> 			if (!isBaseSystem) {
> 				if (ips.length) {
> 					msg += '' + _('The system has been configured with the IP address(es) %s.', ips.join(', ')) + '';
>@@ -1586,7 +1623,7 @@
> 			if (array.indexOf(this.disabledFields, 'reboot') !== -1) {
> 				msg += _('After clicking on the button Finish the system will be prepared for the first boot procedure and will be rebooted.');
> 			} else {
>-				msg += _('Click now on the button Finish to complete the setup process.');
>+				msg += _('It is mandatory to click on Finish for putting UCS into operation and completing the setup process.');
> 			}
> 			this.getPage('done').set('helpText', msg);
> 		},
>Index: umc/js/setup.js
>===================================================================
>--- umc/js/setup.js	(Revision 57193)
>+++ umc/js/setup.js	(Arbeitskopie)
>@@ -90,7 +90,8 @@
> 				'system/setup/boot/pages/blacklist',
> 				'system/setup/boot/fields/blacklist',
> 				'system/setup/boot/installer',
>-				'umc/modules/setup/network/disabled/by'
>+				'umc/modules/setup/network/disabled/by',
>+				'umc/web/appliance/*'
> 			]);
> 
> 			all({
>@@ -216,7 +217,8 @@
> 				umcpCommand: lang.hitch(this, 'umcpCommand'),
> 				umcpProgressCommand: lang.hitch(this, 'umcpProgressCommand'),
> 				partOfInstaller: partOfInstaller,
>-				values: values
>+				values: values,
>+				ucr: ucr
> 			});
> 			this.addChild(this.wizard);
> 			if (!tools.status('overview')) {
>Index: umc/python/setup/de.po
>===================================================================
>--- umc/python/setup/de.po	(Revision 57193)
>+++ umc/python/setup/de.po	(Arbeitskopie)
>@@ -3,7 +3,7 @@
> msgstr ""
> "Project-Id-Version: univention-management-console-module-setup\n"
> "Report-Msgid-Bugs-To: packages@univention.de\n"
>-"POT-Creation-Date: 2014-12-03 13:52+0100\n"
>+"POT-Creation-Date: 2015-01-08 15:54+0100\n"
> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
>@@ -12,11 +12,11 @@
> "Content-Type: text/plain; charset=UTF-8\n"
> "Content-Transfer-Encoding: 8bit\n"
> 
>-#: umc/python/setup/__init__.py:464
>+#: umc/python/setup/__init__.py:465
> msgid "A domain name server needs to be specified."
> msgstr "Ein DomÃ¤nen-DNS-Server muss angegeben werden."
> 
>-#: umc/python/setup/__init__.py:389
>+#: umc/python/setup/__init__.py:390
> msgid ""
> "A valid NetBIOS name can not be longer than 13 characters. If Samba is "
> "installed, the hostname should be shortened."
>@@ -24,7 +24,7 @@
> "Ein gÃ¼ltiger NetBIOS Name darf nicht lÃ¤nger als 13 Zeichen sein. Wenn Samba "
> "installiert wird, sollte der Rechnername gekÃ¼rzt werden."
> 
>-#: umc/python/setup/__init__.py:237
>+#: umc/python/setup/__init__.py:238
> msgid "Already joined systems cannot be joined."
> msgstr "Bereits gejointe Systeme kÃ¶nnen nicht gejoint werden."
> 
>@@ -32,11 +32,11 @@
> msgid "Bond-primary must exist in bond-slaves"
> msgstr "Bond-primary muss in bond-slaves enthalten sein"
> 
>-#: umc/python/setup/__init__.py:418
>+#: umc/python/setup/__init__.py:419
> msgid "Business unit"
> msgstr "Abteilung"
> 
>-#: umc/python/setup/util.py:152 umc/python/setup/__init__.py:481
>+#: umc/python/setup/util.py:152 umc/python/setup/__init__.py:482
> msgid ""
> "Cannot automatically determine the domain. Please specify the server's fully "
> "qualified domain name."
>@@ -71,7 +71,7 @@
> "GerÃ¤te, die in einem Bond-GerÃ¤t verwendet werden, mÃ¼ssen physikalisch sein: "
> "%s ist nicht"
> 
>-#: umc/python/setup/__init__.py:435
>+#: umc/python/setup/__init__.py:436
> msgid "Domain name server"
> msgstr "DomÃ¤nen-DNS-Server"
> 
>@@ -80,16 +80,16 @@
> msgid "Duplicated IP address: %r"
> msgstr "Duplizierte IP-Addresse: %r"
> 
>-#: umc/python/setup/__init__.py:418
>+#: umc/python/setup/__init__.py:419
> msgid "Email address"
> msgstr "E-Mail-Adresse"
> 
>-#: umc/python/setup/__init__.py:214 umc/python/setup/__init__.py:284
>+#: umc/python/setup/__init__.py:215 umc/python/setup/__init__.py:285
> #, python-format
> msgid "Encountered unexpected error during setup process: %s"
> msgstr "Ein unerwarteter Fehler trat wÃ¤hrend des Einrichtungsprozesses auf: %s"
> 
>-#: umc/python/setup/__init__.py:435
>+#: umc/python/setup/__init__.py:436
> msgid "External name server"
> msgstr "Externer DNS-Server"
> 
>@@ -98,7 +98,7 @@
> msgid "Failed to get package for Role %s"
> msgstr "Es konnte kein Paket fÃ¼r die Rolle %s gefunden werden"
> 
>-#: umc/python/setup/__init__.py:396
>+#: umc/python/setup/__init__.py:397
> msgid "Hostname is equal to domain name."
> msgstr "Systemname ist gleich dem DomÃ¤nennamen."
> 
>@@ -141,7 +141,7 @@
> msgid "Invalid device name: %r"
> msgstr "UngÃ¼ltiger GerÃ¤tename: %r"
> 
>-#: umc/python/setup/__init__.py:497
>+#: umc/python/setup/__init__.py:498
> msgid ""
> "It is not possible to install KVM and XEN components on one system. Please "
> "select only one of these components."
>@@ -149,7 +149,7 @@
> "Es ist nicht mÃ¶glich KVM- und XEN-Komponenten auf einem System zu "
> "installieren. Bitte wÃ¤hlen Sie nur eine dieser Komponenten aus."
> 
>-#: umc/python/setup/__init__.py:499
>+#: umc/python/setup/__init__.py:500
> msgid ""
> "It is not possible to install Samba 3 and Samba 4 on one system. Please "
> "select only one of these components."
>@@ -157,7 +157,7 @@
> "Es ist nicht mÃ¶glich Samba 3 und Samba 4 auf einem System zu installieren. "
> "Bitte wÃ¤hlen Sie nur eine dieser Komponenten aus."
> 
>-#: umc/python/setup/__init__.py:416
>+#: umc/python/setup/__init__.py:417
> msgid "Location"
> msgstr "Ort"
> 
>@@ -179,23 +179,23 @@
> msgid "Multiple IPv4 addresses are not supported on this device."
> msgstr "Mehrere IPv4 Adressen sind an diesem GerÃ¤t nicht unterstÃ¼tzt."
> 
>-#: umc/python/setup/__init__.py:399
>+#: umc/python/setup/__init__.py:400
> msgid "No fully qualified domain name has been specified for the system."
> msgstr "Es wurde kein vollstÃ¤ndiger DomÃ¤nenname fÃ¼r das System angegeben."
> 
>-#: umc/python/setup/__init__.py:401
>+#: umc/python/setup/__init__.py:402
> msgid "No hostname has been specified for the system."
> msgstr "Es wurde kein Rechnername fÃ¼r das System angegeben."
> 
>-#: umc/python/setup/__init__.py:418
>+#: umc/python/setup/__init__.py:419
> msgid "Organization"
> msgstr "Organisation"
> 
>-#: umc/python/setup/__init__.py:421
>+#: umc/python/setup/__init__.py:422
> msgid "Please enter a valid email address"
> msgstr "Bitte geben Sie eine gÃ¼ltige E-Mail-Adresse ein"
> 
>-#: umc/python/setup/__init__.py:390
>+#: umc/python/setup/__init__.py:391
> msgid ""
> "Please enter a valid fully qualified domain name in lowercase (e.g. host."
> "example.com)."
>@@ -203,46 +203,39 @@
> "Bitte geben Sie einen klein-geschriebenen und vollstÃ¤ndigen Rechnernamen an "
> "(z.B. host.example.com)."
> 
>-#: umc/python/setup/__init__.py:416
>+#: umc/python/setup/__init__.py:417
> msgid "State"
> msgstr "Land"
> 
>-#: umc/python/setup/__init__.py:409
>+#: umc/python/setup/__init__.py:410
> msgid ""
> "The LDAP base may neither contain blanks nor any special characters. Its "
>-"structure needs to consist of at least two relative distinguished names (RDN) "
>-"which may only use the attribute tags 'dc', 'cn', 'c', 'o', or 'l' (e.g., "
>-"dc=test,dc=net)."
>+"structure needs to consist of at least two relative distinguished names "
>+"(RDN) which may only use the attribute tags 'dc', 'cn', 'c', 'o', or 'l' (e."
>+"g., dc=test,dc=net)."
> msgstr ""
>-"Die LDAP-Basis darf weder Leer- noch Sonderzeichen enthalten. "
>-"Ihre Struktur muss aus mindestens zwei Relative Distinguished Names (RDN) "
>-"bestehen, die eines der Attribut-Tags 'dc', 'cn', 'c', 'o', or 'l' verwenden "
>-"(z.B. dc=test,dc=net)."
>+"Die LDAP-Basis darf weder Leer- noch Sonderzeichen enthalten. Ihre Struktur "
>+"muss aus mindestens zwei Relative Distinguished Names (RDN) bestehen, die "
>+"eines der Attribut-Tags 'dc', 'cn', 'c', 'o', or 'l' verwenden (z.B. dc=test,"
>+"dc=net)."
> 
>-#: umc/python/setup/__init__.py:417
>+#: umc/python/setup/__init__.py:418
> #, python-format
> msgid "The following value is too long, only 128 characters allowed: %s"
> msgstr "Der folgende Wert ist zu lang, es sind nur 128 Zeichen erlaubt: %s"
> 
>-#: umc/python/setup/__init__.py:419
>+#: umc/python/setup/__init__.py:420
> #, python-format
> msgid "The following value is too long, only 64 characters allowed: %s"
> msgstr "Der folgende Wert ist zu lang, es sind nur 64 Zeichen erlaubt: %s"
> 
>-#: umc/python/setup/__init__.py:737
>-msgid ""
>-"The given user is not member of the Domain Admins group in AD."
>+#: umc/python/setup/__init__.py:747
>+msgid "The given user is not member of the Domain Admins group in AD."
> msgstr ""
> "Das angegebene Konto ist nicht Mitglied der Gruppe Domain Admins in AD."
> 
>-#: umc/python/setup/__init__.py:737
>+#: umc/python/setup/__init__.py:389
> msgid ""
>-"Time synchronization with AD server failed."
>-msgstr ""
>-"Die Synchronisation der Systemzeit mit dem AD-Server schlug fehl."
>-
>-#: umc/python/setup/__init__.py:388
>-msgid ""
> "The hostname is not a valid fully qualified domain name in lowercase (e.g. "
> "host.example.com)."
> msgstr ""
>@@ -249,16 +242,16 @@
> "Der Rechnernamen muss vollstÃ¤ndig und klein geschrieben sein (z.B. host."
> "example.com)."
> 
>-#: umc/python/setup/__init__.py:394
>+#: umc/python/setup/__init__.py:395
> msgid ""
> "The length of fully qualified domain name is greater than 63 characters."
> msgstr "Die LÃ¤nge von System- und DomÃ¤nennamen ist grÃ¶Ãer als 63 Zeichen."
> 
>-#: umc/python/setup/__init__.py:432
>+#: umc/python/setup/__init__.py:433
> msgid "The primary network device must exist."
> msgstr "Das primÃ¤re NetzwerkgerÃ¤t muss existieren."
> 
>-#: umc/python/setup/__init__.py:412
>+#: umc/python/setup/__init__.py:413
> msgid ""
> "The root password is too short. For security reasons, your password must "
> "contain at least 8 characters."
>@@ -266,37 +259,37 @@
> "Das Root-Passwort ist zu kurz, aus SicherheitsgrÃ¼nden sollte es mindestens 8 "
> "Zeichen lang sein."
> 
>-#: umc/python/setup/__init__.py:413
>+#: umc/python/setup/__init__.py:414
> msgid "The root password may only contain ascii characters."
> msgstr "FÃ¼r das Root-Passwort sind nur ASCII-Zeichen erlaubt."
> 
>-#: umc/python/setup/__init__.py:442
>+#: umc/python/setup/__init__.py:443
> #, python-format
> msgid "The specified IP address (%s) is not valid: %s"
> msgstr "Die angegebenen IP-Adresse (%s) ist nicht gÃ¼ltig: %s"
> 
>-#: umc/python/setup/__init__.py:488
>+#: umc/python/setup/__init__.py:489
> #, python-format
> msgid "The specified gateway IPv4 address is not valid: %s"
> msgstr "Die angegebene Gateway-IPv4-Adresse ist nicht gÃ¼ltig: %s"
> 
>-#: umc/python/setup/__init__.py:490
>+#: umc/python/setup/__init__.py:491
> #, python-format
> msgid "The specified gateway IPv6 address is not valid: %s"
> msgstr "Die angegebene Gateway-IPv6-Adresse is nicht gÃ¼ltig: %s"
> 
>-#: umc/python/setup/__init__.py:484
>+#: umc/python/setup/__init__.py:485
> #, python-format
> msgid "The specified nameserver %s is not part of a valid UCS domain."
> msgstr "Der angegebene DNS-Server %s ist nicht Teil einer gÃ¼ltigen UCS-DomÃ¤ne."
> 
>-#: umc/python/setup/__init__.py:493
>+#: umc/python/setup/__init__.py:494
> #, python-format
> msgid ""
> "The specified proxy address is not valid (e.g., http://10.201.1.1:8080): %s"
> msgstr "Die Proxy-Adresse ist nicht gÃ¼ltig (z.B. http://10.201.1.1:8080): %s"
> 
>-#: umc/python/setup/__init__.py:384
>+#: umc/python/setup/__init__.py:385
> msgid ""
> "The system role may not change on a system that has already joined to domain."
> msgstr ""
>@@ -303,15 +296,15 @@
> "Die Systemrolle darf sich auf einem bereits gejointen System nicht mehr "
> "Ã¤ndern."
> 
>-#: umc/python/setup/__init__.py:404
>+#: umc/python/setup/__init__.py:405
> msgid "The windows domain name can only consist of upper case characters."
> msgstr "Die Windows-DomÃ¤ne kann nur aus GroÃbuchstaben bestehen."
> 
>-#: umc/python/setup/__init__.py:405
>+#: umc/python/setup/__init__.py:406
> msgid "The windows domain name cannot be longer than 15 characters."
> msgstr "Der Windows-DomÃ¤nenname darf nicht lÃ¤nger als 15 Zeichen sein."
> 
>-#: umc/python/setup/__init__.py:406
>+#: umc/python/setup/__init__.py:407
> msgid "The windows domain name is not valid."
> msgstr "Die Windows-DomÃ¤ne ist nicht gÃ¼ltig."
> 
>@@ -323,6 +316,10 @@
> "Es ist kein GerÃ¤t konfiguriert. Mindestens eine IPv4 oder IPv6-Adresse oder "
> "DHCP oder SLAAC muss angegeben werden."
> 
>+#: umc/python/setup/__init__.py:749
>+msgid "Time synchronization with AD server failed."
>+msgstr "Die Synchronisation der Systemzeit mit dem AD-Server schlug fehl."
>+
> #~ msgid ""
> #~ "At least one domain name server needs to be given if DHCP or SLAAC is not "
> #~ "specified."
>Index: usr/lib/univention-system-setup/scripts/setup-join.sh
>===================================================================
>--- usr/lib/univention-system-setup/scripts/setup-join.sh	(Revision 57193)
>+++ usr/lib/univention-system-setup/scripts/setup-join.sh	(Arbeitskopie)
>@@ -253,14 +253,6 @@
> 	/var/www/ucs-overview/entries.json \
> 	/var/www/ucs-overview/languages.json
> 
>-# Reset the apache2 startsite
>-initialsetup_startsite="ucs-overview/initialsetup.html"
>-system_setup_boot_startsite="univention-management-console/?module=setup\&flavor=wizard\&overview=false\&username=root"
>-startsite="$(ucr get apache2/startsite)"
>-if [ "$startsite" = "$initialsetup_startsite" -o "$startsite" = "$system_setup_boot_startsite" ]; then
>-	ucr set apache2/startsite="$(ucr get system/setup/prev/apache2/startsite)"
>-fi
>-
> # Restart NSCD
> test -x /etc/init.d/nscd && invoke-rc.d nscd restart
>

Actions: View | Diff

Attachments on bug 37488: 6588