Attachment #6066 for bug #35602

View | Details | Raw Unified | Return to bug 35602
Collapse All | Expand All




			if (state && state.mode_admember) {
				this.helpText = _('The system is part of an Active Directory domain.');
			} else if (state && state.mode_adconnector) {
				this.helpText = _('The UCS domain exists in parallel to an Active Directory domain.');
			}
			this.helpText += ' ' + _('This module configures the connection between the Univention Corporate Server and Active Directory.');
			this.showDescription();

				name: 'unencryptedActivateSSL',
				type: Text,
				content: '<p style="margin-top: 4em;">' +
					_('It is also possible to just activate the encrypted connection without certificate verification.') +
					'</p>'
			}, {
				name: 'certificateUpload',

				name: 'downloadInfoADMember',
				type: Text,
				content: makeParagraphs([
					_('By default the Active Directory connection does not transfer encrypted password data into the UCS directory service. The system uses the Active Directory Kerberos infrastructure for authentication.'),
					_('However, in some scenarios it may be reasonable to transfer encrypted password hashes. In this case, The password service should be installed on the Active Directory server.')
				])
			}, {
				name: 'download',

			}, {
				name: 'downloadNextStepADMember',
				type: Text,
				content: _('After the installation the replication of password hashes has to be activated.')
			}];

			var buttons = [{

				label: _('Active Directory connection service'),
				layout: ['running', 'start', 'stop']
			}, {
				label: _('Active Directory connection SSL configuration'),
				layout: ['certificateUpload', 'unencryptedActivateSSL', 'activate']
			}];
			if (this.initialState.mode_adconnector) {

						showEnableSSL = state.mode_adconnector;
						certMsg = makeParagraphs([
							_('Currently, an unencrypted connection to the Active Directory domain is used.'),
							_('To achieve a higher level of security, the Active Directory root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate.'),
							_('The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.')
						]);
					} else {
						certMsg = makeParagraphs([
							_('Currently, an encrypted connection between UCS and the Active Directory domain is used.'),
							_('To achieve a higher level of security, the Active Directory root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate.'),
							_('The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.')
						]);
					}

				} else {
					certMsg = makeParagraphs([
						_('Currently, a secured connection between UCS and the Active Directory domain is used.'),
						_('If there is a need for adjustment, you may upload a new root certificate of the Active Directory domain.')
					]);
				}
				this._widgets.certificateUpload.set('value', certMsg);

Lines 43-49 Link Here

