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

(-)a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/debian/changelog (+9 lines)
 Lines 1-3    Link Here 
1
univention-directory-manager-modules (8.0.101-2) UNRELEASED; urgency=low
2
3
  * Make SSL attributes read-only (Bug #13679)
4
  * Fix label for certificate subject email (Bug #30460)
5
  * Fix translation for certificate state (Bug #30461)
6
  * Reformat certificate attributes in 2 columns.
7
8
 -- Philipp Hahn <hahn@univention.de>  Fri, 15 Feb 2013 18:21:40 +0100
9
1
univention-directory-manager-modules (8.0.101-1) unstable; urgency=low
10
univention-directory-manager-modules (8.0.101-1) unstable; urgency=low
2
11
3
  * Fix assiging dhcp objects to computers when the mac address has an invalid
12
  * Fix assiging dhcp objects to computers when the mac address has an invalid
(-)a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/de.po (-8 / +23 lines)
 Lines 30-38   msgstr "" Link Here 
30
"Project-Id-Version: PACKAGE VERSION\n"
30
"Project-Id-Version: PACKAGE VERSION\n"
31
"Report-Msgid-Bugs-To: \n"
31
"Report-Msgid-Bugs-To: \n"
32
"POT-Creation-Date: 2012-10-11 17:59+0200\n"
32
"POT-Creation-Date: 2012-10-11 17:59+0200\n"
33
"PO-Revision-Date: 2011-11-21 12:46+0100\n"
33
"PO-Revision-Date: 2013-02-15 18:12+0100\n"
34
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
34
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
35
"Language-Team: LANGUAGE <LL@li.org>\n"
35
"Language-Team: German <de@li.org>\n"
36
"Language: \n"
36
"Language: \n"
37
"MIME-Version: 1.0\n"
37
"MIME-Version: 1.0\n"
38
"Content-Type: text/plain; charset=UTF-8\n"
38
"Content-Type: text/plain; charset=UTF-8\n"
 Lines 365-375   msgstr "Land des Zertifikat-Herausgebers" Link Here 
365
365
366
#: user.py:
366
#: user.py:
367
msgid "Issuer State"
367
msgid "Issuer State"
368
msgstr "Herausgeber Staat"
368
msgstr "Herausgeber Bundesland"
369
369
370
#: user.py:
370
#: user.py:
371
msgid "Certificate Issuer State"
371
msgid "Certificate Issuer State"
372
msgstr "Staat des Zertifikat-Herausgebers"
372
msgstr "Bundesland des Zertifikat-Herausgebers"
373
373
374
#: user.py:
374
#: user.py:
375
msgid "Issuer Location"
375
msgid "Issuer Location"
 Lines 421-431   msgstr "Land des Zertifikat-Inhabers" Link Here 
421
421
422
#: user.py:
422
#: user.py:
423
msgid "Subject State"
423
msgid "Subject State"
424
msgstr "Inhaber Staat"
424
msgstr "Inhaber Bundesland"
425
425
426
#: user.py:
426
#: user.py:
427
msgid "Certificate Subject State"
427
msgid "Certificate Subject State"
428
msgstr "Staat des Zertifikat-Inhaber"
428
msgstr "Bundesland des Zertifikat-Inhaber"
429
429
430
#: user.py:
430
#: user.py:
431
msgid "Subject Location"
431
msgid "Subject Location"
 Lines 460-465   msgid "Certificate Subject Common Name" Link Here 
460
msgstr "Allgemeiner Name des Zertifikat-Inhaber"
460
msgstr "Allgemeiner Name des Zertifikat-Inhaber"
461
461
462
#: user.py:
462
#: user.py:
463
msgid "Subject Mail"
464
msgstr "Inhaber E-Mail-Adresse"
465
466
#: user.py:
467
msgid "Certificate Subject Mail"
468
msgstr "E-Mail-Adresse des Zertifikat-Inhabers"
469
470
#: user.py:
463
msgid "Valid from"
471
msgid "Valid from"
464
msgstr "Gültig ab"
472
msgstr "Gültig ab"
465
473
 Lines 576-587   msgid "Certificate" Link Here 
576
msgstr "Zertifikat"
584
msgstr "Zertifikat"
577
585
578
#: user.py:
586
#: user.py:
587
msgid "Subject"
588
msgstr "Inhaber"
589
590
#: user.py:
579
msgid "Issuer"
591
msgid "Issuer"
580
msgstr "Aussteller"
592
msgstr "Aussteller"
581
593
582
#: user.py:
594
#: user.py:
583
msgid "Dates"
595
msgid "Validity"
584
msgstr "Datumsangaben"
596
msgstr "Gültigkeit
585
597
586
#: user.py:
598
#: user.py:
587
msgid "Misc"
599
msgid "Misc"
 Lines 615-620   msgstr "%(homeSharePath)s muss gesetzt sein, wenn %(homeShare)s gesetzt wurde." Link Here 
615
msgid "%s: Invalid path"
627
msgid "%s: Invalid path"
616
msgstr "%s: Ungültige Pfadangabe"
628
msgstr "%s: Ungültige Pfadangabe"
617
629
630
#~ msgid "Dates"
631
#~ msgstr "Datumsangaben"
632
618
#~ msgid "User preferences"
633
#~ msgid "User preferences"
619
#~ msgstr "UMC Benutzer-Einstellungen"
634
#~ msgstr "UMC Benutzer-Einstellungen"
620
635
(-)a/branches/ucs-3.1/ucs/management/univention-directory-manager-modules/modules/univention/admin/handlers/users/user.py (-37 / +31 lines)
 Lines 683-689   property_descriptions={ Link Here 
683
			multivalue=0,
683
			multivalue=0,
684
			required=0,
684
			required=0,
685
			dontsearch=1,
685
			dontsearch=1,
686
			may_change=0,
686
			editable=0,
687
			options=['pki'],
687
			options=['pki'],
688
			identifies=0
688
			identifies=0
689
		),
689
		),
 Lines 694-700   property_descriptions={ Link Here 
694
			multivalue=0,
694
			multivalue=0,
695
			required=0,
695
			required=0,
696
			dontsearch=1,
696
			dontsearch=1,
697
			may_change=0,
697
			editable=0,
698
			options=['pki'],
698
			options=['pki'],
699
			identifies=0
699
			identifies=0
700
		),
700
		),
 Lines 705-711   property_descriptions={ Link Here 
705
			multivalue=0,
705
			multivalue=0,
706
			required=0,
706
			required=0,
707
			dontsearch=1,
707
			dontsearch=1,
708
			may_change=0,
708
			editable=0,
709
			options=['pki'],
709
			options=['pki'],
710
			identifies=0
710
			identifies=0
711
		),
711
		),
 Lines 716-722   property_descriptions={ Link Here 
716
			multivalue=0,
716
			multivalue=0,
717
			required=0,
717
			required=0,
718
			dontsearch=1,
718
			dontsearch=1,
719
			may_change=0,
719
			editable=0,
720
			options=['pki'],
720
			options=['pki'],
721
			identifies=0
721
			identifies=0
722
		),
