Update .po/.pot files and add Spanish and Polish transalations

author: Simo Sorce <ssorce@redhat.com> 2010-10-13 14:28:30 -0400
committer: Rob Crittenden <rcritten@redhat.com> 2010-10-13 14:35:35 -0400
commit: 2e17649aae1b5586c39853b8f745631124c85104 (patch)
tree: 8c4a3bf04b995cbacefbf18d93a91c86176efae2 /install/po
parent: 19272e5b8ef47be91988d2f316391568306e6919 (diff)
download: freeipa-2e17649aae1b5586c39853b8f745631124c85104.tar.gz
freeipa-2e17649aae1b5586c39853b8f745631124c85104.tar.xz
freeipa-2e17649aae1b5586c39853b8f745631124c85104.zip
18 files changed, 1800 insertions, 1622 deletions
diff --git a/install/po/bn_IN.po b/install/po/bn_IN.po
index ca799ea0e..f9ab81cc9 100644
--- a/install/po/bn_IN.po
+++ b/install/po/bn_IN.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-02-19 12:34+0530\n"
 "Last-Translator: sankarshan mukhopadhyay <sankarshan@fedoraproject.org>\n"
 "Language-Team: anubad@lists.ankur.org.in\n"
@@ -150,7 +150,7 @@ msgstr "পাসওয়ার্ড দুটি মিলছে না"
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,61 +900,61 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 #, fuzzy
 msgid "Record type"
 msgstr "ভুল প্রকার"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1080,8 +1087,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1109,7 +1116,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1129,12 +1136,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, fuzzy, python-format
 msgid "Added service \"%(value)s\""
 msgstr "\"%(value)s\" ব্যবহারকারী যোগ করা হয়েছে"
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, fuzzy, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "\"%(value)s\" ব্যবহারকারী যোগ করা হয়েছে"
@@ -1222,9 +1229,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1274,11 +1279,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, fuzzy, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr "\"%(value)s\" ব্যবহারকারী যোগ করা হয়েছে"
@@ -1413,27 +1418,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1585,75 +1594,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1695,27 +1708,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, fuzzy, python-format
 msgid "Modified service \"%(value)s\""
 msgstr "\"%(value)s\" ব্যবহারকারী যোগ করা হয়েছে"
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, fuzzy, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] "%(count)d ভেরিয়াবেল"
 msgstr[1] "%(count)d ভেরিয়াবেল"
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/de.po b/install/po/de.po
index 0e33cb69e..01eccf3bd 100644
--- a/install/po/de.po
+++ b/install/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-27 10:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,60 +900,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1076,8 +1083,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1105,7 +1112,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1125,12 +1132,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1218,9 +1225,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1270,11 +1275,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1409,27 +1414,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1580,75 +1589,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1690,27 +1703,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/es.po b/install/po/es.po
index 47bcbdd46..beef6a462 100644
--- a/install/po/es.po
+++ b/install/po/es.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: freeipa.master.ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Héctor Daniel Cabrera <logan@fedoraproject.org>\n"
 "Language-Team: Fedora Spanisg <trans-es@lists.fedoraproject.org. >\n"
@@ -155,7 +155,7 @@ msgstr "Las contraseñas no coinciden"
 msgid "Command not implemented"
 msgstr "El comando no se ha implementado"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -238,11 +238,12 @@ msgstr "El grupo de usuarios predeterminado no puede ser eliminado"
 
 #: ipalib/errors.py:1071
 msgid "Host does not have corresponding DNS A record"
-msgstr ""
+msgstr "El equipo no posee un registro DNS A con el que se corresponda "
 
 #: ipalib/errors.py:1086
 msgid "Deleting a managed group is not allowed. It must be detached first."
 msgstr ""
+"No se permite eliminar un grupo administrado. Primero debe ser desasociado. "
 
 #: ipalib/errors.py:1109
 #, python-format
@@ -276,6 +277,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr "La operación certificada no puede ser completada: %(error)s"
 
+#: ipalib/errors.py:1237
+#, fuzzy, python-format
+msgid "Certificate format error: %(error)s"
+msgstr "La operación certificada no puede ser completada: %(error)s"
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -290,7 +296,7 @@ msgstr "recuperar todos los atributos"
 msgid "print entries as stored on the server"
 msgstr "imprime las entradas como se encuentran almacenadas en el servidor"
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr "Reenvía al servidor en lugar de ejecutarse localmente"
 
@@ -411,14 +417,12 @@ msgstr ""
 "destino, atributos, o miembro de "
 
 #: ipalib/plugins/aci.py:151
-#, fuzzy
 msgid "group, taskgroup and self are mutually exclusive"
-msgstr "grupo y grupo de tareas se excluyen mutuamente"
+msgstr "grupo, función del grupo y self se excluyen mutuamente"
 
 #: ipalib/plugins/aci.py:153
-#, fuzzy
 msgid "One of group, taskgroup or self is required"
-msgstr "Es necesario grupo o grupo de tareas"
+msgstr "Es necesario o grupo o función del grupo o self"
 
 #: ipalib/plugins/aci.py:172
 #, python-format
@@ -459,12 +463,11 @@ msgid "Permissions"
 msgstr "Permisos"
 
 #: ipalib/plugins/aci.py:307
-#, fuzzy
 msgid ""
 "comma-separated list of permissions to grant(read, write, add, delete, all)"
 msgstr ""
 "lista separada por comas de la concesión de permisos (leer, escribir, "
-"agregar, eliminar, auto escribirse, todos) "
+"agregar, eliminar, todos) "
 
 #: ipalib/plugins/aci.py:313
 msgid "Attributes"
@@ -516,11 +519,11 @@ msgstr "Grupo al que aplicar API"
 
 #: ipalib/plugins/aci.py:344
 msgid "Target your own entry (self)"
-msgstr ""
+msgstr "Dirija su propia entrada (usted)"
 
 #: ipalib/plugins/aci.py:345
 msgid "Apply ACI to your own entry (self)"
-msgstr ""
+msgstr "Aplique ACI a su propia entrada (usted)"
 
 #: ipalib/plugins/aci.py:357
 #, python-format
@@ -544,23 +547,28 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] "%(count)d ACI coincidente"
 msgstr[1] "%(count)d ACIs coincidentes"
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+#, fuzzy
+msgid "Automount"
+msgstr "Mapeos de automontaje"
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr "Ubicación"
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr "Nombre de la ubicación de automontaje"
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr "Mapeo"
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr "Nombre de mapeo de automontaje"
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -570,39 +578,39 @@ msgstr "Nombre de mapeo de automontaje"
 msgid "Description"
 msgstr "Descripción"
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr "Mapeos de automontaje"
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr "Llave"
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr "Nombre de llave de automontaje"
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr "Información de montaje"
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr "descripción"
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr "Llaves de automontaje"
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr "Mapeo del padre"
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr "Nombre del mapeo del automontaje padre (predeterminado: auto.master)"
 
@@ -659,24 +667,21 @@ msgstr "Cantidad de miembros eliminados"
 
 #: ipalib/plugins/baseldap.py:880
 msgid "Time Limit"
-msgstr ""
+msgstr "Tiempo límite"
 
 #: ipalib/plugins/baseldap.py:881
 msgid "Time limit of search in seconds"
-msgstr ""
+msgstr "Tiempo máximo de búsqueda en segundos"
 
 #: ipalib/plugins/baseldap.py:887
-#, fuzzy
 msgid "Size Limit"
-msgstr "Límite del tamaño de la búsqueda"
+msgstr "Tamaño límite"
 
 #: ipalib/plugins/baseldap.py:888
-#, fuzzy
 msgid "Maximum number of entries returned"
-msgstr "Cantidad de variables devueltas (<= total)"
+msgstr "Cantidad máxima de entradas obtenidas"
 
 #: ipalib/plugins/cert.py:93
-#, fuzzy
 msgid "Failure decoding Certificate Signing Request:"
 msgstr ""
 "Falla al intentar decodificar la petición de identificación de certificado"
@@ -693,7 +698,7 @@ msgstr ""
 "Falla al intentar decodificar la petición de identificación de certificado: "
 "%s"
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr "Principal"
 
@@ -707,9 +712,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr "si no existe, agregar automáticamente el principal"
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -719,23 +722,23 @@ msgstr "Asunto"
 
 #: ipalib/plugins/cert.py:195 ipalib/plugins/cert.py:398
 msgid "Issuer"
-msgstr ""
+msgstr "Emisor"
 
 #: ipalib/plugins/cert.py:199 ipalib/plugins/cert.py:401
 msgid "Not Before"
-msgstr ""
+msgstr "No antes de"
 
 #: ipalib/plugins/cert.py:203 ipalib/plugins/cert.py:404
 msgid "Not After"
-msgstr ""
+msgstr "No luego de"
 
 #: ipalib/plugins/cert.py:207 ipalib/plugins/cert.py:407
 msgid "Fingerprint (MD5)"
-msgstr ""
+msgstr "Huella digital (MD5)"
 
 #: ipalib/plugins/cert.py:211 ipalib/plugins/cert.py:410
 msgid "Fingerprint (SHA1)"
-msgstr ""
+msgstr "Huella digital (SHA1)"
 
 #: ipalib/plugins/cert.py:215 ipalib/plugins/cert.py:379
 msgid "Serial number"
@@ -782,9 +785,8 @@ msgid "Error"
 msgstr "Error"
 
 #: ipalib/plugins/config.py:73
-#, fuzzy
 msgid "Configuration"
-msgstr "Información de montaje"
+msgstr "Configuración"
 
 #: ipalib/plugins/config.py:78
 msgid "Max username length"
@@ -861,18 +863,16 @@ msgid "Migration mode"
 msgstr "Modo de migración"
 
 #: ipalib/plugins/config.py:126
-#, fuzzy
 msgid "Enable migration mode"
-msgstr "Modo de migración habilitado"
+msgstr "Habilita el modo de migración"
 
 #: ipalib/plugins/config.py:130
 msgid "Certificate Subject base"
 msgstr "Base de certificado de asunto"
 
 #: ipalib/plugins/config.py:131
-#, fuzzy
 msgid "Base for certificate subjects (OU=Test,O=Example)"
-msgstr "base para certificar asuntos (OU=Prueba,O=Ejemplo)"
+msgstr "Base para certificar asuntos (OU=Prueba,O=Ejemplo)"
 
 #: ipalib/plugins/dns.py:131
 msgid "DNS"
@@ -930,64 +930,63 @@ msgstr "¿permitir actualización dinámica?"
 msgid "BIND update policy"
 msgstr "Política de actualización de BIND"
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr "nombre del recurso"
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr "Tipo de registro"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr "Datos"
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr "Datos de tipo específico"
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr "Tiempo para abandonar"
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr "Clase"
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr "Nombre del recurso"
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr "Criterio de búsqueda"
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr "datos de tipo específico"
 
-#: ipalib/plugins/dns.py:850
-#, fuzzy, python-format
+#: ipalib/plugins/dns.py:865
+#, python-format
 msgid "Found '%(value)s'"
-msgstr "Ha sido agregado el grupo \"%(value)s\""
+msgstr "Ha sido encontrado '%(value)s'"
 
-#: ipalib/plugins/dns.py:854
-#, fuzzy
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
-msgstr "Nombre del equipo"
+msgstr "Nombre del equipo anfitrión"
 
-#: ipalib/plugins/dns.py:867
-#, fuzzy, python-format
+#: ipalib/plugins/dns.py:882
+#, python-format
 msgid "Host '%(host)s' not found"
-msgstr "%(pkey)s: no se encuentra %(oname)s"
+msgstr "No ha sido encontrado el equipo anfitrión '%(host)s' "
 
 #: ipalib/plugins/group.py:94
 msgid "User Groups"
@@ -1052,21 +1051,21 @@ msgstr[0] "%(count)d grupo coincidente"
 msgstr[1] "%(count)d grupos coincidentes"
 
 #: ipalib/plugins/group.py:257
-#, fuzzy, python-format
+#, python-format
 msgid "Detached group \"%(value)s\" from user \"%(value)s\""
