diff --git a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/debian/changelog b/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/debian/changelog index 4244367..4321b73 100644 --- a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/debian/changelog +++ b/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/debian/changelog @@ -1,3 +1,12 @@ +univention-directory-manager-modules (8.0.101-2) UNRELEASED; urgency=low + + * Make SSL attributes read-only (Bug #13679) + * Fix label for certificate subject email (Bug #30460) + * Fix translation for certificate state (Bug #30461) + * Reformat certificate attributes in 2 columns. + + -- Philipp Hahn Fri, 15 Feb 2013 18:21:40 +0100 + univention-directory-manager-modules (8.0.101-1) unstable; urgency=low * Fix assiging dhcp objects to computers when the mac address has an invalid diff --git a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po b/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po index 44b6d8e..39e78ce 100644 --- a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po +++ b/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po @@ -30,9 +30,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-10-11 17:59+0200\n" -"PO-Revision-Date: 2011-11-21 12:46+0100\n" +"PO-Revision-Date: 2013-02-15 18:12+0100\n" "Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Language-Team: German \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -365,11 +365,11 @@ msgstr "Land des Zertifikat-Herausgebers" #: user.py: msgid "Issuer State" -msgstr "Herausgeber Staat" +msgstr "Herausgeber Bundesland" #: user.py: msgid "Certificate Issuer State" -msgstr "Staat des Zertifikat-Herausgebers" +msgstr "Bundesland des Zertifikat-Herausgebers" #: user.py: msgid "Issuer Location" @@ -421,11 +421,11 @@ msgstr "Land des Zertifikat-Inhabers" #: user.py: msgid "Subject State" -msgstr "Inhaber Staat" +msgstr "Inhaber Bundesland" #: user.py: msgid "Certificate Subject State" -msgstr "Staat des Zertifikat-Inhaber" +msgstr "Bundesland des Zertifikat-Inhaber" #: user.py: msgid "Subject Location" @@ -460,6 +460,14 @@ msgid "Certificate Subject Common Name" msgstr "Allgemeiner Name des Zertifikat-Inhaber" #: user.py: +msgid "Subject Mail" +msgstr "Inhaber E-Mail-Adresse" + +#: user.py: +msgid "Certificate Subject Mail" +msgstr "E-Mail-Adresse des Zertifikat-Inhabers" + +#: user.py: msgid "Valid from" msgstr "Gültig ab" @@ -576,12 +584,16 @@ msgid "Certificate" msgstr "Zertifikat" #: user.py: +msgid "Subject" +msgstr "Inhaber" + +#: user.py: msgid "Issuer" msgstr "Aussteller" #: user.py: -msgid "Dates" -msgstr "Datumsangaben" +msgid "Validity" +msgstr "Gültigkeit #: user.py: msgid "Misc" @@ -615,6 +627,9 @@ msgstr "%(homeSharePath)s muss gesetzt sein, wenn %(homeShare)s gesetzt wurde." msgid "%s: Invalid path" msgstr "%s: Ungültige Pfadangabe" +#~ msgid "Dates" +#~ msgstr "Datumsangaben" + #~ msgid "User preferences" #~ msgstr "UMC Benutzer-Einstellungen" diff --git a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py b/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py index 4784580..1d58ffe 100644 --- a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py +++ b/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py @@ -683,7 +683,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -694,7 +694,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -705,7 +705,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -716,7 +716,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -727,7 +727,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -738,7 +738,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -749,7 +749,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -760,7 +760,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -771,7 +771,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -782,7 +782,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -793,7 +793,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -804,7 +804,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -815,18 +815,18 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), 'certificateSubjectMail': univention.admin.property( - short_description=_('Issuer Mail'), - long_description=_( 'Certificate Issuer Mail' ), + short_description=_('Subject Mail'), + long_description=_( 'Certificate Subject Mail' ), syntax=univention.admin.syntax.string, multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -837,7 +837,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -848,7 +848,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -859,7 +859,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -870,7 +870,7 @@ property_descriptions={ multivalue=0, required=0, dontsearch=1, - may_change=0, + editable=0, options=['pki'], identifies=0 ), @@ -968,30 +968,24 @@ layout = [ Tab( _( 'Certificate' ), _( 'Certificate' ), advanced = True, layout = [ Group( _( 'General' ), '', [ 'userCertificate', - 'certificateSubjectCommonName', - 'certificateSubjectOrganisationalUnit', - 'certificateSubjectOrganisation', + ] ), + Group( _( 'Subject' ), '', [ + ['certificateSubjectCommonName', 'certificateSubjectMail'], + ['certificateSubjectOrganisation', 'certificateSubjectOrganisationalUnit'], 'certificateSubjectLocation', - 'certificateSubjectState', - 'certificateSubjectCountry', - 'certificateSubjectMail', + ['certificateSubjectState', 'certificateSubjectCountry'], ] ), Group( _( 'Issuer' ), '', [ - 'certificateIssuerCommonName', - 'certificateIssuerOrganisationalUnit', - 'certificateIssuerOrganisation', + ['certificateIssuerCommonName', 'certificateIssuerMail'], + ['certificateIssuerOrganisation', 'certificateIssuerOrganisationalUnit'], 'certificateIssuerLocation', - 'certificateIssuerState', - 'certificateIssuerCountry', - 'certificateIssuerMail', + ['certificateIssuerState', 'certificateIssuerCountry'], ] ), - Group( _( 'Dates' ), '', [ - 'certificateDateNotBefore', - 'certificateDateNotAfter', + Group( _( 'Validity' ), '', [ + ['certificateDateNotBefore', 'certificateDateNotAfter'] ] ), Group( _( 'Misc' ), '', [ - 'certificateVersion', - 'certificateSerial' + ['certificateVersion', 'certificateSerial'] ] ) ] ) ]