(-)umc/js/adconnector/DownloadInfo.js (-1 / +1 lines)
43	_('The MSI files are the installation files for the password service. The installation can be started on the Active Directory domain controller by double clicking on it.') + ' ' +	43	_('The MSI files are the installation files for the password service. The installation can be started on the Active Directory domain controller by double clicking on it.') + ' ' +
44	_('The package is installed in the <b>C:\\Windows\\UCS-AD-Connector</b> directory automatically. Additionally, the password service is integrated into the Windows environment as a system service, which means the service can be started automatically or manually.') +	44	_('The package is installed in the <b>C:\\Windows\\UCS-AD-Connector</b> directory automatically. Additionally, the password service is integrated into the Windows environment as a system service, which means the service can be started automatically or manually.') +
45	'</p><p>' +	45	'</p><p>' +
46	_('During a standard installation, the Windows firewall blocks the access to the AD Connection service. This must either be deactivated in System settings or Port 6670/TCP authorised.') +	46	_('In a standard setup, the Windows firewall blocks the access to the password service. This must either be deactivated in System settings or Port 6670/TCP authorised.') +
47	'</p>' +	47	'</p>' +
48	'<ul><li><a href="/univention-ad-connector/ucs-ad-connector.msi">ucs-ad-connector.msi</a><br>' +	48	'<ul><li><a href="/univention-ad-connector/ucs-ad-connector.msi">ucs-ad-connector.msi</a><br>' +
49	_('Installation file for the password service for <b>%s</b> Windows.<br />It can be started by double clicking on it.', '32bit') +	49	_('Installation file for the password service for <b>%s</b> Windows.<br />It can be started by double clicking on it.', '32bit') +




				widgets: [{
					type: Text,
					name: 'help',
					content: _('<p>This wizards guides the configuration of the connection with an existing Active Directory domain.</p><p>There are two exclusive options:</p>')
				}, {
					type: RadioButtons,
					name: 'mode',

						label: _('Configure UCS as part of an Active Directory domain (recommended).')
					}, {
						id: 'adconnector',
						label: _('Synchronisation of account data between an Active Directory and this UCS domain.')
					}]
				}, {
					type: Text,

					name: 'help2',
					content: _paragraph(
						_('Use the recommended first option if Active Directory will be the principal domain. Domain users can directly access applications that are installed on UCS.'),
						_('Use the second option for more complex scenarios which necessitate that Active Directory and UCS domains exist in parallel.')
					)
				}]
			}, {

				}]
			}, {
				name: 'error-admember',
				headerText: _('AD Connection - An error occurred'),
				helpText: '<p>' + _('An error occurred during the join process of UCS into the Active Directory domain. The following information will give you some more details on which problems occurred during the join process.') + '</p>',
				widgets: [{
					type: Text,

					type: Text,
					name: 'help',
					content: _paragraph(
						_('The connection to the Active Directory domain has been configured successfully.'),
						_('It is necessary for already joined UCS systems to re-join the domain. This should be done via the UMC module <i>Domain join</i> separately on each system.')
					)
				}]
			}, {

					type: Text,
					'class': 'umcPageHelpText',
					name: 'help',
					content: _('Enter the Active Directory domain information to establish the connection.')
				}, {
					type: TextBox,
					name: 'ad_server_address',

					'class': 'umcPageHelpText',
					name: 'info',
					content: _paragraph(
						_('An encrypted connection to the Active Directory domain could not be established. As a consequence authentication data is submitted in plaintext.'),
						_('To enable an encrypted connection, a certification authority needs to be configured on the Active Directory server. All necessary steps are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.'),
						_('After the certification authority has been set up, press <i>Next</i> to proceed.')
					)

					type: Text,
					'class': 'umcPageHelpText',
					name: 'info',
					content: _('<p>To achieve a higher level of security, the Active Directory root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate. The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>. Alternatively, you may proceed without this configuration.</p>')

				}, {
					name: 'certificateUpload',

					type: Text,
					'class': 'umcPageHelpText',
					name: 'help',
					content: '<p>' + _('Select the synchronisation direction between the UCS domain and the given Active Directory domain.') + '</p>'
				}, {
					type: RadioButtons,
					name: 'connectormode',

					name: 'help',
					content: _paragraph(
						_('The synchronisation of Univention Corporate Server and Active Directory has been succesfully initiated.'),
						_('The UCS server is now ready for usage, and domain account data is now available.')
					)
				}]
			}];




#: umc/js/adconnector/SetupWizard.js:89
msgid ""
"<p>This wizards guides the configuration of the connection with an existing "
"Active Directory domain.</p><p>There are two exclusive options:</p>"
msgstr ""
"<p>Dieser Assistent führt durch die Konfiguration der Verbindung mit einer "
"bestehenden Active Directory-Domäne.</p><p>Es gibt zwei grunsätzliche "
"Möglichkeiten:</p>"

#: umc/js/adconnector/SetupWizard.js:205
msgid ""
"<p>To achieve a higher level of security, the Active Directory root "
"certificate should be exported and uploaded here. The Active Directory "
"certificate service creates that certificate. The necessary steps depend on "
"the actual Microsoft Windows version and are described in the <a href="

"Konfiguration fortfahren.</p>"

#: umc/js/adconnector/SetupWizard.js:136
msgid "AD Connection - An error occurred"
msgstr "AD-Verbindung - Ein Fehler trat auf"

#: umc/js/adconnector/ConfigPage.js:132
msgid "Activate encrypted connection"


#: umc/js/adconnector/SetupWizard.js:85
msgid "Active Directory Connection"
msgstr "Active Directory-Verbindung"

#: umc/js/adconnector/ConfigPage.js:151
msgid "Active Directory connection SSL configuration"
msgstr "Active Directory-Verbindung SSL-Konfiguration"

#: umc/js/adconnector/SetupWizard.js:126 umc/js/adconnector/SetupWizard.js:175
msgid "Active Directory account"


#: umc/js/adconnector/SetupWizard.js:170
msgid "Address of Active Directory domain controller"
msgstr "Adresse des Active Directory-Domänencontrollers"

#: umc/js/adconnector/SetupWizard.js:121
msgid ""

"Address of Active Directory domain controller or name of Active Directory "
"domain"
msgstr ""
"Adresse des Active Directory-Domänencontrollers oder Name der Active "
"Directory-Domäne"