-msgstr "Ha sido eliminado el grupo de funciones \"%(value)s\""
+msgstr "Ha sido desasociado el grupo \"%(value)s\" del usuario \"%(value)s\""
 
 #: ipalib/plugins/group.py:273
 msgid "not allowed to modify user entries"
-msgstr ""
+msgstr "no se permite modificar las entradas de los usuarios"
 
 #: ipalib/plugins/group.py:277
 msgid "not allowed to modify group entries"
-msgstr ""
+msgstr "no se permite modificar las entradas de los grupos"
 
 #: ipalib/plugins/group.py:284 ipalib/plugins/group.py:295
 msgid "Not a managed group"
-msgstr ""
+msgstr "No es un grupo administrado"
 
 #: ipalib/plugins/hbac.py:106
 msgid "HBAC"
@@ -1081,9 +1080,8 @@ msgid "Rule type (allow or deny)"
 msgstr "Tipo de regla (permitir o negar)"
 
 #: ipalib/plugins/hbac.py:117
-#, fuzzy
 msgid "Rule type"
-msgstr "Tipo de registro"
+msgstr "Tipo de regla"
 
 #: ipalib/plugins/hbac.py:123
 msgid "User category"
@@ -1110,23 +1108,21 @@ msgid "Source host category the rule applies to"
 msgstr "Categoría del equipo de origen al que se aplica la regla"
 
 #: ipalib/plugins/hbac.py:141
-#, fuzzy
 msgid "Service category"
-msgstr "Categoría de usuario"
+msgstr "Categoría de servicio"
 
 #: ipalib/plugins/hbac.py:142
-#, fuzzy
 msgid "Service category the rule applies to"
-msgstr "Categoría de usuario al que se aplica la regla"
+msgstr "Categoría de servicio a la que se aplica la regla"
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr "Hora de acceso"
 
 #: ipalib/plugins/hbac.py:154
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #: ipalib/plugins/hbac.py:158 ipalib/plugins/sudorule.py:61
 #: ipalib/plugins/user.py:76
@@ -1144,19 +1140,17 @@ msgid "Host Groups"
 msgstr "Grupos de equipo"
 
 #: ipalib/plugins/hbac.py:170
-#, fuzzy
 msgid "Source hosts"
-msgstr "Categoría del equipo de origen"
+msgstr "Equipos fuente"
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr "Servicios"
 
 #: ipalib/plugins/hbac.py:178
-#, fuzzy
 msgid "Service Groups"
-msgstr "Servicios"
+msgstr "Grupos de servicio"
 
 #: ipalib/plugins/hbacsvc.py:65
 msgid "Service name"
@@ -1172,12 +1166,12 @@ msgstr "Servicios"
 msgid "Description of service"
 msgstr "Descripción"
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr "Ha sido agregado el servicio \"%(value)s\""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "Ha sido eliminado el servicio \"%(value)s\""
@@ -1185,7 +1179,7 @@ msgstr "Ha sido eliminado el servicio \"%(value)s\""
 #: ipalib/plugins/hbacsvcgroup.py:66
 #, fuzzy
 msgid "HBAC Service Groups"
-msgstr "Servicios"
+msgstr "Grupos de servicio"
 
 #: ipalib/plugins/hbacsvcgroup.py:71
 #, fuzzy
@@ -1224,7 +1218,7 @@ msgstr "Ha sido modificado el grupo de funciones \"%(value)s\""
 
 #: ipalib/plugins/host.py:86
 msgid "Fully-qualified hostname required"
-msgstr ""
+msgstr "Es necesario un nombre de equipo totalmente certificado"
 
 #: ipalib/plugins/host.py:118
 msgid "Host name"
@@ -1271,9 +1265,7 @@ msgstr "Contraseña de usuario"
 msgid "Password used in bulk enrollment"
 msgstr "Contraseña utilizada en el registro bruto"
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr "Certificado del servidor codificado con base-64"
 
@@ -1299,9 +1291,9 @@ msgid "Added host \"%(value)s\""
 msgstr "Ha sido agregado el equipo \"%(value)s\""
 
 #: ipalib/plugins/host.py:202
-#, fuzzy
 msgid "force host name even if not in DNS"
-msgstr "fuerza el nombre del prinicpal, aún si no se encuentra en DNS"
+msgstr ""
+"fuerza el nombre del equipo anfitrión, incluso si no se encuentra en DNS"
 
 #: ipalib/plugins/host.py:235
 #, python-format
@@ -1324,18 +1316,18 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] "%(count)d equipo coincidente"
 msgstr[1] "%(count)d equipos coincidentes"
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
-msgstr ""
+msgstr "Keytab"
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
-#, fuzzy, python-format
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
+#, python-format
 msgid "Removed kerberos key from \"%(value)s\""
-msgstr "Ha sido eliminado el grupo de funciones \"%(value)s\""
+msgstr "Se ha eliminado la llave kerberos de \"%(value)s\""
 
 #: ipalib/plugins/host.py:368
 msgid "Host principal has no kerberos key"
-msgstr ""
+msgstr "El principal del equipo anfitrión no posee una llave kerberos "
 
 #: ipalib/plugins/hostgroup.py:74
 msgid "Host-group"
@@ -1381,27 +1373,27 @@ msgstr[1] "%(count)d grupos de equipos coincidentes"
 
 #: ipalib/plugins/internal.py:39
 msgid "Logged In As"
-msgstr "Conectado como"
+msgstr "Registrado como"
 
 #: ipalib/plugins/internal.py:41
 msgid "Add"
-msgstr "Agregue"
+msgstr "Agregar"
 
 #: ipalib/plugins/internal.py:42
 msgid "Find"
-msgstr "Busque"
+msgstr "Buscar"
 
 #: ipalib/plugins/internal.py:43
 msgid "Reset"
-msgstr ""
+msgstr "Resetear"
 
 #: ipalib/plugins/internal.py:44
 msgid "Update"
-msgstr ""
+msgstr "Actualizar"
 
 #: ipalib/plugins/internal.py:45
 msgid "Enroll"
-msgstr ""
+msgstr "Registro"
 
 #: ipalib/plugins/internal.py:46
 msgid "Delete"
@@ -1409,7 +1401,7 @@ msgstr ""
 
 #: ipalib/plugins/internal.py:49
 msgid "Quick Links"
-msgstr ""
+msgstr "Enlaces rápidos"
 
 #: ipalib/plugins/internal.py:50
 msgid "Select All"
@@ -1425,71 +1417,72 @@ msgstr ""
 
 #: ipalib/plugins/internal.py:55
 msgid "Identity Details"
-msgstr ""
+msgstr "Detalles de la identidad"
 
 #: ipalib/plugins/internal.py:56
 msgid "Account Details"
-msgstr ""
+msgstr "Detalles de la cuenta"
 
 #: ipalib/plugins/internal.py:57
 msgid "Contact Details"
-msgstr ""
+msgstr "Detalles del contacto"
 
 #: ipalib/plugins/internal.py:58
-#, fuzzy
 msgid "Mailing Address"
-msgstr "Dirección de correo electrónico"
+msgstr "Dirección de correo"
 
 #: ipalib/plugins/internal.py:59
 msgid "      Employee Information"
-msgstr ""
+msgstr "      Datos del empleador"
 
 #: ipalib/plugins/internal.py:60
-#, fuzzy
 msgid "Misc. Information"
-msgstr "Información de montaje"
+msgstr "Información diversa"
 
 #: ipalib/plugins/internal.py:61
 msgid "Back to Top"
-msgstr ""
+msgstr "Volver al comienzo"
 
 #: ipalib/plugins/internal.py:66
 msgid "Name of object to export"
-msgstr ""
+msgstr "Nombre del objeto a exportar"
 
 #: ipalib/plugins/internal.py:71
 msgid "Dict of JSON encoded IPA Objects"
-msgstr ""
+msgstr "El dict de JSON ha codificado objetos IPA"
 
 #: ipalib/plugins/internal.py:72
 msgid "Dict of I18N messages"
-msgstr ""
+msgstr "Dictado de los mensajes regionales"
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+#, fuzzy
+msgid "Kerberos Ticket Policy"
+msgstr "Principal kerberos"
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr "Nombre de usuario"
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr "Administra política de ticket para un usuario específico"
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr "Vida máxima"
 
-#: ipalib/plugins/krbtpolicy.py:69
-#, fuzzy
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
-msgstr "Vida máxima del ticket"
+msgstr "Duración máxima del ticket (en segundos)"
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr "Renovación máxima"
 
-#: ipalib/plugins/krbtpolicy.py:74
-#, fuzzy
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
-msgstr "Duración máxima renovable"
+msgstr "Duración máxima renovable (en segundos)"
 
 #: ipalib/plugins/migration.py:44
 #, python-format
@@ -1620,9 +1613,8 @@ msgid "Number of plugins loaded"
 msgstr "Cantidad de complementos cargados"
 
 #: ipalib/plugins/netgroup.py:57
-#, fuzzy
 msgid "Member Host"
-msgstr "Equipo miembro"
+msgstr "Miembro del equipo anfitrión"
 
 #: ipalib/plugins/netgroup.py:63
 msgid "External host"
@@ -1652,83 +1644,86 @@ msgstr "ID unico de IPA"
 #, python-format
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
+"la prioridad debe ser un valor único (%(prio)d que ya esté siendo utilizado "
+"por %(gname)s)"
+
+#: ipalib/plugins/pwpolicy.py:170
+#, fuzzy
+msgid "Password Policy"
+msgstr "Contraseña"
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr "Grupo"
 
-#: ipalib/plugins/pwpolicy.py:174
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
-msgstr "Administra política de ticket para un usuario específico"
+msgstr "Administra la política de contraseña de un grupo específico"
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr "Vida máxima (días)"
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr "Vida máxima de la contraseña (días)"
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr "Vida mínima (horas)"
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr "Vida mínima de la contraseña (en horas)"
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr "Tamaño del historial"
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr "Tamaño del historial de la contraseña"
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr "Clases de caracteres"
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr "Cantidad mínima de clases de caracteres"
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr "Longitud mínima"
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr "Longitud mínima de la contraseña"
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr "Prioridad"
 
-#: ipalib/plugins/pwpolicy.py:211
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 "Prioridad de la política (a mayor número corresponde una política menor)"
 
-#: ipalib/plugins/pwpolicy.py:263
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
-msgstr "Vida máxima de la contraseña (días)"
+msgstr "La duración máxima de la contraseña debe ser mayor que la mínima."
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr "la prioridad no puede ser definida en una plítica global"
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr "Usuario"
 
-#: ipalib/plugins/pwpolicy.py:368
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
-msgstr "Administra política de ticket para un usuario específico"
+msgstr "Ofrece la política efectiva para un determinado usuario"
 
 #: ipalib/plugins/rolegroup.py:79
 msgid "Role Groups"
@@ -1768,30 +1763,29 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] "%(count)d grupo de roles coincidente"
 msgstr[1] "%(count)d grupo de roles coincidentes"
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr "Servicio principal"
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr "fuerza el nombre del prinicpal, aún si no se encuentra en DNS"
 
-#: ipalib/plugins/service.py:261
-#, fuzzy, python-format
+#: ipalib/plugins/service.py:292
+#, python-format
 msgid "Modified service \"%(value)s\""
-msgstr "Ha sido modificado el usuario \"%(value)s\""
+msgstr "Ha sido modificado el servicio \"%(value)s\""
 
-#: ipalib/plugins/service.py:298
-#, fuzzy, python-format
+#: ipalib/plugins/service.py:323
+#, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
-msgstr[0] "%(count)d usuario coincidente"
-msgstr[1] "%(count)d usuarios coincidentes"
+msgstr[0] "%(count)d servicio coincidente"
+msgstr[1] "%(count)d servicios coincidentes\t\t\t"
 
-#: ipalib/plugins/service.py:396
-#, fuzzy
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
-msgstr "Servicio principal"
+msgstr "El servicio principal no posee una llave kerberos"
 
 #: ipalib/plugins/sudocmd.py:60
 msgid "SudoCmds"
@@ -1962,6 +1956,7 @@ msgstr "UID"
 #: ipalib/plugins/user.py:133
 msgid "User ID Number (system will assign one if not provided)"
 msgstr ""
