Index: debian/changelog
===================================================================
--- debian/changelog (Revision 52518)
+++ debian/changelog (Revision 52537)
@@ -1,3 +1,21 @@
+univention-system-setup (7.0.69-50) unstable; urgency=low
+
+ * Bug #34484: Fixed changing locale during session
+
+ -- Dirk Wiesenthal Tue, 05 Aug 2014 22:31:00 +0200
+
+univention-system-setup (7.0.69-49) unstable; urgency=low
+
+ * Bug #34484: Fixed required root password; wording
+
+ -- Dirk Wiesenthal Tue, 05 Aug 2014 11:53:15 +0200
+
+univention-system-setup (7.0.69-48) unstable; urgency=low
+
+ * Bug #34484: Change default TLD to .intranet; wording
+
+ -- Dirk Wiesenthal Tue, 05 Aug 2014 10:25:41 +0200
+
univention-system-setup (7.0.69-47) unstable; urgency=medium
* Bug #34484: version bump
Index: umc/python/setup/util.py
===================================================================
--- umc/python/setup/util.py (Revision 52518)
+++ umc/python/setup/util.py (Revision 52537)
@@ -803,7 +803,7 @@
try:
resolver.query('_domaincontroller_master._tcp.%s' % domain, 'SRV')
return True
- except dns.resolver.NXDOMAIN as exc:
+ except dns.resolver.NXDOMAIN:
MODULE.warn('No valid UCS domain (%s) at nameserver %s!' % (domain, nameserver))
return False
Index: umc/python/setup/de.po
===================================================================
--- umc/python/setup/de.po (Revision 52518)
+++ umc/python/setup/de.po (Revision 52537)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: univention-management-console-module-setup\n"
"Report-Msgid-Bugs-To: packages@univention.de\n"
-"POT-Creation-Date: 2014-08-01 15:46+0200\n"
+"POT-Creation-Date: 2014-08-04 23:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -285,6 +285,7 @@
msgstr "Der angegebene DNS-Server %s kann nicht kontaktiert werden."
#: umc/python/setup/__init__.py:388
+#, python-format
msgid "The specified nameserver %s is not part of a valid UCS domain."
msgstr "Der angegebene DNS-Server %s ist nicht Teil einer gültigen UCS-Domäne."
Index: umc/python/setup/__init__.py
===================================================================
--- umc/python/setup/__init__.py (Revision 52518)
+++ umc/python/setup/__init__.py (Revision 52537)
@@ -73,12 +73,15 @@
self._finishedResult = True
self._progressParser = util.ProgressParser()
self._cleanup_required = False
+ self._very_first_locale = None
# reset umask to default
os.umask( 0022 )
def init( self ):
os.environ['LC_ALL'] = str(self.locale)
_locale.setlocale(_locale.LC_ALL, str(self.locale))
+ self._very_first_locale = copy.deepcopy(self.locale)
+ MODULE.process('Very first locale is %s. Will be added if this is very first system setup' % self._very_first_locale)
if not util.is_system_joined():
self._preload_city_data()
@@ -218,7 +221,10 @@
self._progressParser.reset()
# write the profile file and run setup scripts
- util.auto_complete_values_for_join(values, self.locale)
+ # use the _very_first_locale not the current one
+ # otherwise some strange python exceptions occur telling us
+ # about unsupported locale strings...
+ util.auto_complete_values_for_join(values, self._very_first_locale)
util.pre_save(values)
# on unjoined DC master the nameserver must be set to the external nameserver
@@ -573,7 +579,7 @@
os.environ['LC_ALL'] = str(self.locale)
try:
_locale.setlocale(_locale.LC_ALL, str(locale))
- except _locale.Error as exc:
+ except _locale.Error:
MODULE.warn('Locale %s is not supported, using fallback locale "C" instead.' % locale)
_locale.setlocale(_locale.LC_ALL, 'C')
self.locale = locale
Index: umc/js/setup/ApplianceWizard.js
===================================================================
--- umc/js/setup/ApplianceWizard.js (Revision 52518)
+++ umc/js/setup/ApplianceWizard.js (Revision 52537)
@@ -206,7 +206,7 @@
return acceptEmtpy || (isFQDN && hasNoDots);
};
- var _invalidFQDNMessage = _('Invalid fully qualified domain name!
Expected format: hostname.mydomain.local');
+ var _invalidFQDNMessage = _('Invalid fully qualified domain name!
Expected format: hostname.mydomain.intranet');
var _validateFQDN = function(fqdn) {
fqdn = fqdn || '';
var isFQDN = _regFQDN.test(fqdn);
@@ -215,7 +215,7 @@
return acceptEmtpy || (isFQDN && hasEnoughParts);
};
- var _invalidHostOrFQDNMessage = _('Invalid hostname or fully qualified domain name!
Expected format: myhost or hostname.mydomain.local');
+ var _invalidHostOrFQDNMessage = _('Invalid hostname or fully qualified domain name!
Expected format: myhost or hostname.mydomain.intranet');
var _validateHostOrFQDN = function(hostOrFQDN) {
hostOrFQDN = hostOrFQDN || '';
var acceptEmtpy = !hostOrFQDN && !this.required;
@@ -223,7 +223,7 @@
};
var _regDN = /^([^=, ]+=[^=, ]+,)*[^=, ]+=[^=, ]+$/;
- var _invalidLDAPBase = _('Invalid LDAP base!
Expected format: dc=mydomain,dc=local');
+ var _invalidLDAPBase = _('Invalid LDAP base!
Expected format: dc=mydomain,dc=intranet');
var _validateLDAPBase = function(ldapBase) {
ldapBase = ldapBase || '';
var acceptEmtpy = !ldapBase && !this.required;
@@ -289,7 +289,6 @@
constructor: function(props) {
lang.mixin(this, props);
- this.local_mode = true;
this.pages = [{
'class': 'umc-setup-page umc-setup-page-welcome',
@@ -353,7 +352,7 @@
label: _('Keyboard layout'),
dynamicValues: 'setup/lang/keymaps',
onChange: lang.hitch(this, function(value) {
- if(this.local_mode) {
+ if (this.local_mode) {
tools.umcpCommand('setup/keymap/save', {keymap: value});
}
})
@@ -404,7 +403,7 @@
type: Text,
'class': 'umcPageHelpText',
name: 'help',
- content: _('Specify the type of role for the system to join into an existing UCS domain. For this, credentials of a valid domain Administrator account will be necessary.
')
+ content: _('Specify the type of the system to join into an existing UCS domain. For this, credentials of a valid domain Administrator account will be necessary.
')
}, {
type: RadioButton,
radioButtonGroup: 'role',
@@ -455,7 +454,7 @@
type: Text,
'class': 'umcPageHelpText',
name: 'help',
- content: _('Enter the name of your organisation, an e-mail address to activate UCS and a password for your Administrator account.
The password is mandatory, it will be used for the domain Administrator as well as for the local superuser root.
')
+ content: _('Enter the name of your organization, an e-mail address to activate UCS and a password for your Administrator account.
The password is mandatory, it will be used for the domain Administrator as well as for the local superuser root.
')
}, {
type: TextBox,
name: 'organization',
@@ -472,7 +471,7 @@
invalidMessage: _invalidEmailAddressMessage
}, {
type: PasswordInputBox,
- required: this.local_mode,
+ required: true,
name: 'root_password',
label: _('Password')
}]
@@ -848,7 +847,7 @@
msg = _('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 server setups with differing domains.
Note that the domain name cannot be changed after the UCS setup wizard has been completed.');
}
else if (type == 'proxy') {
- msg = _('A proxy address needs to be specified in the format: http://proxy.mydomain.local:3128
Proxy access with username and password may be specified via the format: http://username:password@proxy.mydomain.local:3128');
+ msg = _('A proxy address needs to be specified in the format: http://proxy.mydomain.intranet:3128
Proxy access with username and password may be specified via the format: http://username:password@proxy.mydomain.intranet:3128');
}
if (msg) {
_showTooltip(evt.target, msg, evt);
@@ -1086,7 +1085,7 @@
organization = organization.toLowerCase();
organization = organization.replace(/[\s().]+/g, '-').replace(/-+$/, ''); // remove trailing '-'
var hostname = this._randomHostName();
- var fqdn = lang.replace('{0}.{1}.local', [hostname, organization]);
+ var fqdn = lang.replace('{0}.{1}.intranet', [hostname, organization]);
this.getWidget('network', '_fqdn').set('value', fqdn);
this.getWidget('network', 'hostname').set('value', hostname);
},
@@ -1550,7 +1549,7 @@
if (pageName == 'user-master' || pageName == 'network') {
var passwordWidget = this.getWidget(pageName, 'root_password');
var password = passwordWidget.get('value');
- if (passwordWidget.get('visible') && passwordWidget.get('required') && password.length < 8) {
+ if (passwordWidget.get('visible') && password && password.length < 8) {
passwordWidget.focus();
_alert(_('The root password is too short. For security reasons, your password must contain at least 8 characters.'));
return false;
@@ -1593,7 +1592,7 @@
}],
layout: [ 'text', 'username', 'password' ],
title: _('Domain admin credentials'),
- submit: _('Join'),
+ submit: _('Join domain'),
cancel: _('Cancel'),
style: 'max-width: 400px;'
});
Index: umc/js/de.po
===================================================================
--- umc/js/de.po (Revision 52518)
+++ umc/js/de.po (Revision 52537)
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: univention-management-console-module-setup\n"
"Report-Msgid-Bugs-To: packages@univention.de\n"
-"POT-Creation-Date: 2014-08-01 15:46+0200\n"
+"POT-Creation-Date: 2014-08-05 11:50+0200\n"
"PO-Revision-Date: 2012-02-20 11:34+0100\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -12,23 +12,23 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: umc/js/setup/ApplianceWizard.js:665
+#: umc/js/setup/ApplianceWizard.js:664
msgid "(configure proxy settings)"
msgstr "(Einrichten von Proxy-Einstellungen)"
-#: umc/js/setup/ApplianceWizard.js:412
+#: umc/js/setup/ApplianceWizard.js:411
msgid "Domain controller backup"
msgstr "Domänencontroller Backup"
-#: umc/js/setup/ApplianceWizard.js:424
+#: umc/js/setup/ApplianceWizard.js:423
msgid "Domain controller slave"
msgstr "Domänencontroller Slave"
-#: umc/js/setup/ApplianceWizard.js:435
+#: umc/js/setup/ApplianceWizard.js:434
msgid "Member server"
msgstr "Member-Server"
-#: umc/js/setup/ApplianceWizard.js:1171
+#: umc/js/setup/ApplianceWizard.js:1170
msgid "Unknown"
msgstr "Unbekannt"
@@ -70,7 +70,7 @@
"logisch mit nur einem oder mehreren physikalischen Netzwerkgeräten zu "
"trennen."
-#: umc/js/setup/ApplianceWizard.js:429
+#: umc/js/setup/ApplianceWizard.js:428
msgid ""
"DC slave systems are ideal for site servers and distribution of load-"
"intensive services. Local services running on a DC slave can access a local "
@@ -80,9 +80,9 @@
"lastintensiver Dienste an. Lokale Dienste auf einem DC Slave besitzen "
"Lesezugriff auf eine lokale Kopie der LDAP-Datenbank.
"
-#: umc/js/setup/ApplianceWizard.js:458
+#: umc/js/setup/ApplianceWizard.js:457
msgid ""
-"Enter the name of your organisation, an e-mail address to activate UCS "
+"
Enter the name of your organization, an e-mail address to activate UCS "
"and a password for your Administrator account.
The password is "
"mandatory, it will be used for the domain Administrator as well as for the "
"local superuser root.
"
@@ -93,7 +93,7 @@
"Administrator-Konto als auch für den lokalen Superuser root verwendet."
"
"
-#: umc/js/setup/ApplianceWizard.js:1527
+#: umc/js/setup/ApplianceWizard.js:1526
msgid ""
"It is not possible to install KVM and XEN components on one system."
"p>
Please select only one of these components.
"
@@ -101,7 +101,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:1523
+#: umc/js/setup/ApplianceWizard.js:1522
msgid ""
"It is not possible to install Samba 3 and Samba 4 on one system."
"p>
Please select only one of these components.
"
@@ -109,7 +109,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:440
+#: umc/js/setup/ApplianceWizard.js:439
msgid ""
"Member servers are server systems without a local LDAP server. Access to "
"domain data here is performed via other servers in the domain.
"
@@ -117,7 +117,7 @@
"Member-Server sind Server-Systeme ohne lokalen LDAP-Server. Der Zugriff "
"auf Domänendaten erfolgt hier über andere Server der Domäne."
-#: umc/js/setup/ApplianceWizard.js:681
+#: umc/js/setup/ApplianceWizard.js:680
msgid ""
"
Select UCS software components for installation on this system. This step "
"can be skipped; the components are also available in the Univention App "
@@ -130,17 +130,17 @@
"p>
Software vor Drittanbietern (bspw. Groupware) kann ebenfalls über das "
"Univention App Center installiert werden.
"
-#: umc/js/setup/ApplianceWizard.js:407
+#: umc/js/setup/ApplianceWizard.js:406
msgid ""
-"Specify the type of role for the system to join into an existing UCS "
-"domain. For this, credentials of a valid domain Administrator account will "
-"be necessary.
"
+"Specify the type of the system to join into an existing UCS domain. For "
+"this, credentials of a valid domain Administrator account will be necessary."
+"
"
msgstr ""
"Wählen Sie die Systemrolle aus, um einer bestehenden UCS-Domäne "
"beizutreten. Dazu sind Zugangsdaten eines gültigen Domänen-Administrator-"
"Kontos notwendig.
"
-#: umc/js/setup/ApplianceWizard.js:418
+#: umc/js/setup/ApplianceWizard.js:417
msgid ""
"The DC backup is the fallback system for the DC master and can take over "
"the role of the DC master permanently.
"
@@ -148,7 +148,7 @@
"Ein DC Backup fungiert als Ersatzsystem für den DC Master und kann die "
"Rolle des DC Masters langfristig übernehmen.
"
-#: umc/js/setup/ApplianceWizard.js:721
+#: umc/js/setup/ApplianceWizard.js:720
msgid ""
"UCS has been successfully set up with the specified settings.
Click "
"on the button Finish to complete the setup process.
"
@@ -157,7 +157,7 @@
"p>Klicken Sie auf die Schaltfläche Fertigstellen, um die "
"Einrichtung abzuschließen.
"
-#: umc/js/setup/ApplianceWizard.js:302
+#: umc/js/setup/ApplianceWizard.js:301
msgid ""
"Welcome to Univention Corporate Server (UCS).
A few questions are "
"needed to complete the configuration process.
"
@@ -165,43 +165,43 @@
"Herzlich willkommen bei Univention Corporate Server (UCS). Ein paar "
"Fragen sind notwendig, um die Einrichtung abzuschließen.
"
-#: umc/js/setup/ApplianceWizard.js:1169
+#: umc/js/setup/ApplianceWizard.js:1168
#, python-format
msgid "City: | %s |
"
msgstr "Stadt: | %s |
"
-#: umc/js/setup/ApplianceWizard.js:1189
+#: umc/js/setup/ApplianceWizard.js:1188
#, python-format
msgid "Default locale: | %s |
"
msgstr "Standard-Systemsprache: | %s |
"
-#: umc/js/setup/ApplianceWizard.js:1204
+#: umc/js/setup/ApplianceWizard.js:1203
#, python-format
msgid "Keyboard layout: | %s |
"
msgstr "Tastaturlayout: | %s |
"
-#: umc/js/setup/ApplianceWizard.js:1172
+#: umc/js/setup/ApplianceWizard.js:1171
#, python-format
msgid "Timezone: | %s |
"
msgstr "Zeitzone: | %s |
"
-#: umc/js/setup/ApplianceWizard.js:1308
+#: umc/js/setup/ApplianceWizard.js:1307
msgid "A new UCS domain will be created."
msgstr "Eine neue UCS-Domäne wird erstellt."
-#: umc/js/setup/ApplianceWizard.js:851
+#: umc/js/setup/ApplianceWizard.js:850
msgid ""
"A proxy address needs to be specified in the format: http://proxy."
-"mydomain.local:3128
Proxy access with username and password may be "
-"specified via the format: http://username:password@proxy.mydomain."
-"local:3128"
+"mydomain.intranet:3128
Proxy access with username and password may "
+"be specified via the format: http://username:password@proxy.mydomain."
+"intranet:3128"
msgstr ""
"Eine Proxy-Adresse kann angegeben werden in dem Format: http://proxy."
-"meinedomaene.local:3128
Für Proxy-Zugang mit Benutzername und "
+"meinedomaene.intranet:3128
Für Proxy-Zugang mit Benutzername und "
"Password kann das folgenden Format verwendet werden: http://benutzername:"
-"passwort@proxy.meinedomaene.local:3128"
+"passwort@proxy.meinedomaene.intranet:3128"
-#: umc/js/setup/ApplianceWizard.js:845
+#: umc/js/setup/ApplianceWizard.js:844
msgid ""
"A valid e-mail address allows to activate the UCS system for using the "
"Univention App Center. An e-mail with a personalized license key will then "
@@ -210,7 +210,7 @@
msgstr ""
"Eine gültige E-Mail-Adresse ermöglicht, das UCS-System für die Verwendung "
"des Univention App Centers freizuschalten. Eine E-Mail mit einem "
-"personalisierten Lizenzschlüssel wird Ihnen dann an diese Adresse zugesandt "
+"personalisierten Lizenzschlüssel wird Ihnen dann an diese Adresse zugesendet "
"werden. Die Lizenz kann über den Lizenzdialog der Univention Management "
"Console eingespielt werden."
@@ -218,7 +218,7 @@
msgid "Access settings"
msgstr "Zugriffseinstellungen"
-#: umc/js/setup/ApplianceWizard.js:1214
+#: umc/js/setup/ApplianceWizard.js:1213
msgid "Adapt settings"
msgstr "Einstellungen anpassen"
@@ -242,16 +242,16 @@
msgid "Additional options for this network interface"
msgstr "Weitere Optionen für dieses Netzwerkgerät"
-#: umc/js/setup/ApplianceWizard.js:1354
+#: umc/js/setup/ApplianceWizard.js:1353
msgid "Address configuration"
msgstr "Adresskonfiguration"
-#: umc/js/setup/ApplianceWizard.js:1363
+#: umc/js/setup/ApplianceWizard.js:1362
#, python-format
msgid "Address for %s"
msgstr "Adresse für %s"
-#: umc/js/setup/ApplianceWizard.js:446 umc/js/setup/ApplianceWizard.js:1332
+#: umc/js/setup/ApplianceWizard.js:445 umc/js/setup/ApplianceWizard.js:1331
msgid "Administrator account information"
msgstr "Administrator-Kontoinformationen"
@@ -259,11 +259,11 @@
msgid "Advanced configuration"
msgstr "Erweiterte Konfiguration"
-#: umc/js/setup/ApplianceWizard.js:643
+#: umc/js/setup/ApplianceWizard.js:642
msgid "Alternate UCS domain name server"
msgstr "Alternativer UCS-Domänen-DNS-Server"
-#: umc/js/setup/ApplianceWizard.js:657
+#: umc/js/setup/ApplianceWizard.js:656
msgid "Alternate external name server"
msgstr "Alternativer externer DNS-Server"
@@ -279,9 +279,9 @@
"Mindestens eine IP-Adresse muss angegeben werden oder DHCP oder SLAAC muss "
"eingeschaltet sein."
-#: umc/js/setup/ApplianceWizard.js:1569
+#: umc/js/setup/ApplianceWizard.js:1568
msgid "At least one network device needs to be properly configured."
-msgstr "Mindestens ein Netzwerkgerät muss konfiguiert werden."
+msgstr "Mindestens ein Netzwerkgerät muss konfiguriert werden."
#: umc/js/setup/InterfaceWizard.js:313 umc/js/setup/Interfaces.js:119
msgid "Autoconfiguration (SLAAC)"
@@ -331,9 +331,9 @@
msgid "Business unit"
msgstr "Abteilung"
-#: umc/js/setup/InterfaceGrid.js:132 umc/js/setup/ApplianceWizard.js:1597
-#: umc/js/setup/ApplianceWizard.js:1720 umc/js/setup/BasisPage.js:267
-#: umc/js/setup.js:195 umc/js/setup.js:553
+#: umc/js/setup.js:195 umc/js/setup.js:553 umc/js/setup/InterfaceGrid.js:132
+#: umc/js/setup/ApplianceWizard.js:1596 umc/js/setup/ApplianceWizard.js:1719
+#: umc/js/setup/BasisPage.js:267
msgid "Cancel"
msgstr "Abbrechen"
@@ -396,7 +396,7 @@
msgid "Choose interface type"
msgstr "Wähle Netzwerkgerätetyp aus"
-#: umc/js/setup/ApplianceWizard.js:338
+#: umc/js/setup/ApplianceWizard.js:337
msgid "Choose your system's localization settings."
msgstr "Wählen Sie die Systemsprache"
@@ -412,7 +412,7 @@
msgid "Configuration"
msgstr "Konfiguration"
-#: umc/js/setup/ApplianceWizard.js:1624 umc/js/setup.js:634
+#: umc/js/setup.js:634 umc/js/setup/ApplianceWizard.js:1623
msgid "Configuration finished"
msgstr "Konfiguration abgeschlossen"
@@ -420,11 +420,11 @@
msgid "Configuration of IPv4 and IPv6 adresses"
msgstr "Konfiguration der IPv4 und IPv6 Adressen"
-#: umc/js/setup/ApplianceWizard.js:1008
+#: umc/js/setup/ApplianceWizard.js:1007
msgid "Configure system"
msgstr "System konfigurieren"
-#: umc/js/setup/ApplianceWizard.js:504
+#: umc/js/setup/ApplianceWizard.js:503
msgid ""
"Configure the new UCS domain and specify the network settings for this "
"system."
@@ -432,7 +432,7 @@
"Einrichten der neuen UCS-Domäne und der Netzwerk-Einstellungen dieses "
"Systems."
-#: umc/js/setup/ApplianceWizard.js:380
+#: umc/js/setup/ApplianceWizard.js:379
msgid ""
"Configure this system as standalone and with a new UCS domain. Additional "
"systems can join the domain later to use account information supplied by "
@@ -442,11 +442,11 @@
"System können der Domäne später beitreten, um Kontoinformationen zu nutzen, "
"die durch dieses System bereitgestellt werden."
-#: umc/js/setup/ApplianceWizard.js:695
+#: umc/js/setup/ApplianceWizard.js:694
msgid "Confirm configuration settings"
msgstr "Bestätigen der Einstellungen"
-#: umc/js/setup/ApplianceWizard.js:1723 umc/js/setup/BasisPage.js:271
+#: umc/js/setup/ApplianceWizard.js:1722 umc/js/setup/BasisPage.js:271
msgid "Continue"
msgstr "Fortfahren"
@@ -458,7 +458,7 @@
msgid "Country code"
msgstr "Ländercode"
-#: umc/js/setup/ApplianceWizard.js:374
+#: umc/js/setup/ApplianceWizard.js:373
msgid "Create a new UCS domain"
msgstr "Erstellen einer neuen UCS-Domäne"
@@ -466,16 +466,16 @@
msgid "Created:"
msgstr "Erstellt:"
-#: umc/js/setup/ApplianceWizard.js:1312
+#: umc/js/setup/ApplianceWizard.js:1311
msgid "DC Backup"
msgstr "DC Backup"
-#: umc/js/setup/ApplianceWizard.js:1313
+#: umc/js/setup/ApplianceWizard.js:1312
msgid "DC Slave"
msgstr "DC Slave"
#: umc/js/setup/InterfaceWizard.js:625 umc/js/setup/InterfaceWizard.js:651
-#: umc/js/setup/ApplianceWizard.js:823
+#: umc/js/setup/ApplianceWizard.js:822
msgid "DHCP query failed."
msgstr "DHCP-Anfrage schlug fehl."
@@ -483,8 +483,8 @@
msgid "DHCP-Query"
msgstr "DHCP-Anfrage"
-#: umc/js/setup/ApplianceWizard.js:342 umc/js/setup/LanguagePage.js:135
-#: umc/js/setup/LanguagePage.js:236
+#: umc/js/setup/LanguagePage.js:135 umc/js/setup/LanguagePage.js:236
+#: umc/js/setup/ApplianceWizard.js:341
msgid "Default system locale"
msgstr "Standard-System-Sprachdefinition"
@@ -492,11 +492,11 @@
msgid "Delete"
msgstr "Löschen"
-#: umc/js/setup/ApplianceWizard.js:1595
+#: umc/js/setup/ApplianceWizard.js:1594
msgid "Domain admin credentials"
msgstr "Domänen-Administrator-Zugangsdaten"
-#: umc/js/setup/ApplianceWizard.js:482 umc/js/setup/ApplianceWizard.js:1340
+#: umc/js/setup/ApplianceWizard.js:481 umc/js/setup/ApplianceWizard.js:1339
msgid "Domain and host configuration"
msgstr "Domänen- und Rechnereinstellung"
@@ -508,7 +508,7 @@
msgid "Domain name server (max. 3)"
msgstr "Domänen-DNS-Server (max. 3)"
-#: umc/js/setup/ApplianceWizard.js:364
+#: umc/js/setup/ApplianceWizard.js:363
msgid "Domain setup"
msgstr "Domäneneinstellungen"
@@ -516,8 +516,8 @@
msgid "Dynamic (DHCP)"
msgstr "Dynamisch (DHCP)"
-#: umc/js/setup/ApplianceWizard.js:467 umc/js/setup/ApplianceWizard.js:1251
-#: umc/js/setup/ApplianceWizard.js:1335
+#: umc/js/setup/ApplianceWizard.js:466 umc/js/setup/ApplianceWizard.js:1250
+#: umc/js/setup/ApplianceWizard.js:1334
msgid "E-mail address to activate UCS"
msgstr "E-Mail-Adresse zur Aktivierung von UCS"
@@ -537,7 +537,7 @@
msgid "Email address"
msgstr "E-Mail-Adresse"
-#: umc/js/setup/ApplianceWizard.js:318
+#: umc/js/setup/ApplianceWizard.js:317
msgid ""
"Enter a city nearby to preconfigure settings such as timezone, system "
"language, keyboard layout."
@@ -549,7 +549,7 @@
msgid "Ethernet"
msgstr "Ethernet"
-#: umc/js/setup/NetworkPage.js:300 umc/js/setup/ApplianceWizard.js:1376
+#: umc/js/setup/NetworkPage.js:300 umc/js/setup/ApplianceWizard.js:1375
msgid "External name server"
msgstr "Externer DNS-Server "
@@ -557,7 +557,7 @@
msgid "External name server (max. 3)"
msgstr "Externer DNS-Server "
-#: umc/js/setup/ApplianceWizard.js:1011
+#: umc/js/setup/ApplianceWizard.js:1010
msgid "Finish"
msgstr "Fertigstellen"
@@ -580,7 +580,7 @@
"Warnung, die Einstellungen können mit dem aktuell gewählten Namen "
"gespeichert werden."
-#: umc/js/setup/ApplianceWizard.js:848
+#: umc/js/setup/ApplianceWizard.js:847
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 "
@@ -597,9 +597,9 @@
msgid "Forwarding delay"
msgstr "Forwarding-Verzögerung"
-#: umc/js/setup/ApplianceWizard.js:513 umc/js/setup/ApplianceWizard.js:1269
-#: umc/js/setup/ApplianceWizard.js:1342 umc/js/setup/ApplianceWizard.js:1345
-#: umc/js/setup/ApplianceWizard.js:1349 umc/js/setup/BasisPage.js:221
+#: umc/js/setup/ApplianceWizard.js:512 umc/js/setup/ApplianceWizard.js:1268
+#: umc/js/setup/ApplianceWizard.js:1341 umc/js/setup/ApplianceWizard.js:1344
+#: umc/js/setup/ApplianceWizard.js:1348 umc/js/setup/BasisPage.js:221
msgid "Fully qualified domain name"
msgstr "Vollständiger Rechnername"
@@ -618,8 +618,8 @@
"handbuch-%s.html#computers:networkcomplex\" target=\"_blank\">UCS "
"Dokumentation gefunden werden."
-#: umc/js/setup/InterfaceWizard.js:636 umc/js/setup/ApplianceWizard.js:628
-#: umc/js/setup/ApplianceWizard.js:1365
+#: umc/js/setup/InterfaceWizard.js:636 umc/js/setup/ApplianceWizard.js:627
+#: umc/js/setup/ApplianceWizard.js:1364
msgid "Gateway"
msgstr "Gateway"
@@ -644,7 +644,7 @@
msgstr "Globale Netzwerk-Einstellungen"
#: umc/js/setup/NetworkPage.js:124 umc/js/setup/NetworkPage.js:304
-#: umc/js/setup/ApplianceWizard.js:671 umc/js/setup/ApplianceWizard.js:1378
+#: umc/js/setup/ApplianceWizard.js:670 umc/js/setup/ApplianceWizard.js:1377
msgid "HTTP proxy"
msgstr "HTTP-Proxy"
@@ -652,7 +652,7 @@
msgid "Host and domain settings"
msgstr "Rechner- und Domänen-Einstellungen"
-#: umc/js/setup/ApplianceWizard.js:1271 umc/js/setup/ApplianceWizard.js:1349
+#: umc/js/setup/ApplianceWizard.js:1270 umc/js/setup/ApplianceWizard.js:1348
msgid "Hostname"
msgstr "Rechnername"
@@ -660,11 +660,11 @@
msgid "Hostname and windows domain may not be equal."
msgstr "Hostname und Windows-Domäne dürfen nicht gleich sein."
-#: umc/js/setup/ApplianceWizard.js:528
+#: umc/js/setup/ApplianceWizard.js:527
msgid "Hostname or fully qualified domain name"
msgstr "Rechnername oder vollständiger Domänenname"
-#: umc/js/setup/ApplianceWizard.js:1354
+#: umc/js/setup/ApplianceWizard.js:1353
msgid "IP address is obtained dynamically via DHCP"
msgstr "Die IP-Adresse wird dynamisch bezogen über DHCP"
@@ -676,15 +676,13 @@
msgid "IPv4 address"
msgstr "IPv4-Adresse"
-#: umc/js/setup/ApplianceWizard.js:558 umc/js/setup/ApplianceWizard.js:574
-#: umc/js/setup/ApplianceWizard.js:592 umc/js/setup/ApplianceWizard.js:610
-#, python-brace-format
+#: umc/js/setup/ApplianceWizard.js:557 umc/js/setup/ApplianceWizard.js:573
+#: umc/js/setup/ApplianceWizard.js:591 umc/js/setup/ApplianceWizard.js:609
msgid "IPv4 address/IPv6 address {interface}"
msgstr "IPv4-Adresse/IPv6-Adresse {interface}"
-#: umc/js/setup/ApplianceWizard.js:567 umc/js/setup/ApplianceWizard.js:584
-#: umc/js/setup/ApplianceWizard.js:602 umc/js/setup/ApplianceWizard.js:620
-#, python-brace-format
+#: umc/js/setup/ApplianceWizard.js:566 umc/js/setup/ApplianceWizard.js:583
+#: umc/js/setup/ApplianceWizard.js:601 umc/js/setup/ApplianceWizard.js:619
msgid "IPv4 net mask/IPv6 prefix {interface}"
msgstr "IPv4-Netzmaske/IPv6-Präfix {interface}"
@@ -716,7 +714,7 @@
"Falls Samba auf diesem System verwendet wird, darf der Hostname maximal 13 "
"Zeichen lang sein."
-#: umc/js/setup/ApplianceWizard.js:396
+#: umc/js/setup/ApplianceWizard.js:395
msgid "If unsure, select Create a new UCS domain."
msgstr "Wenn unsicher, wählen Sie Erstellen einer neuen UCS-Domäne."
@@ -728,16 +726,16 @@
"In den Netzwerkeinstellungen können IP-Adressen (IPv4 und IPv6) sowie "
"DNS-Server, Gateways und HTTP-Proxy festgelegt werden."
-#: umc/js/setup/ApplianceWizard.js:1607 umc/js/setup.js:616
+#: umc/js/setup.js:616 umc/js/setup/ApplianceWizard.js:1606
msgid "Initialize the configuration process ..."
msgstr "Initialisiere den Konfigurationsvorgang ..."
-#: umc/js/setup/ApplianceWizard.js:959
+#: umc/js/setup/ApplianceWizard.js:958
#, python-format
msgid "Installation of %d additional software components."
msgstr "Installation von %d zusätzlichen Software-Komponenten."
-#: umc/js/setup/ApplianceWizard.js:957
+#: umc/js/setup/ApplianceWizard.js:956
msgid "Installation of one additional software component."
msgstr "Installation einer zusätzlichen Software-Komponente."
@@ -774,8 +772,9 @@
"0 und 128."
#: umc/js/setup/ApplianceWizard.js:226
-msgid "Invalid LDAP base!
Expected format: dc=mydomain,dc=local"
-msgstr "Ungültige LDAP-Basis!
Erwartetes Format: dc=meinedomaene,dc=local"
+msgid "Invalid LDAP base!
Expected format: dc=mydomain,dc=intranet"
+msgstr ""
+"Ungültige LDAP-Basis!
Erwartetes Format: dc=meinedomaene,dc=intranet"
#: umc/js/setup/ApplianceWizard.js:146
msgid "Invalid e-mail address!
Expected format is:mail@example.com"
@@ -785,33 +784,33 @@
#: umc/js/setup/ApplianceWizard.js:209
msgid ""
"Invalid fully qualified domain name!
Expected format: hostname."
-"mydomain.local"
+"mydomain.intranet"
msgstr ""
"Ungültiger vollständiger Domänenname!
Erwartetes Format: rechnername."
-"meinedomaene.local"
+"meinedomaene.intranet"
#: umc/js/setup/ApplianceWizard.js:218
msgid ""
"Invalid hostname or fully qualified domain name!
Expected format: "
-"myhost or hostname.mydomain.local"
+"myhost or hostname.mydomain.intranet"
msgstr ""
"Ungültiger Rechnername oder vollständiger Domänenname!
Erwartetes Format: "
-"rechnername oder rechnername.meinedomaene.local"
+"rechnername oder rechnername.meinedomaene.intranet"
-#: umc/js/setup/ApplianceWizard.js:1596
-msgid "Join"
-msgstr "Join"
+#: umc/js/setup/ApplianceWizard.js:1595
+msgid "Join domain"
+msgstr "Domäne beitreten"
-#: umc/js/setup/ApplianceWizard.js:386
+#: umc/js/setup/ApplianceWizard.js:385
msgid "Join into an existing UCS domain"
msgstr "Einer bestehenden UCS-Domäne beitreten"
-#: umc/js/setup/ApplianceWizard.js:353 umc/js/setup/LanguagePage.js:88
-#: umc/js/setup/LanguagePage.js:228
+#: umc/js/setup/LanguagePage.js:88 umc/js/setup/LanguagePage.js:228
+#: umc/js/setup/ApplianceWizard.js:352
msgid "Keyboard layout"
msgstr "Tastaturlayout"
-#: umc/js/setup/ApplianceWizard.js:521 umc/js/setup/ApplianceWizard.js:1352
+#: umc/js/setup/ApplianceWizard.js:520 umc/js/setup/ApplianceWizard.js:1351
#: umc/js/setup/BasisPage.js:85 umc/js/setup/BasisPage.js:225
msgid "LDAP base"
msgstr "LDAP-Basis"
@@ -832,12 +831,12 @@
msgid "Language settings"
msgstr "Spracheinstellungen"
-#: umc/js/setup/ApplianceWizard.js:539
+#: umc/js/setup/ApplianceWizard.js:538
msgid "Local root password"
msgstr "Lokales Root-Passwort"
-#: umc/js/setup/ApplianceWizard.js:325 umc/js/setup/ApplianceWizard.js:333
-#: umc/js/setup/ApplianceWizard.js:1321
+#: umc/js/setup/ApplianceWizard.js:324 umc/js/setup/ApplianceWizard.js:332
+#: umc/js/setup/ApplianceWizard.js:1320
msgid "Localization settings"
msgstr "Standorteinstellungen"
@@ -853,7 +852,7 @@
msgid "MII link monitoring frequency"
msgstr "MII-Trägerüberwachungsfrequenz"
-#: umc/js/setup/ApplianceWizard.js:1314
+#: umc/js/setup/ApplianceWizard.js:1313
msgid "Member server"
msgstr "Member-Server"
@@ -901,7 +900,7 @@
msgid "Network interface configuration"
msgstr "Netzwerkgerätkonfiguration"
-#: umc/js/setup/NetworkPage.js:308 umc/js/setup/ApplianceWizard.js:1262
+#: umc/js/setup/NetworkPage.js:308 umc/js/setup/ApplianceWizard.js:1261
msgid "Network interfaces"
msgstr "Netzwerkgeräte"
@@ -913,11 +912,11 @@
msgid "New root password"
msgstr "Neues Root-Passwort"
-#: umc/js/setup/ApplianceWizard.js:954
+#: umc/js/setup/ApplianceWizard.js:953
msgid "No additional software component will be installed."
msgstr "Keine zusätzliche Software-Komponente wird installiert."
-#: umc/js/setup/ApplianceWizard.js:1384
+#: umc/js/setup/ApplianceWizard.js:1383
msgid "No additional software components will be installed."
msgstr "Keine zusätzliche Software-Komponenten werden installiert."
@@ -933,7 +932,7 @@
msgid "Not all changes could be applied successfully:"
msgstr "Nicht alle Änderungen konnten erfolgreich übernommen werden."
-#: umc/js/setup/ApplianceWizard.js:545
+#: umc/js/setup/ApplianceWizard.js:544
msgid "Obtain IP address automatically (DHCP)"
msgstr "IP-Adresse automatisch beziehen (DHCP)"
@@ -945,9 +944,9 @@
msgid "Organization"
msgstr "Organisation"
-#: umc/js/setup/ApplianceWizard.js:462 umc/js/setup/ApplianceWizard.js:1334
+#: umc/js/setup/ApplianceWizard.js:461 umc/js/setup/ApplianceWizard.js:1333
msgid "Organization name"
-msgstr "Organisationsname"
+msgstr "Name der Organisation"
#: umc/js/setup/CertificatePage.js:118
msgid "Organization settings"
@@ -957,7 +956,7 @@
msgid "Parent interface"
msgstr "Übergeordnetes Netzwerkgerät"
-#: umc/js/setup/ApplianceWizard.js:477 umc/js/setup/ApplianceWizard.js:1592
+#: umc/js/setup/ApplianceWizard.js:476 umc/js/setup/ApplianceWizard.js:1591
msgid "Password"
msgstr "Passwort"
@@ -966,7 +965,7 @@
msgstr ""
"Bitte wählen Sie ein Netzwerkgerät bevor Sie eine DHCP-Adresse anfragen."
-#: umc/js/setup/ApplianceWizard.js:696
+#: umc/js/setup/ApplianceWizard.js:695
msgid ""
"Please confirm the chosen configuration settings which are summarized below."
msgstr ""
@@ -984,20 +983,20 @@
msgid "Please confirm to delete the following interfaces:"
msgstr "Bitte Löschung der folgenden Netzwerkgeräte bestätigen:"
-#: umc/js/setup/ApplianceWizard.js:636
+#: umc/js/setup/ApplianceWizard.js:635
msgid "Preferred UCS domain name server"
msgstr "Bevorzugter UCS-Domänen-DNS-Server"
-#: umc/js/setup/ApplianceWizard.js:649
+#: umc/js/setup/ApplianceWizard.js:648
msgid "Preferred external name server"
msgstr "Bevorzugter externer DNS-Server "
#: umc/js/setup/NetworkPage.js:100 umc/js/setup/NetworkPage.js:312
-#: umc/js/setup/ApplianceWizard.js:1265
+#: umc/js/setup/ApplianceWizard.js:1264
msgid "Primary network interface"
msgstr "Primäres Netzwerkgerät"
-#: umc/js/setup/ApplianceWizard.js:1010
+#: umc/js/setup/ApplianceWizard.js:1009
msgid "Reconfigure"
msgstr "Erneut konfigurieren"
@@ -1017,7 +1016,7 @@
msgid "Root password"
msgstr "Root-Passwort"
-#: umc/js/setup/ApplianceWizard.js:1719 umc/js/setup/BasisPage.js:261
+#: umc/js/setup/ApplianceWizard.js:1718 umc/js/setup/BasisPage.js:261
msgid "Root password empty. Continue?"
msgstr "Root-Passwort ist leer. Möchten Sie fortfahren?"
@@ -1044,15 +1043,15 @@
msgid "Should the nameserver and gateway be set: %s"
msgstr "Sollen der Nameserver und Gateway gesetzt werden: %s"
-#: umc/js/setup/ApplianceWizard.js:930
+#: umc/js/setup/ApplianceWizard.js:929
msgid "Software component"
msgstr "Softwarekomponenten"
-#: umc/js/setup/ApplianceWizard.js:1384 umc/js/setup/ApplianceWizard.js:1387
+#: umc/js/setup/ApplianceWizard.js:1383 umc/js/setup/ApplianceWizard.js:1386
msgid "Software components"
msgstr "Softwarekomponenten"
-#: umc/js/setup/ApplianceWizard.js:680
+#: umc/js/setup/ApplianceWizard.js:679
msgid "Software configuration"
msgstr "Software-Konfiguration"
@@ -1060,7 +1059,7 @@
msgid "Specifies the ports which will be added to the bridge."
msgstr "Gibt die Ports an, die zu der Bridge hinzugefügt werden."
-#: umc/js/setup/ApplianceWizard.js:509
+#: umc/js/setup/ApplianceWizard.js:508
msgid ""
"Specify hostname as well as a password for the local superuser root "
"and configure network settings for this system."
@@ -1080,7 +1079,7 @@
msgid "Static (IPv6)"
msgstr "Statisch (IPv6)"
-#: umc/js/setup/ApplianceWizard.js:402
+#: umc/js/setup/ApplianceWizard.js:401
msgid "System role"
msgstr "Systemrolle"
@@ -1099,7 +1098,6 @@
msgstr "Die Änderungen wurden erfolgreich übernommen."
#: umc/js/setup.js:629
-#, 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, "
@@ -1115,7 +1113,7 @@
msgid "The following changes will be applied to the system:"
msgstr "Die folgenden Änderungen werden auf das System übertragen:"
-#: umc/js/setup/ApplianceWizard.js:686 umc/js/setup.js:506 umc/js/setup.js:599
+#: umc/js/setup.js:506 umc/js/setup.js:599 umc/js/setup/ApplianceWizard.js:685
msgid "The following entries could not be validated:"
msgstr "Die folgenden Einträge konnten nicht validiert werden:"
@@ -1127,7 +1125,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:1555
+#: umc/js/setup/ApplianceWizard.js:1554
msgid ""
"The root password is too short. For security reasons, your password must "
"contain at least 8 characters."
@@ -1135,7 +1133,7 @@
"Das Root-Passwort ist zu kurz, aus Sicherheitsgründen sollte es mindestens 8 "
"Zeichen lang sein."
-#: umc/js/setup/ApplianceWizard.js:1434
+#: umc/js/setup/ApplianceWizard.js:1433
msgid ""
"The settings can always be adpated in the UMC module Basic settings. "
"Please confirm now to complete the process."
@@ -1144,7 +1142,7 @@
"Basis-Einstellungen geändert werden. Bitte bestätigen Sie, um den "
"Vorgang abzuschließen."
-#: umc/js/setup/ApplianceWizard.js:1578
+#: umc/js/setup/ApplianceWizard.js:1577
msgid ""
"The specified settings will be applied to the system and the system will be "
"joined into the domain. Please enter username and password of a domain "
@@ -1154,15 +1152,15 @@
"das System der Domäne beitreten. Bitte geben Sie dafür Benutzernamen und "
"Password eines Administrator-Kontos der Domäne an."
-#: umc/js/setup/ApplianceWizard.js:1430
+#: umc/js/setup/ApplianceWizard.js:1429
msgid ""
"The system join process failed. The following information will give some "
"more details on which exact problem occurred during the setup process."
msgstr ""
-"Der Join-Vorgang des Systems schlug fehl. Die folgenden Informationen geben "
-"genauere Informationen über die Problemursache."
+"Der Domänenbeitritt des Systems schlug fehl. Die folgenden Informationen "
+"geben genauere Informationen über die Problemursache."
-#: umc/js/setup/ApplianceWizard.js:1433
+#: umc/js/setup/ApplianceWizard.js:1432
msgid ""
"The system join was successful, however, the following errors occurred while "
"applying the configuration settings."
@@ -1178,23 +1176,23 @@
msgid "This may take a few seconds..."
msgstr "Dies kann einige Sekunden in Anspruch nehmen..."
-#: umc/js/setup/ApplianceWizard.js:391
+#: umc/js/setup/ApplianceWizard.js:390
msgid ""
"This system will join a group of existing systems which share user and "
"computer accounts, credentials and other trustworthy information."
msgstr ""
-"Das System tritt einer Gruppe existierender System bei, die Benutzer- und "
+"Das System tritt einer Gruppe existierender Systeme bei, die Benutzer- und "
"Rechnerkonten sowie Zugangsdaten und andere vertrauenswürdige Informationen "
"miteinander teilen."
-#: umc/js/setup/ApplianceWizard.js:1316
+#: umc/js/setup/ApplianceWizard.js:1315
#, python-format
msgid "This sytem will join an existing UCS domain with the role %s."
msgstr ""
"Das System tritt einer existierenden UCS-Domäne bei mit der Rolle %s."
-#: umc/js/setup/ApplianceWizard.js:348 umc/js/setup/LanguagePage.js:82
-#: umc/js/setup/LanguagePage.js:224
+#: umc/js/setup/LanguagePage.js:82 umc/js/setup/LanguagePage.js:224
+#: umc/js/setup/ApplianceWizard.js:347
msgid "Time zone"
msgstr "Zeitzone"
@@ -1202,7 +1200,7 @@
msgid "Time zone and keyboard settings"
msgstr "Zeitzonen- und Tastatureinstellungen"
-#: umc/js/setup/ApplianceWizard.js:306
+#: umc/js/setup/ApplianceWizard.js:305
msgid "To proceed, choose your language:"
msgstr "Um fortzufahren, wählen Sie Ihre Sprache aus:"
@@ -1210,23 +1208,23 @@
msgid "Type"
msgstr "Typ"
-#: umc/js/setup/ApplianceWizard.js:1306
+#: umc/js/setup/ApplianceWizard.js:1305
msgid "UCS configuration"
msgstr "UCS-Konfiguration"
-#: umc/js/setup/ApplianceWizard.js:1371
+#: umc/js/setup/ApplianceWizard.js:1370
msgid "UCS domain name server"
msgstr "UCS Domänen-DNS-Server"
-#: umc/js/setup/ApplianceWizard.js:716
+#: umc/js/setup/ApplianceWizard.js:715
msgid "UCS has been set up successfully"
msgstr "UCS wurde erfolgreich eingerichtet"
-#: umc/js/setup/ApplianceWizard.js:297
+#: umc/js/setup/ApplianceWizard.js:296
msgid "UCS setup"
msgstr "UCS-Einrichtung"
-#: umc/js/setup/ApplianceWizard.js:705
+#: umc/js/setup/ApplianceWizard.js:704
msgid "UCS setup - An error ocurred"
msgstr "UCS-Einrichtung - Ein Fehler trat auf"
@@ -1234,7 +1232,7 @@
msgid "Unconfigured"
msgstr "Unkonfiguriert"
-#: umc/js/setup/ApplianceWizard.js:1587
+#: umc/js/setup/ApplianceWizard.js:1586
msgid "Username"
msgstr "Benutzername"
@@ -1242,11 +1240,11 @@
msgid "VLAN ID"
msgstr "VLAN ID"
-#: umc/js/setup/ApplianceWizard.js:266 umc/js/setup.js:60
+#: umc/js/setup.js:60 umc/js/setup/ApplianceWizard.js:266
msgid "Validation error"
msgstr "Validierungsfehler"
-#: umc/js/setup/ApplianceWizard.js:685
+#: umc/js/setup/ApplianceWizard.js:684
msgid "Validation failed"
msgstr "Validierungsfehler"
@@ -1254,11 +1252,11 @@
msgid "Virtual LAN"
msgstr "Virtuelles LAN"
-#: umc/js/setup/ApplianceWizard.js:1726
+#: umc/js/setup/ApplianceWizard.js:1725
msgid "Warning"
-msgstr ""
+msgstr "Warnung"
-#: umc/js/setup/ApplianceWizard.js:369
+#: umc/js/setup/ApplianceWizard.js:368
msgid ""
"Will the system be the first system of a new UCS domain or shall it join "
"into an existing one?"
@@ -1270,7 +1268,7 @@
msgid "Windows domain"
msgstr "Windows-Domäne"
-#: umc/js/setup/ApplianceWizard.js:1431
+#: umc/js/setup/ApplianceWizard.js:1430
msgid ""
"You may reconfigure the settings and restart the join process. You may end "
"the wizard and, if necessary, join the system later via the UMC module "
@@ -1285,7 +1283,7 @@
msgid "don't set"
msgstr "nicht setzen"
-#: umc/js/setup/ApplianceWizard.js:319
+#: umc/js/setup/ApplianceWizard.js:318
msgid "e.g., Boston..."
msgstr "bspw. Bremen..."
@@ -1294,8 +1292,8 @@
msgid "http://docs.univention.de/computers-%s.html#uvmm"
msgstr ""
-#: umc/js/setup/ApplianceWizard.js:469 umc/js/setup/ApplianceWizard.js:530
-#: umc/js/setup/ApplianceWizard.js:673
+#: umc/js/setup/ApplianceWizard.js:468 umc/js/setup/ApplianceWizard.js:529
+#: umc/js/setup/ApplianceWizard.js:672
msgid "more information"
msgstr "mehr Informationen"
@@ -1382,8 +1380,8 @@
#~ msgid "Domain controller master"
#~ msgstr "Domänencontroller Master"
-#~ msgid "HTTP proxy (e.g., http://proxy.mydomain.local:3128)"
-#~ msgstr "HTTP-Proxy (bspw. http://proxy.meinedomaene.local:3128)"
+#~ msgid "HTTP proxy (e.g., http://proxy.mydomain.intranet:3128)"
+#~ msgstr "HTTP-Proxy (bspw. http://proxy.meinedomaene.intranet:3128)"
#~ msgid "Help"
#~ msgstr "Hilfe"