Attachment 6089 Details for Bug 33190

[patch] New patch from 2014-09-04

bug_33190_20140904.patch (text/plain), 6.14 KB, created by Alexander Kramer on 2014-09-04 09:56 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Kramer

Created: 2014-09-04 09:56 CEST

Size: 6.14 KB

patch

obsolete

>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/de.po
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/de.po	(Revision 53336)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/de.po	(Arbeitskopie)
>@@ -29,7 +29,7 @@
> msgstr ""
> "Project-Id-Version: PACKAGE VERSION\n"
> "Report-Msgid-Bugs-To: \n"
>-"POT-Creation-Date: 2014-06-26 11:37+CEST\n"
>+"POT-Creation-Date: 2014-09-04 09:27+0200\n"
> "PO-Revision-Date: 2011-10-29 22:19+0200\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
>@@ -111,10 +111,6 @@
> msgid "Empty attributes"
> msgstr "Leere Attribute"
> 
>-#: admin_container.py:132
>-msgid "Univention Directory Manager settings"
>-msgstr "Univention Directory Manager Konfiguration"
>-
> #: admin_container.py:132 admin_container.py:133 autostart.py:128
> #: autostart.py:129 desktop.py:159 desktop.py:160 dhcp_boot.py:140
> #: dhcp_dns.py:139 dhcp_dns.py:140 dhcp_dnsupdate.py:206 dhcp_leasetime.py:150
>@@ -132,13 +128,17 @@
> msgid "General"
> msgstr "Allgemein"
> 
>+#: admin_container.py:132
>+msgid "Univention Directory Manager settings"
>+msgstr "Univention Directory Manager Konfiguration"
>+
> #: admin_container.py:138 autostart.py:134 desktop.py:167 dhcp_boot.py:145
> #: dhcp_dns.py:145 dhcp_dnsupdate.py:214 dhcp_leasetime.py:157
> #: dhcp_netbios.py:156 dhcp_routing.py:133 dhcp_scope.py:179
> #: dhcp_statements.py:190 ldapserver.py:134 mailquota.py:134
> #: maintenance.py:221 masterpackages.py:146 memberpackages.py:146
> #: nfsmounts.py:134 print_quota.py:159 printserver.py:134 pwhistory.py:169
>-#: registry.py:135 release.py:144 repositoryserver.py:135
>+#: registry.py:135 release.py:145 repositoryserver.py:135
> #: repositorysync.py:177 share_userquota.py:181 slavepackages.py:146
> #: umc.py:135
> msgid "Object"
>@@ -370,13 +370,13 @@
> msgstr "Minimal gewÃ¤hrte Lease-Zeit"
> 
> #: dhcp_leasetime.py:149
>+msgid "Lease Time"
>+msgstr "Lease-Zeit"
>+
>+#: dhcp_leasetime.py:149
> msgid "DHCP lease time"
> msgstr "DHCP Lease-Zeit"
> 
>-#: dhcp_leasetime.py:149
>-msgid "Lease Time"
>-msgstr "Lease-Zeit"
>-
> #: dhcp_netbios.py:45 dhcp_netbios.py:77
> msgid "NetBIOS name servers"
> msgstr "NetBIOS-Nameserver"
>@@ -783,6 +783,7 @@
> msgstr "Druck-Quota"
> 
> #: print_quota.py:215 print_quota.py:221
>+#, python-format
> msgid "%s is not valid. "
> msgstr "%s ist nicht erlaubt. "
> 
>@@ -865,25 +866,21 @@
> msgstr "Release Version"
> 
> #: release.py:58
>-msgid "Policy: Release"
>-msgstr "Richtlinie: Release"
>+msgid "Policy: Update"
>+msgstr "Richtlinie: Updates"
> 
>-#: release.py:59
>-msgid "Release"
>-msgstr "Release"
>+#: release.py:59 release.py:138
>+msgid "Automatic updates"
>+msgstr "Automatische Updates"
> 
> #: release.py:76
>-msgid "Activate policy"
>-msgstr "Aktiviere die Richtlinie"
>+msgid "Activate release updates. (Errata updates are activated by default)"
>+msgstr "Aktiviere Release-Updates. (Errata Updates sind per Default aktiviert)"
> 
> #: release.py:86
>-msgid "Release version"
>-msgstr "Release Version"
>+msgid "Update to this UCS version"
>+msgstr "Bis zu dieser UCS-Version aktualisieren"
> 
>-#: release.py:138
>-msgid "Release updates"
>-msgstr "Client Aktualisierungen"
>-
> #: repositoryserver.py:47 repositoryserver.py:59 repositoryserver.py:76
> msgid "Repository server"
> msgstr "Repository-Server"
>@@ -946,8 +943,8 @@
> "of the following units as postfix: B (default), kB, MB, GB"
> msgstr ""
> "Soft limit. Wenn das Limit Ã¼berschritten ist, kÃ¶nnen Benutzer gewarnt "
>-"werden. Dem anzugebenden Wert kann eine der folgenden Einheiten folgen: "
>-"B (Vorgabe), KB, MB, GB"
>+"werden. Dem anzugebenden Wert kann eine der folgenden Einheiten folgen: B "
>+"(Vorgabe), KB, MB, GB"
> 
> #: share_userquota.py:91
> msgid ""
>@@ -1003,6 +1000,21 @@
> msgid "List of allowed UMC operation sets"
> msgstr "Liste der erlaubten UMC Operationen"
> 
>+#~ msgid "Policy: Release"
>+#~ msgstr "Richtlinie: Release"
>+
>+#~ msgid "Release"
>+#~ msgstr "Release"
>+
>+#~ msgid "Activate policy"
>+#~ msgstr "Aktiviere die Richtlinie"
>+
>+#~ msgid "Release version"
>+#~ msgstr "Release Version"
>+
>+#~ msgid "Release updates"
>+#~ msgstr "Client Aktualisierungen"
>+
> #~ msgid "Allowed Groups"
> #~ msgstr "Berechtigte Gruppen"
> 
>@@ -1090,9 +1102,6 @@
> #~ msgid "Servers to use"
> #~ msgstr "Zu nutzende Server"
> 
>-#~ msgid "Automatic detection"
>-#~ msgstr "Automatische Erkennung"
>-
> #~ msgid "Resolution of primary display"
> #~ msgstr "AuflÃ¶sung des primÃ¤ren Monitors"
> 
>Index: management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py
>===================================================================
>--- management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py	(Revision 53336)
>+++ management/univention-directory-manager-modules/modules/univention/admin/handlers/policies/release.py	(Arbeitskopie)
>@@ -55,8 +55,8 @@
> policy_position_dn_prefix="cn=update"
> 
> childs=0
>-short_description=_('Policy: Release')
>-policy_short_description=_('Release')
>+short_description=_('Policy: Update')
>+policy_short_description=_('Automatic updates')
> long_description=''
> options={
> }
>@@ -73,7 +73,7 @@
> 			identifies=1,
> 		),
> 	'activate': univention.admin.property(
>-			short_description=_('Activate policy'),
>+			short_description=_('Activate release updates. (Errata updates are activated by default)'),
> 			long_description='',
> 			syntax=univention.admin.syntax.TrueFalseUp,
> 			multivalue=0,
>@@ -83,8 +83,8 @@
> 			identifies=0
> 		),
> 	'releaseVersion': univention.admin.property(
>-			short_description=_('Release version'),
>-			long_description='',
>+			short_description=_('Update to this UCS version'),
>+			long_description='Without specifying the most recent version will be used',
> 			syntax=univention.admin.syntax.string,
> 			multivalue=0,
> 			options=[],
>@@ -135,10 +135,11 @@
> }
> 
> layout = [
>-	Tab(_('General'),_('Release updates'), layout = [
>+	Tab(_('General'),_('Automatic updates'), layout = [
> 		Group( _( 'General' ), layout = [
> 			'name',
>-			[ 'activate', 'releaseVersion' ]
>+			'activate',
>+			'releaseVersion'
> 		] ),
> 	] ),
> 	Tab(_('Object'),_('Object'), advanced = True, layout = [

Actions: View | Diff

Attachments on bug 33190: 5574 | 5973 | 5974 | 5996 | 6019 | 6020 | 6021 | 6089