+"Número de ID de usuario (el sistema le asignará uno si no se indica ninguno)"
 
 #: ipalib/plugins/user.py:139
 msgid "Street address"
@@ -2018,11 +2013,11 @@ msgstr "Ha sido modificado el usuario \"%(value)s\""
 
 #: ipalib/plugins/user.py:252
 msgid "Self"
-msgstr ""
+msgstr "Self"
 
 #: ipalib/plugins/user.py:253
 msgid "Display user record for current Kerberos principal"
-msgstr ""
+msgstr "Muestra el registro del usuario para el principal de Kerberos actual"
 
 #: ipalib/plugins/user.py:263
 #, python-format
diff --git a/install/po/fr.po b/install/po/fr.po
index 3d7cd28e4..de4a8c0a4 100644
--- a/install/po/fr.po
+++ b/install/po/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-27 10:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,60 +900,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1076,8 +1083,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1105,7 +1112,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1125,12 +1132,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1218,9 +1225,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1270,11 +1275,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1409,27 +1414,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1580,75 +1589,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1690,27 +1703,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/he.po b/install/po/he.po
index 14b361809..78b23be78 100644
--- a/install/po/he.po
+++ b/install/po/he.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-27 10:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,60 +900,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1076,8 +1083,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1105,7 +1112,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1125,12 +1132,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1218,9 +1225,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1270,11 +1275,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1409,27 +1414,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1580,75 +1589,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1690,27 +1703,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/id.po b/install/po/id.po
index 8b89ebc06..1a7cb7954 100644
--- a/install/po/id.po
+++ b/install/po/id.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-02-12 05:59+0700\n"
 "Last-Translator: Teguh DC <dheche@songolimo.net>\n"
 "Language-Team: Fedora Indonesia <trans-id@lists.fedoraproject.org>\n"
@@ -149,7 +149,7 @@ msgstr "Kata sandi tidak cocok"
 msgid "Command not implemented"
 msgstr "Perintah tidak diimplementasikan"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -264,6 +264,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr "Operasi sertifikat tidak dapat diselesaikan: %(error)s"
 
+#: ipalib/errors.py:1237
+#, fuzzy, python-format
+msgid "Certificate format error: %(error)s"
+msgstr "Operasi sertifikat tidak dapat diselesaikan: %(error)s"
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr "Hasil yang terpotong, coba cari dengan lebih spesifik"
@@ -276,7 +281,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -526,23 +531,27 @@ msgid "%(count)d ACI matched"
 msgid_plural "%(count)d ACIs matched"
 msgstr[0] "%(count)d ACI sesuai"
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -552,39 +561,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -669,7 +678,7 @@ msgstr "Gagal mengurai Permintaan Penandatanganan Sertifikat"
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr "Gagal mengurai Permintaan Penandatanganan Sertifikat: %s"
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -682,9 +691,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -897,61 +904,61 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 #, fuzzy
 msgid "Record type"
 msgstr "type salah"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, fuzzy, python-format
 msgid "Found '%(value)s'"
 msgstr "Grup \"%(value)s\" telah ditambahkan"
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1083,8 +1090,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1112,7 +1119,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1132,12 +1139,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, fuzzy, python-format
 msgid "Added service \"%(value)s\""
 msgstr "Pengguna \"%(value)s\" telah ditambahkan"
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, fuzzy, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "Pengguna \"%(value)s\" telah dihapus"
@@ -1225,9 +1232,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1276,11 +1281,11 @@ msgid "%(count)d host matched"
 msgid_plural "%(count)d hosts matched"
 msgstr[0] "%(count)d host sesuai"
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, fuzzy, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr "Rolegroup \"%(value)s\" telah dihapus"
@@ -1414,27 +1419,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1585,75 +1594,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr "prioritas tidak dapat ditetapkan pada kebijakan global"
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1694,26 +1707,26 @@ msgid "%(count)d rolegroup matched"
 msgid_plural "%(count)d rolegroups matched"
 msgstr[0] "%(count)d rolegroup sesuai"
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, fuzzy, python-format
 msgid "Modified service \"%(value)s\""
 msgstr "Pengguna \"%(value)s\" telah dimodifikasi"
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, fuzzy, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] "%(count)d pengguna sesuai"
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/ipa.pot b/install/po/ipa.pot
index ffa782338..41ddcd5ed 100644
--- a/install/po/ipa.pot
+++ b/install/po/ipa.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -151,7 +151,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -266,6 +266,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -278,7 +283,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -525,23 +530,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -551,39 +560,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -667,7 +676,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -680,9 +689,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -894,60 +901,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1077,8 +1084,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1106,7 +1113,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1126,12 +1133,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1219,9 +1226,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1271,11 +1276,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1410,27 +1415,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1581,75 +1590,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1691,27 +1704,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/it.po b/install/po/it.po
index ce5c625cb..c15ba3b06 100644
--- a/install/po/it.po
+++ b/install/po/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-27 10:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,60 +900,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1076,8 +1083,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1105,7 +1112,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1125,12 +1132,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1218,9 +1225,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1270,11 +1275,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1409,27 +1414,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1580,75 +1589,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1690,27 +1703,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/ja.po b/install/po/ja.po
index 4d52df738..bd001c9f2 100644
--- a/install/po/ja.po
+++ b/install/po/ja.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-27 10:25-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -149,7 +149,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -264,6 +264,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -276,7 +281,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -522,23 +527,27 @@ msgid "%(count)d ACI matched"
 msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -548,39 +557,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -664,7 +673,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -677,9 +686,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -891,60 +898,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1073,8 +1080,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1102,7 +1109,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1122,12 +1129,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1215,9 +1222,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1266,11 +1271,11 @@ msgid "%(count)d host matched"
 msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1404,27 +1409,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1574,75 +1583,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1683,26 +1696,26 @@ msgid "%(count)d rolegroup matched"
 msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/kn.po b/install/po/kn.po
index a5cecc101..e0115ffc6 100644
--- a/install/po/kn.po
+++ b/install/po/kn.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-05-11 20:03+0530\n"
 "Last-Translator: gundachandru <gundachandru@gmail.com>\n"
 "Language-Team: Kannada\n"
@@ -151,7 +151,7 @@ msgstr "ಗುಪ್ತಪದಗಳು ಹೊಂದಾಣಿಕೆಯಾಗು�
 msgid "Command not implemented"
 msgstr "ಆಜ್ಞೆ(ಕಮ್ಯಾಂಡ್)ಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗಿಲ್ಲ"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -269,6 +269,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr "ಪ್ರಮಾಣಪತ್ರದ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಆಗುತ್ತಿಲ್ಲ: %(error)s"
 
+#: ipalib/errors.py:1237
+#, fuzzy, python-format
+msgid "Certificate format error: %(error)s"
+msgstr "ಪ್ರಮಾಣಪತ್ರದ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಆಗುತ್ತಿಲ್ಲ: %(error)s"
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr "ಫಲಿತಾಂಶಗಳು ಕತ್ತರಿಸಲ್ಪಟ್ಟಿವೆ, ಹೆಚ್ಚ್ಹು ನಿರ್ದಿಷ್ಟವಾದ ಶೋಧನೆ ಪ್ರಯತ್ನಿಸಿ"
@@ -281,7 +286,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -535,23 +540,28 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] "%(count)d ACI ತಾಳೆಯಾಗುತ್ತಿದೆ"
 msgstr[1] "%(count)d ACIಗಳು ತಾಳೆಯಾಗುತ್ತಿವೆ"
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+#, fuzzy
+msgid "Automount"
+msgstr "ಮ್ಯಾಪ್‌ಗಳ ಆಟೋಮೌಂಟ್"
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr "ಸ್ಥಳ"
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr "ಆಟೊಮೌಂಟ್ ತಾಣದ ಹೆಸರು"
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr "ನಕ್ಷೆ"
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr "ಆಟೊಮೌಂಟ್ ಮ್ಯಾಪ್‌ನ ಹೆಸರು"
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -561,39 +571,39 @@ msgstr "ಆಟೊಮೌಂಟ್ ಮ್ಯಾಪ್‌ನ ಹೆಸರು"
 msgid "Description"
 msgstr "ವಿವರಣೆ"
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr "ಮ್ಯಾಪ್‌ಗಳ ಆಟೋಮೌಂಟ್"
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr "ಕೀ"
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr "ಆಟೊಮೌಂಟ್ ಕೀ ಹೆಸರು"
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr "ಮೌಂಟ್ ಮಾಹಿತಿ"
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr "ವಿವರಣೆ"
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr "ಕೀಗಳ ಆಟೋಮೌಂಟ್"
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr "ಮೌಂಟ್ ಪಾಯಂಟ್"
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr "Parent map"
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr "Name of parent automount map (default: auto.master)"
 
@@ -679,7 +689,7 @@ msgstr "ಪ್ರಮಾಣಪತ್ರದ ಸಹಿಯ ಕೋರಿಕೆಯ ಡ
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr "ಪ್ರಮಾಣಪತ್ರದ ಸಹಿಯ ಕೋರಿಕೆಯ ಡಿಕೋಡಿಂಗ್‌ನ ವಿಫಲತೆ: %s"
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr "Principal"
 
@@ -692,9 +702,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr "ಸ್ವಯಂಚಾಲಿತವಾಗಿ principal ಸೇರಿಸಿ ಅದು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲದಿದ್ದಲ್ಲಿ"
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr "ಪ್ರಮಾಣಪತ್ರ"
 
@@ -910,61 +918,61 @@ msgstr "ಡೈನಮಿಕ್ ಅಪ್‌ಡೇಟ್ ಅನುಮತಿಸಬ�
 msgid "BIND update policy"
 msgstr "BIND update policy"
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr "ವಲಯದ ಹೆಸರು"
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr "ರೀಸೊರ್ಸ್ ಹೆಸರು"
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr "ದಾಖಲೆಯ ಬಗೆ"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr "ದತ್ತಾಂಶ"
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr "ನಮೂನೆ-ನಿಗದಿತ ದತ್ತಾಂಶ"
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr "ಉಳಿದಿರಬೇಕಾದ ಸಮಯ"
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr "ವರ್ಗ"
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr "ರೀಸೊರ್ಸ್ ಹೆಸರು"
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr "ಹುಡುಕು criteria"
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr "ನಮೂನೆ-ನಿಗದಿತ ದತ್ತಾಂಶ"
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, fuzzy, python-format
 msgid "Found '%(value)s'"
 msgstr "\"%(value)s\" ಗುಂಪನ್ನು ಸೇರಿಸಲಾಗಿದೆ"
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 #, fuzzy
 msgid "Hostname"
 msgstr "ಹೋಸ್ಟ್  ಹೆಸರು"
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1099,8 +1107,8 @@ msgstr "ಬಳಕೆದಾರನ ವರ್ಗ"
 msgid "Service category the rule applies to"
 msgstr "ನಿಯಮ ಅನ್ವಯಿಸುವಂತಹ ಬಳಕೆದಾರನ ವರ್ಗ"
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr "ಪ್ರವೇಶದ ಸಮಯ"
 
@@ -1129,7 +1137,7 @@ msgid "Source hosts"
 msgstr "ಮೂಲ ಹೋಸ್ಟ್ ವರ್ಗ"
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr "ಸೇವೆಗಳು(ಸರ್ವೀಸಸ್)"
 
@@ -1152,12 +1160,12 @@ msgstr "ಸೇವೆಗಳು(ಸರ್ವೀಸಸ್)"
 msgid "Description of service"
 msgstr "ವಿವರಣೆ"
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr "\"%(value)s\" ಸೇವೆ(ಸರ್ವೀಸ್)ಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ"
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "\"%(value)s\" ಸೇವೆ(ಸರ್ವೀಸ್)ಯನ್ನು ಅಳಿಸಲಾಗಿದೆ"
@@ -1250,9 +1258,7 @@ msgstr "ಬಳಕೆದಾರನ ಗುಪ್ತಪದ"
 msgid "Password used in bulk enrollment"
 msgstr "ದೊಡ್ಡ ಪ್ರಮಾಣದ ದಾಖಲಾತಿಯಲ್ಲಿ ಬಳಸಲಾದ ಗುಪ್ತಪದ"
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr "Base-64 ಎನ್‌ಕೋಡೆಡ್ ಸರ್ವರ್ ಪ್ರಮಾಣಪತ್ರ"
 