722
		),
 Lines 727-733   property_descriptions={ Link Here 
727
			multivalue=0,
727
			multivalue=0,
728
			required=0,
728
			required=0,
729
			dontsearch=1,
729
			dontsearch=1,
730
			may_change=0,
730
			editable=0,
731
			options=['pki'],
731
			options=['pki'],
732
			identifies=0
732
			identifies=0
733
		),
733
		),
 Lines 738-744   property_descriptions={ Link Here 
738
			multivalue=0,
738
			multivalue=0,
739
			required=0,
739
			required=0,
740
			dontsearch=1,
740
			dontsearch=1,
741
			may_change=0,
741
			editable=0,
742
			options=['pki'],
742
			options=['pki'],
743
			identifies=0
743
			identifies=0
744
		),
744
		),
 Lines 749-755   property_descriptions={ Link Here 
749
			multivalue=0,
749
			multivalue=0,
750
			required=0,
750
			required=0,
751
			dontsearch=1,
751
			dontsearch=1,
752
			may_change=0,
752
			editable=0,
753
			options=['pki'],
753
			options=['pki'],
754
			identifies=0
754
			identifies=0
755
		),
755
		),
 Lines 760-766   property_descriptions={ Link Here 
760
			multivalue=0,
760
			multivalue=0,
761
			required=0,
761
			required=0,
762
			dontsearch=1,
762
			dontsearch=1,
763
			may_change=0,
763
			editable=0,
764
			options=['pki'],
764
			options=['pki'],
765
			identifies=0
765
			identifies=0
766
		),
766
		),
 Lines 771-777   property_descriptions={ Link Here 
771
			multivalue=0,
771
			multivalue=0,
772
			required=0,
772
			required=0,
773
			dontsearch=1,
773
			dontsearch=1,
774
			may_change=0,
774
			editable=0,
775
			options=['pki'],
775
			options=['pki'],
776
			identifies=0
776
			identifies=0
777
		),
777
		),
 Lines 782-788   property_descriptions={ Link Here 
782
			multivalue=0,
782
			multivalue=0,
783
			required=0,
783
			required=0,
784
			dontsearch=1,
784
			dontsearch=1,
785
			may_change=0,
785
			editable=0,
786
			options=['pki'],
786
			options=['pki'],
787
			identifies=0
787
			identifies=0
788
		),
788
		),
 Lines 793-799   property_descriptions={ Link Here 
793
			multivalue=0,
793
			multivalue=0,
794
			required=0,
794
			required=0,
795
			dontsearch=1,
795
			dontsearch=1,
796
			may_change=0,
796
			editable=0,
797
			options=['pki'],
797
			options=['pki'],
798
			identifies=0
798
			identifies=0
799
		),
799
		),
 Lines 804-810   property_descriptions={ Link Here 
804
			multivalue=0,
804
			multivalue=0,
805
			required=0,
805
			required=0,
806
			dontsearch=1,
806
			dontsearch=1,
807
			may_change=0,
807
			editable=0,
808
			options=['pki'],
808
			options=['pki'],
809
			identifies=0
809
			identifies=0
810
		),