#: umc/js/adconnector/SetupWizard.js:194

#: umc/js/adconnector/ConfigPage.js:119
msgid ""
"After the installation the replication of password hashes has to be "
"activated."
msgstr ""
"Nach der Installation muss die Replikation der Passwort Hashes aktiviert "
"werden."

#: umc/js/adconnector/SetupWizard.js:192
msgid ""
"An encrypted connection to the Active Directory domain could not be "
"established. As a consequence authentication data is submitted "
"in plaintext."
msgstr ""
"Es konnte keine verschlüsselte Verbindung zur Active Directory-Domäne "

"domain. The following information will give you some more details on which "
"problems occurred during the join process."
msgstr ""
"Ein Fehler trat während des Beitritts von UCS zur Active Directory-Domäne "
"auf .Die folgenden Informationen enthalten weitere Details über das genauere "
"Problem."

#: umc/js/adconnector/SetupWizard.js:337

msgstr ""
"Ein unerwarteter Fehler trat auf. Weitere Informationen über die "
"Fehlerursache können in der Log-Datei /var/log/univention/management-console-"
"module-adconnector.log gefunden werden. Bitte führen Sie den Beitritt erneut "
"durch, nachdem entsprechende Fehler behoben wurden."

#: umc/js/adconnector/SetupWizard.js:251
msgid "Bidirectional synchronisation of UCS and Active Directory."
msgstr "Bidirektionale Synchronisation zwischen UCS und Active Directory."

#: umc/js/adconnector/ConfigPage.js:110
msgid ""
"By default the Active Directory connection does not transfer encrypted password data into "
"the UCS directory service. The system uses the Active Directory Kerberos "
"infrastructure for authentication."
msgstr ""
"Standardmäßig überträgt die eingerichtete Active Directory-Verbindung keine "
"verschlüsselten Passwortdaten in den UCS-Verzeichnisdienst. Das System nutzt die Active "
"Directory Kerberos Infrastruktur zur Authentifizierung."

#: umc/js/adconnector/SetupWizard.js:356


#: umc/js/adconnector/SetupWizard.js:148 umc/js/adconnector/SetupWizard.js:282
msgid "Completion of Active Directory Connection"
msgstr "Fertigstellung der Active Directory-Verbindung"

#: umc/js/adconnector/SetupWizard.js:230
msgid "Configuration of Active Directory domain synchronisation"

msgid ""
"Currently, an unencrypted connection to the Active Directory domain is used."
msgstr ""
"Es wird aktuell keine verschlüsselte Verbindung zu der "
"Active Directory Domäne verwendet."

#: umc/js/adconnector/ConfigPage.js:156
msgid "Download the password service for Windows and the UCS certificate"
msgstr ""
"Herunterladen des UCS-Zertifikats und des Passwortdienstes für Windows"

#: umc/js/adconnector/DownloadInfo.js:46
msgid ""
"In a standard setup, the Windows firewall blocks the access to "
"the password service. This must either be deactivated in System "
"settings or Port 6670/TCP authorised."
msgstr ""
"In einer Standard-Installation blockiert die Windows-Firewall die Zugriffe "
"auf den Passwortdienst. Diese muss entweder in der Systemsteuerung "
"deaktiviert werden oder Port 6670/TCP freigegeben werden. "

#: umc/js/adconnector/SetupWizard.js:165
msgid ""
"Enter the Active Directory domain information to establish the connection."
msgstr ""
"Geben Sie die Active Directory-Domäneninformationen ein, um die Verbindung "
"einzurichten."


#: umc/js/adconnector/ConfigPage.js:111
msgid ""
"However, in some scenarios it may be reasonable to transfer encrypted password hashes. In "
"this case, The password service should be installed on the Active Directory "
"server."
msgstr ""
"In einigen Szenarien kann es dennoch sinnvoll sein, die verschlüsselten Passwortdaten zu "
"übertragen. In diesem Fall sollte der Passwort Dienst auf dem Active "
"Directory-Server installiert werden."

#: umc/js/adconnector/DownloadInfo.js:49 umc/js/adconnector/DownloadInfo.js:51
#, python-format

"Installation file for the password service for <b>%s</b> Windows.<br />It "
"can be started by double clicking on it."
msgstr ""
"Installationsdatei für den Passwortdienst für <b>%s</b> Windows.<br />Diese "
"kann per Doppelklick gestartet werden."