@@ -1303,11 +1309,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] "%(count)d ಹೋಸ್ಟ್‌ ತಾಳೆಯಾಗುತ್ತಿದೆ"
 msgstr[1] "%(count)d ಹೋಸ್ಟ್‌ಗಳು ತಾಳೆಯಾಗುತ್ತಿವೆ"
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, fuzzy, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr "\"%(value)s\" ರೋಲ್‌ಗ್ರೂಪನ್ನು ಅಳಿಸಲಾಗಿದೆ"
@@ -1444,28 +1450,33 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+#, fuzzy
+msgid "Kerberos Ticket Policy"
+msgstr "Kerberos principal"
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr "ಬಳಕೆದಾರನ ಹೆಸರು"
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr "ನಿಗದಿತ ಬಳಕೆದಾರನಿಗೆ ಟಿಕೆಟ್ ಪಾಲಿಸಿಯನ್ನು ನಿರ್ವಹಿಸು"
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr "ಗರಿಷ್ಟ ಜೀವಿತಾವಧಿ"
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 #, fuzzy
 msgid "Maximum ticket life (seconds)"
 msgstr "ಗರಿಷ್ಟ ಟಿಕೆಟ್ ಜೀವಿತಾವಧಿ"
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr "ಗರಿಷ್ಟ ನವೀಕರಣ"
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 #, fuzzy
 msgid "Maximum renewable age (seconds)"
 msgstr "ಗರಿಷ್ಟ ನವೀಕರಿಸಬಲ್ಲ ಆಯಸ್ಸು"
@@ -1621,78 +1632,83 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+#, fuzzy
+msgid "Password Policy"
+msgstr "ಗುಪ್ತಪದ"
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr "ಗುಂಪು"
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 #, fuzzy
 msgid "Manage password policy for specific group"
 msgstr "ನಿಗದಿತ ಬಳಕೆದಾರನಿಗೆ ಟಿಕೆಟ್ ಪಾಲಿಸಿಯನ್ನು ನಿರ್ವಹಿಸು"
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr "ಗರಿಷ್ಟ ಜೀವಿತಾವಧಿ (ದಿನಗಳು)"
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr "ಗುಪ್ತಪದದ ಗರಿಷ್ಟ ಜೀವಿತಾವಧಿ (ದಿನಗಳಲ್ಲಿ)"
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr "ಕನಿಷ್ಟ ಜೀವಿತಾವಧಿ (ಘಂಟೆಗಳು)"
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr "ಗುಪ್ತಪದದ ಕನಿಷ್ಟ ಜೀವಿತಾವಧಿ (ಘಂಟೆಗಳಲ್ಲಿ)"
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr "ಇತಿಹಾಸದ ಗಾತ್ರ"
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr "ಗುಪ್ತಪದ ಇತಿಹಾಸದ ಗಾತ್ರ"
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr "ಕ್ಯಾರೆಕ್ಟರ್ ಕ್ಲಾಸ್‌ಗಳು"
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr "ಕನಿಷ್ಟ ಸಂಖ್ಯೆಯ ಕ್ಯಾರಕ್ಟರ್ ಕ್ಲಾಸ್‌ಗಳು"
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr "ಕನಿಷ್ಟ ಉದ್ದ"
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr "ಗುಪ್ತಪದದ ಕನಿಷ್ಟ ಉದ್ದ"
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr "ಆದ್ಯತೆ"
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 #, fuzzy
 msgid "Priority of the policy (higher number means lower priority"
 msgstr "ಪಾಲಿಸಿಯ ಆದ್ಯತೆ (ಗರಿಷ್ಟ ಸಂಖ್ಯೆ ಕನಿಷ್ಟ ಆದ್ಯತೆಗೆ ಸಮನಾಗಿರುತ್ತದೆ)"
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 #, fuzzy
 msgid "Maximum password life must be greater than minimum."
 msgstr "ಗುಪ್ತಪದದ ಗರಿಷ್ಟ ಜೀವಿತಾವಧಿ (ದಿನಗಳಲ್ಲಿ)"
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr "ಗ್ಲೋಬಲ್ ಪಾಲಿಸಿಯಲ್ಲಿ ಆದ್ಯತೆಯನ್ನು ಸೆಟ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ"
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr "ಬಳಕೆದಾರ"
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 #, fuzzy
 msgid "Display effective policy for a specific user"
 msgstr "ನಿಗದಿತ ಬಳಕೆದಾರನಿಗೆ ಟಿಕೆಟ್ ಪಾಲಿಸಿಯನ್ನು ನಿರ್ವಹಿಸು"
@@ -1735,28 +1751,28 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] "%(count)d ರೋಲ್‌ಗ್ರೂಪ್ ತಾಳೆಯಾಗುತ್ತಿದೆ"
 msgstr[1] "%(count)d ರೋಲ್‌ಗ್ರೂಪ್‌ಗಳು ತಾಳೆಯಾಗುತ್ತಿವೆ"
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr "Service principal"
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 #, fuzzy
 msgid "force principal name even if not in DNS"
 msgstr "ಈ ಹೋಸ್ಟ್‌ಗೆ Kerberos principalನ ಹೆಸರು"
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, fuzzy, python-format
 msgid "Modified service \"%(value)s\""
 msgstr "\"%(value)s\" ಬಳಕೆದಾರನನ್ನು ಬದಲಾಯಿಸಲಾಗಿದೆ"
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, fuzzy, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] "%(count)d ಬಳಕೆದಾರ ತಾಳೆಯಾಗುತ್ತಿದ್ದಾನೆ"
 msgstr[1] "%(count)d ಬಳಕೆದಾರರು ತಾಳೆಯಾಗುತ್ತಿದ್ದಾರೆ"
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 #, fuzzy
 msgid "Service principal has no kerberos key"
 msgstr "Service principal"
diff --git a/install/po/ko.po b/install/po/ko.po
index 7e3cf3213..94287ba0d 100644
--- a/install/po/ko.po
+++ b/install/po/ko.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-27 10:23-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -149,7 +149,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -264,6 +264,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -276,7 +281,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -522,23 +527,27 @@ msgid "%(count)d ACI matched"
 msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -548,39 +557,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -664,7 +673,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -677,9 +686,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -891,60 +898,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1073,8 +1080,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1102,7 +1109,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1122,12 +1129,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1215,9 +1222,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1266,11 +1271,11 @@ msgid "%(count)d host matched"
 msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1404,27 +1409,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1574,75 +1583,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1683,26 +1696,26 @@ msgid "%(count)d rolegroup matched"
 msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/pl.po b/install/po/pl.po
index ca6e4ffcc..329b2c4dd 100644
--- a/install/po/pl.po
+++ b/install/po/pl.po
@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
-"PO-Revision-Date: 2010-03-07 20:58+0100\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
+"PO-Revision-Date: 2010-10-01 14:54+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
 "Language: pl\n"
@@ -153,7 +153,7 @@ msgstr "Hasła się nie zgadzają"
 msgid "Command not implemented"
 msgstr "Polecenie nie jest zaimplementowane"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -234,11 +234,13 @@ msgstr "Nie można usunąć domyślnej grupy użytkowników"
 
 #: ipalib/errors.py:1071
 msgid "Host does not have corresponding DNS A record"
-msgstr ""
+msgstr "Komputer nie posiada pasującego wpisu DNS A"
 
 #: ipalib/errors.py:1086
 msgid "Deleting a managed group is not allowed. It must be detached first."
 msgstr ""
+"Usuwanie zarządzanej grupy nie jest dozwolone. Musi zostać najpierw "
+"odłączona."
 
 #: ipalib/errors.py:1109
 #, python-format
@@ -272,6 +274,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr "Nie można ukończyć działania na certyfikacie: %(error)s"
 
+#: ipalib/errors.py:1237
+#, fuzzy, python-format
+msgid "Certificate format error: %(error)s"
+msgstr "Nie można ukończyć działania na certyfikacie: %(error)s"
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -285,7 +292,7 @@ msgstr "odbiór wszystkich atrybutów"
 msgid "print entries as stored on the server"
 msgstr "wyświetlenie wpisów przechowywanych w serwerze"
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr "Przekazanie do serwera zamiast uruchamiania lokalnie"
 
@@ -408,14 +415,12 @@ msgstr ""
 "\"targetgroup\", \"attrs\" lub \"memberof\" jest wymagana"
 
 #: ipalib/plugins/aci.py:151
-#, fuzzy
 msgid "group, taskgroup and self are mutually exclusive"
-msgstr "wartości \"group\" i \"taskgroup\" są wzajemnie wyłączne"
+msgstr "wartości \"group\", \"taskgroup\" i \"self\" są wzajemnie wyłączne"
 
 #: ipalib/plugins/aci.py:153
-#, fuzzy
 msgid "One of group, taskgroup or self is required"
-msgstr "Wymagana jest wartość \"group\" lub \"taskgroup\""
+msgstr "Wymagana jest wartość \"group\", \"taskgroup\" lub \"self\""
 
 #: ipalib/plugins/aci.py:172
 #, python-format
@@ -456,12 +461,11 @@ msgid "Permissions"
 msgstr "Uprawnienia"
 
 #: ipalib/plugins/aci.py:307
-#, fuzzy
 msgid ""
 "comma-separated list of permissions to grant(read, write, add, delete, all)"
 msgstr ""
 "lista uprawnień oddzielonych przecinkami do udzielenia (odczyt, zapis, "
-"dodanie, usunięcie, zapisanie do siebie, wszystkie)"
+"dodanie, usunięcie, wszystkie)"
 
 #: ipalib/plugins/aci.py:313
 msgid "Attributes"
@@ -513,11 +517,11 @@ msgstr "Grupa, do której zastosować ACI"
 
 #: ipalib/plugins/aci.py:344
 msgid "Target your own entry (self)"
-msgstr ""
+msgstr "Cel własnego wpisu (\"self\")"
 
 #: ipalib/plugins/aci.py:345
 msgid "Apply ACI to your own entry (self)"
-msgstr ""
+msgstr "Zastosowanie ACI do własnego wpisu (\"self\")"
 
 #: ipalib/plugins/aci.py:357
 #, python-format
@@ -542,23 +546,28 @@ msgstr[0] "Pasuje %(count)d ACI"
 msgstr[1] "Pasują %(count)d ACI"
 msgstr[2] "Pasuje %(count)d ACI"
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+#, fuzzy
+msgid "Automount"
+msgstr "Automatyczne montowanie map"
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr "Położenie"
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr "Automatyczne montowanie nazwy położenia"
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr "Mapa"
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr "Automatyczne montowanie nazwy mapy"
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -568,39 +577,39 @@ msgstr "Automatyczne montowanie nazwy mapy"
 msgid "Description"
 msgstr "Opis"
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr "Automatyczne montowanie map"
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr "Klucz"
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr "Automatyczne montowanie nazw kluczy"
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr "Informacje o montowaniu"
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr "opis"
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr "Automatyczne montowanie kluczy"
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr "Punkt montowania"
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr "Mapa nadrzędna"
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 "Nazwa nadrzędnej mapy automatycznego montowania (domyślnie: auto.master)"
@@ -658,26 +667,23 @@ msgstr "Liczba usuniętych elementów"
 
 #: ipalib/plugins/baseldap.py:880
 msgid "Time Limit"
-msgstr ""
+msgstr "Ograniczenie czasu"
 
 #: ipalib/plugins/baseldap.py:881
 msgid "Time limit of search in seconds"
-msgstr ""
+msgstr "Ograniczenie czasu wyszukiwania w sekundach"
 
 #: ipalib/plugins/baseldap.py:887
-#, fuzzy
 msgid "Size Limit"
-msgstr "Ograniczenie rozmiaru wyszukiwania"
+msgstr "Ograniczenie rozmiaru"
 
 #: ipalib/plugins/baseldap.py:888