810
		),
 Lines 815-832   property_descriptions={ Link Here 
815
			multivalue=0,
815
			multivalue=0,
816
			required=0,
816
			required=0,
817
			dontsearch=1,
817
			dontsearch=1,
818
			may_change=0,
818
			editable=0,
819
			options=['pki'],
819
			options=['pki'],
820
			identifies=0
820
			identifies=0
821
		),
821
		),
822
	'certificateSubjectMail': univention.admin.property(
822
	'certificateSubjectMail': univention.admin.property(
823
			short_description=_('Issuer Mail'),
823
			short_description=_('Subject Mail'),
824
			long_description=_( 'Certificate Issuer Mail' ),
824
			long_description=_( 'Certificate Subject Mail' ),
825
			syntax=univention.admin.syntax.string,
825
			syntax=univention.admin.syntax.string,
826
			multivalue=0,
826
			multivalue=0,
827
			required=0,
827
			required=0,
828
			dontsearch=1,
828
			dontsearch=1,
829
			may_change=0,
829
			editable=0,
830
			options=['pki'],
830
			options=['pki'],
831
			identifies=0
831
			identifies=0
832
		),
832
		),
 Lines 837-843   property_descriptions={ Link Here 
837
			multivalue=0,
837
			multivalue=0,
838
			required=0,
838
			required=0,
839
			dontsearch=1,
839
			dontsearch=1,
840
			may_change=0,
840
			editable=0,
841
			options=['pki'],
841
			options=['pki'],
842
			identifies=0
842
			identifies=0
843
		),
843
		),
 Lines 848-854   property_descriptions={ Link Here 
848
			multivalue=0,
848
			multivalue=0,
849
			required=0,
849
			required=0,
850
			dontsearch=1,
850
			dontsearch=1,
851
			may_change=0,
851
			editable=0,
852
			options=['pki'],
852
			options=['pki'],
853
			identifies=0
853
			identifies=0
854
		),
854
		),
 Lines 859-865   property_descriptions={ Link Here 
859
			multivalue=0,
859
			multivalue=0,
860
			required=0,
860
			required=0,
861
			dontsearch=1,
861
			dontsearch=1,
862
			may_change=0,
862
			editable=0,
863
			options=['pki'],
863
			options=['pki'],
864
			identifies=0
864
			identifies=0
865
		),
865
		),
 Lines 870-876   property_descriptions={ Link Here 
870
			multivalue=0,
870
			multivalue=0,
871
			required=0,
871
			required=0,
872
			dontsearch=1,
872
			dontsearch=1,
873
			may_change=0,
873
			editable=0,
874
			options=['pki'],
874
			options=['pki'],
875
			identifies=0
875
			identifies=0
876
		),
876
		),
 Lines 968-997   layout = [ Link Here 
968
	Tab( _( 'Certificate' ), _( 'Certificate' ), advanced = True, layout = [
968
	Tab( _( 'Certificate' ), _( 'Certificate' ), advanced = True, layout = [
969
		Group( _( 'General' ), '', [
969
		Group( _( 'General' ), '', [
970
			'userCertificate',
970
			'userCertificate',
971
			'certificateSubjectCommonName',
971
			] ),
972
			'certificateSubjectOrganisationalUnit',
972
		Group( _( 'Subject' ), '', [
973
			'certificateSubjectOrganisation',
973
			['certificateSubjectCommonName', 'certificateSubjectMail'],
974
			['certificateSubjectOrganisation', 'certificateSubjectOrganisationalUnit'],
974
			'certificateSubjectLocation',
975
			'certificateSubjectLocation',
975
			'certificateSubjectState',
976
			['certificateSubjectState', 'certificateSubjectCountry'],
976
			'certificateSubjectCountry',
977
			'certificateSubjectMail',
978
			] ),
977
			] ),
979
		Group( _( 'Issuer' ), '', [
978
		Group( _( 'Issuer' ), '', [
980
			'certificateIssuerCommonName',
979
			['certificateIssuerCommonName', 'certificateIssuerMail'],
981
			'certificateIssuerOrganisationalUnit',
980
			['certificateIssuerOrganisation', 'certificateIssuerOrganisationalUnit'],
982
			'certificateIssuerOrganisation',
983
			'certificateIssuerLocation',
981
			'certificateIssuerLocation',
984
			'certificateIssuerState',
982
			['certificateIssuerState', 'certificateIssuerCountry'],
985
			'certificateIssuerCountry',
986
			'certificateIssuerMail',
987
			] ),
983
			] ),
988
		Group( _( 'Dates' ), '', [
984
		Group( _( 'Validity' ), '', [
989
			'certificateDateNotBefore',
985
			['certificateDateNotBefore', 'certificateDateNotAfter']
990
			'certificateDateNotAfter',
991
			] ),
986
			] ),
992
		Group( _( 'Misc' ), '', [
987
		Group( _( 'Misc' ), '', [
993
			'certificateVersion',
988
			['certificateVersion', 'certificateSerial']
994
			'certificateSerial'
995
			] )
989
			] )
996
		] )
990
		] )
997
	]
991
	]

Return to bug 30461