Attachment 9990 Details for Bug 49111 – 1.diff

[patch] 1.diff

1.diff (text/plain), 14.57 KB, created by Arvid Requate on 2019-04-24 12:38:10 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2019-04-24 12:38:10 CEST

Size: 14.57 KB

patch

obsolete

>diff --git a/services/univention-ad-connector/umc/js/adconnector/ConfigPage.js b/services/univention-ad-connector/umc/js/adconnector/ConfigPage.js
>index f95548458b..ca3509e425 100644
>--- a/services/univention-ad-connector/umc/js/adconnector/ConfigPage.js
>+++ b/services/univention-ad-connector/umc/js/adconnector/ConfigPage.js
>@@ -102,7 +102,7 @@ define([
> 					this.showHideElements();
> 				})
> 			}, {
>-				name: 'downloadInfoADMember',
>+				name: 'pwdsyncInfoADMember',
> 				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.'),
>@@ -144,8 +144,8 @@ define([
> 			}];
> 			if (this.initialState.mode_admember) {
> 				layout.push({
>-					label: _('Password service'),
>-					layout: ['downloadInfoADMember']
>+					label: _('Password sync'),
>+					layout: ['pwdsyncInfoADMember']
> 				});
> 			}
> 			var _container = render.layout(layout, this._widgets, this._buttons);
>@@ -209,7 +209,7 @@ define([
> 				this._widgets.unencryptedActivateSSL.set('visible', showEnableSSL);
> 				this._buttons.activate.set('visible', showEnableSSL);
> 
>-				this._widgets.downloadInfoADMember.set('visible', state.mode_admember);
>+				this._widgets.pwdsyncInfoADMember.set('visible', state.mode_admember);
> //				this._buttons.password_sync.set('visible', state.mode_admember && !state.password_sync_enabled);
> //				this._buttons.password_sync_stop.set('visible', state.mode_admember && state.password_sync_enabled);
> 			}));
>diff --git a/services/univention-ad-connector/umc/js/de.po b/services/univention-ad-connector/umc/js/de.po
>index c592ab3ce1..88ebf22b61 100644
>--- a/services/univention-ad-connector/umc/js/de.po
>+++ b/services/univention-ad-connector/umc/js/de.po
>@@ -32,14 +32,6 @@ msgstr ""
> msgid "DNS Check"
> msgstr "DNS-Check"
> 
>-#: umc/js/adconnector/DownloadInfo.js:68
>-msgid ""
>-" Please verify that the file has been downloaded as cert.pem, "
>-"Internet Explorer appends a .txt under some circumstances."
>-msgstr ""
>-" Bitte Ã¼berprÃ¼fen, dass die Datei als cert.pem runtergeladen "
>-"wurde, Internet Explorer hÃ¤ngt unter bestimmten UmstÃ¤nden ein .txt an."
>-
> #: umc/js/adconnector/SetupWizard.js:354
> msgid ""
> "An encrypted connection to the Active Directory domain could still not be "
>@@ -141,14 +133,6 @@ msgid ""
> msgstr ""
> "Klicken Sie Weiter sobald die Zertifizierungsstelle eingerichtet ist."
> 
>-#: 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 "
>@@ -241,10 +225,6 @@ 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/SetupWizard.js:165
> msgid ""
> "Enter the Active Directory domain information to establish the connection."
>@@ -280,29 +260,6 @@ msgstr ""
> "Bei Anpassungsbedarf kÃ¶nnen Sie hier ein neues Root-Zertifikat aus der "
> "Active Directory-DomÃ¤ne hochladen."
> 
>-#: 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/DownloadInfo.js:49 umc/js/adconnector/DownloadInfo.js:51
>-#, python-format
>-msgid ""
>-"Installation file for the password service for %s Windows. It "
>-"can be started by double clicking on it."
>-msgstr ""
>-"Installationsdatei fÃ¼r den Passwortdienst fÃ¼r %s Windows. Diese "
>-"kann per Doppelklick gestartet werden."
>-
>-#: umc/js/adconnector/SetupWizard.js:272
>-msgid "Installation of password service"
>-msgstr "Installation des Passwortdienstes"
>-
> #: umc/js/adconnector/ConfigPage.js:88
> msgid ""
> "It is also possible to just activate the encrypted connection without "
>@@ -321,12 +278,6 @@ msgstr ""
> "beizutreten. Dies sollte Ã¼ber das UMC-Module DomÃ¤nenbeitritt 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"
> msgstr "AD-DomÃ¤ne beitreten"
>@@ -335,17 +286,9 @@ msgstr "AD-DomÃ¤ne beitreten"
> msgid "Joining UCS into Active Directory domain"
> msgstr "UCS der Active Directory-DomÃ¤ne beitreten lassen"
> 
>-#: umc/js/adconnector/DownloadInfo.js:53
>-msgid ""
>-"Microsoft Visual C++ 2010 Redistributable Package (x86) - Must be "
>-"installed on a 64bit Windows."
>-msgstr ""
>-"Microsoft Visual C++ 2010 Redistributable Package (x86) - Muss auf "
>-"einem 64bit Windows installiert sein."
>-
> #: umc/js/adconnector/ConfigPage.js:161
>-msgid "Password service"
>-msgstr "Passwortdienst"
>+msgid "Password sync"
>+msgstr "Passwort Sync"
> 
> #: umc/js/adconnector/SetupWizard.js:548
> msgid "Please confirm to carry out a restart of the UMC server components."
>@@ -391,30 +334,6 @@ msgstr ""
> "Synchronisation von Kontendaten zwischen einer Active Directory- und dieser "
> "UCS-DomÃ¤ne."
> 
>-#: umc/js/adconnector/DownloadInfo.js:66
>-msgid ""
>-"The cert.pem file contains the SSL certificates created in UCS for "
>-"secure communication."
>-msgstr ""
>-"Die cert.pem Datei enthÃ¤lt die in UCS erstellten SSL-Zertifikate fÃ¼r "
>-"sichere Kommunikation."
>-
>-#: umc/js/adconnector/DownloadInfo.js:70
>-msgid ""
>-"The private.key file contains the private key to the SSL certificates."
>-msgstr ""
>-"Die private.key Datei beinhaltet den privaten SchlÃ¼ssel des SSL-"
>-"Zertifikats."
>-
>-#: umc/js/adconnector/DownloadInfo.js:43
>-msgid ""
>-"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."
>-msgstr ""
>-"Die MSI-Dateien sind die Installationsdateien fÃ¼r den Passwortdienst. Die "
>-"Installation kann mit einem Doppelklick gestartet werden."
>-
> #: 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."
>@@ -449,18 +368,6 @@ msgstr ""
> "connector:ad-zertifikat\" target=\"_blank\">UCS Dokumentation</a> "
> "beispielhaft beschrieben."
> 
>-#: umc/js/adconnector/DownloadInfo.js:44
>-msgid ""
>-"The package is installed in the C:\\Windows\\UCS-AD-Connector "
>-"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."
>-msgstr ""
>-"Das Paket ist automatisch im C:\\Windows\\UCS-AD-Connector "
>-"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 ""
>@@ -542,184 +449,3 @@ msgstr ""
> "Benutzen Sie die zweite Option fÃ¼r komplexere Szenarien, die den "
> "Parallelbetrieb der Active Directory- und UCS-DomÃ¤ne voraussetzen."
> 
>-#~ msgid ""
>-#~ " The Configuation of UCS Active Directory Connector must be completed "
>-#~ "before the server can be started."
>-#~ msgstr ""
>-#~ " Die Konfiguration von UCS Active Directory Connector muss zuerst "
>-#~ "abgeschlossen werden bevor der Dienst gestartet werden kann."
>-
>-#~ msgid "Deactivated!"
>-#~ msgstr "Deaktiviert!"
>-
>-#~ msgid ""
>-#~ "Click \"Next\" to inititate the join process into the AD domain."
>-#~ msgstr "Klicken Sie \"Weiter\", um der AD-DomÃ¤ne beizutreten."
>-
>-#~ msgid ""
>-#~ "A certification authority should be configured on the Active Directory "
>-#~ "server. All necessary steps are described in the <a href=\"http://docs."
>-#~ "univention.de/manual-4.0.html#ad-connector:ad-zertifikat\" target=\"_blank"
>-#~ "\">UCS manual</a>."
>-#~ msgstr ""
>-#~ "Auf dem Active Directory Server sollte eine Zertifizierungsstelle "
>-#~ "eingerichtet werden. Die notwendigen Schritte sind im <a href=\"http://"
>-#~ "docs.univention.de/handbuch-4.0.html#ad-connector:ad-zertifikat\" target="
>-#~ "\"_blank\">UCS Handbuch</a> beschrieben."
>-
>-#~ msgid "Activate the encrypted connection afterwards."
>-#~ msgstr "AnschlieÃend aktivieren Sie bitte die verschlÃ¼sselte Verbindung."
>-
>-#~ msgid "Active Directory Server"
>-#~ msgstr "Active Directory Server"
>-
>-#~ msgid "Active Directory domain"
>-#~ msgstr "Active Directory-DomÃ¤ne"
>-
>-#~ msgid "Active Directory domain information"
>-#~ msgstr "Active Directory-DomÃ¤neninformationen"
>-
>-#~ msgid "Add debug output for functions"
>-#~ msgstr "Debug-Ausgaben fÃ¼r Funktionen ausgeben"
>-
>-#~ msgid "Automatic determination of the LDAP configuration"
>-#~ msgstr "Automatische Ermittlung der LDAP-Konfiguration"
>-
>-#~ msgid "Configuration"
>-#~ msgstr "Konfiguration"
>-
>-#~ msgid "Configure UCS Active Directory Connector"
>-#~ msgstr "UCS Active Directory Connector einrichten"
>-
>-#~ msgid "Debug level of Active Directory Connector"
>-#~ msgstr "Debug-level des UCS Active Directory Connector"
>-
>-#~ msgid "English"
>-#~ msgstr "Englisch"
>-
>-#~ msgid "Extended settings"
>-#~ msgstr "Erweiterte Einstellungen"
>-
>-#~ msgid "German"
>-#~ msgstr "Deutsch"
>-
>-#~ msgid ""
>-#~ "If on the other hand the replacement of a native Active Directory domain "
>-#~ "is desired, Univention AD Takeover should be used instead."
>-#~ msgstr ""
>-#~ "Wenn andererseits die AblÃ¶sung einer nativen Active Directory DomÃ¤ne "
>-#~ "gewÃ¼nscht ist, sollte statt dessen Univention AD Takeover verwendet "
>-#~ "werden."
>-
>-#~ msgid "Kerberos domain"
>-#~ msgstr "Kerberos-DomÃ¤ne"
>-
>-#~ msgid "LDAP DN of the synchronisation user"
>-#~ msgstr "LDAP DN des Synchronisationsbenutzers"
>-
>-#~ msgid "LDAP and Kerberos"
>-#~ msgstr "LDAP und Kerberos"
>-
>-#~ msgid ""
>-#~ "LDAP and kerberos configuration of the Active Directory server needs to "
>-#~ "be specified for the synchronisation."
>-#~ msgstr ""
>-#~ "Die LDAP- und Kerberos-Konfiguration des Active Directory Servers muss "
>-#~ "fÃ¼r die Synchronisation angegeben werden."
>-
>-#~ msgid "LDAP base"
>-#~ msgstr "LDAP-Basis"
>-
>-#~ msgid "Password of the synchronisation user"
>-#~ msgstr "Passwort des Synchronisationsbenutzers"
>-
>-#~ msgid ""
>-#~ "Please enter the fully qualified hostname of the Active Directory server."
>-#~ msgstr ""
>-#~ "Der vollqualifizierte Rechnername des Active Directory Servers wird "
>-#~ "benÃ¶tigt."
>-
>-#~ msgid "Poll Interval (seconds)"
>-#~ msgstr "Polling-Intervall (in Sekunden)"
>-
>-#~ msgid "Retry interval for rejected objects"
>-#~ msgstr "Wiederholungsintervall fÃ¼r abgelehnte Objekte"
>-
>-#~ msgid "Start UCS Active Directory Connector"
>-#~ msgstr "UCS Active Directory Connector starten"
>-
>-#~ msgid "Stop UCS Active Directory Connector"
>-#~ msgstr "UCS Active Directory Connector stoppen"
>-
>-#~ msgid "Synchronisation mode"
>-#~ msgstr "Synchronisationsmodus"
>-
>-#~ msgid "System language of Active Directory server"
>-#~ msgstr "Systemsprache des Active Directory Servers"
>-
>-#~ msgid "The Active Directory certificate has been successfully installed."
>-#~ msgstr "Das Active Directory Zertifikat wurde erfolgreich installiert."
>-
>-#~ msgid "The Active Directory certificate has not been installed yet."
>-#~ msgstr "Das Active Directory Zertifikat wurde noch nicht installiert."
>-
>-#~ msgid ""
>-#~ "The configuration process has been finished and all required settings for "
>-#~ "UCS Active Directory Connector are set."
>-#~ msgstr ""
>-#~ "Die Konfiguration ist abgeschlossen und alle benÃ¶tigten Einstellungen fÃ¼r "
>-#~ "den UCS Active Directory Connector sind gesetzt."
>-
>-#~ msgid "The configuration process has not been started yet or is incomplete."
>-#~ msgstr ""
>-#~ "Die Konfigration ist noch nicht vorhanden oder zumindest unvollstÃ¤ndig."
>-
>-#~ msgid ""
>-#~ "The following settings control the internal behaviour of the UCS Active "
>-#~ "Directory connector. For all attributes reasonable default values are "
>-#~ "provided."
>-#~ msgstr ""
>-#~ "Die folgenden Einstellungen kontrollieren das interne Verhalten des UCS "
>-#~ "Active Directory Connector. FÃ¼r alle Attribute sind sinnvolle "
>-#~ "Vorgabewerte definiert."
>-
>-#~ msgid ""
>-#~ "The hostname must be resolvable by the UCS server. A DNS entry can be "
>-#~ "configured in the DNS module, or a static host record can be configured "
>-#~ "through the Univention Configuration Registry module, e.g."
>-#~ msgstr ""
>-#~ "Der Hostname muss durch den UCS Server aufgelÃ¶st werden kÃ¶nnen. Ein DNS "
>-#~ "Eintrag kann Ã¼ber das DNS Modul konfiguriert werden. Alternativ kann ein "
>-#~ "statischer Hosteintrag analog zu folgendem Beispiel im Univention "
>-#~ "Configuration Registry Modul erstellt werden."
>-
>-#~ msgid "The hostname of the Active Directory server is required"
>-#~ msgstr "Der Rechnername des Active Directory Servers wird benÃ¶tigt"
>-
>-#~ msgid "The password for the synchronisation account is required!"
>-#~ msgstr "Das Passwort fÃ¼r den Synchronisationsbenutzer wird benÃ¶tigt!"
>-
>-#~ msgid ""
>-#~ "This module provides a configuration wizard for the UCS Active Directory "
>-#~ "Connector to simplify the setup."
>-#~ msgstr ""
>-#~ "Dieses Modul stellt einen Konfigurationsassistenten zur einfachen "
>-#~ "Einrichtung des UCS Active Directory Connector zur VerfÃ¼gung."
>-
>-#~ msgid ""
>-#~ "This wizard configures a synchronized parallel operation of UCS next to a "
>-#~ "native Active Directory domain."
>-#~ msgstr ""
>-#~ "Dieser Assistent konfiguriert einen synchronisierten parallelen Betrieb "
>-#~ "von UCS neben einer nativen Active Directory DomÃ¤ne."
>-
>-#~ msgid "UCS Active Directory Connector Wizard"
>-#~ msgstr "UCS Active Directory Connector Assistent"
>-
>-#~ msgid "UCS Active Directory Connector configuration"
>-#~ msgstr "UCS Active Directory Connector Konfiguration"
>-
>-#~ msgid ""
>-#~ "UCS Active Directory Connector supports three types of synchronisation."
>-#~ msgstr ""
>-#~ "UCS Active Directory Connector unterstÃ¼tzt drei Typen der Synchronisation."

Actions: View | Diff

Attachments on bug 49111: 9942 | 9990