-#, fuzzy
 msgid "Maximum number of entries returned"
-msgstr "Liczba zwróconych zmiennych (<= razem)"
+msgstr "Maksymalna liczba zwróconych wpisów"
 
 #: ipalib/plugins/cert.py:93
-#, fuzzy
 msgid "Failure decoding Certificate Signing Request:"
-msgstr "Dekodowanie żądania podpisywania certyfikatu nie powiodło się"
+msgstr "Dekodowanie żądania podpisywania certyfikatu nie powiodło się:"
 
 #: ipalib/plugins/cert.py:106 ipalib/plugins/cert.py:118
 msgid "Failure decoding Certificate Signing Request"
@@ -688,7 +694,7 @@ msgstr "Dekodowanie żądania podpisywania certyfikatu nie powiodło się"
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr "Dekodowanie żądania podpisywania certyfikatu nie powiodło się: %s"
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr "Naczelnik"
 
@@ -701,9 +707,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr "automatycznie dodaj naczelnika, jeśli nie istnieje"
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr "Certyfikat"
 
@@ -713,23 +717,23 @@ msgstr "Temat"
 
 #: ipalib/plugins/cert.py:195 ipalib/plugins/cert.py:398
 msgid "Issuer"
-msgstr ""
+msgstr "Wydawca"
 
 #: ipalib/plugins/cert.py:199 ipalib/plugins/cert.py:401
 msgid "Not Before"
-msgstr ""
+msgstr "Nie wcześniej"
 
 #: ipalib/plugins/cert.py:203 ipalib/plugins/cert.py:404
 msgid "Not After"
-msgstr ""
+msgstr "Nie po"
 
 #: ipalib/plugins/cert.py:207 ipalib/plugins/cert.py:407
 msgid "Fingerprint (MD5)"
-msgstr ""
+msgstr "Odcisk (MD5)"
 
 #: ipalib/plugins/cert.py:211 ipalib/plugins/cert.py:410
 msgid "Fingerprint (SHA1)"
-msgstr ""
+msgstr "Odcisk (SHA1)"
 
 #: ipalib/plugins/cert.py:215 ipalib/plugins/cert.py:379
 msgid "Serial number"
@@ -777,9 +781,8 @@ msgid "Error"
 msgstr "Błąd"
 
 #: ipalib/plugins/config.py:73
-#, fuzzy
 msgid "Configuration"
-msgstr "Informacje o montowaniu"
+msgstr "Konfiguracja"
 
 #: ipalib/plugins/config.py:78
 msgid "Max username length"
@@ -855,18 +858,16 @@ msgid "Migration mode"
 msgstr "Tryb migracji"
 
 #: ipalib/plugins/config.py:126
-#, fuzzy
 msgid "Enable migration mode"
-msgstr "Włączono tryb migracji"
+msgstr "Włączenie trybu migracji"
 
 #: ipalib/plugins/config.py:130
 msgid "Certificate Subject base"
 msgstr "Podstawa tematu certyfikatu"
 
 #: ipalib/plugins/config.py:131
-#, fuzzy
 msgid "Base for certificate subjects (OU=Test,O=Example)"
-msgstr "podstawa dla tematów certyfikatów (OU=Test,O=Przykład)"
+msgstr "Podstawa dla tematów certyfikatów (OU=Test,O=Przykład)"
 
 #: ipalib/plugins/dns.py:131
 msgid "DNS"
@@ -924,64 +925,63 @@ msgstr "zezwolić na dynamiczne aktualizacje?"
 msgid "BIND update policy"
 msgstr "Polityka aktualizacji BIND"
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr "Nazwa strefy"
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr "nazwa zasobu"
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr "Typ wpisu"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr "Dane"
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr "Dane specyficzne dla typu"
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr "Czas życia"
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr "Klasa"
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr "Nazwa zasobu"
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr "Kryterium wyszukiwania"
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr "dane specyficzne dla typu"
 
-#: ipalib/plugins/dns.py:850
-#, fuzzy, python-format
+#: ipalib/plugins/dns.py:865
+#, python-format
 msgid "Found '%(value)s'"
-msgstr "Dodano grupę \"%(value)s\""
+msgstr "Odnaleziono \"%(value)s\""
 
-#: ipalib/plugins/dns.py:854
-#, fuzzy
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr "Nazwa komputera"
 
-#: ipalib/plugins/dns.py:867
-#, fuzzy, python-format
+#: ipalib/plugins/dns.py:882
+#, python-format
 msgid "Host '%(host)s' not found"
-msgstr "%(pkey)s: nie odnaleziono %(oname)s"
+msgstr "Nie odnaleziono komputera \"%(host)s\""
 
 #: ipalib/plugins/group.py:94
 msgid "User Groups"
@@ -1047,21 +1047,21 @@ msgstr[1] "Pasują %(count)d grupy"
 msgstr[2] "Pasuje %(count)d grup"
 
 #: ipalib/plugins/group.py:257
-#, fuzzy, python-format
+#, python-format
 msgid "Detached group \"%(value)s\" from user \"%(value)s\""
-msgstr "Usunięto grupę roli \"%(value)s\""
+msgstr "Odłączono grupę \"%(value)s\" od użytkownika \"%(value)s\""
 
 #: ipalib/plugins/group.py:273
 msgid "not allowed to modify user entries"
-msgstr ""
+msgstr "modyfikowanie wpisów użytkowników nie jest dozwolone"
 
 #: ipalib/plugins/group.py:277
 msgid "not allowed to modify group entries"
-msgstr ""
+msgstr "modyfikowanie wpisów grup nie jest dozwolone"
 
 #: ipalib/plugins/group.py:284 ipalib/plugins/group.py:295
 msgid "Not a managed group"
-msgstr ""
+msgstr "Nie jest zarządzaną grupą"
 
 #: ipalib/plugins/hbac.py:106
 msgid "HBAC"
@@ -1076,9 +1076,8 @@ msgid "Rule type (allow or deny)"
 msgstr "Typ reguły (zezwalanie lub zabranianie)"
 
 #: ipalib/plugins/hbac.py:117
-#, fuzzy
 msgid "Rule type"
-msgstr "Typ wpisu"
+msgstr "Typ reguły"
 
 #: ipalib/plugins/hbac.py:123
 msgid "User category"
@@ -1105,23 +1104,21 @@ msgid "Source host category the rule applies to"
 msgstr "Kategoria komputerów źródłowych, do których zastosowywana jest reguła"
 
 #: ipalib/plugins/hbac.py:141
-#, fuzzy
 msgid "Service category"
-msgstr "Kategoria użytkowników"
+msgstr "Kategoria usług"
 
 #: ipalib/plugins/hbac.py:142
-#, fuzzy
 msgid "Service category the rule applies to"
-msgstr "Kategoria użytkowników, do których zastosowywana jest reguła"
+msgstr "Kategoria usług, do których zastosowywana jest reguła"
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr "Czas dostępu"
 
 #: ipalib/plugins/hbac.py:154
 msgid "Enabled"
-msgstr ""
+msgstr "Włączone"
 
 #: ipalib/plugins/hbac.py:158 ipalib/plugins/sudorule.py:61
 #: ipalib/plugins/user.py:76
@@ -1139,23 +1136,22 @@ msgid "Host Groups"
 msgstr "Grupy komputerów"
 
 #: ipalib/plugins/hbac.py:170
-#, fuzzy
 msgid "Source hosts"
-msgstr "Kategoria komputerów źródłowych"
+msgstr "Komputery źródłowe"
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr "Usługi"
 
 #: ipalib/plugins/hbac.py:178
-#, fuzzy
 msgid "Service Groups"
-msgstr "Usługi"
+msgstr "Grupy usług"
 
 #: ipalib/plugins/hbacsvc.py:65
+#, fuzzy
 msgid "Service name"
-msgstr "Nazwa usługi"
+msgstr "nazwa zasobu"
 
 #: ipalib/plugins/hbacsvc.py:66
 #, fuzzy
@@ -1167,12 +1163,12 @@ msgstr "Usługi"
 msgid "Description of service"
 msgstr "Opis"
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr "Dodano usługę \"%(value)s\""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "Usunięto usługę \"%(value)s\""
@@ -1180,12 +1176,12 @@ msgstr "Usunięto usługę \"%(value)s\""
 #: ipalib/plugins/hbacsvcgroup.py:66
 #, fuzzy
 msgid "HBAC Service Groups"
-msgstr "Usługi"
+msgstr "Grupy usług"
 
 #: ipalib/plugins/hbacsvcgroup.py:71
 #, fuzzy
 msgid "Service group name"
-msgstr "Nazwa usługi"
+msgstr "Grupy usług"
 
 #: ipalib/plugins/hbacsvcgroup.py:78
 #, fuzzy
@@ -1219,7 +1215,7 @@ msgstr "Zmodyfikowano grupę roli \"%(value)s\""
 
 #: ipalib/plugins/host.py:86
 msgid "Fully-qualified hostname required"
-msgstr ""
+msgstr "Wymagana jest w pełni kwalifikowana nazwa komputera"
 
 #: ipalib/plugins/host.py:118
 msgid "Host name"
@@ -1265,9 +1261,7 @@ msgstr "Hasło użytkownika"
 msgid "Password used in bulk enrollment"
 msgstr "Hasło używane w zapisywaniu większej części"
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr "Certyfikat serwera zakodowany za pomocą Base-64"
 
@@ -1293,9 +1287,8 @@ msgid "Added host \"%(value)s\""
 msgstr "Dodano komputer \"%(value)s\""
 
 #: ipalib/plugins/host.py:202
-#, fuzzy
 msgid "force host name even if not in DNS"
-msgstr "wymuszenie nazwy naczelnika nawet, jeśli nie w DNS"
+msgstr "wymuszenie nazwy komputera nawet, jeśli nie w DNS"
 
 #: ipalib/plugins/host.py:235
 #, python-format
@@ -1319,18 +1312,18 @@ msgstr[0] "Pasuje %(count)d komputer"
 msgstr[1] "Pasuje %(count)d komputery"
 msgstr[2] "Pasuje %(count)d komputerów"
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
-msgstr ""
+msgstr "Tabela kluczy"
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
-#, fuzzy, python-format
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
+#, python-format
 msgid "Removed kerberos key from \"%(value)s\""
-msgstr "Usunięto grupę roli \"%(value)s\""
+msgstr "Usunięto klucz Kerberosa z \"%(value)s\""
 
 #: ipalib/plugins/host.py:368
 msgid "Host principal has no kerberos key"
-msgstr ""
+msgstr "Naczelnik komputera nie posiada klucza Kerberosa"
 
 #: ipalib/plugins/hostgroup.py:74
 msgid "Host-group"
@@ -1377,27 +1370,27 @@ msgstr[2] "Pasuje %(count)d grup komputerów"
 
 #: ipalib/plugins/internal.py:39
 msgid "Logged In As"
-msgstr ""
+msgstr "Zalogowano jako"
 
 #: ipalib/plugins/internal.py:41
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #: ipalib/plugins/internal.py:42
 msgid "Find"
-msgstr ""
+msgstr "Znajdź"
 
 #: ipalib/plugins/internal.py:43
 msgid "Reset"
-msgstr ""
+msgstr "Przywróć"
 
 #: ipalib/plugins/internal.py:44
 msgid "Update"
-msgstr ""
+msgstr "Zaktualizuj"
 
 #: ipalib/plugins/internal.py:45
 msgid "Enroll"
-msgstr ""
+msgstr "Zapisz się"
 
 #: ipalib/plugins/internal.py:46
 msgid "Delete"
@@ -1405,7 +1398,7 @@ msgstr ""
 
 #: ipalib/plugins/internal.py:49
 msgid "Quick Links"
-msgstr ""
+msgstr "Szybkie odnośniki"
 
 #: ipalib/plugins/internal.py:50
 msgid "Select All"
@@ -1421,71 +1414,72 @@ msgstr ""
 
 #: ipalib/plugins/internal.py:55
 msgid "Identity Details"