#: umc/js/adconnector/SetupWizard.js:272


#: umc/js/adconnector/ConfigPage.js:88
msgid ""
"It is also possible to just activate the encrypted connection without "
"certificate verification."
msgstr ""
"Es ist auch möglich, die verschlüsselte Verbindung ohne Zertifikatsprüfung "
"zu aktivieren."

#: umc/js/adconnector/SetupWizard.js:154
msgid ""
"It is necessary for already joined UCS systems to re-join the domain. This "
"should be done via the UMC module <i>Domain join</i> separately on each system."
msgstr ""
"Für bereits gejointe UCS-Systeme ist es notwendig, der Domäne neu "
"beizutreten. Dies sollte über das UMC-Module <i>Domänenbeitritt</i> separat "
"auf jedem System durchgeführt werden."

#: umc/js/adconnector/DownloadInfo.js:67 umc/js/adconnector/DownloadInfo.js:71

msgid ""
"It must be copied into the installation directory of the password service."
msgstr ""
"Es muss in das Installationsverzeichnis des Passwortdienstes kopiert werden."

#: umc/js/adconnector/SetupWizard.js:297
msgid "Join AD domain"


#: umc/js/adconnector/SetupWizard.js:239
msgid ""
"Select the synchronisation direction between the UCS domain and the given "
"Active Directory domain."
msgstr ""
"Wählen Sie die Synchronisationsrichtung zwischen der UCS-Domäne und der "
"angegebenen Active Directory-Domäne aus."

#: umc/js/adconnector/ConfigPage.js:124
msgid "Start Active Directory connection service"


#: umc/js/adconnector/SetupWizard.js:98
msgid ""
"Synchronisation of account data between an Active Directory and this UCS domain."
msgstr ""
"Synchronisation von Kontendaten zwischen einer Active Directory und dieser "
"UCS-Domäne."

"The <b>cert.pem</b> file contains the SSL certificates created in UCS for "
"secure communication."
msgstr ""
"Die <b>cert.pem</b> Datei enthält die in UCS erstellten SSL-Zertifikate für "
"sichere Kommunikation."

#: umc/js/adconnector/DownloadInfo.js:70

msgid ""
"The <b>private.key</b> file contains the private key to the SSL certificates."
msgstr ""
"Die <b>private.key</b> Datei beinhaltet den privaten Schlüssel des "
"SSL-Zertifikats."

#: umc/js/adconnector/DownloadInfo.js:43
msgid ""

"installation can be started on the Active Directory domain controller by "
"double clicking on it."
msgstr ""
"Die MSI-Dateien sind die Installationsdateien für den Passwortdienst. "
"Die Installation kann mit einem Doppelklick gestartet werden."

#: umc/js/adconnector/SetupWizard.js:288
msgid ""
"The UCS server is now ready for usage, and domain account data is "
"now available."
msgstr ""
"Das UCS-System kann nun eingesetzt werden und Domänen-Kontodaten "
"sind verfügbar."

#: umc/js/adconnector/SetupWizard.js:220 umc/js/adconnector/ConfigPage.js:100


#: umc/js/adconnector/SetupWizard.js:153
msgid ""
"The connection to the Active Directory domain has been configured "
"successfully."
msgstr ""
"Die Verbindung zur Active Directory Domäne wurde erfolgreich eingerichtet."

#: umc/js/adconnector/ConfigPage.js:72
msgid "The UCS domain exists in parallel to an Active Directory domain."
msgstr "Die UCS-Domäne existiert parallel zu einer Active Directory-Domäne."

#: umc/js/adconnector/ConfigPage.js:207 umc/js/adconnector/ConfigPage.js:213
msgid ""

"can be started automatically or manually."
msgstr ""
"Das Paket ist automatisch im <b>C:\\Windows\\UCS-AD-Connector</b> "
"Verzeichnis installiert. Zusätzlich ist der Passwortdienst als "
"Systemdienst in die Windows-Umgebung integriert. Dadurch kann der Dienst "
"automatisch oder manuell gestartet werden."

#: umc/js/adconnector/SetupWizard.js:331

#, python-format
msgid ""
"The server <i>%(_hostname)s (%(DC_IP)s)</i> is used as Active Directory "
"domain controller for the domain <i>%(Domain)s</i>."
msgstr ""
"Der Server <i>%(_hostname)s (%(DC_IP)s)</i> wird als Active "
"Directory-Domänencontroller für die Domäne <i>%(Domain)s</i> genutzt."

