Attachment 7772 Details for Bug 40782 – bug40782.patch

[patch] bug40782.patch

bug40782.patch (text/plain), 64.13 KB, created by Johannes Keiser on 2016-06-28 18:33:56 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Keiser

Created: 2016-06-28 18:33:56 CEST

Size: 64.13 KB

patch

obsolete

>Index: debian/control
>===================================================================
>--- debian/control	(Revision 70680)
>+++ debian/control	(Arbeitskopie)
>@@ -110,6 +110,7 @@
> univention-updater,
> univention-management-console-module-lib,
> univention-management-console-module-appcenter,
>+ univention-management-console-module-sysinfo,
> univention-management-console-frontend,
> python-univention-lib (>= 4.0.5-12),
> python-dnspython,
>Index: debian/univention-management-console-module-setup.postinst
>===================================================================
>--- debian/univention-management-console-module-setup.postinst	(Revision 70680)
>+++ debian/univention-management-console-module-setup.postinst	(Arbeitskopie)
>@@ -34,11 +34,11 @@
> adduser --system --no-create-home --disabled-password --force-badname '__systemsetup__'
> 
> # set UMC ACLs for special user
>-/usr/sbin/univention-management-console-acls allow -u "__systemsetup__" -c "setup/*" -c "lib/server/*" -H "*"
>+/usr/sbin/univention-management-console-acls allow -u "__systemsetup__" -c "setup/*" -c "lib/server/*" -c "sysinfo/*" -H "*"
> 
> # For remote configuration give root the permission to see this module. Normally the
> # ACL will be defined in the UMC package and can be removed here after UCS 3.0-2
>-/usr/sbin/univention-management-console-acls allow -u "root" -c "setup/*" -c "lib/server/*" -H "*"
>+/usr/sbin/univention-management-console-acls allow -u "root" -c "setup/*" -c "lib/server/*" -c "sysinfo/*" -H "*"
> 
> ucr set umc/web/appliance/fast_setup_mode?true
> 
>Index: umc/js/setup/ApplianceWizard.js
>===================================================================
>--- umc/js/setup/ApplianceWizard.js	(Revision 70680)
>+++ umc/js/setup/ApplianceWizard.js	(Arbeitskopie)
>@@ -50,9 +50,11 @@
> 	"dojox/html/entities",
> 	"umc/dialog",
> 	"umc/tools",
>+	"umc/modules/sysinfo/lib",
> 	"umc/widgets/TextBox",
> 	"umc/widgets/CheckBox",
> 	"umc/widgets/ComboBox",
>+	"umc/widgets/ContainerWidget",
> 	"umc/widgets/Text",
> 	"umc/widgets/Button",
> 	"umc/widgets/TitlePane",
>@@ -67,7 +69,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, request, Select, Tooltip, focusUtil, timing, styles, entities, dialog, tools, TextBox, CheckBox, ComboBox, Text, Button, TitlePane, PasswordInputBox, PasswordBox, Wizard, Grid, RadioButton, ProgressBar, LiveSearch, VirtualKeyboardBox, i18nTools, _) {
>+], function(dojo, declare, lang, array, dojoEvent, domClass, on, Evented, topic, Deferred, all, Memory, request, Select, Tooltip, focusUtil, timing, styles, entities, dialog, tools, sysinfo, TextBox, CheckBox, ComboBox, ContainerWidget, Text, Button, TitlePane, PasswordInputBox, PasswordBox, Wizard, Grid, RadioButton, ProgressBar, LiveSearch, VirtualKeyboardBox, i18nTools, _) {
> 
> 	var _Grid = declare(Grid, {
> 		_onRowClick: function(evt) {
>@@ -865,10 +867,15 @@
> 				name: 'error',
> 				headerText: errorHeader,
> 				helpText: '_',
>+				_errorFeedbackButtons: null,
> 				widgets: [{
> 					type: Text,
>+					name: 'errors',
>+					style: 'width: 100%',
>+					content: ''
>+				}, {
>+					type: Text,
> 					name: 'info',
>-					style: 'font-style:italic;',
> 					content: ''
> 				}]
> 			}), lang.mixin({}, pageConf, {
>@@ -1828,49 +1835,177 @@
> 		},
> 
> 		_updateErrorPage: function(details, critical) {
>+			var createErrorMessages = function() {
>+				//make the occurred errors more readable
>+				var previousErrorHeader = '';
>+				array.forEach(details, function(idetail) {
>+					var splitDetail = idetail.split(":");
>+					if (splitDetail.length === 2) {
>+						var errorHeader = splitDetail[0];
>+						var error = splitDetail[1];
>+						if (errorHeader === previousErrorHeader) {
>+							errors += error.trim() + '\n\n';
>+						} else {
>+							errors += "* " + errorHeader + ':\n' + error.trim() + '\n\n';
>+						}
>+						previousErrorHeader = errorHeader;
>+					} else {
>+						var readableMessage = idetail.replace(/ /g, "\n");
>+						errors += readableMessage + '\n';
>+						previousErrorHeader = '';
>+					}
>+				});
>+
>+				//compose an error message that is shown to the user
>+				errorMsgHeader = _('The following errors occurred while applying the settings.');
>+				var errorsBox = '<pre style="max-height: 200px">' + errors + '</pre>';
>+				var errorFeedbackText = _('Help us improve UCS by sending the occurred errors as feedback.');
>+
>+				errorMsg = '' + errorMsgHeader + '';
>+				errorMsg += errorsBox;
>+				errorMsg += '' + errorFeedbackText + '';
>+			};
>+
>+			var createInfoMessage = lang.hitch(this, function() {
>+				infoMsg += '<hr>';
>+				infoMsg += '' + _('You may restart the configuration process again with modified settings.') + '';
>+
>+				// TODO: all these messages about joining are useless if (critical)? ... Maybe some hint about Univention support? Or sdb article how to deal with errors.
>+				if (isMaster) {
>+					infoMsg += '';
>+					infoMsg += _('Alternatively, you may click on the button Finish to exit the wizard and resolve the described problems via Univention Management Console.') + ' ';
>+					infoMsg += _('Failed join scripts can be executed via the UMC module Domain join.');
>+					infoMsg += '';
>+
>+					infoMsg += '' + _('Connect to Univention Management Console on this system either as user Administrator or as user root in case the system has not yet created a new UCS domain:') + '';
>+					infoMsg += this._getUMCLinks();
>+				} else if (isBaseSystem) {
>+					var fqdn = this._getFQDN();
>+					var ips = this._getIPAdresses();
>+					infoMsg += '';
>+					infoMsg += _('Alternatively, you may click on the button Finish to exit the wizard and resolve the described problems at a later point.') + ' ';
>+					infoMsg += _('The system is reachable at %(fqdn)s or via its IP address(es) %(addresses)s.', {fqdn: fqdn, addresses: ips.join(', ')});
>+				} else { // if (isNonMaster || isAdMemberMaster || isAdMember) {
>+					infoMsg += '';
>+					infoMsg += _('Alternatively, you may click on the button Finish to exit the wizard and resolve the described problems via Univention Management Console.') + ' ';
>+					infoMsg += _('Failed join scripts or a new join of the system can be executed via the UMC module Domain join.');
>+					infoMsg += '';
>+
>+					infoMsg += '' + _('Connect to Univention Management Console on this system either as user Administrator or as user root in case the system has not yet joined the domain:') + '';
>+					infoMsg += this._getUMCLinks();
>+				}
>+			});
>+
>+			var createFeedback = lang.hitch(this, function() {
>+				feedbackMsg = lang.replace("{0}\n\n{1}\n\n{2}", [
>+					tools.status('ucsVersion'),
>+					errorMsgHeader,
>+					errors
>+				]);
>+
>+				feedbackMailLabel = _('Send feedback as mail');
>+				feedbackMailto = lang.replace('mailto:{email}?body={body}&subject={subject}', {
>+					email: encodeURIComponent(tools.status('feedbackAddress')),
>+					body: encodeURIComponent(entities.decode(feedbackMsg)),
>+					subject: encodeURIComponent(tools.status('feedbackSubject'))
>+				});
>+				feedbackMailLink = '<a href="' + feedbackMailto + '">' + feedbackMailLabel + '</a>';
>+			});
>+
>+			var createFeedbackButtons = lang.hitch(this, function() {
>+				var page = this.getPage('error');
>+				var _errors = this.getWidget('error', 'errors');
>+
>+				//cleanup old buttons
>+				if (page._errorFeedbackButtons) {
>+					page._errorFeedbackButtons.destroyRecursive();
>+				}
>+				//create new buttons
>+				var _errorFeedbackButtons = new ContainerWidget();
>+				var _sendErrorAsMailButton = null;
>+				//var _sendErrorAsMailButton = getSendErrorsAsMailButton();
>+				var _sendErrorButton = getSendErrorButton();
>+				//add buttons
>+				if (_sendErrorAsMailButton) {
>+					_errorFeedbackButtons.addChild(_sendErrorAsMailButton);
>+				}
>+				if (_sendErrorButton) {
>+					_errorFeedbackButtons.addChild(_sendErrorButton);
>+				}
>+
>+				page._errorFeedbackButtons = _errorFeedbackButtons;
>+			});
>+
>+			var getSendErrorButton = lang.hitch(this, function() {
>+				var _sendErrorButton = null;
>+
>+				_sendErrorButton = new Button({
>+					label: _('Send feedback'),
>+					style: 'float: right',
>+					onClick: lang.hitch(this, function() {
>+						values = {
>+							traceback: details.join('\n'),
>+							remark: feedbackMsg,
>+							email: ''
>+						};
>+						tools.umcpCommand('sysinfo/traceback', values, false).then(
>+							function() {
>+								dialog.alert(_('Thank you for your help'));
>+							},
>+							function() {
>+								dialog.alert(_('Sending the information to the vendor failed'));
>+							}
>+						);
>+					})
>+				});
>+
>+				return _sendErrorButton;
>+			});
>+
>+			var getSendErrorsAsMailButton = lang.hitch(this, function() {
>+				var _sendErrorAsMail = null;
>+				if (!this.local_mode) {
>+					_sendErrorAsMail = new Button({
>+						label: feedbackMailLabel,
>+						style: 'float: right',
>+						onClick: function() {
>+							window.location.href = feedbackMailto;
>+						}
>+					});
>+				}	
>+
>+				return _sendErrorAsMail;
>+			});
>+
>+			var displayInformation = lang.hitch(this, function() {
>+				var page = this.getPage('error').set('helpText', helpText);
>+				var errors = this.getWidget('error', 'errors').set('content', errorMsg);
>+				//display feedback buttons
>+				dojo.place(page._errorFeedbackButtons.domNode, errors.domNode, 'after');
>+				this.getWidget('error', 'info').set('content', infoMsg);
>+			});
>+
> 			var isMaster = this._isRoleMaster();
> 			var isBaseSystem = this._isRoleBaseSystem();
>-
> 			var helpText = '' + _('The system configuration could not be completed. Please choose to retry the configuration process or finish the wizard.') + '';
>-			var msg = '' + _('The following errors occurred while applying the settings.') + '';
>-			msg += '<ul>';
>-			array.forEach(details, function(idetail) {
>-				msg += '<li>' + idetail + '</li>';
>-			});
>-			msg += '</ul>';
> 
>-			msg += '' + _('You may restart the configuration process again with modified settings.') + '';
>+			var errorMsg = '';
>+			var errorMsgHeader = '';
>+			var errors = '';
>+			createErrorMessages();
> 
>-			// TODO: all these messages about joining are useless if (critical)? ... Maybe some hint about Univention support? Or sdb article how to deal with errors.
>-			if (isMaster) {
>-				msg += '';
>-				msg += _('Alternatively, you may click on the button Finish to exit the wizard and resolve the described problems via Univention Management Console.') + ' ';
>-				msg += _('Failed join scripts can be executed via the UMC module Domain join.');
>-				msg += '';
>+			var infoMsg = '';
>+			createInfoMessage();
> 
>-				msg += '' + _('Connect to Univention Management Console on this system either as user Administrator or as user root in case the system has not yet created a new UCS domain:') + '';
>-				msg += this._getUMCLinks();
>-			} else if (isBaseSystem) {
>-				var fqdn = this._getFQDN();
>-				var ips = this._getIPAdresses();
>-				msg += '';
>-				msg += _('Alternatively, you may click on the button Finish to exit the wizard and resolve the described problems at a later point.') + ' ';
>-				msg += _('The system is reachable at %(fqdn)s or via its IP address(es) %(addresses)s.', {fqdn: fqdn, addresses: ips.join(', ')});
>-				msg += '';
>-			} else { // if (isNonMaster || isAdMemberMaster || isAdMember) {
>-				msg += '';
>-				msg += _('Alternatively, you may click on the button Finish to exit the wizard and resolve the described problems via Univention Management Console.') + ' ';
>-				msg += _('Failed join scripts or a new join of the system can be executed via the UMC module Domain join.');
>-				msg += '';
>+			var feedbackMsg = '';
>+			var feedbackMailLabel = '';
>+			var feedbackMailto = '';
>+			var feedbackMailLink = '';
>+			createFeedback();
>+			createFeedbackButtons();
> 
>-				msg += '' + _('Connect to Univention Management Console on this system either as user Administrator or as user root in case the system has not yet joined the domain:') + '';
>-				msg += this._getUMCLinks();
>-			}
>+			displayInformation();
> 
>-			// display validation information
>-			this.getPage('error').set('helpText', helpText);
>-			this.getWidget('error', 'info').set('content', msg);
>-
> 			// save the state
> 			this._criticalJoinErrorOccurred = critical;
> 		},
>Index: umc/js/de.po
>===================================================================
>--- umc/js/de.po	(Revision 70680)
>+++ umc/js/de.po	(Arbeitskopie)
>@@ -1,7 +1,7 @@
> msgid ""
> msgstr ""
> "Report-Msgid-Bugs-To: packages@univention.de\n"
>-"POT-Creation-Date: 2016-03-15 18:14+0100\n"
>+"POT-Creation-Date: 2016-06-23 15:35+0200\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"
>@@ -10,39 +10,49 @@
> "Content-Type: text/plain; charset=UTF-8\n"
> "Content-Transfer-Encoding: 8bit\n"
> 
>-#: umc/js/setup/ApplianceWizard.js:317
>+#: umc/js/setup/ApplianceWizard.js:322
> #, python-format
> msgid "%s Appliance"
> msgstr ""
> 
>-#: umc/js/setup/ApplianceWizard.js:1797
>+#: umc/js/setup/ApplianceWizard.js:2721
> #, python-format
>+msgid ""
>+"%s Appliance could not be joined because the license on the DC Master is not "
>+"activated."
>+msgstr ""
>+"%s Appliance kann nicht gejoined werden. Es liegt keine aktivierte Lizenz "
>+"auf dem DC Master vor."
>+
>+#: umc/js/setup/ApplianceWizard.js:2018
>+#, python-format
> msgid "%s Appliance has been successfully set up."
> msgstr "%s Appliance wurde erfolgreich eingerichtet."
> 
>-#: umc/js/setup/ApplianceWizard.js:1132
>+#: umc/js/setup/ApplianceWizard.js:1159
> #, python-format
> msgid "%s GiB"
> msgstr ""
> 
>-#: umc/js/setup/ApplianceWizard.js:1130
>+#: umc/js/setup/ApplianceWizard.js:1157
> #, python-format
> msgid "%s MiB"
> msgstr ""
> 
>-#: umc/js/setup/ApplianceWizard.js:433
>+#: umc/js/setup/ApplianceWizard.js:438
> msgid "(Request address again)"
> msgstr "(Adresse erneut anfordern)"
> 
>-#: umc/js/setup/ApplianceWizard.js:541
>+#: umc/js/setup/ApplianceWizard.js:546
> msgid "(configure proxy settings)"
> msgstr "(Einrichten von Proxy-Einstellungen)"
> 
>-#: umc/js/setup/ApplianceWizard.js:1440
>+#: umc/js/setup/ApplianceWizard.js:1536
> msgid "Unknown"
> msgstr "Unbekannt"
> 
>-#: umc/js/setup/ApplianceWizard.js:1135
>+#: umc/js/setup/ApplianceWizard.js:1162
>+#, python-brace-format
> msgid ""
> "Warning: At least {memory_min} RAM is required for the installation "
> "of {product_name}."
>@@ -88,7 +98,7 @@
> "logisch mit nur einem oder mehreren physikalischen NetzwerkgerÃ¤ten zu "
> "trennen."
> 
>-#: umc/js/setup/ApplianceWizard.js:1802
>+#: umc/js/setup/ApplianceWizard.js:2023
> msgid ""
> "After clicking on the button Finish the system will be prepared "
> "for the first boot procedure and will be rebooted."
>@@ -96,18 +106,18 @@
> "Nach dem Klicken auf die SchaltflÃ¤che Fertigstellen wird das "
> "System auf den ersten Bootvorgang vorbereitet und neu gestartet."
> 
>-#: umc/js/setup/ApplianceWizard.js:1813
>+#: umc/js/setup/ApplianceWizard.js:2034
> msgid "Click on Finish for putting UCS into operation."
> msgstr ""
> "Klicken Sie auf Fertigstellen, um UCS in Betrieb zu nehmen."
> 
>-#: umc/js/setup/ApplianceWizard.js:1804
>+#: umc/js/setup/ApplianceWizard.js:2025
> msgid "Click on Finish for putting this system into operation."
> msgstr ""
> "Klicken Sie auf Fertigstellen, um dieses System in Betrieb zu "
> "nehmen."
> 
>-#: umc/js/setup/ApplianceWizard.js:938
>+#: umc/js/setup/ApplianceWizard.js:962
> msgid ""
> "Enter the name of your organization and an e-mail address to activate UCS."
> ""
>@@ -115,7 +125,7 @@
> "Geben Sie den Namen Ihrer Organisation und eine E-Mail-Adresse fÃ¼r die "
> "Aktivierung von UCS ein."
> 
>-#: umc/js/setup/ApplianceWizard.js:323
>+#: umc/js/setup/ApplianceWizard.js:328
> #, python-format
> msgid ""
> "Enter the name of your organization, an e-mail address to activate %s "
>@@ -129,7 +139,7 @@
> "sowohl fÃ¼r das DomÃ¤nen-Administrator-Konto als auch fÃ¼r den lokalen "
> "Superuser root verwendet."
> 
>-#: umc/js/setup/ApplianceWizard.js:313
>+#: umc/js/setup/ApplianceWizard.js:318
> msgid ""
> "Enter the name of your organization, an e-mail address to activate UCS "
> "and a password for your Administrator account.The password is "
>@@ -142,7 +152,7 @@
> "Administrator-Konto als auch fÃ¼r den lokalen Superuser root verwendet."
> ""
> 
>-#: umc/js/setup/ApplianceWizard.js:2253
>+#: umc/js/setup/ApplianceWizard.js:2569
> #, python-format
> msgid ""
> "One or more network interfaces could not obtain an IP address via DHCP. "
>@@ -156,7 +166,7 @@
> "ihre DHCP-Konfiguration an oder bestÃ¤tigen Sie die Nutzung der privaten "
> "Adresse(n)."
> 
>-#: umc/js/setup/ApplianceWizard.js:823
>+#: umc/js/setup/ApplianceWizard.js:842
> msgid ""
> "Select UCS software components for installation on this system. This step "
> "can be skipped; the components are also available in the Univention App "
>@@ -169,7 +179,7 @@
> "p>Software von Drittanbietern (bspw. Groupware) kann ebenfalls Ã¼ber das "
> "Univention App Center installiert werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1809
>+#: umc/js/setup/ApplianceWizard.js:2030
> msgid ""
> "When accessing the system for the first time, you will be asked to "
> "request and upload a new license."
>@@ -177,7 +187,7 @@
> "Beim initialen Zugriff auf das System, werden Sie gebeten eine "
> "Lizenzdatei anzufordern und hochzuladen."
> 
>-#: umc/js/setup/ApplianceWizard.js:1807
>+#: umc/js/setup/ApplianceWizard.js:2028
> msgid ""
> "When accessing the system for the first time, you will be asked to upload "
> "a new license that has been sent to your email account."
>@@ -185,7 +195,7 @@
> "Beim initialen Zugriff auf das System, werden Sie gebeten eine "
> "Lizenzdatei, die an Ihre E-Mail-Adresse gesendet wurde, hochzuladen."
> 
>-#: umc/js/setup/ApplianceWizard.js:2257
>+#: umc/js/setup/ApplianceWizard.js:2573
> msgid ""
> "With the current settings no internet access is available.</"
> "p>Because of this some functions like the App Center or software-updates "
>@@ -195,27 +205,27 @@
> "Dadurch werden einige Funktionen wie zum Beispiel das App Center oder "
> "Software-Aktualisierungen nicht zur VerfÃ¼gung stehen."
> 
>-#: umc/js/setup/ApplianceWizard.js:1438
>+#: umc/js/setup/ApplianceWizard.js:1534
> #, 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:1458
>+#: umc/js/setup/ApplianceWizard.js:1554
> #, 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:1487
>+#: umc/js/setup/ApplianceWizard.js:1583
> #, 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:1441
>+#: umc/js/setup/ApplianceWizard.js:1537
> #, 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:634
>+#: umc/js/setup/ApplianceWizard.js:642
> 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 "
>@@ -225,15 +235,15 @@
> "des DC Masters langfristig Ã¼bernehmen. Es ist empfohlen, mindestens einen DC "
> "Backup in der DomÃ¤ne zu verwenden."
> 
>-#: umc/js/setup/ApplianceWizard.js:325
>+#: umc/js/setup/ApplianceWizard.js:330
> 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:1608
>+#: umc/js/setup/ApplianceWizard.js:1704
> msgid "A new UCS domain will be created."
> msgstr "Eine neue UCS-DomÃ¤ne wird erstellt."
> 
>-#: umc/js/setup/ApplianceWizard.js:321
>+#: umc/js/setup/ApplianceWizard.js:326
> msgid ""
> "A new domain directory is created on this system. User and management data "
> "are stored locally."
>@@ -241,11 +251,11 @@
> "Ein neues DomÃ¤nenverzeichnis wird auf diesem System erstellt. Benutzer- und "
> "Verwaltungsdaten werden lokal gespeichert."
> 
>-#: umc/js/setup/ApplianceWizard.js:1682
>+#: umc/js/setup/ApplianceWizard.js:1706
> msgid "A preconfigured test domain will be instantiated."
> msgstr "Eine vorkonfigurierte UCS-Test-DomÃ¤ne wird instanziiert."
> 
>-#: umc/js/setup/ApplianceWizard.js:1134
>+#: umc/js/setup/ApplianceWizard.js:1145
> msgid ""
> "A proxy address needs to be specified in the format: http://proxy."
> "mydomain.intranet:3128 Proxy access with username and password may "
>@@ -257,7 +267,7 @@
> "Password kann das folgenden Format verwendet werden: http://benutzername:"
> "passwort@proxy.meinedomaene.intranet:3128"
> 
>-#: umc/js/setup/ApplianceWizard.js:1111
>+#: umc/js/setup/ApplianceWizard.js:1138
> msgid ""
> "A valid e-mail address allows to activate the UCS system for using the "
> "Univention App Center. The address can be specified now or also at a later "
>@@ -272,7 +282,7 @@
> "werden. Die Lizenz kann Ã¼ber den Lizenzdialog der Univention Management "
> "Console eingespielt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1109
>+#: umc/js/setup/ApplianceWizard.js:1136
> #, python-format
> msgid ""
> "A valid e-mail address is required to activate %s Appliance. The address can "
>@@ -286,15 +296,15 @@
> "personalisierter LizenzschlÃ¼ssel zugesendet. Die Lizenz kann Ã¼ber den "
> "Lizenzdialog der Univention Management Console eingespielt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:650 umc/js/setup/ApplianceWizard.js:1642
>+#: umc/js/setup/ApplianceWizard.js:669 umc/js/setup/ApplianceWizard.js:1740
> msgid "Account information"
> msgstr "Kontoinformationen"
> 
>-#: umc/js/setup/ApplianceWizard.js:686
>+#: umc/js/setup/ApplianceWizard.js:705
> msgid "Active Directory join information"
> msgstr "Active Directory-Kontoinformationen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1497
>+#: umc/js/setup/ApplianceWizard.js:1593
> msgid "Adapt settings"
> msgstr "Einstellungen anpassen"
> 
>@@ -318,16 +328,16 @@
> msgid "Additional options for this network interface"
> msgstr "Weitere Optionen fÃ¼r dieses NetzwerkgerÃ¤t"
> 
>-#: umc/js/setup/ApplianceWizard.js:1669
>+#: umc/js/setup/ApplianceWizard.js:1767
> msgid "Address configuration"
> msgstr "Adresskonfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:1678
>+#: umc/js/setup/ApplianceWizard.js:1776
> #, python-format
> msgid "Address for %s"
> msgstr "Adresse fÃ¼r %s"
> 
>-#: umc/js/setup/ApplianceWizard.js:691
>+#: umc/js/setup/ApplianceWizard.js:710
> msgid ""
> "Address of Active Directory domain controller or name of Active Directory "
> "domain"
>@@ -335,7 +345,7 @@
> "Adresse des Active Directory-DomÃ¤nencontrollers oder Name der Active "
> "Directory-DomÃ¤ne"
> 
>-#: umc/js/setup/ApplianceWizard.js:2277 umc/js/setup/ApplianceWizard.js:2339
>+#: umc/js/setup/ApplianceWizard.js:2593 umc/js/setup/ApplianceWizard.js:2655
> msgid "Adjust settings"
> msgstr "Einstellungen anpassen"
> 
>@@ -343,11 +353,11 @@
> msgid "Advanced configuration"
> msgstr "Erweiterte Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:534
>+#: umc/js/setup/ApplianceWizard.js:539
> msgid "Alternate DNS server"
> msgstr "Alternativer DNS-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:1766
>+#: umc/js/setup/ApplianceWizard.js:1880
> msgid ""
> "Alternatively, you may click on the button Finish to exit the wizard "
> "and resolve the described problems at a later point."
>@@ -356,7 +366,7 @@
> "Einrichtungsassistenten zu beenden und die beschriebenen Probleme zu einem "
> "spÃ¤teren Zeitpunkt zu beheben."
> 
>-#: umc/js/setup/ApplianceWizard.js:1756 umc/js/setup/ApplianceWizard.js:1771
>+#: umc/js/setup/ApplianceWizard.js:1870 umc/js/setup/ApplianceWizard.js:1884
> msgid ""
> "Alternatively, you may click on the button Finish to exit the wizard "
> "and resolve the described problems via Univention Management Console."
>@@ -365,16 +375,7 @@
> "Einrichtungsassistenten zu beenden und die beschriebenen Probleme mittels "
> "Univention Management Console zu beheben."
> 
>-#: umc/js/setup/ApplianceWizard.js:2405
>-#, python-format
>-msgid ""
>-"%s Appliance could not be joined because the license on the DC Master is not "
>-"activated."
>-msgstr ""
>-"%s Appliance kann nicht gejoined werden. Es liegt keine aktivierte Lizenz "
>-"auf dem DC Master vor."
>-
>-#: umc/js/setup.js:155 umc/js/setup.js:507
>+#: umc/js/setup.js:156 umc/js/setup.js:507
> msgid "Apply changes"
> msgstr "Ãnderungen Ã¼bernehmen"
> 
>@@ -386,7 +387,7 @@
> "Mindestens eine IP-Adresse muss angegeben werden oder DHCP oder SLAAC muss "
> "eingeschaltet sein."
> 
>-#: umc/js/setup/ApplianceWizard.js:2042
>+#: umc/js/setup/ApplianceWizard.js:2272
> msgid "At least one network device needs to be properly configured."
> msgstr "Wenigstens ein NetzwerkgerÃ¤t muss konfiguriert werden."
> 
>@@ -438,9 +439,9 @@
> msgid "Business unit"
> msgstr "Abteilung"
> 
>-#: umc/js/setup.js:148 umc/js/setup.js:504
>-#: umc/js/setup/ApplianceWizard.js:2261 umc/js/setup/ApplianceWizard.js:2467
>-#: umc/js/setup/InterfaceGrid.js:131
>+#: umc/js/setup/InterfaceGrid.js:131 umc/js/setup/ApplianceWizard.js:2577
>+#: umc/js/setup/ApplianceWizard.js:2783 umc/js/setup.js:149
>+#: umc/js/setup.js:504
> msgid "Cancel"
> msgstr "Abbrechen"
> 
>@@ -481,7 +482,7 @@
> "zur Folge haben. Dies kann ernsthafte Auswirkungen haben, sollte sich das "
> "System im Produktiveinsatz befinden."
> 
>-#: umc/js/setup.js:289
>+#: umc/js/setup.js:296
> #, python-format
> msgid ""
> "Changing network settings is disabled due to specific UVMM settings. See %s "
>@@ -490,7 +491,7 @@
> "Ãndern von Netzwerkeinstellungen ist durch spezifische UVMM Einstellungen "
> "deaktiviert. FÃ¼r weitere Informationen siehe %s."
> 
>-#: umc/js/setup.js:293
>+#: umc/js/setup.js:300
> msgid ""
> "Changing network settings is disabled. It can be re enabled by unsetting the "
> "UCR variable \"umc/modules/setup/network/disabled/by\"."
>@@ -503,15 +504,15 @@
> msgid "Choose interface type"
> msgstr "WÃ¤hle NetzwerkgerÃ¤tetyp aus"
> 
>-#: umc/js/setup/ApplianceWizard.js:348
>+#: umc/js/setup/ApplianceWizard.js:353
> msgid "Choose your language"
> msgstr "WÃ¤hlen Sie Ihre Sprache aus"
> 
>-#: umc/js/setup/ApplianceWizard.js:376
>+#: umc/js/setup/ApplianceWizard.js:381
> msgid "Choose your system's localization settings."
> msgstr "WÃ¤hlen Sie die Systemsprache."
> 
>-#: umc/js/setup.js:138 umc/js/setup.js:143
>+#: umc/js/setup.js:139 umc/js/setup.js:144
> msgid "Close"
> msgstr "SchlieÃen"
> 
>@@ -523,7 +524,7 @@
> msgid "Configuration"
> msgstr "Konfiguration"
> 
>-#: umc/js/setup.js:577 umc/js/setup/ApplianceWizard.js:2079
>+#: umc/js/setup.js:577
> msgid "Configuration finished"
> msgstr "Konfiguration abgeschlossen"
> 
>@@ -531,11 +532,11 @@
> msgid "Configuration of IPv4 and IPv6 adresses"
> msgstr "Konfiguration der IPv4 und IPv6 Adressen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1298
>+#: umc/js/setup/ApplianceWizard.js:1325
> msgid "Configure system"
> msgstr "System konfigurieren"
> 
>-#: umc/js/setup/ApplianceWizard.js:311
>+#: umc/js/setup/ApplianceWizard.js:316
> msgid ""
> "Configure this system as first system for the new domain. Additional systems "
> "can join the domain later."
>@@ -543,11 +544,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:835
>+#: umc/js/setup/ApplianceWizard.js:854
> msgid "Confirm configuration settings"
> msgstr "BestÃ¤tigen der Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1760
>+#: umc/js/setup/ApplianceWizard.js:1874
> msgid ""
> "Connect to Univention Management Console on this system either as user "
> "Administrator or as user root in case the system has not yet "
>@@ -557,7 +558,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:1775
>+#: umc/js/setup/ApplianceWizard.js:1888
> msgid ""
> "Connect to Univention Management Console on this system either as user "
> "Administrator or as user root in case the system has not yet "
>@@ -567,31 +568,31 @@
> "entweder als Benutzer Administrator oder als Benutzer root, "
> "falls das System noch nicht der DomÃ¤ne beigetreten ist:"
> 
>-#: umc/js/setup/ApplianceWizard.js:2416
>+#: umc/js/setup/ApplianceWizard.js:2732
> msgid "Connection failed. Please recheck the address"
> msgstr "Verbindungsaufbau gescheitert. Bitte Ã¼berprÃ¼fen Sie die Adresse"
> 
>-#: umc/js/setup/ApplianceWizard.js:2413
>+#: umc/js/setup/ApplianceWizard.js:2729
> msgid "Connection refused. Please recheck the password"
> msgstr "Verbindungsaufbau abgelehnt. Bitte Ã¼berprÃ¼fen Sie das Passwort"
> 
>-#: umc/js/setup/ApplianceWizard.js:2470
>+#: umc/js/setup/ApplianceWizard.js:2786
> msgid "Continue"
> msgstr "Fortfahren"
> 
>-#: umc/js/setup/ApplianceWizard.js:2254
>+#: umc/js/setup/ApplianceWizard.js:2570
> msgid "Continue with 169.254.*.* addresse(s)"
> msgstr "Fortfahren mit 169.254.*.* Adresse(n)"
> 
>-#: umc/js/setup/ApplianceWizard.js:2342
>+#: umc/js/setup/ApplianceWizard.js:2658
> msgid "Continue with incomplete settings"
> msgstr "Fortfahren mit unvollstÃ¤ndigen Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:2258 umc/js/setup/ApplianceWizard.js:2280
>+#: umc/js/setup/ApplianceWizard.js:2574 umc/js/setup/ApplianceWizard.js:2596
> msgid "Continue without internet access"
> msgstr "Ohne Internetzugriff fortfahren"
> 
>-#: umc/js/setup/ApplianceWizard.js:1136
>+#: umc/js/setup/ApplianceWizard.js:1163
> msgid ""
> "Continuing the installation might lead to a not functioning or hung up "
> "system."
>@@ -607,7 +608,7 @@
> msgid "Country code"
> msgstr "LÃ¤ndercode"
> 
>-#: umc/js/setup/ApplianceWizard.js:310
>+#: umc/js/setup/ApplianceWizard.js:315
> msgid "Create a new UCS domain"
> msgstr "Erstellen einer neuen UCS-DomÃ¤ne"
> 
>@@ -615,19 +616,19 @@
> msgid "Created:"
> msgstr "Erstellt:"
> 
>-#: umc/js/setup/ApplianceWizard.js:1613
>+#: umc/js/setup/ApplianceWizard.js:1711
> msgid "DC Backup"
> msgstr "DC Backup"
> 
>-#: umc/js/setup/ApplianceWizard.js:1619
>+#: umc/js/setup/ApplianceWizard.js:1717
> msgid "DC Master"
> msgstr "DC Master"
> 
>-#: umc/js/setup/ApplianceWizard.js:1614
>+#: umc/js/setup/ApplianceWizard.js:1712
> msgid "DC Slave"
> msgstr "DC Slave"
> 
>-#: umc/js/setup/ApplianceWizard.js:645
>+#: umc/js/setup/ApplianceWizard.js:653
> 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 "
>@@ -637,7 +638,7 @@
> "Authentifizierungsdienste bereit. Lokale Dienste auf einem DC Slave haben "
> "Zugriff auf die lokale LDAP-Datenbank."
> 
>-#: umc/js/setup/ApplianceWizard.js:1081 umc/js/setup/InterfaceWizard.js:616
>+#: umc/js/setup/ApplianceWizard.js:1108 umc/js/setup/InterfaceWizard.js:616
> #: umc/js/setup/InterfaceWizard.js:642
> msgid "DHCP query failed."
> msgstr "DHCP-Anfrage schlug fehl."
>@@ -646,11 +647,11 @@
> msgid "DHCP-Query"
> msgstr "DHCP-Anfrage"
> 
>-#: umc/js/setup/ApplianceWizard.js:1688
>+#: umc/js/setup/ApplianceWizard.js:1786
> msgid "DNS server"
> msgstr "DNS-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:380 umc/js/setup/LanguagePage.js:149
>+#: umc/js/setup/ApplianceWizard.js:385 umc/js/setup/LanguagePage.js:149
> #: umc/js/setup/LanguagePage.js:229
> msgid "Default system locale"
> msgstr "Standard-System-Sprachdefinition"
>@@ -659,31 +660,31 @@
> msgid "Delete"
> msgstr "LÃ¶schen"
> 
>-#: umc/js/setup/ApplianceWizard.js:607
>+#: umc/js/setup/ApplianceWizard.js:615
> msgid "Do not use any domain"
> msgstr "Keine DomÃ¤ne benutzen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1650
>+#: umc/js/setup/ApplianceWizard.js:1748
> msgid "Domain and host configuration"
> msgstr "DomÃ¤nen- und Rechnereinstellung"
> 
>-#: umc/js/setup/ApplianceWizard.js:417
>+#: umc/js/setup/ApplianceWizard.js:422
> msgid "Domain and network configuration"
> msgstr "DomÃ¤nen- und Netzwerkeinstellung"
> 
>-#: umc/js/setup/ApplianceWizard.js:628
>+#: umc/js/setup/ApplianceWizard.js:636
> msgid "Domain controller backup"
> msgstr "DomÃ¤nencontroller Backup"
> 
>-#: umc/js/setup/ApplianceWizard.js:640
>+#: umc/js/setup/ApplianceWizard.js:648
> msgid "Domain controller slave"
> msgstr "DomÃ¤nencontroller Slave"
> 
>-#: umc/js/setup/ApplianceWizard.js:707
>+#: umc/js/setup/ApplianceWizard.js:726
> msgid "Domain join information"
> msgstr "Informationen zum DomÃ¤nenbeitritt"
> 
>-#: umc/js/setup/ApplianceWizard.js:770
>+#: umc/js/setup/ApplianceWizard.js:789
> msgid "Domain name"
> msgstr "DomÃ¤nenname"
> 
>@@ -695,7 +696,7 @@
> msgid "Domain name server (max. 3)"
> msgstr "DomÃ¤nen-DNS-Server (max. 3)"
> 
>-#: umc/js/setup/ApplianceWizard.js:555
>+#: umc/js/setup/ApplianceWizard.js:560
> msgid "Domain setup"
> msgstr "DomÃ¤neneinstellungen"
> 
>@@ -703,13 +704,13 @@
> msgid "Dynamic (DHCP)"
> msgstr "Dynamisch (DHCP)"
> 
>-#: umc/js/setup/ApplianceWizard.js:322
>+#: umc/js/setup/ApplianceWizard.js:327
> #, python-format
> msgid "E-mail address to activate %s Appliance"
> msgstr "E-Mail-Adresse zur Aktivierung von %s Appliance"
> 
>-#: umc/js/setup/ApplianceWizard.js:312 umc/js/setup/ApplianceWizard.js:1546
>-#: umc/js/setup/ApplianceWizard.js:1645
>+#: umc/js/setup/ApplianceWizard.js:317 umc/js/setup/ApplianceWizard.js:1642
>+#: umc/js/setup/ApplianceWizard.js:1743
> msgid "E-mail address to activate UCS"
> msgstr "E-Mail-Adresse zur Aktivierung von UCS"
> 
>@@ -729,7 +730,7 @@
> msgid "Email address"
> msgstr "E-Mail-Adresse"
> 
>-#: umc/js/setup/ApplianceWizard.js:361
>+#: umc/js/setup/ApplianceWizard.js:366
> msgid ""
> "Enter a city nearby to preconfigure settings such as timezone, system "
> "language, keyboard layout."
>@@ -737,7 +738,7 @@
> "Geben Sie eine nahegelegene Stadt zur Einrichtung von Zeitzone, "
> "Systemsprache und Tastaturlayout ein."
> 
>-#: umc/js/setup/ApplianceWizard.js:687 umc/js/setup/ApplianceWizard.js:708
>+#: umc/js/setup/ApplianceWizard.js:706 umc/js/setup/ApplianceWizard.js:727
> msgid ""
> "Enter name and password of a user account which is authorised to join a "
> "system into this domain."
>@@ -757,7 +758,7 @@
> msgid "External name server (max. 3)"
> msgstr "Externer DNS-Server (max. 3)"
> 
>-#: umc/js/setup/ApplianceWizard.js:1757
>+#: umc/js/setup/ApplianceWizard.js:1871
> msgid ""
> "Failed join scripts can be executed via the UMC module Domain join."
> msgstr ""
>@@ -764,7 +765,7 @@
> "Fehlgeschlagene DomÃ¤nenbeitritt-Skripte kÃ¶nnen mit dem UMC-Modul "
> "DomÃ¤nenbeitritt ausgefÃ¼hrt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1772
>+#: umc/js/setup/ApplianceWizard.js:1885
> msgid ""
> "Failed join scripts or a new join of the system can be executed via the UMC "
> "module Domain join."
>@@ -772,7 +773,11 @@
> "Fehlgeschlagene DomÃ¤nenbeitritt-Skripte oder ein erneuter DomÃ¤nenbeitritt "
> "kann mit dem UMC-Modul DomÃ¤nenbeitritt ausgefÃ¼hrt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:677
>+#: umc/js/setup/ApplianceWizard.js:566
>+msgid "Fast demo configuration"
>+msgstr "Schnelle Demo-Konfiguration"
>+
>+#: umc/js/setup/ApplianceWizard.js:696
> msgid ""
> "Fill in the password for the system administrator user root and the "
> "domain administrative user account Administrator."
>@@ -780,7 +785,7 @@
> "FÃ¼llen Sie das Passwort fÃ¼r den Systemadministrator-Benutzer root und "
> "den DomÃ¤nenadministrator-Benutzeraccount Administrator aus."
> 
>-#: umc/js/setup/ApplianceWizard.js:1301
>+#: umc/js/setup/ApplianceWizard.js:1328
> msgid "Finish"
> msgstr "Fertigstellen"
> 
>@@ -792,7 +797,7 @@
> "Nach Vergabe der Zertifikatseinstellungen wird ein neues Root-"
> "Zertifikat fÃ¼r die DomÃ¤ne erstellt."
> 
>-#: umc/js/setup/ApplianceWizard.js:1115
>+#: umc/js/setup/ApplianceWizard.js:1142
> 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 "
>@@ -809,9 +814,9 @@
> msgid "Forwarding delay"
> msgstr "Forwarding-VerzÃ¶gerung"
> 
>-#: umc/js/setup/ApplianceWizard.js:783 umc/js/setup/ApplianceWizard.js:1564
>-#: umc/js/setup/ApplianceWizard.js:1652 umc/js/setup/ApplianceWizard.js:1656
>-#: umc/js/setup/ApplianceWizard.js:1661
>+#: umc/js/setup/ApplianceWizard.js:802 umc/js/setup/ApplianceWizard.js:1660
>+#: umc/js/setup/ApplianceWizard.js:1750 umc/js/setup/ApplianceWizard.js:1754
>+#: umc/js/setup/ApplianceWizard.js:1759
> msgid "Fully qualified domain name"
> msgstr "Vollqualifizierter DomÃ¤nenname"
> 
>@@ -826,7 +831,7 @@
> "handbuch-%s.html#computers:networkcomplex\" target=\"_blank\">UCS "
> "Dokumentation</a> gefunden werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:522 umc/js/setup/ApplianceWizard.js:1680
>+#: umc/js/setup/ApplianceWizard.js:527 umc/js/setup/ApplianceWizard.js:1778
> #: umc/js/setup/InterfaceWizard.js:627
> msgid "Gateway"
> msgstr "Gateway"
>@@ -847,33 +852,39 @@
> msgid "Global network settings"
> msgstr "Globale Netzwerk-Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:547 umc/js/setup/ApplianceWizard.js:1692
>+#: umc/js/setup/ApplianceWizard.js:552 umc/js/setup/ApplianceWizard.js:1790
> #: umc/js/setup/NetworkPage.js:125 umc/js/setup/NetworkPage.js:295
> msgid "HTTP proxy"
> msgstr "HTTP-Proxy"
> 
>-#: umc/js/setup/ApplianceWizard.js:753 umc/js/setup/ApplianceWizard.js:798
>+#: umc/js/setup/ApplianceWizard.js:1856
>+msgid "Help us improve UCS by sending the occurred errors as feedback."
>+msgstr ""
>+"Helfen Sie uns UCS zu verbessern, indem Sie uns die aufgetretenen Fehler als "
>+"Feedback senden."
>+
>+#: umc/js/setup/ApplianceWizard.js:772 umc/js/setup/ApplianceWizard.js:817
> msgid "Host settings"
> msgstr "Rechnereinstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1566 umc/js/setup/ApplianceWizard.js:1661
>+#: umc/js/setup/ApplianceWizard.js:1662 umc/js/setup/ApplianceWizard.js:1759
> msgid "Hostname"
> msgstr "Rechnername"
> 
>-#: umc/js/setup/ApplianceWizard.js:762 umc/js/setup/ApplianceWizard.js:1397
>+#: umc/js/setup/ApplianceWizard.js:781 umc/js/setup/ApplianceWizard.js:1493
> msgid "Hostname (unchangeable. Was set while creating the container)"
> msgstr ""
> "Rechnername (unverÃ¤nderbar. Wurde beim Erstellen des Containers vergeben)"
> 
>-#: umc/js/setup/ApplianceWizard.js:732
>+#: umc/js/setup/ApplianceWizard.js:751
> msgid "Hostname of the domain controller master"
> msgstr "Rechnername des DomÃ¤nencontroller Masters"
> 
>-#: umc/js/setup/ApplianceWizard.js:807
>+#: umc/js/setup/ApplianceWizard.js:826
> msgid "Hostname or fully qualified domain name"
> msgstr "Rechnername oder vollstÃ¤ndiger DomÃ¤nenname"
> 
>-#: umc/js/setup/ApplianceWizard.js:1669
>+#: umc/js/setup/ApplianceWizard.js:1767
> msgid "IP address is obtained dynamically via DHCP"
> msgstr "Die IP-Adresse wird dynamisch Ã¼ber DHCP bezogen"
> 
>@@ -885,8 +896,9 @@
> msgid "IPv4 address"
> msgstr "IPv4-Adresse"
> 
>-#: umc/js/setup/ApplianceWizard.js:461 umc/js/setup/ApplianceWizard.js:478
>-#: umc/js/setup/ApplianceWizard.js:496 umc/js/setup/ApplianceWizard.js:514
>+#: umc/js/setup/ApplianceWizard.js:466 umc/js/setup/ApplianceWizard.js:483
>+#: umc/js/setup/ApplianceWizard.js:501 umc/js/setup/ApplianceWizard.js:519
>+#, python-brace-format
> msgid "IPv4 net mask/IPv6 prefix {interface}"
> msgstr "IPv4-Netzmaske/IPv6-PrÃ¤fix {interface}"
> 
>@@ -894,8 +906,9 @@
> msgid "IPv4 network interface configuration"
> msgstr "IPv4-NetzwerkgerÃ¤tkonfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:452 umc/js/setup/ApplianceWizard.js:468
>-#: umc/js/setup/ApplianceWizard.js:486 umc/js/setup/ApplianceWizard.js:504
>+#: umc/js/setup/ApplianceWizard.js:457 umc/js/setup/ApplianceWizard.js:473
>+#: umc/js/setup/ApplianceWizard.js:491 umc/js/setup/ApplianceWizard.js:509
>+#, python-brace-format
> msgid "IPv4/IPv6 address {interface}"
> msgstr "IPv4/IPv6-Adresse {interface}"
> 
>@@ -915,12 +928,12 @@
> msgid "Identifier"
> msgstr "Bezeichner"
> 
>-#: umc/js/setup/ApplianceWizard.js:617
>+#: umc/js/setup/ApplianceWizard.js:625
> #, python-format
> msgid "If unsure, select %s."
> msgstr "Wenn unsicher, wÃ¤hlen Sie %s."
> 
>-#: umc/js/setup/ApplianceWizard.js:1137
>+#: umc/js/setup/ApplianceWizard.js:1164
> msgid ""
> "If you want to upgrade your memory first please press the power button of "
> "your server to shutdown the system."
>@@ -936,16 +949,16 @@
> "In den Netzwerkeinstellungen kÃ¶nnen IP-Adressen (IPv4 und IPv6) sowie "
> "DNS-Server, Gateways und HTTP-Proxy festgelegt werden."
> 
>-#: umc/js/setup.js:565 umc/js/setup/ApplianceWizard.js:2062
>+#: umc/js/setup/ApplianceWizard.js:2282 umc/js/setup.js:565
> msgid "Initialize the configuration process ..."
> msgstr "Initialisiere den Konfigurationsvorgang ..."
> 
>-#: umc/js/setup/ApplianceWizard.js:1245
>+#: umc/js/setup/ApplianceWizard.js:1272
> #, python-format
> msgid "Installation of %d additional software components."
> msgstr "Installation von %d zusÃ¤tzlichen Software-Komponenten."
> 
>-#: umc/js/setup/ApplianceWizard.js:1243
>+#: umc/js/setup/ApplianceWizard.js:1270
> msgid "Installation of one additional software component."
> msgstr "Installation einer zusÃ¤tzlichen Software-Komponente."
> 
>@@ -966,11 +979,11 @@
> msgid "Interface type"
> msgstr "NetzwerkgerÃ¤tetyp"
> 
>-#: umc/js/setup/ApplianceWizard.js:137
>+#: umc/js/setup/ApplianceWizard.js:140
> 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:150
>+#: umc/js/setup/ApplianceWizard.js:153
> 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 "
>@@ -981,7 +994,7 @@
> "255.255.255.0. Erwartetes Format fÃ¼r IPv6 ist eine Zahl zwischen "
> "0 und 128."
> 
>-#: umc/js/setup/ApplianceWizard.js:222
>+#: umc/js/setup/ApplianceWizard.js:225
> 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 "
>@@ -993,17 +1006,17 @@
> "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:196
>+#: umc/js/setup/ApplianceWizard.js:199
> msgid "Invalid domain name! Expected format: mydomain.intranet"
> msgstr ""
> "UngÃ¼ltiger DomÃ¤nenname! Erwartetes Format: meinedomaene.intranet"
> 
>-#: umc/js/setup/ApplianceWizard.js:129
>+#: umc/js/setup/ApplianceWizard.js:132
> 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:205
>+#: umc/js/setup/ApplianceWizard.js:208
> msgid ""
> "Invalid fully qualified domain name! Expected format: hostname."
> "mydomain.intranet"
>@@ -1011,7 +1024,7 @@
> "UngÃ¼ltiger vollqualifizierter DomÃ¤nenname! Erwartetes Format: "
> "rechnername.meinedomaene.intranet"
> 
>-#: umc/js/setup/ApplianceWizard.js:214
>+#: umc/js/setup/ApplianceWizard.js:217
> msgid ""
> "Invalid hostname or fully qualified domain name! Expected format: "
> "myhost or hostname.mydomain.intranet"
>@@ -1019,7 +1032,7 @@
> "UngÃ¼ltiger Rechnername oder vollstÃ¤ndiger DomÃ¤nenname! Erwartetes "
> "Format: rechnername oder rechnername.meinedomaene.intranet"
> 
>-#: umc/js/setup/ApplianceWizard.js:2000
>+#: umc/js/setup/ApplianceWizard.js:2230
> msgid ""
> "It is not possible to install KVM and XEN components on one system. Please "
> "select only one of these components."
>@@ -1027,7 +1040,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:1996
>+#: umc/js/setup/ApplianceWizard.js:2226
> msgid ""
> "It is not possible to install Samba 3 and Samba 4 on one system. Please "
> "select only one of these components."
>@@ -1035,7 +1048,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/js/setup/ApplianceWizard.js:2356
>+#: umc/js/setup/ApplianceWizard.js:2672
> msgid ""
> "It seems that a UCS DC master system has already joined into the Windows AD "
> "domain. Please choose a different option as other system roles for joining "
>@@ -1045,15 +1058,15 @@
> "beigetreten ist. Bitte wÃ¤hlen Sie eine andere Option, da weitere "
> "Systemrollen fÃ¼r den Joinvorgang nicht zur VerfÃ¼gung stehen."
> 
>-#: umc/js/setup/ApplianceWizard.js:585
>+#: umc/js/setup/ApplianceWizard.js:593
> msgid "Join into an existing Active Directory domain"
> msgstr "Einer bestehenden Active-Directory-DomÃ¤ne beitreten"
> 
>-#: umc/js/setup/ApplianceWizard.js:596
>+#: umc/js/setup/ApplianceWizard.js:604
> msgid "Join into an existing UCS domain"
> msgstr "Einer bestehenden UCS-DomÃ¤ne beitreten"
> 
>-#: umc/js/setup/ApplianceWizard.js:395 umc/js/setup/LanguagePage.js:88
>+#: umc/js/setup/ApplianceWizard.js:400 umc/js/setup/LanguagePage.js:88
> #: umc/js/setup/LanguagePage.js:217
> msgid "Keyboard layout"
> msgstr "Tastaturlayout"
>@@ -1066,7 +1079,7 @@
> msgid "Keyboard variant"
> msgstr "Tastaturvariante"
> 
>-#: umc/js/setup/ApplianceWizard.js:791 umc/js/setup/ApplianceWizard.js:1665
>+#: umc/js/setup/ApplianceWizard.js:810 umc/js/setup/ApplianceWizard.js:1763
> msgid "LDAP base"
> msgstr "LDAP-Basis"
> 
>@@ -1086,16 +1099,16 @@
> msgid "Language settings"
> msgstr "Spracheinstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:407
>+#: umc/js/setup/ApplianceWizard.js:412
> msgid "License agreement"
> msgstr "Lizenzvereinbarung"
> 
>-#: umc/js/setup/ApplianceWizard.js:817
>+#: umc/js/setup/ApplianceWizard.js:836
> msgid "Local root password"
> msgstr "Lokales Root-Passwort"
> 
>-#: umc/js/setup/ApplianceWizard.js:369 umc/js/setup/ApplianceWizard.js:375
>-#: umc/js/setup/ApplianceWizard.js:1630
>+#: umc/js/setup/ApplianceWizard.js:374 umc/js/setup/ApplianceWizard.js:380
>+#: umc/js/setup/ApplianceWizard.js:1728
> msgid "Localization settings"
> msgstr "Standorteinstellungen"
> 
>@@ -1111,15 +1124,15 @@
> msgid "MII link monitoring frequency"
> msgstr "MII-TrÃ¤gerÃ¼berwachungsfrequenz"
> 
>-#: umc/js/setup/ApplianceWizard.js:320
>+#: umc/js/setup/ApplianceWizard.js:325
> msgid "Manage users and permissions directly on this system"
> msgstr "Verwalten von Benutzern und Rechten direkt auf diesem System"
> 
>-#: umc/js/setup/ApplianceWizard.js:640 umc/js/setup/ApplianceWizard.js:1615
>+#: umc/js/setup/ApplianceWizard.js:659 umc/js/setup/ApplianceWizard.js:1713
> msgid "Member server"
> msgstr "Member-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:656
>+#: umc/js/setup/ApplianceWizard.js:664
> msgid ""
> "Member servers should be used for services which do not need a local "
> "authentication database, for example for file or print servers."
>@@ -1171,7 +1184,7 @@
> msgid "Network interface configuration"
> msgstr "NetzwerkgerÃ¤tkonfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:1557 umc/js/setup/NetworkPage.js:299
>+#: umc/js/setup/ApplianceWizard.js:1653 umc/js/setup/NetworkPage.js:299
> msgid "Network interfaces"
> msgstr "NetzwerkgerÃ¤te"
> 
>@@ -1179,19 +1192,19 @@
> msgid "Network settings"
> msgstr "Netzwerk-Einstellungen"
> 
>-#: umc/js/setup/ApplianceWizard.js:1240
>+#: umc/js/setup/ApplianceWizard.js:1267
> msgid "No additional software component will be installed."
> msgstr "Keine zusÃ¤tzliche Software-Komponente wird installiert."
> 
>-#: umc/js/setup/ApplianceWizard.js:1700
>+#: umc/js/setup/ApplianceWizard.js:1798
> msgid "No additional software components will be installed."
> msgstr "Keine zusÃ¤tzliche Software-Komponenten werden installiert."
> 
>-#: umc/js/setup.js:440
>+#: umc/js/setup.js:444
> msgid "No changes have been made."
> msgstr "Es wurden keine Ãnderungen durchgefÃ¼hrt."
> 
>-#: umc/js/setup/ApplianceWizard.js:2338
>+#: umc/js/setup/ApplianceWizard.js:2654
> msgid ""
> "No domain controller was found at the address of the name server. It is "
> "recommended to verify that the network settings are correct."
>@@ -1199,7 +1212,7 @@
> "Unter der Adresse des DNS-Servers konnte kein DomÃ¤nencontroller gefunden "
> "werden. Die Netzwerkeinstellungen sollten Ã¼berprÃ¼ft werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:2351
>+#: umc/js/setup/ApplianceWizard.js:2667
> msgid ""
> "No domain controller was found at the address of the name server. Please "
> "adjust your network settings."
>@@ -1207,11 +1220,11 @@
> "Unter der Adresse des DNS-Servers konnte kein DomÃ¤nencontroller gefunden "
> "werden. Bitte Ã¼berprÃ¼fen Sie die Netzwerkeinstellungen."
> 
>-#: umc/js/setup/ApplianceWizard.js:749
>+#: umc/js/setup/ApplianceWizard.js:768
> msgid "No domain warning"
> msgstr "Warnung: Keine DomÃ¤ne"
> 
>-#: umc/js/setup/ApplianceWizard.js:2276
>+#: umc/js/setup/ApplianceWizard.js:2592
> msgid ""
> "No gateway has been specified and thus no access to the internet is "
> "possible. As UCS requires internet access for its functionality, certain "
>@@ -1228,15 +1241,15 @@
> msgid "None"
> msgstr "Kein"
> 
>-#: umc/js/setup.js:594
>+#: umc/js/setup.js:598
> msgid "Not all changes could be applied successfully:"
> msgstr "Nicht alle Ãnderungen konnten erfolgreich Ã¼bernommen werden:"
> 
>-#: umc/js/setup/ApplianceWizard.js:439
>+#: umc/js/setup/ApplianceWizard.js:444
> msgid "Obtain IP address automatically (DHCP)"
> msgstr "IP-Adresse automatisch beziehen (DHCP)"
> 
>-#: umc/js/setup.js:598
>+#: umc/js/setup.js:602
> msgid "Ok"
> msgstr "Ok"
> 
>@@ -1244,7 +1257,7 @@
> msgid "Organization"
> msgstr "Organisation"
> 
>-#: umc/js/setup/ApplianceWizard.js:661 umc/js/setup/ApplianceWizard.js:1644
>+#: umc/js/setup/ApplianceWizard.js:680 umc/js/setup/ApplianceWizard.js:1742
> msgid "Organization name"
> msgstr "Name der Organisation"
> 
>@@ -1256,8 +1269,8 @@
> msgid "Parent interface"
> msgstr "Ãbergeordnetes NetzwerkgerÃ¤t"
> 
>-#: umc/js/setup/ApplianceWizard.js:682 umc/js/setup/ApplianceWizard.js:702
>-#: umc/js/setup/ApplianceWizard.js:744
>+#: umc/js/setup/ApplianceWizard.js:701 umc/js/setup/ApplianceWizard.js:721
>+#: umc/js/setup/ApplianceWizard.js:763
> msgid "Password"
> msgstr "Passwort"
> 
>@@ -1270,7 +1283,7 @@
> msgid "Please click on the required character."
> msgstr "Bitte klicken Sie auf das gewÃ¼nschte Zeichen."
> 
>-#: umc/js/setup/ApplianceWizard.js:836
>+#: umc/js/setup/ApplianceWizard.js:855
> msgid ""
> "Please confirm the chosen configuration settings which are summarized in the "
> "following."
>@@ -1278,7 +1291,7 @@
> "Bitte bestÃ¤tigen Sie die gewÃ¤hlten Einstellungen, die nachstehend "
> "zusammengefasst sind."
> 
>-#: umc/js/setup.js:495
>+#: umc/js/setup.js:499
> msgid ""
> "Please confirm to apply these changes to the system. This may take some time."
> msgstr ""
>@@ -1289,12 +1302,12 @@
> msgid "Please confirm to delete the following interfaces:"
> msgstr "Bitte LÃ¶schung der folgenden NetzwerkgerÃ¤te bestÃ¤tigen:"
> 
>-#: umc/js/setup/ApplianceWizard.js:408
>+#: umc/js/setup/ApplianceWizard.js:413
> #, python-format
> msgid "Please read carefully the license agreement for %s Appliance."
> msgstr "Bitte lesen Sie die nachstehende Lizenzvereinbarung fÃ¼r %s Appliance."
> 
>-#: umc/js/setup/ApplianceWizard.js:556
>+#: umc/js/setup/ApplianceWizard.js:561
> msgid "Please select your domain settings."
> msgstr "Bitte wÃ¤hlen Sie die DomÃ¤neneinstellungen."
> 
>@@ -1302,16 +1315,25 @@
> 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:528
>+#: umc/js/setup/ApplianceWizard.js:533
> msgid "Preferred DNS server"
> msgstr "Bevorzugter DNS-Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:1560 umc/js/setup/NetworkPage.js:101
>+#: umc/js/setup/ApplianceWizard.js:1656 umc/js/setup/NetworkPage.js:101
> #: umc/js/setup/NetworkPage.js:303
> msgid "Primary network interface"
> msgstr "PrimÃ¤res NetzwerkgerÃ¤t"
> 
>-#: umc/js/setup/ApplianceWizard.js:1300
>+#: umc/js/setup/ApplianceWizard.js:574
>+msgid ""
>+"Quick setup of a system for testing purposes. Several system configurations "
>+"are predefined and cannot be changed at a later point."
>+msgstr ""
>+"Schnelle Einrichtung eines Systems zu Testzwecken. Einige "
>+"Systemeinstellungen sind vorgegeben und kÃ¶nnen im Nachhinein nicht mehr "
>+"geÃ¤ndert werden"
>+
>+#: umc/js/setup/ApplianceWizard.js:1327
> msgid "Reconfigure"
> msgstr "Erneut konfigurieren"
> 
>@@ -1319,11 +1341,11 @@
> msgid "Removed:"
> msgstr "GelÃ¶scht:"
> 
>-#: umc/js/setup.js:368 umc/js/setup.js:375
>+#: umc/js/setup.js:375
> msgid "Restarting server components..."
> msgstr "Neustart der Server-Komponenten..."
> 
>-#: umc/js/setup/ApplianceWizard.js:2466
>+#: umc/js/setup/ApplianceWizard.js:2782
> msgid "Root password empty. Continue?"
> msgstr "Root-Passwort ist leer. MÃ¶chten Sie fortfahren?"
> 
>@@ -1331,27 +1353,31 @@
> msgid "SSL root certificate"
> msgstr "SSL-Root-Zertifikat"
> 
>-#: umc/js/setup/ApplianceWizard.js:724
>+#: umc/js/setup/ApplianceWizard.js:743
> msgid "Search Domain controller master in DNS"
> msgstr "DomÃ¤nencontroller Master im DNS suchen"
> 
>-#: umc/js/setup/ApplianceWizard.js:567
>-msgid ""
>-"Quick setup of a system for testing purposes. Several system configurations "
>-"are predefined and cannot be changed at a later point."
>-msgstr ""
>-"Schnelle Einrichtung eines Systems zu Testzwecken. Einige Systemeinstellungen "
>-"sind vorgegeben und kÃ¶nnen im Nachhinein nicht mehr geÃ¤ndert werden"
>+#: umc/js/setup/ApplianceWizard.js:1941
>+msgid "Send feedback"
>+msgstr "Feedback senden"
> 
>-#: umc/js/setup/ApplianceWizard.js:319
>+#: umc/js/setup/ApplianceWizard.js:1900
>+msgid "Send feedback as mail"
>+msgstr "Feedback als E-Mail senden"
>+
>+#: umc/js/setup/ApplianceWizard.js:1950
>+msgid "Sending the information to the vendor failed"
>+msgstr "Das Versenden der Informationen zum Hersteller ist fehlgeschlagen"
>+
>+#: umc/js/setup/ApplianceWizard.js:324
> msgid "Setup - An error occurred"
> msgstr "Einrichtung - Ein Fehler ist aufgetreten"
> 
>-#: umc/js/setup.js:288
>+#: umc/js/setup.js:295
> msgid "Setup for UCS Virtual Machine Manager"
> msgstr "Einrichtung fÃ¼r UCS Virtual Machine Manager"
> 
>-#: umc/js/setup/ApplianceWizard.js:318
>+#: umc/js/setup/ApplianceWizard.js:323
> msgid "Setup successful"
> msgstr "Einrichtung erfolgreich"
> 
>@@ -1359,7 +1385,7 @@
> msgid "Several network types can be chosen."
> msgstr "Mehrere Netzwerktypen kÃ¶nnen ausgewÃ¤hlt werden."
> 
>-#: umc/js/setup.js:142
>+#: umc/js/setup.js:143
> msgid "Should the UMC module be closed? All unsaved modification will be lost."
> msgstr ""
> "Soll das UMC-Modul geschlossen werden? Alle nicht gespeicherten Ãnderungen "
>@@ -1370,31 +1396,31 @@
> msgid "Should the nameserver and gateway be set: %s"
> msgstr "Sollen DNS-Server und Gateway gesetzt werden: %s"
> 
>-#: umc/js/setup/ApplianceWizard.js:1216
>+#: umc/js/setup/ApplianceWizard.js:1243
> msgid "Software component"
> msgstr "Softwarekomponente"
> 
>-#: umc/js/setup/ApplianceWizard.js:1700 umc/js/setup/ApplianceWizard.js:1703
>+#: umc/js/setup/ApplianceWizard.js:1798 umc/js/setup/ApplianceWizard.js:1801
> msgid "Software components"
> msgstr "Softwarekomponenten"
> 
>-#: umc/js/setup/ApplianceWizard.js:822
>+#: umc/js/setup/ApplianceWizard.js:841
> msgid "Software configuration"
> msgstr "Software-Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:754 umc/js/setup/ApplianceWizard.js:799
>+#: umc/js/setup/ApplianceWizard.js:773 umc/js/setup/ApplianceWizard.js:818
> msgid "Specify the name of this system."
> msgstr "Eingabe des Namens dieses Systems."
> 
>-#: umc/js/setup/ApplianceWizard.js:418
>+#: umc/js/setup/ApplianceWizard.js:423
> msgid "Specify the network settings for this system."
> msgstr "Eingabe der Netzwerkeinstellungen dieses Systems."
> 
>-#: umc/js/setup/ApplianceWizard.js:623
>+#: umc/js/setup/ApplianceWizard.js:631
> msgid "Specify the type of this system."
> msgstr "Eingabe des Typs dieses Systems."
> 
>-#: umc/js/setup/ApplianceWizard.js:712
>+#: umc/js/setup/ApplianceWizard.js:731
> msgid "Start join at the end of the installation"
> msgstr "DomÃ¤nenbeitritt am Ende der Installation starten"
> 
>@@ -1410,15 +1436,20 @@
> msgid "Static (IPv6)"
> msgstr "Statisch (IPv6)"
> 
>-#: umc/js/setup/ApplianceWizard.js:622
>+#: umc/js/setup/ApplianceWizard.js:630
> msgid "System role"
> msgstr "Systemrolle"
> 
>-#: umc/js/setup.js:582 umc/js/setup.js:588
>+#: umc/js/setup/ApplianceWizard.js:1947
>+msgid "Thank you for your help"
>+msgstr "Vielen Dank fÃ¼r Ihre Hilfe"
>+
>+#: umc/js/setup.js:586 umc/js/setup.js:592
> msgid "The changes have been applied successfully."
> msgstr "Die Ãnderungen wurden erfolgreich Ã¼bernommen."
> 
> #: umc/js/setup.js:572
>+#, python-brace-format
> msgid ""
> "The connection to the server could not be established after {time} seconds. "
> "This problem can occur due to a change of the IP address. In this case, "
>@@ -1430,15 +1461,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:489
>+#: umc/js/setup.js:493
> msgid "The following changes will be applied to the system:"
> msgstr "Die folgenden Ãnderungen werden auf das System Ã¼bertragen:"
> 
>-#: umc/js/setup.js:466 umc/js/setup.js:542 umc/js/setup/ApplianceWizard.js:827
>+#: umc/js/setup/ApplianceWizard.js:846 umc/js/setup.js:466 umc/js/setup.js:542
> msgid "The following entries could not be validated:"
> msgstr "Die folgenden EintrÃ¤ge konnten nicht validiert werden:"
> 
>-#: umc/js/setup/ApplianceWizard.js:1744
>+#: umc/js/setup/ApplianceWizard.js:1854
> msgid "The following errors occurred while applying the settings."
> msgstr ""
> "Die folgenden Fehler sind beim Setzen der Konfigurationseinstellungen "
>@@ -1452,7 +1483,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:750
>+#: umc/js/setup/ApplianceWizard.js:769
> 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 "
>@@ -1462,7 +1493,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:2028
>+#: umc/js/setup/ApplianceWizard.js:2258
> msgid ""
> "The root password is too short. For security reasons, your password must "
> "contain at least 8 characters."
>@@ -1470,7 +1501,7 @@
> "Das Root-Passwort ist zu kurz, aus SicherheitsgrÃ¼nden muss es mindestens 8 "
> "Zeichen lang sein."
> 
>-#: umc/js/setup/ApplianceWizard.js:1743
>+#: umc/js/setup/ApplianceWizard.js:1985
> msgid ""
> "The system configuration could not be completed. Please choose to retry the "
> "configuration process or finish the wizard."
>@@ -1479,7 +1510,7 @@
> "den Konfigurationsvorgang zu wiederholen oder den Einrichtungsassistenten zu "
> "beenden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1767
>+#: umc/js/setup/ApplianceWizard.js:1881
> #, python-format
> msgid ""
> "The system is reachable at %(fqdn)s or via its IP address(es) "
>@@ -1492,11 +1523,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:368 umc/js/setup.js:375
>+#: umc/js/setup.js:375
> msgid "This may take a few seconds..."
> msgstr "Dies kann einige Sekunden in Anspruch nehmen..."
> 
>-#: umc/js/setup/ApplianceWizard.js:612
>+#: umc/js/setup/ApplianceWizard.js:620
> msgid ""
> "This should only be used in rare use cases, for example as firewall systems."
> msgstr ""
>@@ -1503,11 +1534,12 @@
> "Diese Einstellung sollte nur in speziellen Szenarien, z.B. Firewall-"
> "Systemen, gewÃ¤hlt werden."
> 
>-#: umc/js/setup/ApplianceWizard.js:1136
>+#: umc/js/setup/ApplianceWizard.js:1163
>+#, python-brace-format
> msgid "This system only has {memory_total} RAM."
> msgstr "Dieses System verfÃ¼gt nur Ã¼ber {memory_total} Arbeitsspeicher."
> 
>-#: umc/js/setup/ApplianceWizard.js:1610
>+#: umc/js/setup/ApplianceWizard.js:1708
> msgid ""
> "This system will be a base system without domain integration and without the "
> "capabilities to join one in the future."
>@@ -1515,23 +1547,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:590
>+#: umc/js/setup/ApplianceWizard.js:598
> 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:1621
>+#: umc/js/setup/ApplianceWizard.js:1719
> #, 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:1623
>+#: umc/js/setup/ApplianceWizard.js:1721
> #, 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:388 umc/js/setup/LanguagePage.js:76
>+#: umc/js/setup/ApplianceWizard.js:393 umc/js/setup/LanguagePage.js:76
> #: umc/js/setup/LanguagePage.js:209
> msgid "Time zone"
> msgstr "Zeitzone"
>@@ -1544,23 +1576,23 @@
> msgid "Type"
> msgstr "Typ"
> 
>-#: umc/js/setup/ApplianceWizard.js:1605
>+#: umc/js/setup/ApplianceWizard.js:1701
> msgid "UCS configuration"
> msgstr "UCS-Konfiguration"
> 
>-#: umc/js/setup/ApplianceWizard.js:1799
>+#: umc/js/setup/ApplianceWizard.js:2020
> msgid "UCS has been successfully set up."
> msgstr "UCS wurde erfolgreich eingerichtet."
> 
>-#: umc/js/setup/ApplianceWizard.js:307
>+#: umc/js/setup/ApplianceWizard.js:312
> msgid "UCS setup"
> msgstr "UCS-Einrichtung"
> 
>-#: umc/js/setup/ApplianceWizard.js:309
>+#: umc/js/setup/ApplianceWizard.js:314
> msgid "UCS setup - An error occurred"
> msgstr "UCS-Einrichtung - Ein Fehler ist aufgetreten"
> 
>-#: umc/js/setup/ApplianceWizard.js:308
>+#: umc/js/setup/ApplianceWizard.js:313
> msgid "UCS setup successful"
> msgstr "UCS-Einrichtung erfolgreich"
> 
>@@ -1568,24 +1600,20 @@
> msgid "Unconfigured"
> msgstr "Unkonfiguriert"
> 
>-#: umc/js/setup/ApplianceWizard.js:1140
>+#: umc/js/setup/ApplianceWizard.js:1167
> msgid "Univention Corporate Server"
> msgstr "Univention Corporate Server"
> 
>-#: umc/js/setup/ApplianceWizard.js:845
>+#: umc/js/setup/ApplianceWizard.js:864
> msgid "Update system after setup"
> msgstr "System nach der Einrichtung aktualisieren"
> 
>-#: umc/js/setup/ApplianceWizard.js:561
>-msgid "Fast demo configuration"
>-msgstr "Schnelle Demo-Konfiguration"
>-
>-#: umc/js/setup/ApplianceWizard.js:601
>+#: umc/js/setup/ApplianceWizard.js:609
> 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:696 umc/js/setup/ApplianceWizard.js:738
>+#: umc/js/setup/ApplianceWizard.js:715 umc/js/setup/ApplianceWizard.js:757
> msgid "Username"
> msgstr "Benutzername"
> 
>@@ -1593,11 +1621,11 @@
> msgid "VLAN ID"
> msgstr "VLAN ID"
> 
>-#: umc/js/setup.js:61 umc/js/setup/ApplianceWizard.js:262
>+#: umc/js/setup/ApplianceWizard.js:265 umc/js/setup.js:62
> msgid "Validation error"
> msgstr "Validierungsfehler"
> 
>-#: umc/js/setup/ApplianceWizard.js:826
>+#: umc/js/setup/ApplianceWizard.js:845
> msgid "Validation failed"
> msgstr "Validierungsfehler"
> 
>@@ -1609,26 +1637,26 @@
> msgid "Virtual keyboard"
> msgstr "Virtuelle Tastatur"
> 
>-#: umc/js/setup/ApplianceWizard.js:2168
>+#: umc/js/setup/ApplianceWizard.js:1444 umc/js/setup/ApplianceWizard.js:2399
> msgid "Waiting for restart of server components..."
> msgstr "Warten auf den Neustart der Server-Komponenten ..."
> 
>-#: umc/js/setup/ApplianceWizard.js:1158 umc/js/setup/ApplianceWizard.js:2292
>-#: umc/js/setup/ApplianceWizard.js:2308 umc/js/setup/ApplianceWizard.js:2370
>-#: umc/js/setup/ApplianceWizard.js:2487
>+#: umc/js/setup/ApplianceWizard.js:1169 umc/js/setup/ApplianceWizard.js:2583
>+#: umc/js/setup/ApplianceWizard.js:2599 umc/js/setup/ApplianceWizard.js:2661
>+#: umc/js/setup/ApplianceWizard.js:2789
> msgid "Warning"
> msgstr "Warnung"
> 
>-#: umc/js/setup/ApplianceWizard.js:306
>+#: umc/js/setup/ApplianceWizard.js:311
> msgid "Welcome to Univention Corporate Server (UCS)."
> msgstr "Wilkommen bei Univention Corporate Server (UCS)."
> 
>-#: umc/js/setup/ApplianceWizard.js:316
>+#: umc/js/setup/ApplianceWizard.js:321
> #, python-format
> msgid "Welcome to the setup of %s Appliance."
> msgstr "Wilkommen bei der Einrichtung von %s Appliance."
> 
>-#: umc/js/setup/ApplianceWizard.js:1751
>+#: umc/js/setup/ApplianceWizard.js:1865
> msgid "You may restart the configuration process again with modified settings."
> msgstr ""
> "Sie kÃ¶nnen den Konfigurationsvorgang mit verÃ¤nderten Einstellungen erneut "
>@@ -1638,18 +1666,18 @@
> msgid "don't set"
> msgstr "nicht setzen"
> 
>-#: umc/js/setup/ApplianceWizard.js:362
>+#: umc/js/setup/ApplianceWizard.js:367
> msgid "e.g., Boston..."
> msgstr "bspw. Bremen..."
> 
>-#: umc/js/setup.js:288
>+#: umc/js/setup.js:295
> #, python-format
> msgid "http://docs.univention.de/manual-%s.html#computers:networkcomplex:uvmm"
> msgstr ""
> "http://docs.univention.de/handbuch-%s.html#computers:networkcomplex:uvmm"
> 
>-#: umc/js/setup/ApplianceWizard.js:549 umc/js/setup/ApplianceWizard.js:669
>-#: umc/js/setup/ApplianceWizard.js:809
>+#: umc/js/setup/ApplianceWizard.js:554 umc/js/setup/ApplianceWizard.js:688
>+#: umc/js/setup/ApplianceWizard.js:828
> msgid "more information"
> msgstr "mehr Informationen"
>

Actions: View | Diff

Attachments on bug 40782: 7772 | 7807