-msgstr ""
+msgstr "Informacje o tożsamości"
 
 #: ipalib/plugins/internal.py:56
 msgid "Account Details"
-msgstr ""
+msgstr "Informacje o koncie"
 
 #: ipalib/plugins/internal.py:57
 msgid "Contact Details"
-msgstr ""
+msgstr "Informacje o kontakcie"
 
 #: ipalib/plugins/internal.py:58
-#, fuzzy
 msgid "Mailing Address"
-msgstr "Adres e-mail"
+msgstr "Adres pocztowy"
 
 #: ipalib/plugins/internal.py:59
 msgid "      Employee Information"
-msgstr ""
+msgstr "Informacje o pracowniku"
 
 #: ipalib/plugins/internal.py:60
-#, fuzzy
 msgid "Misc. Information"
-msgstr "Informacje o montowaniu"
+msgstr "Różne informacje"
 
 #: ipalib/plugins/internal.py:61
 msgid "Back to Top"
-msgstr ""
+msgstr "Wróć na górę"
 
 #: ipalib/plugins/internal.py:66
 msgid "Name of object to export"
-msgstr ""
+msgstr "Nazwa obiektu do wyeksportowania"
 
 #: ipalib/plugins/internal.py:71
 msgid "Dict of JSON encoded IPA Objects"
-msgstr ""
+msgstr "Słownik obiektów IPA zakodowanych w formacie JSON"
 
 #: ipalib/plugins/internal.py:72
 msgid "Dict of I18N messages"
-msgstr ""
+msgstr "Słownik komunikatów umiędzynaradawiania"
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+#, fuzzy
+msgid "Kerberos Ticket Policy"
+msgstr "Naczelnik Kerberosa"
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
-msgstr "Zarządzaj polityką zgłoszeń dla podanego użytkownika"
+msgstr "Zarządzanie polityką zgłoszeń dla podanego użytkownika"
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr "Maksymalny czas życia"
 
-#: ipalib/plugins/krbtpolicy.py:69
-#, fuzzy
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
-msgstr "Minimalny czas życia zgłoszenia"
+msgstr "Minimalny czas życia zgłoszenia (sekundy)"
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr "Maksymalne odnowienie"
 
-#: ipalib/plugins/krbtpolicy.py:74
-#, fuzzy
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
-msgstr "Maksymalny czas, w którym możliwe jest odnowienie"
+msgstr "Maksymalny czas, w którym możliwe jest odnowienie (sekundy)"
 
 #: ipalib/plugins/migration.py:44
 #, python-format
@@ -1620,7 +1614,6 @@ msgid "Number of plugins loaded"
 msgstr "Liczba wczytanych wtyczek"
 
 #: ipalib/plugins/netgroup.py:57
-#, fuzzy
 msgid "Member Host"
 msgstr "Komputer elementu"
 
@@ -1652,82 +1645,85 @@ msgstr "Unikalny identyfikator IPA"
 #, python-format
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
+"priorytet musi być unikalną wartością (%(prio)d jest już używane przez "
+"%(gname)s)"
+
+#: ipalib/plugins/pwpolicy.py:170
+#, fuzzy
+msgid "Password Policy"
+msgstr "Hasło"
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr "Grupa"
 
-#: ipalib/plugins/pwpolicy.py:174
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
-msgstr "Zarządzaj polityką zgłoszeń dla podanego użytkownika"
+msgstr "Zarządzanie polityką haseł dla podanej grupy"
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr "Maksymalny czas życia (w dniach)"
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr "Maksymalny czas życia hasła (w dniach)"
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr "Minimalny czas życia (w godzinach)"
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr "Minimalny czas życia hasła (w godzinach)"
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr "Rozmiar historii"
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr "Rozmiar historii haseł"
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr "Klasy znaków"
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr "Minimalna liczba klas znaków"
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr "Minimalna długość"
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr "Minimalna długość hasła"
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr "Priorytet"
 
-#: ipalib/plugins/pwpolicy.py:211
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
-msgstr "Priorytet polityki (wyższy numer równa się niższemu priorytetowi)"
+msgstr "Priorytet polityki (wyższy numer równa się niższemu priorytetowi"
 
-#: ipalib/plugins/pwpolicy.py:263
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
-msgstr "Maksymalny czas życia hasła (w dniach)"
+msgstr "Maksymalny czas życia hasła musi być wyższy niż minimalny."
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr "nie można ustawiać priorytetu dla globalnej polityki"
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr "Użytkownik"
 
-#: ipalib/plugins/pwpolicy.py:368
-#, fuzzy
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
-msgstr "Zarządzaj polityką zgłoszeń dla podanego użytkownika"
+msgstr "Wyświetlanie aktywnej polityki dla podanego użytkownika"
 
 #: ipalib/plugins/rolegroup.py:79
 msgid "Role Groups"
@@ -1768,31 +1764,30 @@ msgstr[0] "Pasuje %(count)d grupa roli"
 msgstr[1] "Pasują %(count)d grupy roli"
 msgstr[2] "Pasuje %(count)d grup roli"
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr "Naczelnik usługi"
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr "wymuszenie nazwy naczelnika nawet, jeśli nie w DNS"
 
-#: ipalib/plugins/service.py:261
-#, fuzzy, python-format
+#: ipalib/plugins/service.py:292
+#, python-format
 msgid "Modified service \"%(value)s\""
-msgstr "Zmodyfikowano użytkownika \"%(value)s\""
+msgstr "Zmodyfikowano usługę \"%(value)s\""
 
-#: ipalib/plugins/service.py:298
-#, fuzzy, python-format
+#: ipalib/plugins/service.py:323
+#, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
-msgstr[0] "Pasuje %(count)d użytkownik"
-msgstr[1] "Pasuje %(count)d użytkowników"
-msgstr[2] "Pasuje %(count)d użytkowników"
+msgstr[0] "Pasuje %(count)d usługa"
+msgstr[1] "Pasuje %(count)d usługi"
+msgstr[2] "Pasuje %(count)d usług"
 
-#: ipalib/plugins/service.py:396
-#, fuzzy
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
-msgstr "Naczelnik usługi"
+msgstr "Naczelnik usługi nie posiada klucza Kerberosa"
 
 #: ipalib/plugins/sudocmd.py:60
 msgid "SudoCmds"
@@ -1966,6 +1961,8 @@ msgstr "UID"
 #: ipalib/plugins/user.py:133
 msgid "User ID Number (system will assign one if not provided)"
 msgstr ""
+"Numer identyfikacyjny użytkownika (system go przydzieli, jeśli nie zostanie "
+"podany)"
 
 #: ipalib/plugins/user.py:139
 msgid "Street address"
@@ -2022,11 +2019,11 @@ msgstr "Zmodyfikowano użytkownika \"%(value)s\""
 
 #: ipalib/plugins/user.py:252
 msgid "Self"
-msgstr ""
+msgstr "Własny"
 
 #: ipalib/plugins/user.py:253
 msgid "Display user record for current Kerberos principal"
-msgstr ""
+msgstr "Wyświetlenie wpisu użytkownika dla bieżącego naczelnika Kerberosa"
 
 #: ipalib/plugins/user.py:263
 #, python-format
@@ -2244,9 +2241,8 @@ msgid "Contact this specific KDC Server"
 msgstr ""
 
 #: ipa-client/ipa-getkeytab.c:782
-#, fuzzy
 msgid "Server Name"
-msgstr "Nazwa usługi"
+msgstr ""
 
 #: ipa-client/ipa-getkeytab.c:784 ipa-client/ipa-rmkeytab.c:188
 msgid "The principal to get a keytab for (ex: ftp/ftp.example.com@EXAMPLE.COM)"
@@ -2423,9 +2419,9 @@ msgid "Unable to determine root DN of %s\n"
 msgstr ""
 
 #: ipa-client/ipa-join.c:377
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to determine certificate subject of %s\n"
-msgstr "Nie można dekodować certyfikatu we wpisie"
+msgstr ""
 
 #: ipa-client/ipa-join.c:385
 #, c-format
@@ -2604,9 +2600,8 @@ msgid "IPA Server to use"
 msgstr ""
 
 #: ipa-client/ipa-join.c:971
-#, fuzzy
 msgid "IPA Server Name"
-msgstr "Nazwa usługi"
+msgstr ""
 
 #: ipa-client/ipa-rmkeytab.c:44
 #, c-format
@@ -2639,9 +2634,9 @@ msgid "krb5_kt_get_entry %d: %s\n"
 msgstr ""
 
 #: ipa-client/ipa-rmkeytab.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to remove entry\n"
-msgstr "Nie można dekodować certyfikatu we wpisie"
+msgstr ""
 
 #: ipa-client/ipa-rmkeytab.c:85
 #, c-format
@@ -2698,30 +2693,3 @@ msgstr ""
 
 #~ msgid "Locked user \"%(value)s\""
 #~ msgstr "Zablokowany użytkownik \"%(value)s\""
-
-#~ msgid "Name of service the rule applies to (e.g. ssh)"
-#~ msgstr "Nazwa usługi, do której zastosowywana jest reguła (np. ssh)"
-
-#~ msgid "UID (use this option to set it manually)"
-#~ msgstr "UID (ta opcja umożliwia jego ręczne ustawienie)"
-
-#~ msgid "Added policy for group \"%(value)s\""
-#~ msgstr "Dodano politykę dla grupy \"%(value)s\""
-
-#~ msgid "Group to set policy for"
-#~ msgstr "Grupa, dla której ustawić politykę"
-
-#~ msgid "Modified policy for group \"%(value)s\""
-#~ msgstr "Zmodyfikowano politykę dla grupy \"%(value)s\""
-
-#~ msgid "Deleted policy for group \"%(value)s\""
-#~ msgstr "Usunięto politykę dla grupy \"%(value)s\""
-
-#~ msgid "Group to remove policy from"
-#~ msgstr "Grupa, z której usunąć politykę"
-
-#~ msgid "Group to display policy"
-#~ msgstr "Grupa, dla której wyświetlić politykę"
-
-#~ msgid "Display policy applied to a given user"
-#~ msgstr "Wyświetl politykę zastosowaną dla podanego użytkownika"
diff --git a/install/po/pt.po b/install/po/pt.po
index d7c1b68fc..632c176b3 100644
--- a/install/po/pt.po
+++ b/install/po/pt.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-03-16 17:21-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,60 +900,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1076,8 +1083,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1105,7 +1112,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1125,12 +1132,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1218,9 +1225,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1270,11 +1275,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1409,27 +1414,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1580,75 +1589,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1690,27 +1703,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/pt_BR.po b/install/po/pt_BR.po
index 190501011..43996b315 100644
--- a/install/po/pt_BR.po
+++ b/install/po/pt_BR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-03-16 17:21-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -150,7 +150,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -265,6 +265,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -277,7 +282,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -524,23 +529,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -550,39 +559,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -666,7 +675,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -679,9 +688,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -893,60 +900,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1076,8 +1083,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1105,7 +1112,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1125,12 +1132,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1218,9 +1225,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1270,11 +1275,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1409,27 +1414,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1580,75 +1589,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1690,27 +1703,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/ru.po b/install/po/ru.po
index 4499b58d4..399528bad 100644
--- a/install/po/ru.po
+++ b/install/po/ru.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-02-12 16:31+0000\n"
 "Last-Translator: Andrew Martynov <andrewm@inventa.ru>\n"
 "Language-Team: Russian <trans-ru@fedoraproject.org>\n"
@@ -152,7 +152,7 @@ msgstr "Пароли не совпадают"
 msgid "Command not implemented"
 msgstr "Команда пока не реализована"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -273,6 +273,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr "Операция с сертификатом не может быть завершена: %(error)s"
 