#: umc/js/adconnector/SetupWizard.js:287
msgid ""


#: umc/js/adconnector/ConfigPage.js:206 umc/js/adconnector/ConfigPage.js:212
msgid ""
"To achieve a higher level of security, the Active Directory root "
"certificate should be exported and uploaded here. The Active Directory "
"certificate service creates that certificate."
msgstr ""

#: umc/js/adconnector/SetupWizard.js:193
msgid ""
"To enable an encrypted connection, a certification authority needs to be "
"configured on the Active Directory server. All steps necessary are described "
"in the <a href=\"http://docs.univention.de/manual-3.2.html#ad-connector:ad-"
"zertifikat\" target=\"_blank\">UCS manual</a>."
msgstr ""


#: umc/js/adconnector/SetupWizard.js:105
msgid ""
"Use the second option for more complex scenarios which necessitate that "
"Active Directory and UCS domains exist in parallel."
msgstr ""
"Benutzen Sie die zweite Option für komplexere Szenarien, die den "


#: umc/js/adconnector/ConfigPage.js:219
msgid ""
"If there is a need for adjustment, you may upload a new root certificate of "
"the Active Directory domain."
msgstr ""
"Bei Anpassungsbedarf können Sie hier ein neues Root-Zertifikat aus der "
"Active Directory Domäne hochladen."

#~ msgid ""

Return to bug 35602

Lines 69-75 Link Here

(-)umc/js/adconnector/ConfigPage.js (-9 / +9 lines)
69	if (state && state.mode_admember) {	69	if (state && state.mode_admember) {
70	this.helpText = _('The system is part of an Active Directory domain.');	70	this.helpText = _('The system is part of an Active Directory domain.');
71	} else if (state && state.mode_adconnector) {	71	} else if (state && state.mode_adconnector) {
72	this.helpText = _('The domain exists in parallel to an Active Directory domain.');	72	this.helpText = _('The UCS domain exists in parallel to an Active Directory domain.');
73	}	73	}
74	this.helpText += ' ' + _('This module configures the connection between the Univention Corporate Server and Active Directory.');	74	this.helpText += ' ' + _('This module configures the connection between the Univention Corporate Server and Active Directory.');
75	this.showDescription();	75	this.showDescription();
Lines 85-91 Link Here
85	name: 'unencryptedActivateSSL',	85	name: 'unencryptedActivateSSL',
86	type: Text,	86	type: Text,
87	content: '<p style="margin-top: 4em;">' +	87	content: '<p style="margin-top: 4em;">' +
88	_('It is also possible to just activate the encrypted connection without a certificate.') +	88	_('It is also possible to just activate the encrypted connection without certificate verification.') +
89	'</p>'	89	'</p>'
90	}, {	90	}, {
91	name: 'certificateUpload',	91	name: 'certificateUpload',
Lines 107-114 Link Here
107	name: 'downloadInfoADMember',	107	name: 'downloadInfoADMember',
108	type: Text,	108	type: Text,
109	content: makeParagraphs([	109	content: makeParagraphs([
110	_('By default the Active Directory connection does not transfer passwords into the UCS directory service. The system uses the Active Directory Kerberos infrastructure for authentication.'),	110	_('By default the Active Directory connection does not transfer encrypted password data into the UCS directory service. The system uses the Active Directory Kerberos infrastructure for authentication.'),
111	_('However, in some szenarios it may be reasonable to transfer passwords. In this case, The password service should be installed on the Active Directory server.')	111	_('However, in some scenarios it may be reasonable to transfer encrypted password hashes. In this case, The password service should be installed on the Active Directory server.')
112	])	112	])
113	}, {	113	}, {
114	name: 'download',	114	name: 'download',
Lines 116-122 Link Here
116	}, {	116	}, {
117	name: 'downloadNextStepADMember',	117	name: 'downloadNextStepADMember',
118	type: Text,	118	type: Text,
119	content: _('After the installation the replication of password hashes has to be activated:')	119	content: _('After the installation the replication of password hashes has to be activated.')
120	}];	120	}];
121		121
122	var buttons = [{	122	var buttons = [{
Lines 148-154 Link Here
148	label: _('Active Directory connection service'),	148	label: _('Active Directory connection service'),
149	layout: ['running', 'start', 'stop']	149	layout: ['running', 'start', 'stop']
150	}, {	150	}, {
151	label: _('Active Directory Server configuration'),	151	label: _('Active Directory connection SSL configuration'),
152	layout: ['certificateUpload', 'unencryptedActivateSSL', 'activate']	152	layout: ['certificateUpload', 'unencryptedActivateSSL', 'activate']
153	}];	153	}];
154	if (this.initialState.mode_adconnector) {	154	if (this.initialState.mode_adconnector) {
Lines 203-215 Link Here
203	showEnableSSL = state.mode_adconnector;	203	showEnableSSL = state.mode_adconnector;
204	certMsg = makeParagraphs([	204	certMsg = makeParagraphs([
205	_('Currently, an unencrypted connection to the Active Directory domain is used.'),	205	_('Currently, an unencrypted connection to the Active Directory domain is used.'),
206	_('To achieve a higher level of security, the Active Directory system\'s root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate.'),	206	_('To achieve a higher level of security, the Active Directory root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate.'),
207	_('The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.')	207	_('The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.')
208	]);	208	]);
209	} else {	209	} else {
210	certMsg = makeParagraphs([	210	certMsg = makeParagraphs([
211	_('Currently, an encrypted connection between UCS and the Active Directory domain is used.'),	211	_('Currently, an encrypted connection between UCS and the Active Directory domain is used.'),
212	_('To achieve a higher level of security, the Active Directory system\'s root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate.'),	212	_('To achieve a higher level of security, the Active Directory root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate.'),
213	_('The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.')	213	_('The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.')
214	]);	214	]);
215	}	215	}
Lines 216-222 Link Here
216	} else {	216	} else {
217	certMsg = makeParagraphs([	217	certMsg = makeParagraphs([
218	_('Currently, a secured connection between UCS and the Active Directory domain is used.'),	218	_('Currently, a secured connection between UCS and the Active Directory domain is used.'),
219	_('When there is a need of adjustment, you may upload a new root certificate of the Active Directory domain.')	219	_('If there is a need for adjustment, you may upload a new root certificate of the Active Directory domain.')
220	]);	220	]);
221	}	221	}
222	this._widgets.certificateUpload.set('value', certMsg);	222	this._widgets.certificateUpload.set('value', certMsg);