+#: ipalib/errors.py:1237
+#, fuzzy, python-format
+msgid "Certificate format error: %(error)s"
+msgstr "Операция с сертификатом не может быть завершена: %(error)s"
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr "Результаты усечены. Попробуйте задать более точные условия поиска"
@@ -285,7 +290,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -538,23 +543,27 @@ msgstr[0] "совпадает %(count)d ACI"
 msgstr[1] "совпадают %(count)d ACI"
 msgstr[2] "совпадают %(count)d ACI"
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -564,39 +573,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -681,7 +690,7 @@ msgstr "Сбой при декодировании Certificate Signing Request"
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr "Сбой при декодировании Certificate Signing Request: %s"
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -694,9 +703,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -910,61 +917,61 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 #, fuzzy
 msgid "Record type"
 msgstr "неверный тип"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, fuzzy, python-format
 msgid "Found '%(value)s'"
 msgstr "Добавлена группа \"%(value)s\""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1098,8 +1105,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1127,7 +1134,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1147,12 +1154,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, fuzzy, python-format
 msgid "Added service \"%(value)s\""
 msgstr "Добавлен пользователь \"%(value)s\""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, fuzzy, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "Удален пользователь \"%(value)s\""
@@ -1240,9 +1247,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1293,11 +1298,11 @@ msgstr[0] "совпадает %(count)d узел"
 msgstr[1] "совпадает %(count)d узла"
 msgstr[2] "совпадает %(count)d узлов"
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, fuzzy, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr "Удалена rolegroup \"%(value)s\""
@@ -1433,27 +1438,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1606,75 +1615,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr "приоритет не может быть задан для глобальной политики"
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1717,20 +1730,20 @@ msgstr[0] "совпадает %(count)d rolegroup"
 msgstr[1] "совпадают %(count)d rolegroup"
 msgstr[2] "совпадают %(count)d rolegroup"
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, fuzzy, python-format
 msgid "Modified service \"%(value)s\""
 msgstr "Изменен пользователь \"%(value)s\""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, fuzzy, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
@@ -1738,7 +1751,7 @@ msgstr[0] "совпадает %(count)d пользователь"
 msgstr[1] "совпадают %(count)d пользователя"
 msgstr[2] "совпадают %(count)d пользователей"
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/uk.po b/install/po/uk.po
index c7ecf5946..dd4b9ad92 100644
--- a/install/po/uk.po
+++ b/install/po/uk.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-09-28 18:04+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -152,7 +152,7 @@ msgstr "Паролі не збігаються"
 msgid "Command not implemented"
 msgstr "Команду не реалізовано"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -274,6 +274,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr "Не вдалося завершити дію з сертифікатом: %(error)s"
 
+#: ipalib/errors.py:1237
+#, fuzzy, python-format
+msgid "Certificate format error: %(error)s"
+msgstr "Не вдалося завершити дію з сертифікатом: %(error)s"
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -287,7 +292,7 @@ msgstr "отримати всі атрибути"
 msgid "print entries as stored on the server"
 msgstr "вивести записи у формі, у якій вони зберігаються на сервері"
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr "Переспрямувати на сервер замість локального виконання"
 
@@ -539,23 +544,28 @@ msgstr[0] "встановлено відповідність %(count)d ACI"
 msgstr[1] "встановлено відповідність %(count)d ACI"
 msgstr[2] "встановлено відповідність %(count)d ACI"
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+#, fuzzy
+msgid "Automount"
+msgstr "Карти автоматичного монтування"
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr "Розташування"
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr "Адреса автомонтування"
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr "Карта"
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr "Назва карти автоматичного монтування"
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -565,39 +575,39 @@ msgstr "Назва карти автоматичного монтування"
 msgid "Description"
 msgstr "Опис"
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr "Карти автоматичного монтування"
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr "Ключ"
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr "Назва ключа автоматичного монтування"
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr "Інформація щодо монтування"
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr "опис"
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr "Ключі автомонтування"
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr "Точка монтування"
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr "Батьківська карта"
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr "Назва батьківської карти автомонтування (типове значення: auto.master)"
 
@@ -682,7 +692,7 @@ msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 "Помилка під час декодування запиту на підписування сертифіката (CSR): %s"
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr "Реєстраційний запис"
 
@@ -697,9 +707,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr "автоматично додати реєстраційний запис, якщо його не існує"
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr "Сертифікат"
 
@@ -916,60 +924,60 @@ msgstr "дозволити динамічне оновлення?"
 msgid "BIND update policy"
 msgstr "Правила оновлення BIND"
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr "Назва зони"
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr "назва ресурсу"
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr "Тип запису"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr "Дані"
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr "Специфічні для типу дані"
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr "Строк дії"
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr "Клас"
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr "Назва ресурсу"
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr "Критерій пошуку"
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr "специфічні для типу дані"
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr "Знайдено «%(value)s»"
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr "Назва вузла"
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr "Вузла «%(host)s» не знайдено"
@@ -1102,8 +1110,8 @@ msgstr "Категорія служб"
 msgid "Service category the rule applies to"
 msgstr "Категорія служб, до якої застосовується правило"
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr "Час доступу"
 
@@ -1131,7 +1139,7 @@ msgid "Source hosts"
 msgstr "Вузли вихідних даних"
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr "Служби"
 
@@ -1153,12 +1161,12 @@ msgstr "Служби"
 msgid "Description of service"
 msgstr "Опис"
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr "Додано службу «%(value)s»"
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr "Вилучено службу «%(value)s»"
@@ -1251,9 +1259,7 @@ msgstr "Пароль користувача"
 msgid "Password used in bulk enrollment"
 msgstr "Пароль для загального керування реєстраційними записами"
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr "Сертифікат сервера у кодуванні Base-64"
 
@@ -1304,11 +1310,11 @@ msgstr[0] "встановлено відповідність %(count)d вузл�
 msgstr[1] "встановлено відповідність %(count)d вузлів"
 msgstr[2] "встановлено відповідність %(count)d вузлів"
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr "Таблиця ключів"
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr "Вилучено ключ kerberos з «%(value)s»"
@@ -1444,27 +1450,32 @@ msgstr "Словник закодованих JSON об’єктів IPA"
 msgid "Dict of I18N messages"
 msgstr "Словник перекладених повідомлень"
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+#, fuzzy
+msgid "Kerberos Ticket Policy"
+msgstr "Реєстраційний запис Kerberos"
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr "Керування правилами обробки квитків певного користувача"
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr "Макс. строк дії"
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr "Максимальний строк дії квитка (у секундах)"
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr "Макс. вік поновлення"
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr "Максимальний вік, протягом якого можливе поновлення (у секундах)"
 
@@ -1634,76 +1645,81 @@ msgstr ""
 "пріоритет повинен мати унікальне значення (%(prio)d вже використано для "
 "%(gname)s)"
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+#, fuzzy
+msgid "Password Policy"
+msgstr "Пароль"
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr "Група"
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr "Керування правилами обробки паролів для певної групи"
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr "Макс. строк дії (у днях)"
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr "Максимальний строк дії пароля (у днях)"
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr "Мін. строк дії (у годинах)"
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr "Мінімальний строк дії пароля (у годинах)"
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr "Розмір журналу"
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr "Розмір журналу паролів"
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr "Класи символів"
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr "Мінімальна кількість класів символів"
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr "Мін. довжина"
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr "Мінімальна довжина пароля"
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr "Пріоритет"
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr "Пріоритет правил (більше число — нижчий пріоритет)"
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 "Максимальний строк дії пароля має перевищувати мінімальний строк його дії."
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr "для загальних правил не може встановлювати пріоритети"
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr "Користувач"
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr "Показати поточні правила для певного користувача"
 
@@ -1746,21 +1762,21 @@ msgstr[0] "встановлено відповідність %(count)d груп�
 msgstr[1] "встановлено відповідність %(count)d груп ролей"
 msgstr[2] "встановлено відповідність %(count)d груп ролей"
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr "Реєстраційний запис служби"
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 "примусове значення назви реєстраційного запису, навіть якщо назви немає у DNS"
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr "Змінено службу «%(value)s»"
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
@@ -1768,7 +1784,7 @@ msgstr[0] "встановлено відповідність %(count)d служ�
 msgstr[1] "встановлено відповідність %(count)d служб"
 msgstr[2] "встановлено відповідність %(count)d служб"
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr "Реєстраційний запис служби не має ключа kerberos"
 
diff --git a/install/po/zh_CN.po b/install/po/zh_CN.po
index 1629e484c..06ce6a22c 100644
--- a/install/po/zh_CN.po
+++ b/install/po/zh_CN.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-03-18 22:43+0800\n"
 "Last-Translator: Jake Li <gnozil@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh_CN>\n"
@@ -152,7 +152,7 @@ msgstr "密码不匹配"
 msgid "Command not implemented"
 msgstr "命令没有实现"
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr "%(reason)s"
@@ -267,6 +267,11 @@ msgstr "%(info)s"
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr "结果被截断，请尝试更明确的搜索"
@@ -279,7 +284,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -526,23 +531,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr "位置"
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -552,39 +561,39 @@ msgstr ""
 msgid "Description"
 msgstr "描述"
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr "描述"
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr "挂载点"
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -669,7 +678,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -682,9 +691,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr "证书"
 
@@ -897,61 +904,61 @@ msgstr "允许动态更新？"
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr "资源名称"
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr "记录类型"
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr "数据"
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr "资源名称"
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr "搜索条件"
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, fuzzy, python-format
 msgid "Found '%(value)s'"
 msgstr "已添加组\"%(value)s\""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 #, fuzzy
 msgid "Hostname"
 msgstr "主机名"
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1084,8 +1091,8 @@ msgstr "用户类别"
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr "访问时间"
 
@@ -1114,7 +1121,7 @@ msgid "Source hosts"
 msgstr "源主机类别"
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr "服务"
 
@@ -1137,12 +1144,12 @@ msgstr "服务"
 msgid "Description of service"
 msgstr "描述"
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1235,9 +1242,7 @@ msgstr "用户密码"
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr "Base-64 编码格式的服务器证书"
 
@@ -1287,11 +1292,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, fuzzy, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr "已锁定用户\"%(value)s\""
@@ -1427,27 +1432,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr "用户名"
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1601,75 +1610,80 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+#, fuzzy
+msgid "Password Policy"
+msgstr "密码"
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr "组"
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr "最小长度"
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr "优先级"
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr "用户"
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1711,27 +1725,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, fuzzy, python-format
 msgid "Modified service \"%(value)s\""
 msgstr "已修改用户\"%(value)s\""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, fuzzy, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] "%(count)d 个组匹配"
 msgstr[1] "%(count)d 个组匹配"
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
 
diff --git a/install/po/zh_TW.po b/install/po/zh_TW.po
index e1edc4a41..ae36c9fd7 100644
--- a/install/po/zh_TW.po
+++ b/install/po/zh_TW.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: ipa\n"
 "Report-Msgid-Bugs-To: https://hosted.fedoraproject.org/projects/freeipa/"
 "newticket\n"
-"POT-Creation-Date: 2010-10-12 11:51-0400\n"
+"POT-Creation-Date: 2010-10-13 14:22-0400\n"
 "PO-Revision-Date: 2010-03-16 17:21-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -151,7 +151,7 @@ msgstr ""
 msgid "Command not implemented"
 msgstr ""
 
-#: ipalib/errors.py:783 ipalib/errors.py:1023
+#: ipalib/errors.py:783 ipalib/errors.py:1023 ipalib/errors.py:1254
 #, python-format
 msgid "%(reason)s"
 msgstr ""
@@ -266,6 +266,11 @@ msgstr ""
 msgid "Certificate operation cannot be completed: %(error)s"
 msgstr ""
 
+#: ipalib/errors.py:1237
+#, python-format
+msgid "Certificate format error: %(error)s"
+msgstr ""
+
 #: ipalib/frontend.py:380
 msgid "Results are truncated, try a more specific search"
 msgstr ""
@@ -278,7 +283,7 @@ msgstr ""
 msgid "print entries as stored on the server"
 msgstr ""
 
-#: ipalib/frontend.py:914
+#: ipalib/frontend.py:940
 msgid "Forward to server instead of running locally"
 msgstr ""
 
@@ -525,23 +530,27 @@ msgid_plural "%(count)d ACIs matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/automount.py:107 ipalib/plugins/host.py:134
+#: ipalib/plugins/automount.py:103
+msgid "Automount"
+msgstr ""
+
+#: ipalib/plugins/automount.py:109 ipalib/plugins/host.py:134
 msgid "Location"
 msgstr ""
 