Lines 86-92 Link Here

(-)umc/js/adconnector/SetupWizard.js (-11 / +11 lines)
86	widgets: [{	86	widgets: [{
87	type: Text,	87	type: Text,
88	name: 'help',	88	name: 'help',
89	content: _('<p>This wizards guides the configuration of the connection with an existing Active Directory domain.</p><p>There are two possible ways:</p>')	89	content: _('<p>This wizards guides the configuration of the connection with an existing Active Directory domain.</p><p>There are two exclusive options:</p>')
90	}, {	90	}, {
91	type: RadioButtons,	91	type: RadioButtons,
92	name: 'mode',	92	name: 'mode',
Lines 95-101 Link Here
95	label: _('Configure UCS as part of an Active Directory domain (recommended).')	95	label: _('Configure UCS as part of an Active Directory domain (recommended).')
96	}, {	96	}, {
97	id: 'adconnector',	97	id: 'adconnector',
98	label: _('Synchronisation of account data between an Active Directory and a UCS domain.')	98	label: _('Synchronisation of account data between an Active Directory and this UCS domain.')
99	}]	99	}]
100	}, {	100	}, {
101	type: Text,	101	type: Text,
Lines 102-108 Link Here
102	name: 'help2',	102	name: 'help2',
103	content: _paragraph(	103	content: _paragraph(
104	_('Use the recommended first option if Active Directory will be the principal domain. Domain users can directly access applications that are installed on UCS.'),	104	_('Use the recommended first option if Active Directory will be the principal domain. Domain users can directly access applications that are installed on UCS.'),
105	_('Use the second option for more complex szenarios which necessitate that Active Directory and UCS domains exist in parallel.')	105	_('Use the second option for more complex scenarios which necessitate that Active Directory and UCS domains exist in parallel.')
106	)	106	)
107	}]	107	}]
108	}, {	108	}, {
Lines 133-139 Link Here
133	}]	133	}]
134	}, {	134	}, {
135	name: 'error-admember',	135	name: 'error-admember',
136	headerText: _('AD Connection - An error ocurred'),	136	headerText: _('AD Connection - An error occurred'),
137	helpText: '<p>' + _('An error occurred during the join process of UCS into the Active Directory domain. The following information will give you some more details on which problems occurred during the join process.') + '</p>',	137	helpText: '<p>' + _('An error occurred during the join process of UCS into the Active Directory domain. The following information will give you some more details on which problems occurred during the join process.') + '</p>',
138	widgets: [{	138	widgets: [{
139	type: Text,	139	type: Text,
Lines 150-157 Link Here
150	type: Text,	150	type: Text,
151	name: 'help',	151	name: 'help',
152	content: _paragraph(	152	content: _paragraph(
153	_('The connection with the Active Directory domain has been configured successfully.'),	153	_('The connection to the Active Directory domain has been configured successfully.'),
154	_('It is necessary for already joined UCS systems to re-join the domain. This is done via the UMC module <i>Domain join</i> separately on each system.')	154	_('It is necessary for already joined UCS systems to re-join the domain. This should be done via the UMC module <i>Domain join</i> separately on each system.')
155	)	155	)
156	}]	156	}]
157	}, {	157	}, {
Lines 162-168 Link Here
162	type: Text,	162	type: Text,
163	'class': 'umcPageHelpText',	163	'class': 'umcPageHelpText',
164	name: 'help',	164	name: 'help',
165	content: _('Enter the Active Directory domain information to configure the connection.')	165	content: _('Enter the Active Directory domain information to establish the connection.')
166	}, {	166	}, {
167	type: TextBox,	167	type: TextBox,
168	name: 'ad_server_address',	168	name: 'ad_server_address',
Lines 189-195 Link Here
189	'class': 'umcPageHelpText',	189	'class': 'umcPageHelpText',
190	name: 'info',	190	name: 'info',
191	content: _paragraph(	191	content: _paragraph(
192	_('An encrypted connection to the Active Directory domain could not be established. This has as consequence that authentication data is submitted in plaintext.'),	192	_('An encrypted connection to the Active Directory domain could not be established. As a consequence authentication data is submitted in plaintext.'),
193	_('To enable an encrypted connection, a certification authority needs to be configured on the Active Directory server. All necessary steps are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.'),	193	_('To enable an encrypted connection, a certification authority needs to be configured on the Active Directory server. All necessary steps are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>.'),
194	_('After the certification authority has been set up, press <i>Next</i> to proceed.')	194	_('After the certification authority has been set up, press <i>Next</i> to proceed.')
195	)	195	)
Lines 202-208 Link Here
202	type: Text,	202	type: Text,
203	'class': 'umcPageHelpText',	203	'class': 'umcPageHelpText',
204	name: 'info',	204	name: 'info',
205	content: _('<p>To achieve a higher level of security, the Active Directory system\'s root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate. The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>. Alternatively, you may proceed without this configuration.</p>')	205	content: _('<p>To achieve a higher level of security, the Active Directory root certificate should be exported and uploaded here. The Active Directory certificate service creates that certificate. The necessary steps depend on the actual Microsoft Windows version and are described in the <a href="http://docs.univention.de/manual-3.2.html#ad-connector:ad-zertifikat" target="_blank">UCS manual</a>. Alternatively, you may proceed without this configuration.</p>')
206		206
207	}, {	207	}, {
208	name: 'certificateUpload',	208	name: 'certificateUpload',
Lines 236-242 Link Here
236	type: Text,	236	type: Text,
237	'class': 'umcPageHelpText',	237	'class': 'umcPageHelpText',
238	name: 'help',	238	name: 'help',
239	content: '<p>' + _('Specify the synchronisation direction between the UCS domain and the given Active Directory domain.') + '</p>'	239	content: '<p>' + _('Select the synchronisation direction between the UCS domain and the given Active Directory domain.') + '</p>'
240	}, {	240	}, {
241	type: RadioButtons,	241	type: RadioButtons,
242	name: 'connectormode',	242	name: 'connectormode',
Lines 285-291 Link Here
285	name: 'help',	285	name: 'help',
286	content: _paragraph(	286	content: _paragraph(
287	_('The synchronisation of Univention Corporate Server and Active Directory has been succesfully initiated.'),	287	_('The synchronisation of Univention Corporate Server and Active Directory has been succesfully initiated.'),
288	_('The UCS server is now ready for usage, and domain account information are now available.')	288	_('The UCS server is now ready for usage, and domain account data is now available.')
289	)	289	)
290	}]	290	}]
291	}];	291	}];