-#: ipalib/plugins/automount.py:108
+#: ipalib/plugins/automount.py:110
 msgid "Automount location name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:224
+#: ipalib/plugins/automount.py:226
 msgid "Map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:225
+#: ipalib/plugins/automount.py:227
 msgid "Automount map name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:230 ipalib/plugins/group.py:108
+#: ipalib/plugins/automount.py:232 ipalib/plugins/group.py:108
 #: ipalib/plugins/hbac.py:151 ipalib/plugins/hbacsvc.py:72
 #: ipalib/plugins/hbacsvcgroup.py:77 ipalib/plugins/host.py:124
 #: ipalib/plugins/hostgroup.py:81 ipalib/plugins/netgroup.py:96
@@ -551,39 +560,39 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:234
+#: ipalib/plugins/automount.py:236
 msgid "Automount Maps"
 msgstr ""
 
-#: ipalib/plugins/automount.py:306
+#: ipalib/plugins/automount.py:308
 msgid "Key"
 msgstr ""
 
-#: ipalib/plugins/automount.py:307
+#: ipalib/plugins/automount.py:309
 msgid "Automount key name"
 msgstr ""
 
-#: ipalib/plugins/automount.py:312
+#: ipalib/plugins/automount.py:314
 msgid "Mount information"
 msgstr ""
 
-#: ipalib/plugins/automount.py:316
+#: ipalib/plugins/automount.py:318
 msgid "description"
 msgstr ""
 
-#: ipalib/plugins/automount.py:320
+#: ipalib/plugins/automount.py:322
 msgid "Automount Keys"
 msgstr ""
 
-#: ipalib/plugins/automount.py:340
+#: ipalib/plugins/automount.py:342
 msgid "Mount point"
 msgstr ""
 
-#: ipalib/plugins/automount.py:344
+#: ipalib/plugins/automount.py:346
 msgid "Parent map"
 msgstr ""
 
-#: ipalib/plugins/automount.py:345
+#: ipalib/plugins/automount.py:347
 msgid "Name of parent automount map (default: auto.master)"
 msgstr ""
 
@@ -667,7 +676,7 @@ msgstr ""
 msgid "Failure decoding Certificate Signing Request: %s"
 msgstr ""
 
-#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:162
+#: ipalib/plugins/cert.py:171 ipalib/plugins/service.py:197
 msgid "Principal"
 msgstr ""
 
@@ -680,9 +689,7 @@ msgid "automatically add the principal if it doesn't exist"
 msgstr ""
 
 #: ipalib/plugins/cert.py:187 ipalib/plugins/cert.py:392
-#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:185
-#: ipalib/plugins/service.py:265 ipalib/plugins/service.py:304
-#: ipalib/plugins/service.py:343
+#: ipalib/plugins/host.py:154 ipalib/plugins/service.py:204
 msgid "Certificate"
 msgstr ""
 
@@ -894,60 +901,60 @@ msgstr ""
 msgid "BIND update policy"
 msgstr ""
 
-#: ipalib/plugins/dns.py:411 ipalib/plugins/dns.py:445
-#: ipalib/plugins/dns.py:480 ipalib/plugins/dns.py:595
-#: ipalib/plugins/dns.py:680 ipalib/plugins/dns.py:804
+#: ipalib/plugins/dns.py:426 ipalib/plugins/dns.py:460
+#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:695 ipalib/plugins/dns.py:819
 msgid "Zone name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:485
+#: ipalib/plugins/dns.py:500
 msgid "resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:490 ipalib/plugins/dns.py:605
-#: ipalib/plugins/dns.py:696
+#: ipalib/plugins/dns.py:505 ipalib/plugins/dns.py:620
+#: ipalib/plugins/dns.py:711
 msgid "Record type"
 msgstr ""
 
-#: ipalib/plugins/dns.py:494 ipalib/plugins/dns.py:609
+#: ipalib/plugins/dns.py:509 ipalib/plugins/dns.py:624
 msgid "Data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:495 ipalib/plugins/dns.py:610
+#: ipalib/plugins/dns.py:510 ipalib/plugins/dns.py:625
 msgid "Type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:502
+#: ipalib/plugins/dns.py:517
 msgid "Time to live"
 msgstr ""
 
-#: ipalib/plugins/dns.py:507
+#: ipalib/plugins/dns.py:522
 msgid "Class"
 msgstr ""
 
-#: ipalib/plugins/dns.py:600 ipalib/plugins/dns.py:692
-#: ipalib/plugins/dns.py:809
+#: ipalib/plugins/dns.py:615 ipalib/plugins/dns.py:707
+#: ipalib/plugins/dns.py:824
 msgid "Resource name"
 msgstr ""
 
-#: ipalib/plugins/dns.py:685
+#: ipalib/plugins/dns.py:700
 msgid "Search criteria"
 msgstr ""
 
-#: ipalib/plugins/dns.py:700
+#: ipalib/plugins/dns.py:715
 msgid "type-specific data"
 msgstr ""
 
-#: ipalib/plugins/dns.py:850
+#: ipalib/plugins/dns.py:865
 #, python-format
 msgid "Found '%(value)s'"
 msgstr ""
 
-#: ipalib/plugins/dns.py:854
+#: ipalib/plugins/dns.py:869
 msgid "Hostname"
 msgstr ""
 
-#: ipalib/plugins/dns.py:867
+#: ipalib/plugins/dns.py:882
 #, python-format
 msgid "Host '%(host)s' not found"
 msgstr ""
@@ -1077,8 +1084,8 @@ msgstr ""
 msgid "Service category the rule applies to"
 msgstr ""
 
-#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:309
-#: ipalib/plugins/hbac.py:347
+#: ipalib/plugins/hbac.py:147 ipalib/plugins/hbac.py:325
+#: ipalib/plugins/hbac.py:363
 msgid "Access time"
 msgstr ""
 
@@ -1106,7 +1113,7 @@ msgid "Source hosts"
 msgstr ""
 
 #: ipalib/plugins/hbac.py:174 ipalib/plugins/hbacsvc.py:60
-#: ipalib/plugins/service.py:157
+#: ipalib/plugins/service.py:192
 msgid "Services"
 msgstr ""
 
@@ -1126,12 +1133,12 @@ msgstr ""
 msgid "Description of service"
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:176
+#: ipalib/plugins/hbacsvc.py:84 ipalib/plugins/service.py:216
 #, python-format
 msgid "Added service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:224
+#: ipalib/plugins/hbacsvc.py:93 ipalib/plugins/service.py:255
 #, python-format
 msgid "Deleted service \"%(value)s\""
 msgstr ""
@@ -1219,9 +1226,7 @@ msgstr ""
 msgid "Password used in bulk enrollment"
 msgstr ""
 
-#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:186
-#: ipalib/plugins/service.py:266 ipalib/plugins/service.py:305
-#: ipalib/plugins/service.py:344
+#: ipalib/plugins/host.py:155 ipalib/plugins/service.py:205
 msgid "Base-64 encoded server certificate"
 msgstr ""
 
@@ -1271,11 +1276,11 @@ msgid_plural "%(count)d hosts matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:83
+#: ipalib/plugins/host.py:337 ipalib/plugins/service.py:84
 msgid "Keytab"
 msgstr ""
 
-#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:386
+#: ipalib/plugins/host.py:359 ipalib/plugins/service.py:399
 #, python-format
 msgid "Removed kerberos key from \"%(value)s\""
 msgstr ""
@@ -1410,27 +1415,31 @@ msgstr ""
 msgid "Dict of I18N messages"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:62 ipalib/plugins/passwd.py:52
+#: ipalib/plugins/krbtpolicy.py:59
+msgid "Kerberos Ticket Policy"
+msgstr ""
+
+#: ipalib/plugins/krbtpolicy.py:64 ipalib/plugins/passwd.py:52
 msgid "User name"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:63
+#: ipalib/plugins/krbtpolicy.py:65
 msgid "Manage ticket policy for specific user"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:68
+#: ipalib/plugins/krbtpolicy.py:70
 msgid "Max life"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:69
+#: ipalib/plugins/krbtpolicy.py:71
 msgid "Maximum ticket life (seconds)"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:73
+#: ipalib/plugins/krbtpolicy.py:75
 msgid "Max renew"
 msgstr ""
 
-#: ipalib/plugins/krbtpolicy.py:74
+#: ipalib/plugins/krbtpolicy.py:76
 msgid "Maximum renewable age (seconds)"
 msgstr ""
 
@@ -1581,75 +1590,79 @@ msgstr ""
 msgid "priority must be a unique value (%(prio)d already used by %(gname)s)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:173
+#: ipalib/plugins/pwpolicy.py:170
+msgid "Password Policy"
+msgstr ""
+
+#: ipalib/plugins/pwpolicy.py:175
 msgid "Group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:174
+#: ipalib/plugins/pwpolicy.py:176
 msgid "Manage password policy for specific group"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:179
+#: ipalib/plugins/pwpolicy.py:181
 msgid "Max lifetime (days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:180
+#: ipalib/plugins/pwpolicy.py:182
 msgid "Maximum password lifetime (in days)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:185
+#: ipalib/plugins/pwpolicy.py:187
 msgid "Min lifetime (hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:186
+#: ipalib/plugins/pwpolicy.py:188
 msgid "Minimum password lifetime (in hours)"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:191
+#: ipalib/plugins/pwpolicy.py:193
 msgid "History size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:192
+#: ipalib/plugins/pwpolicy.py:194
 msgid "Password history size"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:197
+#: ipalib/plugins/pwpolicy.py:199
 msgid "Character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:198
+#: ipalib/plugins/pwpolicy.py:200
 msgid "Minimum number of character classes"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:204
+#: ipalib/plugins/pwpolicy.py:206
 msgid "Min length"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:205
+#: ipalib/plugins/pwpolicy.py:207
 msgid "Minimum length of password"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:210
+#: ipalib/plugins/pwpolicy.py:212
 msgid "Priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:211
+#: ipalib/plugins/pwpolicy.py:213
 msgid "Priority of the policy (higher number means lower priority"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:263
+#: ipalib/plugins/pwpolicy.py:265
 msgid "Maximum password life must be greater than minimum."
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:328
+#: ipalib/plugins/pwpolicy.py:330
 msgid "priority cannot be set on global policy"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:367
+#: ipalib/plugins/pwpolicy.py:369
 msgid "User"
 msgstr ""
 
-#: ipalib/plugins/pwpolicy.py:368
+#: ipalib/plugins/pwpolicy.py:370
 msgid "Display effective policy for a specific user"
 msgstr ""
 
@@ -1691,27 +1704,27 @@ msgid_plural "%(count)d rolegroups matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:163
+#: ipalib/plugins/service.py:198
 msgid "Service principal"
 msgstr ""
 
-#: ipalib/plugins/service.py:181
+#: ipalib/plugins/service.py:221
 msgid "force principal name even if not in DNS"
 msgstr ""
 
-#: ipalib/plugins/service.py:261
+#: ipalib/plugins/service.py:292
 #, python-format
 msgid "Modified service \"%(value)s\""
 msgstr ""
 
-#: ipalib/plugins/service.py:298
+#: ipalib/plugins/service.py:323
 #, python-format
 msgid "%(count)d service matched"
 msgid_plural "%(count)d services matched"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ipalib/plugins/service.py:396
+#: ipalib/plugins/service.py:409
 msgid "Service principal has no kerberos key"
 msgstr ""
author	Simo Sorce <ssorce@redhat.com>	2010-10-13 14:28:30 -0400
committer	Rob Crittenden <rcritten@redhat.com>	2010-10-13 14:35:35 -0400
commit	2e17649aae1b5586c39853b8f745631124c85104 (patch)
tree	8c4a3bf04b995cbacefbf18d93a91c86176efae2 /install/po
parent	19272e5b8ef47be91988d2f316391568306e6919 (diff)
download	freeipa-2e17649aae1b5586c39853b8f745631124c85104.tar.gz freeipa-2e17649aae1b5586c39853b8f745631124c85104.tar.xz freeipa-2e17649aae1b5586c39853b8f745631124c85104.zip